Hello community, here is the log from the commit of package mailcommon for openSUSE:Factory checked in at 2018-07-18 22:45:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailcommon (Old) and /work/SRC/openSUSE:Factory/.mailcommon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailcommon" Wed Jul 18 22:45:48 2018 rev:28 rq:622757 version:18.04.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mailcommon/mailcommon.changes 2018-06-13 15:27:05.831713297 +0200 +++ /work/SRC/openSUSE:Factory/.mailcommon.new/mailcommon.changes 2018-07-18 22:45:49.884573920 +0200 @@ -1,0 +2,10 @@ +Fri Jul 13 04:50:17 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: + * FolderSettings: Fix "no resource found in collection" assert. + +------------------------------------------------------------------- Old: ---- mailcommon-18.04.2.tar.xz New: ---- mailcommon-18.04.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailcommon.spec ++++++ --- /var/tmp/diff_new_pack.W99XFM/_old 2018-07-18 22:45:50.444572064 +0200 +++ /var/tmp/diff_new_pack.W99XFM/_new 2018-07-18 22:45:50.448572050 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: mailcommon -Version: 18.04.2 +Version: 18.04.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ mailcommon-18.04.2.tar.xz -> mailcommon-18.04.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/CMakeLists.txt new/mailcommon-18.04.3/CMakeLists.txt --- old/mailcommon-18.04.2/CMakeLists.txt 2018-06-05 03:31:50.000000000 +0200 +++ new/mailcommon-18.04.3/CMakeLists.txt 2018-07-10 02:15:51.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.8.2") +set(PIM_VERSION "5.8.3") project(mailcommon VERSION ${PIM_VERSION}) @@ -25,16 +25,16 @@ include(ECMCoverageOption) set(MAILCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.8.2") -set(MESSAGELIB_LIB_VERSION "5.8.2") +set(AKONADIMIME_LIB_VERSION "5.8.3") +set(MESSAGELIB_LIB_VERSION "5.8.3") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.8.2") -set(KMAILTRANSPORT_LIB_VERSION "5.8.2") -set(MAILIMPORTER_LIB_VERSION "5.8.2") -set(LIBKDEPIM_LIB_VERSION "5.8.2") -set(PIMCOMMON_LIB_VERSION "5.8.2") +set(KMIME_LIB_VERSION "5.8.3") +set(KMAILTRANSPORT_LIB_VERSION "5.8.3") +set(MAILIMPORTER_LIB_VERSION "5.8.3") +set(LIBKDEPIM_LIB_VERSION "5.8.3") +set(PIMCOMMON_LIB_VERSION "5.8.3") -set(AKONADI_VERSION "5.8.2") +set(AKONADI_VERSION "5.8.3") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Test Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/po/ca/libmailcommon.po new/mailcommon-18.04.3/po/ca/libmailcommon.po --- old/mailcommon-18.04.2/po/ca/libmailcommon.po 2018-06-05 03:31:47.000000000 +0200 +++ new/mailcommon-18.04.3/po/ca/libmailcommon.po 2018-07-10 02:15:50.000000000 +0200 @@ -5,14 +5,14 @@ # # Manuel Tortosa <[email protected]>, 2011. # Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. -# Antoni Bella Pérez <[email protected]>, 2011, 2013, 2014, 2015, 2016, 2017. +# Antoni Bella Pérez <[email protected]>, 2011, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libmailcommon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-10 03:20+0100\n" -"PO-Revision-Date: 2018-01-30 20:13+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2018-06-23 19:24+0100\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -644,7 +644,7 @@ #: filter/filteractions/filteractionrewriteheader.cpp:66 #, kde-format msgid "Search string is empty." -msgstr "La cadena de cerca és buida." +msgstr "La cadena de cerca està buida." #: filter/filteractions/filteractionrewriteheader.cpp:127 #, kde-format @@ -1174,7 +1174,7 @@ #: filter/kmfilterdialog.cpp:300 #, kde-format msgid "Icon for this filter:" -msgstr "Icona per aquest filtre:" +msgstr "Icona per a aquest filtre:" #: filter/kmfilterdialog.cpp:319 #, kde-format @@ -2139,7 +2139,7 @@ #: search/searchrule/searchrule.cpp:209 #, kde-format msgid "is not in addressbook" -msgstr "no és a la llibreta d'adreces" +msgstr "no es troba a la llibreta d'adreces" #: search/searchrule/searchrule.cpp:212 search/searchrule/searchrule.cpp:215 #, kde-format @@ -2360,21 +2360,21 @@ #: search/searchrule/searchrulestring.cpp:246 #, kde-format msgid "String is empty." -msgstr "La cadena és buida." +msgstr "La cadena està buida." #: search/widgethandler/daterulewidgethandler.cpp:36 #: search/widgethandler/numericdoublerulewidgethandler.cpp:33 #: search/widgethandler/numericrulewidgethandler.cpp:34 #, kde-format msgid "is equal to" -msgstr "és igual a" +msgstr "és igual que" #: search/widgethandler/daterulewidgethandler.cpp:37 #: search/widgethandler/numericdoublerulewidgethandler.cpp:34 #: search/widgethandler/numericrulewidgethandler.cpp:35 #, kde-format msgid "is not equal to" -msgstr "no és igual a" +msgstr "no és igual que" #: search/widgethandler/daterulewidgethandler.cpp:38 #, kde-format @@ -2384,7 +2384,7 @@ #: search/widgethandler/daterulewidgethandler.cpp:39 #, kde-format msgid "is before or equal to" -msgstr "va abans o igual a" +msgstr "va abans o és igual que" #: search/widgethandler/daterulewidgethandler.cpp:40 #, kde-format @@ -2394,7 +2394,7 @@ #: search/widgethandler/daterulewidgethandler.cpp:41 #, kde-format msgid "is after or equal to" -msgstr "va després o igual que" +msgstr "va després o és igual que" #: search/widgethandler/encryptionwidgethandler.cpp:31 #: search/widgethandler/statusrulewidgethandler.cpp:32 @@ -2471,7 +2471,7 @@ #: search/widgethandler/textrulerwidgethandler.cpp:46 #, kde-format msgid "matches regular expr." -msgstr "coincideix amb expr. regular" +msgstr "coincideix amb l'expr. regular" # skip-rule: punctuation-period #: search/widgethandler/headersrulerwidgethandler.cpp:47 @@ -2480,19 +2480,19 @@ #: search/widgethandler/textrulerwidgethandler.cpp:47 #, kde-format msgid "does not match reg. expr." -msgstr "no coincideix amb expr. regular" +msgstr "no coincideix amb l'expr. regular" #: search/widgethandler/headersrulerwidgethandler.cpp:48 #: search/widgethandler/headersrulerwidgethandler.cpp:171 #, kde-format msgid "is in address book" -msgstr "és a la llibreta d'adreces" +msgstr "es troba a la llibreta d'adreces" #: search/widgethandler/headersrulerwidgethandler.cpp:49 #: search/widgethandler/headersrulerwidgethandler.cpp:173 #, kde-format msgid "is not in address book" -msgstr "no és a la llibreta d'adreces" +msgstr "no es troba a la llibreta d'adreces" #: search/widgethandler/messagerulewidgethandler.cpp:41 #: search/widgethandler/messagerulewidgethandler.cpp:162 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/po/ca@valencia/libmailcommon.po new/mailcommon-18.04.3/po/ca@valencia/libmailcommon.po --- old/mailcommon-18.04.2/po/ca@valencia/libmailcommon.po 2018-06-05 03:31:47.000000000 +0200 +++ new/mailcommon-18.04.3/po/ca@valencia/libmailcommon.po 2018-07-10 02:15:50.000000000 +0200 @@ -5,14 +5,14 @@ # # Manuel Tortosa <[email protected]>, 2011. # Josep Ma. Ferrer <[email protected]>, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. -# Antoni Bella Pérez <[email protected]>, 2011, 2013, 2014, 2015, 2016, 2017. +# Antoni Bella Pérez <[email protected]>, 2011, 2013, 2014, 2015, 2016, 2017, 2018. msgid "" msgstr "" "Project-Id-Version: libmailcommon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-10 03:20+0100\n" -"PO-Revision-Date: 2018-01-30 20:13+0100\n" -"Last-Translator: Josep Ma. Ferrer <[email protected]>\n" +"PO-Revision-Date: 2018-06-23 19:24+0100\n" +"Last-Translator: Antoni Bella Pérez <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -644,7 +644,7 @@ #: filter/filteractions/filteractionrewriteheader.cpp:66 #, kde-format msgid "Search string is empty." -msgstr "La cadena de cerca és buida." +msgstr "La cadena de cerca està buida." #: filter/filteractions/filteractionrewriteheader.cpp:127 #, kde-format @@ -1174,7 +1174,7 @@ #: filter/kmfilterdialog.cpp:300 #, kde-format msgid "Icon for this filter:" -msgstr "Icona per aquest filtre:" +msgstr "Icona per a aquest filtre:" #: filter/kmfilterdialog.cpp:319 #, kde-format @@ -2139,7 +2139,7 @@ #: search/searchrule/searchrule.cpp:209 #, kde-format msgid "is not in addressbook" -msgstr "no és a la llibreta d'adreces" +msgstr "no es troba a la llibreta d'adreces" #: search/searchrule/searchrule.cpp:212 search/searchrule/searchrule.cpp:215 #, kde-format @@ -2360,21 +2360,21 @@ #: search/searchrule/searchrulestring.cpp:246 #, kde-format msgid "String is empty." -msgstr "La cadena és buida." +msgstr "La cadena està buida." #: search/widgethandler/daterulewidgethandler.cpp:36 #: search/widgethandler/numericdoublerulewidgethandler.cpp:33 #: search/widgethandler/numericrulewidgethandler.cpp:34 #, kde-format msgid "is equal to" -msgstr "és igual a" +msgstr "és igual que" #: search/widgethandler/daterulewidgethandler.cpp:37 #: search/widgethandler/numericdoublerulewidgethandler.cpp:34 #: search/widgethandler/numericrulewidgethandler.cpp:35 #, kde-format msgid "is not equal to" -msgstr "no és igual a" +msgstr "no és igual que" #: search/widgethandler/daterulewidgethandler.cpp:38 #, kde-format @@ -2384,7 +2384,7 @@ #: search/widgethandler/daterulewidgethandler.cpp:39 #, kde-format msgid "is before or equal to" -msgstr "va abans o igual a" +msgstr "va abans o és igual que" #: search/widgethandler/daterulewidgethandler.cpp:40 #, kde-format @@ -2394,7 +2394,7 @@ #: search/widgethandler/daterulewidgethandler.cpp:41 #, kde-format msgid "is after or equal to" -msgstr "va després o igual que" +msgstr "va després o és igual que" #: search/widgethandler/encryptionwidgethandler.cpp:31 #: search/widgethandler/statusrulewidgethandler.cpp:32 @@ -2471,7 +2471,7 @@ #: search/widgethandler/textrulerwidgethandler.cpp:46 #, kde-format msgid "matches regular expr." -msgstr "coincideix amb expr. regular" +msgstr "coincideix amb l'expr. regular" # skip-rule: punctuation-period #: search/widgethandler/headersrulerwidgethandler.cpp:47 @@ -2480,19 +2480,19 @@ #: search/widgethandler/textrulerwidgethandler.cpp:47 #, kde-format msgid "does not match reg. expr." -msgstr "no coincideix amb expr. regular" +msgstr "no coincideix amb l'expr. regular" #: search/widgethandler/headersrulerwidgethandler.cpp:48 #: search/widgethandler/headersrulerwidgethandler.cpp:171 #, kde-format msgid "is in address book" -msgstr "és a la llibreta d'adreces" +msgstr "es troba a la llibreta d'adreces" #: search/widgethandler/headersrulerwidgethandler.cpp:49 #: search/widgethandler/headersrulerwidgethandler.cpp:173 #, kde-format msgid "is not in address book" -msgstr "no és a la llibreta d'adreces" +msgstr "no es troba a la llibreta d'adreces" #: search/widgethandler/messagerulewidgethandler.cpp:41 #: search/widgethandler/messagerulewidgethandler.cpp:162 @@ -2850,171 +2850,3 @@ msgstr "" "Aquest botó obri un diàleg separat a on podreu seleccionar destinataris des " "de totes les adreces disponibles." - -#~ msgid "" -#~ "<p>You will not be able to read the encrypted emails on any other " -#~ "computer or email client unless you have your private key available there." -#~ "</p><p>Also note that most webmail interfaces don't support encryption, " -#~ "so you will not be able to read the encrypted emails there.</p>" -#~ msgstr "" -#~ "<p>No podreu llegir els correus electrònics encriptats a cap altra " -#~ "ordinador o client de correu electrònic tret que tingui la vostra clau " -#~ "privada.</p><p>Tingueu també en compte, que la majoria de les interfícies " -#~ "de correu web no admeten l'encriptatge, de manera que no els hi podreu " -#~ "llegir.</p>" - -#~ msgid "" -#~ "<qt><p>Check this button to force the confirmation dialog to be displayed." -#~ "</p><p>This is useful if you have defined a ruleset that tags messages to " -#~ "be downloaded later. Without the possibility to force the dialog popup, " -#~ "these messages could never be downloaded if no other large messages were " -#~ "waiting on the server, or if you wanted to change the ruleset to tag the " -#~ "messages differently.</p></qt>" -#~ msgstr "" -#~ "<qt><p>Activeu aquest botó per forçar que es mostri el diàleg de " -#~ "confirmació. </p><p>Això és útil si heu definit un joc de regles que " -#~ "etiqueta missatges per baixar més tard. Sense la possibilitat de forçar " -#~ "el diàleg emergent, aquests missatges mai es podrien baixar si no hi ha " -#~ "més missatges esperant en el servidor, o si voleu canviar el joc de " -#~ "regles per etiquetar els missatges de manera diferent.</p></qt>" - -#~ msgctxt "type of folder content" -#~ msgid "Mail" -#~ msgstr "Correu" - -#~ msgctxt "type of folder content" -#~ msgid "Calendar" -#~ msgstr "Calendari" - -#~ msgctxt "type of folder content" -#~ msgid "Contacts" -#~ msgstr "Contactes" - -#~ msgctxt "type of folder content" -#~ msgid "Notes" -#~ msgstr "Notes" - -#~ msgctxt "type of folder content" -#~ msgid "Tasks" -#~ msgstr "Tasques" - -#~ msgctxt "type of folder content" -#~ msgid "Journal" -#~ msgstr "Diari" - -#~ msgctxt "type of folder content" -#~ msgid "Configuration" -#~ msgstr "Configuració" - -#~ msgctxt "type of folder content" -#~ msgid "Freebusy" -#~ msgstr "Lliure/ocupat" - -#~ msgctxt "type of folder content" -#~ msgid "Files" -#~ msgstr "Fitxers" - -#~ msgctxt "type of folder content" -#~ msgid "Unknown" -#~ msgstr "Desconegut" - -#~ msgid "&Folder contents:" -#~ msgstr "Contingut de la &carpeta:" - -#~ msgid "Generate free/&busy and activate alarms for:" -#~ msgstr "Genera la informació de lliure/ocupat i activa les alarmes per:" - -#~ msgid "Nobody" -#~ msgstr "Ningú" - -#~ msgid "Admins of This Folder" -#~ msgstr "Administradors d'aquesta carpeta" - -#~ msgid "All Readers of This Folder" -#~ msgstr "Tots els lectors d'aquesta carpeta" - -#~ msgid "" -#~ "This setting defines which users sharing this folder should get \"busy\" " -#~ "periods in their freebusy lists and should see the alarms for the events " -#~ "or tasks in this folder. The setting applies to Calendar and Task folders " -#~ "only (for tasks, this setting is only used for alarms).\n" -#~ "\n" -#~ "Example use cases: if the boss shares a folder with his secretary, only " -#~ "the boss should be marked as busy for his meetings, so he should select " -#~ "\"Admins\", since the secretary has no admin rights on the folder.\n" -#~ "On the other hand if a working group shares a Calendar for group " -#~ "meetings, all readers of the folders should be marked as busy for " -#~ "meetings.\n" -#~ "A company-wide folder with optional events in it would use \"Nobody\" " -#~ "since it is not known who will go to those events." -#~ msgstr "" -#~ "Aquest arranjament defineix quins dels usuaris que comparteixen aquesta " -#~ "carpeta han de tenir períodes «ocupat» a les seves llistes de lliure/" -#~ "ocupat i s'ha d'establir alarmes pels esdeveniments o tasques en aquesta " -#~ "carpeta. L'arranjament serveix només per a carpetes de calendari o " -#~ "tasques (per a les tasques, aquest arranjament s'usa només per a les " -#~ "alarmes).\n" -#~ "\n" -#~ "Exemple de casos d'ús: si el director comparteix una carpeta amb el seu " -#~ "secretari, només el director s'ha de marcar com a ocupat per a les seves " -#~ "reunions, així que ha de seleccionar «Administradors», ja que el " -#~ "secretari no té drets d'administració de la carpeta.\n" -#~ "D'altra banda si un grup de treball comparteix un calendari per a " -#~ "reunions de grup, tots els lectors de les carpetes s'han de marcar com a " -#~ "ocupats per a les reunions.\n" -#~ "Una carpeta de tota la companyia amb esdeveniments opcionals usa «Ningú», " -#~ "ja que no se sap qui anirà a aquests esdeveniments." - -#~ msgid "Sh&ortcut:" -#~ msgstr "&Drecera:" - -#~ msgid "Edit..." -#~ msgstr "Edita..." - -#~ msgid "Import Thunderbird Filters" -#~ msgstr "Importa els filtres del Thunderbird" - -#~ msgid "Import Icedove Filters" -#~ msgstr "Importa els filtres del Icedove" - -#~ msgid "Beep" -#~ msgstr "Timbre" - -#~ msgid "Add Filter" -#~ msgstr "Afegeix un filtre" - -#~ msgid "Edit Filter" -#~ msgstr "Edita el filtre" - -#~ msgid "Do you really want to remove filter <b>%1</b>?" -#~ msgstr "Realment voleu eliminar el filtre <b>%1</b>?" - -#~ msgid "Add" -#~ msgstr "Afegeix" - -#~ msgid "Edit" -#~ msgstr "Edita" - -#~ msgid "Remove" -#~ msgstr "Elimina" - -#~ msgid "Move Up" -#~ msgstr "Mou amunt" - -#~ msgid "Move Down" -#~ msgstr "Mou avall" - -#~ msgid "Create Todo/Reminder" -#~ msgstr "Crea una pendent/recordatori" - -#~ msgid "Attach inline without attachments" -#~ msgstr "Adjunta inclòs sense fitxers adjunts" - -#~ msgid "Attach &inline" -#~ msgstr "Adjunta &inclòs" - -#~ msgid "Attach as &link" -#~ msgstr "Adjunta com a en&llaç" - -#~ msgid "How should the email be attached?" -#~ msgstr "Com s'ha d'adjuntar el correu electrònic?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/po/cs/libmailcommon.po new/mailcommon-18.04.3/po/cs/libmailcommon.po --- old/mailcommon-18.04.2/po/cs/libmailcommon.po 2018-06-05 03:31:47.000000000 +0200 +++ new/mailcommon-18.04.3/po/cs/libmailcommon.po 2018-07-10 02:15:50.000000000 +0200 @@ -1,7 +1,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # Lukáš Tinkl <[email protected]>, 2010, 2011, 2012. -# Vít Pelčák <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017. +# Vít Pelčák <[email protected]>, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018. # Tomáš Chvátal <[email protected]>, 2012, 2013. # msgid "" @@ -9,7 +9,7 @@ "Project-Id-Version: kmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-10 03:20+0100\n" -"PO-Revision-Date: 2017-11-14 17:27+0100\n" +"PO-Revision-Date: 2018-06-15 15:03+0100\n" "Last-Translator: Vit Pelcak <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" "Language: en_US\n" @@ -2517,12 +2517,12 @@ #: snippets/snippetsmanager.cpp:604 #, kde-format msgid "Add Snippet..." -msgstr "Přidat úryvek..." +msgstr "Přidat ústřižek..." #: snippets/snippetsmanager.cpp:605 #, kde-format msgid "Edit Snippet..." -msgstr "Upravit úryvek..." +msgstr "Upravit ústřižek..." #: snippets/snippetsmanager.cpp:607 #, kde-format @@ -2557,7 +2557,7 @@ #: snippets/snippetsmodel.cpp:386 #, kde-format msgid "Update snippet" -msgstr "" +msgstr "Aktualizovat ústřižek" #: snippets/snippetvariabledialog.cpp:40 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/po/zh_CN/libmailcommon.po new/mailcommon-18.04.3/po/zh_CN/libmailcommon.po --- old/mailcommon-18.04.2/po/zh_CN/libmailcommon.po 2018-06-05 03:31:50.000000000 +0200 +++ new/mailcommon-18.04.3/po/zh_CN/libmailcommon.po 2018-07-10 02:15:51.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-02-10 03:20+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" @@ -417,7 +417,7 @@ #: filter/filteractions/filteractiondecrypt.cpp:109 #, kde-format msgid "<b>Warning:</b> Decrypted emails may be uploaded to a server!" -msgstr "" +msgstr "<b>警告：</b>解密的电子邮件可能会被上传到服务器！" #: filter/filteractions/filteractiondecrypt.cpp:110 #, kde-format @@ -454,7 +454,7 @@ #: filter/filteractions/filteractionencrypt.cpp:271 #, kde-format msgid "<b>Warning:</b> Seckey necessary to read emails." -msgstr "" +msgstr "<b>警告:</b> 需要密钥来阅读邮件。" #: filter/filteractions/filteractionencrypt.cpp:272 #, kde-format @@ -473,7 +473,7 @@ #: filter/filteractions/filteractionexec.cpp:48 #, kde-format msgid "Missing command." -msgstr "" +msgstr "缺少命令。" #: filter/filteractions/filteractionforward.cpp:48 #, kde-format @@ -2467,7 +2467,7 @@ #: snippets/snippetsmodel.cpp:386 #, kde-format msgid "Update snippet" -msgstr "" +msgstr "更新代码段" #: snippets/snippetvariabledialog.cpp:40 #, kde-format @@ -2625,7 +2625,7 @@ #: widgets/redirectdialog.cpp:154 #, kde-format msgid "Select the recipient addresses to redirect to:" -msgstr "" +msgstr "选择自动转发的收信地址：" #: widgets/redirectdialog.cpp:183 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/src/folder/foldersettings.cpp new/mailcommon-18.04.3/src/folder/foldersettings.cpp --- old/mailcommon-18.04.2/src/folder/foldersettings.cpp 2018-05-29 08:52:10.000000000 +0200 +++ new/mailcommon-18.04.3/src/folder/foldersettings.cpp 2018-07-09 20:51:26.000000000 +0200 @@ -231,7 +231,7 @@ void FolderSettings::writeConfig() const { - Q_ASSERT_X(!mCollection.resource().isEmpty(), "FolderSettings::writeConfig", "No resource found in collection"); + const QString res = resource(); KConfigGroup configGroup(KernelIf->config(), configGroupName(mCollection)); configGroup.writeEntry("MailingListEnabled", mMailingListEnabled); @@ -242,8 +242,8 @@ if (!mUseDefaultIdentity) { uint defaultIdentityId = -1; - if (PimCommon::Util::isImapResource(mCollection.resource())) { - MailCommon::ResourceReadConfigFile resourceFile(mCollection.resource()); + if (PimCommon::Util::isImapResource(res)) { + MailCommon::ResourceReadConfigFile resourceFile(res); KConfigGroup grp = resourceFile.group(QStringLiteral("cache")); if (grp.isValid()) { defaultIdentityId = grp.readEntry(QStringLiteral("AccountIdentity"), -1); @@ -319,11 +319,22 @@ } } +QString FolderSettings::resource() const +{ + const QString resource = mCollection.resource(); + if (resource.isEmpty()) { + const Collection col = CommonKernel->collectionFromId(mCollection.id()); + Q_ASSERT(col.isValid()); + Q_ASSERT(!col.resource().isEmpty()); + return col.resource(); + } + return resource; +} + uint FolderSettings::fallBackIdentity() const { - Q_ASSERT_X(!mCollection.resource().isEmpty(), "FolderSettings::fallBackIdentity", "No resource found in collection"); int identityId = -1; - MailCommon::ResourceReadConfigFile resourceFile(mCollection.resource()); + MailCommon::ResourceReadConfigFile resourceFile(resource()); KConfigGroup grp = resourceFile.group(QStringLiteral("cache")); if (grp.isValid()) { const bool useDefault = grp.readEntry(QStringLiteral("UseDefaultIdentity"), true); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailcommon-18.04.2/src/folder/foldersettings.h new/mailcommon-18.04.3/src/folder/foldersettings.h --- old/mailcommon-18.04.2/src/folder/foldersettings.h 2018-05-29 08:52:10.000000000 +0200 +++ new/mailcommon-18.04.3/src/folder/foldersettings.h 2018-07-09 20:51:26.000000000 +0200 @@ -121,6 +121,7 @@ private: explicit FolderSettings(const Akonadi::Collection &col, bool writeconfig); + QString resource() const; Akonadi::Collection mCollection;
