From 698035fc1ec030edfbdcd9308aaaafa3445a2d9b Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sun, 11 Aug 2019 08:13:39 +0200 Subject: [PATCH 1/5] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- .../akonadi_followupreminder_agent.notifyrc | 2 +- agents/followupreminderagent/followupreminder.desktop | 4 ++-- src/data/kmail2.notifyrc | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc index 692248942..f768a4124 100644 --- a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc +++ b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc @@ -22,7 +22,7 @@ Comment[ko]=후속 작업 알림 에이전트 Comment[nb]=Agent for påminnelse om oppfølging Comment[nds]=Antwoortnaricht-Anstoothölper Comment[nl]=Agent voor herinneren aan vervolgactie -Comment[pl]=Usługa ponaglającego przypominania +Comment[pl]=Usługa przypominania Comment[pt]=Agente de recordação de seguimentos Comment[pt_BR]=Agente para acompanhar os lembretes Comment[ru]=Агент напоминания о продолжении diff --git a/agents/followupreminderagent/followupreminder.desktop b/agents/followupreminderagent/followupreminder.desktop index e88a83f0f..06d2af4c7 100644 --- a/agents/followupreminderagent/followupreminder.desktop +++ b/agents/followupreminderagent/followupreminder.desktop @@ -21,7 +21,7 @@ Name[ko]=후속 작업 알림 에이전트 Name[nb]=Agent for påminnelse om oppfølging Name[nds]=Antwoortnaricht-Anstoothölper Name[nl]=Agent voor herinneren aan vervolgactie -Name[pl]=Usługa ponaglającego przypominania +Name[pl]=Usługa przypominania Name[pt]=Agente de Recordação de Seguimentos Name[pt_BR]=Agente de Lembretes de Acompanhamento Name[ru]=Агент напоминания о продолжении @@ -60,7 +60,7 @@ Comment[nb]=Agenten for påminnelse om oppfølging kan minne deg om at det ikke Comment[nds]=De Antwoortnaricht-Anstoothölper stööt Di an, wenn Du op en Nettbreef noch nich antert hest. Comment[nl]=Agent voor herinneren aan vervolgactie stelt u in staat om u te herinneren aan een nog niet beantwoord e-mailbericht. Comment[nn]=Agenten for oppfølgingspåminning kan minna deg på å svara. -Comment[pl]=Usługa ponaglającego przypominania przypomina ci gdy nie odpowiedziano na wiadomość. +Comment[pl]=Usługa przypominania przypomina ci gdy nie odpowiedziano na wiadomość. Comment[pt]=O Agente de Recordação de Seguimentos permite-lhe lembrar que um dado e-mail não foi respondido. Comment[pt_BR]=O Agende de Lembretes de Acompanhamento permite lembrar-lhe quando um e-mail não foi respondido. Comment[ru]=Агент напоминания о продолжении будет напоминать вам о письмах, на которые вам не ответили. diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index 1310b394c..c85de063a 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -449,7 +449,7 @@ Name[ko]=폴더 보관 오류 Name[nb]=Feil i postarkiv Name[nds]=Orner-Archiveerfehler Name[nl]=fout in archiveren van map -Name[pl]=Usługa archiwizacji poczty +Name[pl]=Usługa archiwizowania poczty Name[pt]=Erro no Arquivo de Pastas Name[pt_BR]=Erro no arquivamento de pastas Name[ru]=Ошибка архивирования папки From 3a724812da4f22bb3fcc29194eea5b7f6a9405ac Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 16 Aug 2019 07:05:51 +0200 Subject: [PATCH 2/5] GIT_SILENT: Prepare 5.12.0 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0128e3c54..8d51f2430 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(KDEPIM_VERSION_NUMBER "5.12.0") +set(KDEPIM_VERSION_NUMBER "5.12.1") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) From 46a46adaa294db161700a68a6332b0f282de5009 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Sat, 17 Aug 2019 08:47:26 +0200 Subject: [PATCH 3/5] SVN_SILENT made messages (.desktop file) - always resolve ours In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop" --- kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index 5488a8f98..a80dff4c7 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -5,6 +5,7 @@ Name[de]=Erneuerung der Einstellungen für KMail Name[en_GB]=KMail Refresh Settings Name[fi]=KMailin asetusten virkistys Name[fr]=Rafraîchissement des paramètres de KMail +Name[gl]=Configuración de actualización de KMail Name[it]=Rinnovo delle impostazioni di KMail Name[nl]=Vernieuwen van instellingen van KMail Name[pl]=Odświeżanie ustawień KMaila @@ -24,6 +25,7 @@ GenericName[de]=Erneuerung der Einstellungen für KMail GenericName[en_GB]=KMail refresh settings GenericName[fi]=KMailin asetusten virkistys GenericName[fr]=Rafraîchissement des paramètres de KMail +GenericName[gl]=Configuración de actualización de KMail GenericName[it]=Rinnovo delle impostazioni di KMail GenericName[nl]=Instellingen van vernieuwen KMail GenericName[pl]=Odświeżanie ustawień KMaila @@ -39,6 +41,7 @@ Comment[de]=Erneuerung der Einstellungen für KMail Comment[en_GB]=Refresh KMail settings Comment[fi]=Virkistä KMail-asetukset Comment[fr]=Rafraîchir les paramètres de KMail +Comment[gl]=Configuración de actualización de KMail Comment[it]=Rinnova le impostazioni di KMail Comment[nl]=KMail-instellingen vernieuwen Comment[pl]=Ustawienia odświeżania KMaila From 059c1b6d7bfc484bfde229f9ccaca8ab2bef7588 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 26 Aug 2019 06:55:26 +0200 Subject: [PATCH 4/5] GIT_SILENT: Prepare 5.12.1 --- CMakeLists.txt | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8d51f2430..e24e04b85 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,19 +42,19 @@ endif() set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") -set(AKONADI_MIMELIB_VERSION "5.12.0") -set(AKONADI_CONTACT_VERSION "5.12.0") -set(KCONTACTS_LIB_VERSION "5.12.0") -set(KCALENDARCORE_LIB_VERSION "5.12.0") -set(CALENDARUTILS_LIB_VERSION "5.12.0") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.0") -set(KLDAP_LIB_VERSION "5.12.0") -set(KMAILTRANSPORT_LIB_VERSION "5.12.0") -set(KONTACTINTERFACE_LIB_VERSION "5.12.0") -set(KMIME_LIB_VERSION "5.12.0") -set(KPIMTEXTEDIT_LIB_VERSION "5.12.0") -set(AKONADI_VERSION "5.12.0") -set(KTNEF_LIB_VERSION "5.12.0") +set(AKONADI_MIMELIB_VERSION "5.12.1") +set(AKONADI_CONTACT_VERSION "5.12.1") +set(KCONTACTS_LIB_VERSION "5.12.1") +set(KCALENDARCORE_LIB_VERSION "5.12.1") +set(CALENDARUTILS_LIB_VERSION "5.12.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.12.1") +set(KLDAP_LIB_VERSION "5.12.1") +set(KMAILTRANSPORT_LIB_VERSION "5.12.1") +set(KONTACTINTERFACE_LIB_VERSION "5.12.1") +set(KMIME_LIB_VERSION "5.12.1") +set(KPIMTEXTEDIT_LIB_VERSION "5.12.1") +set(AKONADI_VERSION "5.12.1") +set(KTNEF_LIB_VERSION "5.12.1") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -65,18 +65,18 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branc option(KDEPIM_RUN_AKONADI_TEST "Enable autotest based on Akonadi." TRUE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) -set(LIBGRAVATAR_VERSION_LIB "5.12.0") -set(MAILCOMMON_LIB_VERSION_LIB "5.12.0") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.0") -set(MESSAGELIB_LIB_VERSION_LIB "5.12.0") -set(LIBKLEO_LIB_VERSION_LIB "5.12.0") -set(PIMCOMMON_LIB_VERSION_LIB "5.12.0") -set(LIBKDEPIM_LIB_VERSION_LIB "5.12.0") -set(LIBKSIEVE_LIB_VERSION_LIB "5.12.0") +set(LIBGRAVATAR_VERSION_LIB "5.12.1") +set(MAILCOMMON_LIB_VERSION_LIB "5.12.1") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.12.1") +set(MESSAGELIB_LIB_VERSION_LIB "5.12.1") +set(LIBKLEO_LIB_VERSION_LIB "5.12.1") +set(PIMCOMMON_LIB_VERSION_LIB "5.12.1") +set(LIBKDEPIM_LIB_VERSION_LIB "5.12.1") +set(LIBKSIEVE_LIB_VERSION_LIB "5.12.1") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.12.0" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.12.1" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "https://www.kde.org" TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set(GPGMEPP_LIB_VERSION "1.11.1") From 1ed64bf4065afae609592a0c48272e3ca0ce14db Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Tue, 27 Aug 2019 13:24:02 +0200 Subject: [PATCH 5/5] Fix Bug 409662 - Missing "Save Attachments..." from Multiple Emails FIXED-IN: 5.12.1 BUG: 409662 BUG: 392143 --- src/kmcommands.cpp | 4 ++-- src/kmcommands.h | 2 +- src/kmmainwidget.cpp | 6 ++---- src/searchdialog/searchwindow.cpp | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/kmcommands.cpp b/src/kmcommands.cpp index 88e438649..3a728abd9 100644 --- a/src/kmcommands.cpp +++ b/src/kmcommands.cpp @@ -1765,9 +1765,9 @@ KMSaveAttachmentsCommand::KMSaveAttachmentsCommand(QWidget *parent, const Akonad fetchScope().fetchFullPayload(true); } -KMSaveAttachmentsCommand::KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs) +KMSaveAttachmentsCommand::KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs, MessageViewer::Viewer *viewer) : KMCommand(parent, msgs) - , mViewer(nullptr) + , mViewer(viewer) { fetchScope().fetchFullPayload(true); } diff --git a/src/kmcommands.h b/src/kmcommands.h index d7dc72f5d..431b1bbf0 100644 --- a/src/kmcommands.h +++ b/src/kmcommands.h @@ -309,7 +309,7 @@ public: @param parent The parent widget of the command used for message boxes. @param msgs The messages of which the attachments should be saved. */ - KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs); + KMSaveAttachmentsCommand(QWidget *parent, const Akonadi::Item::List &msgs, MessageViewer::Viewer *viewer); private: Result execute() override; diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index bfe7d3f62..815b3baaa 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -2349,7 +2349,7 @@ void KMMainWidget::slotSaveAttachments() dummyItem.setPayload(mMsgView->message().payload()); saveCommand = new KMSaveAttachmentsCommand(this, dummyItem, mMsgView->viewer()); } else { - saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages); + saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages, mMsgView->viewer()); } saveCommand->start(); @@ -3851,9 +3851,7 @@ void KMMainWidget::updateMessageActionsDelayed() } else if (single_actions) { actionList << mMsgActions->editAsNewAction(); } - if (single_actions) { - actionList << mSaveAttachmentsAction; - } + actionList << mSaveAttachmentsAction; if (mCurrentCollection.isValid() && FolderArchive::FolderArchiveUtil::resourceSupportArchiving(mCurrentCollection.resource())) { actionList << mArchiveAction; } diff --git a/src/searchdialog/searchwindow.cpp b/src/searchdialog/searchwindow.cpp index fe4f1deaa..840f12db8 100644 --- a/src/searchdialog/searchwindow.cpp +++ b/src/searchdialog/searchwindow.cpp @@ -838,7 +838,7 @@ void SearchWindow::slotSaveMsg() void SearchWindow::slotSaveAttachments() { - KMSaveAttachmentsCommand *saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages()); + KMSaveAttachmentsCommand *saveCommand = new KMSaveAttachmentsCommand(this, selectedMessages(), nullptr); saveCommand->start(); }