From e440366ac56dde69d3cb7fcbf26bd3fa464b3d62 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 2 Aug 2020 10:14:10 +0200 Subject: [PATCH 1/6] GIT_SILENT: prepare 5.15.0 --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6fbe0fbba..1461c542a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.14.90") +set(PIM_VERSION "5.15.0") project(kmail VERSION ${PIM_VERSION}) @@ -32,8 +32,8 @@ include(ECMAddAppIcon) include(ECMQtDeclareLoggingCategory) # Do NOT add quote -set(KDEPIM_DEV_VERSION rc) -set(RELEASE_SERVICE_VERSION "20.07.90") +set(KDEPIM_DEV_VERSION) +set(RELEASE_SERVICE_VERSION "20.08.0") # add an extra space if(DEFINED KDEPIM_DEV_VERSION) From e66861779b4f74841c321342e42ed1fe9520bba9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Mon, 3 Aug 2020 07:14:48 +0200 Subject: [PATCH 2/6] GIT_SILENT: prepare 5.15.0 --- CMakeLists.txt | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1461c542a..34b7bb5b1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,17 +43,17 @@ endif() set(KDEPIM_VERSION "${PIM_VERSION}${KDEPIM_DEV_VERSION} (${RELEASE_SERVICE_VERSION})") -set(AKONADI_MIMELIB_VERSION "5.14.90") -set(AKONADI_CONTACT_VERSION "5.14.90") -set(CALENDARUTILS_LIB_VERSION "5.14.90") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.14.90") -set(KLDAP_LIB_VERSION "5.14.90") -set(KMAILTRANSPORT_LIB_VERSION "5.14.90") -set(KONTACTINTERFACE_LIB_VERSION "5.14.90") -set(KMIME_LIB_VERSION "5.14.90") -set(KPIMTEXTEDIT_LIB_VERSION "5.14.90") -set(AKONADI_VERSION "5.14.90") -set(KTNEF_LIB_VERSION "5.14.90") +set(AKONADI_MIMELIB_VERSION "5.15.0") +set(AKONADI_CONTACT_VERSION "5.15.0") +set(CALENDARUTILS_LIB_VERSION "5.15.0") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.15.0") +set(KLDAP_LIB_VERSION "5.15.0") +set(KMAILTRANSPORT_LIB_VERSION "5.15.0") +set(KONTACTINTERFACE_LIB_VERSION "5.15.0") +set(KMIME_LIB_VERSION "5.15.0") +set(KPIMTEXTEDIT_LIB_VERSION "5.15.0") +set(AKONADI_VERSION "5.15.0") +set(KTNEF_LIB_VERSION "5.15.0") set(KDEPIM_LIB_VERSION "${PIM_VERSION}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,17 +64,17 @@ 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.14.90") -set(MAILCOMMON_LIB_VERSION_LIB "5.14.90") -set(MESSAGELIB_LIB_VERSION_LIB "5.14.90") -set(LIBKLEO_LIB_VERSION_LIB "5.14.90") -set(PIMCOMMON_LIB_VERSION_LIB "5.14.90") -set(LIBKDEPIM_LIB_VERSION_LIB "5.14.90") -set(LIBKSIEVE_LIB_VERSION_LIB "5.14.90") +set(LIBGRAVATAR_VERSION_LIB "5.15.0") +set(MAILCOMMON_LIB_VERSION_LIB "5.15.0") +set(MESSAGELIB_LIB_VERSION_LIB "5.15.0") +set(LIBKLEO_LIB_VERSION_LIB "5.15.0") +set(PIMCOMMON_LIB_VERSION_LIB "5.15.0") +set(LIBKDEPIM_LIB_VERSION_LIB "5.15.0") +set(LIBKSIEVE_LIB_VERSION_LIB "5.15.0") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.14.90" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.15.0" 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 0d1fe2eab6ca9c9b57494f19c9cb92cbf89b685f Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Wed, 5 Aug 2020 10:24:25 +0200 Subject: [PATCH 3/6] GIT_SILENT Update Appstream for new release --- src/data/org.kde.kmail2.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/org.kde.kmail2.appdata.xml b/src/data/org.kde.kmail2.appdata.xml index 6e8205988..253f863e8 100644 --- a/src/data/org.kde.kmail2.appdata.xml +++ b/src/data/org.kde.kmail2.appdata.xml @@ -264,9 +264,9 @@ kmail + - From 60275a75d3e17c048f6cafd86350ba6f0cd001a6 Mon Sep 17 00:00:00 2001 From: l10n daemon script Date: Tue, 18 Aug 2020 09:33:37 +0200 Subject: [PATCH 4/6] 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 | 4 ++-- agents/followupreminderagent/followupreminder.desktop | 8 ++++---- .../org.kde.kmail-refresh-settings.desktop | 8 ++++---- src/data/kmail2.notifyrc | 4 ++-- src/data/kmail_config_composer.desktop | 4 ++-- src/data/kmail_config_plugins.desktop | 4 ++-- src/data/kmail_config_security.desktop | 4 ++-- src/data/org.kde.kmail2.desktop | 4 ++-- src/kontactplugin/kmail/kcmkmailsummary.desktop | 4 ++-- 9 files changed, 22 insertions(+), 22 deletions(-) diff --git a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc index 5563a9021..fd970910f 100644 --- a/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc +++ b/agents/followupreminderagent/akonadi_followupreminder_agent.notifyrc @@ -3,8 +3,8 @@ IconName=kmail Comment=Followup reminder agent Comment[ar]=عميل متابعة التّذكيرات Comment[bs]=Prateći agent koji Vas podsjeća -Comment[ca]=Agent per a recordatoris de seguiment -Comment[ca@valencia]=Agent per a recordatoris de seguiment +Comment[ca]=Agent per als recordatoris de seguiment +Comment[ca@valencia]=Agent per als recordatoris de seguiment Comment[da]=Agent til opfølgningspåmindelse Comment[de]=Agent zur Erinnerung an Folgenachrichten Comment[el]=Πράκτορας υπενθύμισης συνέχισης επικοινωνίας diff --git a/agents/followupreminderagent/followupreminder.desktop b/agents/followupreminderagent/followupreminder.desktop index e6886c701..2ab3c7015 100644 --- a/agents/followupreminderagent/followupreminder.desktop +++ b/agents/followupreminderagent/followupreminder.desktop @@ -2,8 +2,8 @@ Name=Followup Reminder Agent Name[ar]=عميل متابعة التّذكيرات Name[bs]=Prateći agent koji Vas podsjeća -Name[ca]=Agent per a recordatoris de seguiment -Name[ca@valencia]=Agent per a recordatoris de seguiment +Name[ca]=Agent per als recordatoris de seguiment +Name[ca@valencia]=Agent per als recordatoris de seguiment Name[da]=Agent til opfølgningspåmindelse Name[de]=Agent zur Erinnerung an Folgenachrichten Name[el]=Πράκτορας υπενθύμισης συνέχισης επικοινωνίας @@ -41,8 +41,8 @@ Name[zh_TW]=回覆提醒代理程式 Comment=Followup Reminder Agent allows to remind you when an email was not answered. Comment[ar]=يذكّرك «عميل متابعة التّذكيرات» بالبريد الذي لم تُجب عليه. Comment[bs]=Prateći agent koji Vas podsjeća omogućava vam informaciju kada neki email nije odgovoren. -Comment[ca]=L'agent per a recordatoris de seguiment permet recordar quan un correu electrònic no ha estat respost. -Comment[ca@valencia]=L'agent per a recordatoris de seguiment permet recordar quan un correu electrònic no ha estat respost. +Comment[ca]=L'agent per als recordatoris de seguiment permet recordar quan un correu electrònic no ha estat respost. +Comment[ca@valencia]=L'agent per als recordatoris de seguiment permet recordar quan un correu electrònic no ha estat respost. Comment[da]=Agent til opfølgningspåmindelse muliggør at minde dig om når e-mail ikke er blevet besvaret. Comment[de]=Der Agent zur Erinnerung an Folgenachrichten erinnert Sie, wenn eine E-Mail nicht beantwortet wurde. Comment[el]=Ο πράκτορας υπενθύμισης συνέχισης επικοινωνίας σας υπενθυμίζει πότε ένα μήνυμα ηλ. αλληλογραφίας δεν έχει απαντηθεί. diff --git a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop index d37f5060a..297b3efa5 100755 --- a/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop +++ b/kmail-refresh-settings/org.kde.kmail-refresh-settings.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Name=KMail Refresh Settings -Name[ca]=Actualització dels ajustaments del KMail -Name[ca@valencia]=Actualització dels ajustaments del KMail +Name[ca]=Actualitza els ajustaments del KMail +Name[ca@valencia]=Actualitza els ajustaments del KMail Name[cs]=Obnovení nastavení KMailu Name[da]=Indstillinger for genopfriskning af KMail Name[de]=Erneuerung der Einstellungen für KMail @@ -31,8 +31,8 @@ Exec=kmail-refresh-settings -qwindowtitle %c %u Icon=kmail X-DocPath=kmail2/index.html GenericName=KMail refresh settings -GenericName[ca]=Actualització dels ajustaments del KMail -GenericName[ca@valencia]=Actualització dels ajustaments del KMail +GenericName[ca]=Actualitza els ajustaments del KMail +GenericName[ca@valencia]=Actualitza els ajustaments del KMail GenericName[cs]=Obnovení nastavení KMailu GenericName[da]=Indstillinger for genopfriskning af KMail GenericName[de]=Erneuerung der Einstellungen für KMail diff --git a/src/data/kmail2.notifyrc b/src/data/kmail2.notifyrc index c1e4e004f..4f1d13d11 100644 --- a/src/data/kmail2.notifyrc +++ b/src/data/kmail2.notifyrc @@ -493,8 +493,8 @@ Action=Popup [Event/undosend] Name=Email added to the send later queue -Name[ca]=Correu afegit a la cua d'enviar més tard -Name[ca@valencia]=Correu afegit a la cua d'enviar més tard +Name[ca]=Correu afegit a la cua per a enviar més tard +Name[ca@valencia]=Correu afegit a la cua per a enviar més tard Name[cs]=E-maily přidané do fronty pro pozdější odeslání Name[da]=E-mail føjet til send senere-køen Name[de]=E-Mail zur Später-Senden-Warteschlange hinzugefügt diff --git a/src/data/kmail_config_composer.desktop b/src/data/kmail_config_composer.desktop index d5735de1c..b6c56189e 100644 --- a/src/data/kmail_config_composer.desktop +++ b/src/data/kmail_config_composer.desktop @@ -83,8 +83,8 @@ Name[zh_TW]=編寫器 Comment=Message Composer Settings Comment[ar]=إعدادات مؤلّف الرّسائل Comment[bs]=Postvake pisača poruka -Comment[ca]=Arranjament de l'editor de missatges -Comment[ca@valencia]=Arranjament de l'editor de missatges +Comment[ca]=Ajustaments per a l'editor de missatges +Comment[ca@valencia]=Ajustaments per a l'editor de missatges Comment[cs]=Nastavení editoru zpráv Comment[da]=Indstiling af brevskriver Comment[de]=Einstellungen für den E-Mail-Editor diff --git a/src/data/kmail_config_plugins.desktop b/src/data/kmail_config_plugins.desktop index 996398678..49ead531d 100644 --- a/src/data/kmail_config_plugins.desktop +++ b/src/data/kmail_config_plugins.desktop @@ -85,8 +85,8 @@ Name[zh_CN]=插件 Name[zh_TW]=外掛程式 Comment=Settings Plugins Comment[ar]=إعدادات الملحقات -Comment[ca]=Arranjament dels connectors -Comment[ca@valencia]=Arranjament dels connectors +Comment[ca]=Ajustaments per als connectors +Comment[ca@valencia]=Ajustaments per als connectors Comment[cs]=Moduly Nastavení Comment[da]=Plugins til indstillinger Comment[de]=Einstellungsmodul diff --git a/src/data/kmail_config_security.desktop b/src/data/kmail_config_security.desktop index 15cfcd46b..397d8f89d 100644 --- a/src/data/kmail_config_security.desktop +++ b/src/data/kmail_config_security.desktop @@ -92,8 +92,8 @@ Comment[be]=Настаўленні бяспекі і прыватнасці Comment[bg]=Настройки на сигурността Comment[br]=Kefluniadur surentez ar buhez prevez Comment[bs]=Postavke sigurnosti i privatnosti -Comment[ca]=Arranjament de la seguretat i privadesa -Comment[ca@valencia]=Arranjament de la seguretat i privadesa +Comment[ca]=Ajustaments per a la seguretat i privadesa +Comment[ca@valencia]=Ajustaments per a la seguretat i privadesa Comment[cs]=Nastavení soukromí a zabezpečení Comment[da]=Sikkerheds- & Privathedsindstillinger Comment[de]=Sicherheit und Privatsphäre diff --git a/src/data/org.kde.kmail2.desktop b/src/data/org.kde.kmail2.desktop index 782648b9c..7377ac4f2 100755 --- a/src/data/org.kde.kmail2.desktop +++ b/src/data/org.kde.kmail2.desktop @@ -154,8 +154,8 @@ GenericName[zh_CN]=邮件客户端 GenericName[zh_TW]=收發信軟體 Comment=Send, receive and manage your mail with KMail Comment[ar]=أرسل البريد واستلمه وأدره عبر «بريدك» -Comment[ca]=Envia, rep i gestiona el vostre correu amb el KMail -Comment[ca@valencia]=Envia, rep i gestiona el vostre correu amb el KMail +Comment[ca]=Envia, rep i gestiona el correu amb el KMail +Comment[ca@valencia]=Envia, rep i gestiona el correu amb el KMail Comment[da]=Send, modtag og håndtér din e-mail med KMail Comment[de]=Senden, empfangen und verwalten Ihrer E-Mails mit KMail Comment[en_GB]=Send, receive and manage your mail with KMail diff --git a/src/kontactplugin/kmail/kcmkmailsummary.desktop b/src/kontactplugin/kmail/kcmkmailsummary.desktop index e112d00d9..9e47a6d43 100644 --- a/src/kontactplugin/kmail/kcmkmailsummary.desktop +++ b/src/kontactplugin/kmail/kcmkmailsummary.desktop @@ -134,8 +134,8 @@ Comment[zh_TW]=郵件摘要設定 X-KDE-Keywords=email, summary, configure, settings X-KDE-Keywords[ar]=email,summary,configure,settings,بريد,ملخص,ضبط,إعداد,إعدادات X-KDE-Keywords[bs]=elektronska pošta, rezime, konfiguriranje, postavke -X-KDE-Keywords[ca]=correu electrònic, resum, configura, arranjament -X-KDE-Keywords[ca@valencia]=correu electrònic, resum, configura, arranjament +X-KDE-Keywords[ca]=correu electrònic, resum, configura, ajustaments +X-KDE-Keywords[ca@valencia]=correu electrònic, resum, configura, ajustaments X-KDE-Keywords[da]=e-mail, oversigt, indstil, indstillinger X-KDE-Keywords[de]=E-Mail,email,Übersicht,einstellen,konfigurieren,Konfiguration,Einrichtung,Einstellungen X-KDE-Keywords[el]=αλληλογραφία, σύνοψη, διαμόρφωση, ρυθμίσεις From 55238114c7a258eb7bd5eca7ab6c8dc798f7f124 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sat, 22 Aug 2020 13:02:16 +0200 Subject: [PATCH 5/6] GIT_SILENT: prepare 5.15.1 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 34b7bb5b1..8de57e504 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.5) -set(PIM_VERSION "5.15.0") +set(PIM_VERSION "5.15.1") project(kmail VERSION ${PIM_VERSION}) @@ -33,7 +33,7 @@ include(ECMQtDeclareLoggingCategory) # Do NOT add quote set(KDEPIM_DEV_VERSION) -set(RELEASE_SERVICE_VERSION "20.08.0") +set(RELEASE_SERVICE_VERSION "20.08.1") # add an extra space if(DEFINED KDEPIM_DEV_VERSION) From 0b8cfef8b5407cb8d1f7afcf4384d1f0decbf09d Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Sun, 23 Aug 2020 15:18:58 +0200 Subject: [PATCH 6/6] Fix crash when we call "save attachments" BUG: 425532 FIXED-IN: 5.15.1 --- src/kmmainwidget.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp index 7d5d56cc1..45fe9e9f6 100644 --- a/src/kmmainwidget.cpp +++ b/src/kmmainwidget.cpp @@ -2340,6 +2340,9 @@ void KMMainWidget::slotSaveAttachments() if (selectedMessages.isEmpty()) { return; } + if (!mMsgView) { + return; + } // Avoid re-downloading in the common case that only one message is selected, and the message // is also displayed in the viewer. For this, create a dummy item without a parent collection / item id, // so that KMCommand doesn't download it.