Hello community, here is the log from the commit of package kmail for openSUSE:Factory checked in at 2018-07-18 22:43:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmail (Old) and /work/SRC/openSUSE:Factory/.kmail.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmail" Wed Jul 18 22:43:02 2018 rev:22 rq:622689 version:18.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kmail/kmail.changes 2018-06-13 15:23:04.888588284 +0200 +++ /work/SRC/openSUSE:Factory/.kmail.new/kmail.changes 2018-07-18 22:43:05.481118843 +0200 @@ -1,0 +2,19 @@ +Fri Jul 13 04:50:01 UTC 2018 - [email protected] + +- Update to 18.04.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.04.3.php +- Changes since 18.04.2: + * Fix Bug 395353 - kmail doesn't honor Subject and In-Reply-To in mailto: links (kde#395353) + * KMail: don't move the mainwindow to the current desktop when invoking a composer + * Fix typo in argument name + * Allow to make working as an email when we forward message as attachment + +------------------------------------------------------------------- +Thu Jun 21 07:59:43 UTC 2018 - [email protected] + +- Add explicit requires for pimcommon libraries (libKF5PimCommon5 and + libKF5PimCommonAkonadi5) and for messagelib + +------------------------------------------------------------------- Old: ---- kmail-18.04.2.tar.xz New: ---- kmail-18.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmail.spec ++++++ --- /var/tmp/diff_new_pack.MJM7Tm/_old 2018-07-18 22:43:06.085116841 +0200 +++ /var/tmp/diff_new_pack.MJM7Tm/_new 2018-07-18 22:43:06.089116828 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: kmail -Version: 18.04.2 +Version: 18.04.3 Release: 0 %define kf5_version 5.35.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) @@ -103,6 +103,9 @@ Requires: kdepim-addons Requires: kdepim-runtime Requires: kmail-account-wizard +%requires_eq libKF5PimCommon5 +%requires_eq libKF5PimCommonAkonadi5 +%requires_eq messagelib Recommends: akonadi-import-wizard Recommends: akonadi-search Recommends: kleopatra ++++++ kmail-18.04.2.tar.xz -> kmail-18.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/CMakeLists.txt new/kmail-18.04.3/CMakeLists.txt --- old/kmail-18.04.2/CMakeLists.txt 2018-06-05 03:21:10.000000000 +0200 +++ new/kmail-18.04.3/CMakeLists.txt 2018-07-10 02:14:33.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.1) -set(KDEPIM_VERSION_NUMBER "5.8.2") +set(KDEPIM_VERSION_NUMBER "5.8.3") project(kmail VERSION ${KDEPIM_VERSION_NUMBER}) @@ -43,19 +43,19 @@ set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}") -set(AKONADI_MIMELIB_VERSION "5.8.2") -set(AKONADI_CONTACT_VERSION "5.8.2") -set(KCONTACTS_LIB_VERSION "5.8.2") -set(KCALENDARCORE_LIB_VERSION "5.8.2") -set(CALENDARUTILS_LIB_VERSION "5.8.2") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.2") -set(KLDAP_LIB_VERSION "5.8.2") -set(KMAILTRANSPORT_LIB_VERSION "5.8.2") -set(KONTACTINTERFACE_LIB_VERSION "5.8.2") -set(KMIME_LIB_VERSION "5.8.2") -set(KPIMTEXTEDIT_LIB_VERSION "5.8.2") -set(AKONADI_VERSION "5.8.2") -set(KTNEF_LIB_VERSION "5.8.2") +set(AKONADI_MIMELIB_VERSION "5.8.3") +set(AKONADI_CONTACT_VERSION "5.8.3") +set(KCONTACTS_LIB_VERSION "5.8.3") +set(KCALENDARCORE_LIB_VERSION "5.8.3") +set(CALENDARUTILS_LIB_VERSION "5.8.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.8.3") +set(KLDAP_LIB_VERSION "5.8.3") +set(KMAILTRANSPORT_LIB_VERSION "5.8.3") +set(KONTACTINTERFACE_LIB_VERSION "5.8.3") +set(KMIME_LIB_VERSION "5.8.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.8.3") +set(AKONADI_VERSION "5.8.3") +set(KTNEF_LIB_VERSION "5.8.3") set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}") set(KDEPIM_LIB_SOVERSION "5") @@ -64,18 +64,18 @@ option(KDEPIM_ENTERPRISE_BUILD "Enable features specific to the enterprise branch, which are normally disabled. Also, it disables many components not needed for Kontact such as the Kolab client." FALSE) find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED DBus Network Test Widgets WebEngine WebEngineWidgets) -set(LIBGRAVATAR_VERSION_LIB "5.8.2") -set(MAILCOMMON_LIB_VERSION_LIB "5.8.2") -set(KDEPIM_APPS_LIB_VERSION_LIB "5.8.2") -set(MESSAGELIB_LIB_VERSION_LIB "5.8.2") -set(LIBKLEO_LIB_VERSION_LIB "5.8.2") -set(PIMCOMMON_LIB_VERSION_LIB "5.8.2") -set(LIBKDEPIM_LIB_VERSION_LIB "5.8.2") -set(LIBKSIEVE_LIB_VERSION_LIB "5.8.2") +set(LIBGRAVATAR_VERSION_LIB "5.8.3") +set(MAILCOMMON_LIB_VERSION_LIB "5.8.3") +set(KDEPIM_APPS_LIB_VERSION_LIB "5.8.3") +set(MESSAGELIB_LIB_VERSION_LIB "5.8.3") +set(LIBKLEO_LIB_VERSION_LIB "5.8.3") +set(PIMCOMMON_LIB_VERSION_LIB "5.8.3") +set(LIBKDEPIM_LIB_VERSION_LIB "5.8.3") +set(LIBKSIEVE_LIB_VERSION_LIB "5.8.3") find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION_LIB} CONFIG REQUIRED) -find_package(KF5AkonadiSearch "5.8.2" CONFIG REQUIRED) +find_package(KF5AkonadiSearch "5.8.3" CONFIG REQUIRED) set_package_properties(KF5AkonadiSearch PROPERTIES DESCRIPTION "The Akonadi Search libraries" URL "http://www.kde.org"; TYPE REQUIRED PURPOSE "Provides search capabilities in KMail and Akonadi") set(GPGMEPP_LIB_VERSION "1.8.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/agents/archivemailagent/akonadi_archivemail_agent.notifyrc new/kmail-18.04.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc --- old/kmail-18.04.2/agents/archivemailagent/akonadi_archivemail_agent.notifyrc 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/agents/archivemailagent/akonadi_archivemail_agent.notifyrc 2018-06-29 07:03:36.000000000 +0200 @@ -202,6 +202,7 @@ Name[nb]=Mappa finnes ikke Name[nds]=Gifft Orner nich Name[nl]=Map bestaat niet +Name[nn]=Mappa finst ikkje Name[pl]=Katalog nie istnieje Name[pt]=A pasta não existe Name[pt_BR]=A pasta não existe diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/ca/docs/kmail2/configure.docbook new/kmail-18.04.3/po/ca/docs/kmail2/configure.docbook --- old/kmail-18.04.2/po/ca/docs/kmail2/configure.docbook 2018-06-05 03:21:00.000000000 +0200 +++ new/kmail-18.04.3/po/ca/docs/kmail2/configure.docbook 2018-07-10 02:14:32.000000000 +0200 @@ -675,7 +675,7 @@ ><para >Aquest tipus de signatura no té res a veure amb les signatures (digital) que >heu pogut seleccionar a la pestanya <link >linkend="configure-identity-cryptography" >Criptografia</link ->. Aquesta paraula s'empra per a cridar a una signatura, però aquest terme també és usat a d'altres llocs, pel que conservarem aquesta notació. Tingueu present que aquestes signatures i les signatures digitals són dues coses completament diferents.</para +>. Aquesta paraula s'empra per a cridar a una signatura, però aquest terme també és usat a altres llocs, pel que conservarem aquesta notació. Tingueu present que aquestes signatures i les signatures digitals són dues coses completament diferents.</para ></note> <para >Marqueu l'opció <guilabel @@ -2133,7 +2133,7 @@ </term> <listitem> <para ->No s'enviarà cap part del missatge que els obligatoris id. del missatge i el destinatari original, que s'inclouen en la resposta &mdn;. Es preserva prou informació com perquè el remitent trobi el missatge entre els que ha enviat i per al que s'ha generat aquesta &mdn;. </para> +>No s'enviarà cap part del missatge que els obligatoris id. del missatge i el destinatari original, que s'inclouen en la resposta &mdn;. Es preserva prou informació perquè el remitent trobi el missatge entre els que ha enviat i per al que s'ha generat aquesta &mdn;. </para> </listitem> </varlistentry> <varlistentry> @@ -2232,7 +2232,7 @@ >Si està marcada, qualsevol missatge que s'encripti per als destinataris també >serà encriptat per a vosaltres. </para> <warning> <para ->Si desmarqueu aquesta opció, podríeu no ser capaç de desencriptar els missatges que escriviu i els encriptats per d'altra gent. </para> +>Si desmarqueu aquesta opció, podríeu no ser capaç de desencriptar els missatges que escriviu i els encriptats per altra gent. </para> </warning> </listitem> </varlistentry> @@ -2956,7 +2956,7 @@ <warning ><para ->Per a qualsevol canvi d'aquestes opcions, primer assegureu-vos de sortir del &kmail; abans d'editar el fitxer de configuració. Només reinicieu el &kmail; després que hàgeu fet <emphasis +>Per a qualsevol canvi d'aquestes opcions, primer assegureu-vos de sortir del &kmail; abans d'editar el fitxer de configuració. Només reinicieu el &kmail; després que hàgiu fet <emphasis >i desat</emphasis > els canvis al fitxer de configuració. </para ></warning> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/ca/docs/kmail2/faq.docbook new/kmail-18.04.3/po/ca/docs/kmail2/faq.docbook --- old/kmail-18.04.2/po/ca/docs/kmail2/faq.docbook 2018-06-05 03:21:00.000000000 +0200 +++ new/kmail-18.04.3/po/ca/docs/kmail2/faq.docbook 2018-07-10 02:14:32.000000000 +0200 @@ -1050,7 +1050,7 @@ >Tanca del Mutt</guilabel > pot usar-se de la mateixa manera que l'opció <guilabel >Fitxer de blocat procmail</guilabel ->, amb la mateixa limitació en quant a les carpetes <filename class="directory" +>, amb la mateixa limitació respecte a les carpetes <filename class="directory" >/var/spool/mail/</filename >. Tanmateix, l'opció <guilabel >Tanca privilegiada del Mutt</guilabel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/ca/docs/kmail2/troubleshooting.docbook new/kmail-18.04.3/po/ca/docs/kmail2/troubleshooting.docbook --- old/kmail-18.04.2/po/ca/docs/kmail2/troubleshooting.docbook 2018-06-05 03:21:00.000000000 +0200 +++ new/kmail-18.04.3/po/ca/docs/kmail2/troubleshooting.docbook 2018-07-10 02:14:32.000000000 +0200 @@ -33,7 +33,7 @@ >akonadiconsole</application > i afegint Agent distribuïdor de correu. </para> <para ->Si l'ordinador ha passat sobtadament a mode de suspensió (&pex; per un tall d'energia) de vegades els correus electrònics simplement es queden a la safata de sortida sense enviar, però no hi ha missatge d'error generat. Això es pot deure al fet que l'Agent distribuïdor de correu està establert a <quote +>Si l'ordinador ha passat sobtadament al mode de suspensió (&pex; per un tall d'energia) de vegades els correus electrònics simplement es queden a la safata de sortida sense enviar, però no hi ha missatge d'error generat. Això es pot deure al fet que l'Agent distribuïdor de correu està establert a <quote >fora de línia</quote > en el fitxer de configuració durant la suspensió i no es canvia a causa de > la caiguda. Editeu el següent fitxer: </para> <para diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/fr/kmail.po new/kmail-18.04.3/po/fr/kmail.po --- old/kmail-18.04.2/po/fr/kmail.po 2018-06-05 03:20:46.000000000 +0200 +++ new/kmail-18.04.3/po/fr/kmail.po 2018-07-10 02:14:30.000000000 +0200 @@ -22,13 +22,14 @@ # xavier <[email protected]>, 2012. # Sebastien Renard <[email protected]>, 2012, 2013, 2014, 2015. # Vincent Pinon <[email protected]>, 2017, 2018. +# Simon Depiets <[email protected]>, 2018. msgid "" msgstr "" "Project-Id-Version: kmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-05-30 06:22+0200\n" -"PO-Revision-Date: 2018-04-03 09:11+0100\n" -"Last-Translator: Vincent Pinon <[email protected]>\n" +"PO-Revision-Date: 2018-06-05 14:25+0800\n" +"Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -46,7 +47,7 @@ msgstr "" "Vincent Pinon,Matthieu Robin,Gilles Caulier,Joëlle Cornavin,Thibaut Cousin," "Gérard Delafond,François-Xavier Duranceau,Jean-Marc Duval,Nicolas Ternisien," -"Sébastien Renard" +"Sébastien Renard,Simon Depiets" #, kde-format msgctxt "EMAIL OF TRANSLATORS" @@ -54,7 +55,7 @@ msgstr "" "[email protected],[email protected],[email protected],[email protected]," "[email protected],[email protected],[email protected],[email protected]," -"[email protected],[email protected]" +"[email protected],[email protected],[email protected]" #: about/introduction_kmail.html:5 html.cpp:2 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/nb/kmail.po new/kmail-18.04.3/po/nb/kmail.po --- old/kmail-18.04.2/po/nb/kmail.po 2018-06-05 03:20:52.000000000 +0200 +++ new/kmail-18.04.3/po/nb/kmail.po 2018-07-10 02:14:31.000000000 +0200 @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: MAIL\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2018-05-15 06:24+0200\n" +"POT-Creation-Date: 2018-05-30 06:22+0200\n" "PO-Revision-Date: 2015-02-07 22:15+0100\n" "Last-Translator: Bjørn Steensrud <[email protected]>\n" "Language-Team: Norwegian Bokmål <[email protected]>\n" @@ -3171,7 +3171,7 @@ "Eksempler tilgjengelige på <a href=\"http://ace.home.xs4all.nl/X-Faces/"; "\">http://ace.home.xs4all.nl/X-Faces/</a>." -#: identity/xfaceconfigurator.cpp:225 kmcommands.cpp:1699 +#: identity/xfaceconfigurator.cpp:225 kmcommands.cpp:1696 #, kde-format msgid "Image" msgstr "Bilde" @@ -3556,7 +3556,7 @@ msgid "The file contains multiple messages. Only the first message is shown." msgstr "Fila inneholder flere meldinger. Bare den første meldinga blir vist." -#: kmcommands.cpp:928 +#: kmcommands.cpp:925 #, kde-format msgid "" "Do you want to forward the selected messages as attachments in one message " @@ -3565,32 +3565,32 @@ "Skal de valgte meldingene videresendes som vedlegg i én melding (som MIME-" "samling) eller som enkeltmeldinger?" -#: kmcommands.cpp:931 +#: kmcommands.cpp:928 #, kde-format msgid "Send As Digest" msgstr "Send som samling" -#: kmcommands.cpp:932 +#: kmcommands.cpp:929 #, kde-format msgid "Send Individually" msgstr "Send enkeltvis" -#: kmcommands.cpp:1343 +#: kmcommands.cpp:1340 #, kde-format msgid "Filtering messages" msgstr "Filtrerer meldinger" -#: kmcommands.cpp:1350 +#: kmcommands.cpp:1347 #, kde-format msgid "Filtering message %1 of %2" msgstr "Filtrerer melding %1 av %2" -#: kmcommands.cpp:1566 +#: kmcommands.cpp:1563 #, kde-format msgid "Moving messages" msgstr "Flytter meldinger" -#: kmcommands.cpp:1566 +#: kmcommands.cpp:1563 #, kde-format msgid "Deleting messages" msgstr "Sletter meldinger" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/akonadi_archivemail_agent.po new/kmail-18.04.3/po/zh_CN/akonadi_archivemail_agent.po --- old/kmail-18.04.2/po/zh_CN/akonadi_archivemail_agent.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/akonadi_archivemail_agent.po 2018-07-10 02:14:32.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-01-02 03:15+0100\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/akonadi_followupreminder_agent.po new/kmail-18.04.3/po/zh_CN/akonadi_followupreminder_agent.po --- old/kmail-18.04.2/po/zh_CN/akonadi_followupreminder_agent.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/akonadi_followupreminder_agent.po 2018-07-10 02:14:32.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-01-17 03:25+0100\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/akonadi_mailfilter_agent.po new/kmail-18.04.3/po/zh_CN/akonadi_mailfilter_agent.po --- old/kmail-18.04.2/po/zh_CN/akonadi_mailfilter_agent.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/akonadi_mailfilter_agent.po 2018-07-10 02:14:32.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-10-12 03:26+0200\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/akonadi_sendlater_agent.po new/kmail-18.04.3/po/zh_CN/akonadi_sendlater_agent.po --- old/kmail-18.04.2/po/zh_CN/akonadi_sendlater_agent.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/akonadi_sendlater_agent.po 2018-07-10 02:14:32.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-01-02 03:15+0100\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/kmail.po new/kmail-18.04.3/po/zh_CN/kmail.po --- old/kmail-18.04.2/po/zh_CN/kmail.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/kmail.po 2018-07-10 02:14:32.000000000 +0200 @@ -16,7 +16,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-05-30 06:22+0200\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -1309,7 +1309,7 @@ #, kde-format msgid "" "'Content-Type' is not an authorized string. This header will be not saved." -msgstr "" +msgstr "\"内容类型\" 不是授权字符串。此标头将不被保存。" #: configuredialog/configurecomposerpage.cpp:1084 #, kde-format @@ -5845,7 +5845,7 @@ #: ui/composercryptoconfiguration.ui:64 #, kde-format msgid "When sa&ving as draft, sign/encrypt as indicated" -msgstr "保存为草稿时，按照指示进行签名和/或加密" +msgstr "保存(&V)为草稿时，按照指示进行签名和/或加密" #. i18n: ectx: property (text), widget (QCheckBox, mShowEncSignIndicator) #: ui/composercryptoconfiguration.ui:71 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/po/zh_CN/ktnef.po new/kmail-18.04.3/po/zh_CN/ktnef.po --- old/kmail-18.04.2/po/zh_CN/ktnef.po 2018-06-05 03:20:58.000000000 +0200 +++ new/kmail-18.04.3/po/zh_CN/ktnef.po 2018-07-10 02:14:32.000000000 +0200 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-12-02 03:12+0100\n" -"PO-Revision-Date: 2018-05-18 06:29-0400\n" +"PO-Revision-Date: 2018-07-03 17:39\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/src/data/kmail_addattachmentservicemenu.desktop new/kmail-18.04.3/src/data/kmail_addattachmentservicemenu.desktop --- old/kmail-18.04.2/src/data/kmail_addattachmentservicemenu.desktop 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/src/data/kmail_addattachmentservicemenu.desktop 2018-06-29 07:03:36.000000000 +0200 @@ -32,6 +32,7 @@ Name[nb]=Send som e-postvedlegg Name[nds]=As Nettpostbilaag loosstüern Name[nl]=Als e-mailbijlage verzenden +Name[nn]=Send som e-postvedlegg Name[pl]=Wyślij jako załącznik poczty Name[pt]=Enviar como Anexo do E-Mail Name[pt_BR]=Enviar como anexo de e-mail diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/src/data/org.kde.kmail2.desktop new/kmail-18.04.3/src/data/org.kde.kmail2.desktop --- old/kmail-18.04.2/src/data/org.kde.kmail2.desktop 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/src/data/org.kde.kmail2.desktop 2018-06-29 07:03:36.000000000 +0200 @@ -210,6 +210,7 @@ Name[gl]=Nova mensaxe… Name[it]=Nuovo messaggio... Name[nl]=Nieuw bericht... +Name[nn]=Ny melding … Name[pl]=Nowa wiadomość... Name[pt]=Nova Mensagem... Name[sl]=Novo sporočilo ... @@ -237,6 +238,7 @@ Name[it]=Controlla posta Name[ko]=메일 확인 Name[nl]=E-mail controleren +Name[nn]=Sjekk e-post Name[pl]=Sprawdź pocztę Name[pt]=Verificar o Correio Name[ru]=Проверить почту diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/src/editor/attachment/attachmentcontroller.cpp new/kmail-18.04.3/src/editor/attachment/attachmentcontroller.cpp --- old/kmail-18.04.2/src/editor/attachment/attachmentcontroller.cpp 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/src/editor/attachment/attachmentcontroller.cpp 2018-06-29 07:03:36.000000000 +0200 @@ -127,9 +127,19 @@ void AttachmentController::onShowAttachment(KMime::Content *content, const QByteArray &charset) { - KMReaderMainWin *win - = new KMReaderMainWin(content, MessageViewer::Viewer::Text, QString::fromLatin1(charset)); - win->show(); + + if (content->bodyAsMessage()) { + KMime::Message::Ptr m = KMime::Message::Ptr(new KMime::Message); + m->setContent(content->bodyAsMessage()->encodedContent()); + m->parse(); + KMReaderMainWin *win = new KMReaderMainWin(); + win->showMessage(QString::fromLatin1(charset), m); + win->show(); + } else { + KMReaderMainWin *win + = new KMReaderMainWin(content, MessageViewer::Viewer::Text, QString::fromLatin1(charset)); + win->show(); + } } void AttachmentController::doubleClicked(const QModelIndex &itemClicked) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/src/kmkernel.cpp new/kmail-18.04.3/src/kmkernel.cpp --- old/kmail-18.04.2/src/kmkernel.cpp 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/src/kmkernel.cpp 2018-06-29 07:03:36.000000000 +0200 @@ -389,7 +389,7 @@ QMap<QString, QString> values = MessageCore::StringUtil::parseMailtoUrl(urlDecoded); QString previousKey; for (auto it = values.cbegin(), end = values.cend(); it != end; ++it) { - const QString key = it.key(); + const QString key = it.key().toLower(); if (key == QLatin1Literal("to")) { if (!it->isEmpty()) { to += *it + QStringLiteral(", "); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmail-18.04.2/src/main.cpp new/kmail-18.04.3/src/main.cpp --- old/kmail-18.04.2/src/main.cpp 2018-05-29 08:54:51.000000000 +0200 +++ new/kmail-18.04.3/src/main.cpp 2018-06-29 07:03:36.000000000 +0200 @@ -49,10 +49,14 @@ { } - int activate(const QStringList &args, const QString &workindDir) override; + int activate(const QStringList &args, const QString &workingDir) override; void commitData(QSessionManager &sm); void setEventLoopReached(); - void delayedInstanceCreation(const QStringList &args, const QString &workindDir); + void delayedInstanceCreation(const QStringList &args, const QString &workingDir); + +public Q_SLOTS: + int newInstance(const QByteArray &startupId, const QStringList &arguments, const QString &workingDirectory) override; + protected: bool mDelayedInstanceCreation; bool mEventLoopReached; @@ -69,7 +73,18 @@ mEventLoopReached = true; } -int KMailApplication::activate(const QStringList &args, const QString &workindDir) +int KMailApplication::newInstance(const QByteArray &startupId, const QStringList &arguments, const QString &workingDirectory) +{ + if (!kmkernel->firstInstance() && !arguments.isEmpty()) { + // if we're going to create a new window (viewer or composer), + // don't bring the mainwindow onto the current desktop + return activate(arguments, workingDirectory); + } else { + return PimUniqueApplication::newInstance(startupId, arguments, workingDirectory); + } +} + +int KMailApplication::activate(const QStringList &args, const QString &workingDir) { // If the event loop hasn't been reached yet, the kernel is probably not // fully initialized. Creating an instance would therefore fail, this is why @@ -89,16 +104,16 @@ } if (!kmkernel->firstInstance() || !qApp->isSessionRestored()) { - kmkernel->handleCommandLine(true, args, workindDir); + kmkernel->handleCommandLine(true, args, workingDir); } kmkernel->setFirstInstance(false); return 0; } -void KMailApplication::delayedInstanceCreation(const QStringList &args, const QString &workindDir) +void KMailApplication::delayedInstanceCreation(const QStringList &args, const QString &workingDir) { if (mDelayedInstanceCreation) { - activate(args, workindDir); + activate(args, workingDir); } }
