Hello community, here is the log from the commit of package pimcommon for openSUSE:Factory checked in at 2017-10-23 16:35:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pimcommon (Old) and /work/SRC/openSUSE:Factory/.pimcommon.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pimcommon" Mon Oct 23 16:35:04 2017 rev:19 rq:534841 version:17.08.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pimcommon/pimcommon.changes 2017-09-12 19:51:53.796589903 +0200 +++ /work/SRC/openSUSE:Factory/.pimcommon.new/pimcommon.changes 2017-10-23 16:35:06.591742073 +0200 @@ -1,0 +2,10 @@ +Tue Oct 17 00:33:06 CEST 2017 - [email protected] + +- Update to 17.08.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.2.php +- Changes since 17.08.1: + * Make sure that we show last text + +------------------------------------------------------------------- Old: ---- pimcommon-17.08.1.tar.xz New: ---- pimcommon-17.08.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pimcommon.spec ++++++ --- /var/tmp/diff_new_pack.74dekV/_old 2017-10-23 16:35:07.123717168 +0200 +++ /var/tmp/diff_new_pack.74dekV/_new 2017-10-23 16:35:07.127716980 +0200 @@ -19,7 +19,7 @@ %bcond_without lang Name: pimcommon -Version: 17.08.1 +Version: 17.08.2 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ pimcommon-17.08.1.tar.xz -> pimcommon-17.08.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-17.08.1/CMakeLists.txt new/pimcommon-17.08.2/CMakeLists.txt --- old/pimcommon-17.08.1/CMakeLists.txt 2017-09-05 02:42:14.000000000 +0200 +++ new/pimcommon-17.08.2/CMakeLists.txt 2017-10-10 02:19:05.000000000 +0200 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.6.1") +set(PIM_VERSION "5.6.2") project(pimcommon VERSION ${PIM_VERSION}) @@ -26,15 +26,15 @@ set(PIMCOMMON_LIB_VERSION ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.6.1") -set(AKONADICONTACT_LIB_VERSION "5.6.1") -set(LIBKDEPIM_LIB_VERSION "5.6.1") +set(AKONADIMIME_LIB_VERSION "5.6.2") +set(AKONADICONTACT_LIB_VERSION "5.6.2") +set(LIBKDEPIM_LIB_VERSION "5.6.2") set(QT_REQUIRED_VERSION "5.7.0") -set(KMIME_LIB_VERSION "5.6.1") -set(KIMAP_LIB_VERSION "5.6.1") -set(KCONTACTS_LIB_VERSION "5.6.1") -set(KPIMTEXTEDIT_LIB_VERSION "5.6.1") -set(AKONADI_VERSION "5.6.1") +set(KMIME_LIB_VERSION "5.6.2") +set(KIMAP_LIB_VERSION "5.6.2") +set(KCONTACTS_LIB_VERSION "5.6.2") +set(KPIMTEXTEDIT_LIB_VERSION "5.6.2") +set(AKONADI_VERSION "5.6.2") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets DBus Network Test Xml PrintSupport) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-17.08.1/po/fi/libpimcommon.po new/pimcommon-17.08.2/po/fi/libpimcommon.po --- old/pimcommon-17.08.1/po/fi/libpimcommon.po 2017-09-05 02:42:13.000000000 +0200 +++ new/pimcommon-17.08.2/po/fi/libpimcommon.po 2017-10-10 02:19:04.000000000 +0200 @@ -9,7 +9,7 @@ "Project-Id-Version: libpimcommon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-14 03:13+0200\n" -"PO-Revision-Date: 2016-11-19 15:16+0200\n" +"PO-Revision-Date: 2017-09-08 10:54+0200\n" "Last-Translator: Tommi Nieminen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" "Language: fi\n" @@ -376,7 +376,7 @@ #: pimcommon/logactivities/logactivitiesdialog.cpp:43 #, kde-format msgid "Log activities" -msgstr "" +msgstr "Vie toimenpiteet lokiin" #: pimcommon/logactivities/logactivitiesdialog.cpp:51 #: pimcommon/translator/translatorwidget.cpp:259 @@ -392,11 +392,10 @@ msgstr "Kaikki tiedostot (*)" #: pimcommon/logactivities/logactivitiesdialog.cpp:79 -#, fuzzy, kde-format -#| msgid "Save config" +#, kde-format msgctxt "@title:window" msgid "Save Log" -msgstr "Tallenna asetukset" +msgstr "Tallenna loki" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:47 #, kde-format @@ -951,7 +950,7 @@ #: pimcommon/widgets/lineeditpassword.cpp:59 #, kde-format msgid "Change the visibility of the password" -msgstr "" +msgstr "Vaihda salasanan näkyvyyttä" #: pimcommon/widgets/lineeditwithcompleter.cpp:40 #, kde-format @@ -1171,11 +1170,10 @@ #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:54 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:159 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:217 -#, fuzzy, kde-format -#| msgid "Mail" +#, kde-format msgctxt "type of folder content" msgid "Mail" -msgstr "Sähköposti|/|$[aseta jakomuoto Sähköpostissa]" +msgstr "Sähköposti" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:56 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:162 @@ -1183,7 +1181,7 @@ #, kde-format msgctxt "type of folder content" msgid "Calendar" -msgstr "" +msgstr "Kalenteri" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:58 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:165 @@ -1191,17 +1189,15 @@ #, kde-format msgctxt "type of folder content" msgid "Contacts" -msgstr "" +msgstr "Yhteystiedot" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:60 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:168 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:202 -#, fuzzy, kde-format -#| msgctxt "@title:window" -#| msgid "Add Note" +#, kde-format msgctxt "type of folder content" msgid "Notes" -msgstr "Lisää muistiinpano" +msgstr "Muistiinpanot" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:62 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:171 @@ -1209,22 +1205,20 @@ #, kde-format msgctxt "type of folder content" msgid "Tasks" -msgstr "" +msgstr "Tehtävät" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:64 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:174 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:205 -#, fuzzy, kde-format -#| msgid "LiveJournal" +#, kde-format msgctxt "type of folder content" msgid "Journal" -msgstr "LiveJournal|/|$[aseta jakomuoto LiveJournalissa]" +msgstr "Päiväkirja" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:66 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:177 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:208 -#, fuzzy, kde-format -#| msgid "Configure" +#, kde-format msgctxt "type of folder content" msgid "Configuration" msgstr "Asetukset" @@ -1235,47 +1229,46 @@ #, kde-format msgctxt "type of folder content" msgid "Freebusy" -msgstr "" +msgstr "Varaustiedot" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:70 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:183 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:214 -#, fuzzy, kde-format -#| msgid "File" +#, kde-format msgctxt "type of folder content" msgid "Files" -msgstr "Tiedosto" +msgstr "Tiedostot" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:72 #, kde-format msgctxt "type of folder content" msgid "Unknown" -msgstr "" +msgstr "Tuntematon" #: pimcommonakonadi/collectionpage/contenttypewidget.cpp:48 #, kde-format msgid "&Folder contents:" -msgstr "" +msgstr "&Kansion sisältö:" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:45 #, kde-format msgid "Generate free/&busy and activate alarms for:" -msgstr "" +msgstr "Luo &varaustiedot ja ota hälytykset käyttöön:" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:53 #, kde-format msgid "Nobody" -msgstr "" +msgstr "Ei kenellekään" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:54 #, kde-format msgid "Admins of This Folder" -msgstr "" +msgstr "Kansion ylläpitäjille" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:55 #, kde-format msgid "All Readers of This Folder" -msgstr "" +msgstr "Kaikille kansiota lukeville" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:57 #, kde-format @@ -1293,6 +1286,18 @@ "A company-wide folder with optional events in it would use \"Nobody\" since " "it is not known who will go to those events." msgstr "" +"Tämä asetus määrittää kansiota jakavat käyttäjät, joiden tulisi saada " +"varausmerkinnät varaustietoihinsa ja nähdä kansion tapahtumien tai tehtävien " +"hälytykset. Asetus vaikuttaa vain kalenteriin ja tehtäväkansioihin; " +"tehtävissä asetus vaikuttaa vain hälytyksiin.\n" +"\n" +"Käyttöesimerkki: jos johtaja jakaa kansion sihteerinsä kanssa, vain johtaja " +"tulisi merkitä varatuksi tapaamisiinsa, joten hänen tulee valita " +"”Ylläpitäjät”, koska sihteerillä ei ole kansion ylläpito-oikeuksia.\n" +"Toisaalta jos työryhmä jakaa kalenterin ryhmätapaamisia varten, kaikki " +"kansiota lukevat tulee merkitä varatuiksi tapaamisajaksi.\n" +"Vapaaehtoisia tapahtumia sisältävässä koko yrityksen kansiossa asetus olisi " +"”ei kenellekään”, koska ei ole tiedossa, kuka tapahtumiin osallistuu." #: pimcommonakonadi/folderdialog/checkedcollectionwidget.cpp:91 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-17.08.1/po/gl/libpimcommon.po new/pimcommon-17.08.2/po/gl/libpimcommon.po --- old/pimcommon-17.08.1/po/gl/libpimcommon.po 2017-09-05 02:42:13.000000000 +0200 +++ new/pimcommon-17.08.2/po/gl/libpimcommon.po 2017-10-10 02:19:04.000000000 +0200 @@ -4,14 +4,14 @@ # Adrian Chaves Fernandez <[email protected]>, 2013, 2015, 2016, 2017. # Marce Villarino <[email protected]>, 2013, 2014. # Xosé <[email protected]>, 2014. +# Adrián Chaves (Gallaecio) <[email protected]>, 2017. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-14 03:13+0200\n" -"PO-Revision-Date: 2017-02-02 21:13+0100\n" -"Last-Translator: Adrián Chaves Fernández (Gallaecio) <adriyetichaves@gmail." -"com>\n" +"PO-Revision-Date: 2017-09-30 04:47+0100\n" +"Last-Translator: Adrián Chaves (Gallaecio) <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" "Language: gl\n" "MIME-Version: 1.0\n" @@ -990,7 +990,7 @@ #: pimcommon/widgets/renamefiledialog.cpp:152 #, kde-format msgid "&Rename" -msgstr "Cambia&r o nome" +msgstr "&Renomear" #: pimcommon/widgets/renamefiledialog.cpp:162 #, kde-format @@ -1325,7 +1325,7 @@ "Log in failed, please configure the IMAP account before setting up server-" "side subscription." msgstr "" -"Fallou o rexistro; configure a conta de IMAP antes de configurar a " +"Non foi posíbel acceder; configure a conta de IMAP antes de configurar a " "subscrición do lado do servidor." #: pimcommonakonadi/util/createresource.cpp:78 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-17.08.1/po/zh_CN/libpimcommon.po new/pimcommon-17.08.2/po/zh_CN/libpimcommon.po --- old/pimcommon-17.08.1/po/zh_CN/libpimcommon.po 2017-09-05 02:42:14.000000000 +0200 +++ new/pimcommon-17.08.2/po/zh_CN/libpimcommon.po 2017-10-10 02:19:05.000000000 +0200 @@ -1,9 +1,13 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Weng Xuetian <[email protected]>, 2013, 2014, 2015. msgid "" msgstr "" "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-14 03:13+0200\n" -"PO-Revision-Date: 2017-08-31 05:16-0400\n" +"PO-Revision-Date: 2017-09-30 17:48-0400\n" "Last-Translator: guoyunhebrave <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -29,7 +33,7 @@ #: pimcommon/autocorrection/autocorrectionwidget.cpp:369 #, kde-format msgid "\"Replace\" string is the same as \"Find\" string." -msgstr "" +msgstr "\"替换\"字符串和\"查找\"字符串相同。" #: pimcommon/autocorrection/autocorrectionwidget.cpp:369 #, kde-format @@ -58,7 +62,7 @@ #: pimcommon/autocorrection/autocorrectionwidget.cpp:562 #, kde-format msgid "LibreOffice Autocorrection File (*.data)" -msgstr "" +msgstr "LibreOffice 自动更正文件 (*.data)" #: pimcommon/autocorrection/autocorrectionwidget.cpp:565 #, kde-format @@ -68,12 +72,12 @@ #: pimcommon/autocorrection/autocorrectionwidget.cpp:566 #, kde-format msgid "KMail Autocorrection File (*.xml)" -msgstr "" +msgstr "KMail 自动更正文件 (*.xml)" #: pimcommon/autocorrection/autocorrectionwidget.cpp:615 #, kde-format msgid "Language was changed, do you want to save config for previous language?" -msgstr "" +msgstr "语言已改变，您想要保存之前语言的配置吗？" #: pimcommon/autocorrection/autocorrectionwidget.cpp:615 #, kde-format @@ -105,7 +109,7 @@ #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:26 #, kde-format msgid "Replacement and exception for language:" -msgstr "" +msgstr "语言的替换和例外：" #. i18n: ectx: attribute (title), widget (QWidget, tab_1) #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:42 @@ -221,7 +225,7 @@ #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:120 #, kde-format msgid "Replace 1st... with 1^st... (HTML mode)" -msgstr "" +msgstr "替换 1st... 为 1^st... (HTML 模式)" #. i18n: ectx: attribute (title), widget (QWidget, tab_2) #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:141 @@ -253,7 +257,7 @@ #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:270 #, kde-format msgid "Add non breaking space before specific punctuation marks in French text" -msgstr "" +msgstr "在法语的某些特定标点之前添加不换行空格" #. i18n: ectx: attribute (title), widget (QWidget, tab_3) #: pimcommon/autocorrection/ui/autocorrectionwidget.ui:278 @@ -359,13 +363,13 @@ #: pimcommon/configureplugins/configurepluginswidget.cpp:55 #, kde-format msgid "Restart is necessary for applying the changes." -msgstr "" +msgstr "要应用更改必须重启启动。" #: pimcommon/logactivities/logactivitiesdialog.cpp:35 #: pimcommon/logactivities/logactivitiesdialog.cpp:43 #, kde-format msgid "Log activities" -msgstr "" +msgstr "记录活动日志" #: pimcommon/logactivities/logactivitiesdialog.cpp:51 #: pimcommon/translator/translatorwidget.cpp:259 @@ -384,12 +388,12 @@ #, kde-format msgctxt "@title:window" msgid "Save Log" -msgstr "" +msgstr "保存日志" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:47 #, kde-format msgid "Share On..." -msgstr "" +msgstr "分享到..." #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:50 #, kde-format @@ -400,17 +404,17 @@ #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:98 #, kde-format msgid "Facebook" -msgstr "" +msgstr "Facebook" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:101 #, kde-format msgid "Twitter" -msgstr "" +msgstr "Twitter" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:104 #, kde-format msgid "Google Plus" -msgstr "" +msgstr "Google Plus" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:107 #, kde-format @@ -420,22 +424,22 @@ #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:110 #, kde-format msgid "LinkedIn" -msgstr "" +msgstr "LinkedIn" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:113 #, kde-format msgid "Evernote" -msgstr "" +msgstr "Evernote" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:116 #, kde-format msgid "Pocket" -msgstr "" +msgstr "Pocket" #: pimcommon/shareserviceurl/shareserviceurlmanager.cpp:119 #, kde-format msgid "LiveJournal" -msgstr "" +msgstr "LiveJournal" #: pimcommon/templatewidgets/templateeditdialog.cpp:38 #, kde-format @@ -505,7 +509,7 @@ #: pimcommon/translator/googletranslator.cpp:148 #, kde-format msgid "You used same language for from and to language." -msgstr "" +msgstr "您为来源和目标语言使用了同样的语言。" #: pimcommon/translator/translatordebugdialog.cpp:32 #, kde-format @@ -817,7 +821,7 @@ #: pimcommon/translator/translatorwidget.cpp:130 #, kde-format msgid "Problem when connecting to the translator web site." -msgstr "" +msgstr "连接到翻译网站出错。" #: pimcommon/translator/translatorwidget.cpp:227 #: pimcommon/translator/translatorwidget.cpp:230 @@ -857,12 +861,12 @@ #: pimcommon/translator/translatorwidget.cpp:296 #, kde-format msgid "Drag text that you want to translate." -msgstr "" +msgstr "拖动您想要翻译的文本。" #: pimcommon/translator/translatorwidget.cpp:363 #, kde-format msgid "No network connection detected, we cannot translate text." -msgstr "" +msgstr "未检测到网络连接，无法翻译文本。" #: pimcommon/translator/translatorwidget.cpp:363 #, kde-format @@ -908,6 +912,8 @@ "<qt><p>This setting has been fixed by your administrator.</p><p>If you think " "this is an error, please contact him.</p></qt>" msgstr "" +"<qt><p>此设置由您的管理员已修复。</p><p>如果您认为这是一个错误，请与他联系。" +"</p></qt>" #: pimcommon/widgets/kactionmenuchangecase.cpp:45 #, kde-format @@ -1051,7 +1057,7 @@ #: pimcommonakonadi/acl/acllistview.cpp:66 #, kde-format msgid "Folder cannot be administrated." -msgstr "" +msgstr "不能管理文件夹。" #: pimcommonakonadi/acl/aclmanager.cpp:180 #, kde-format @@ -1099,7 +1105,7 @@ #: pimcommonakonadi/acl/aclmodifyjob.cpp:187 #, kde-format msgid "Apply Permissions" -msgstr "" +msgstr "应用权限" #: pimcommonakonadi/acl/aclutils.cpp:32 #, kde-format @@ -1144,7 +1150,7 @@ #: pimcommonakonadi/acl/collectionaclwidget.cpp:90 #, kde-format msgid "Apply permissions on all &subfolders." -msgstr "" +msgstr "应用权限到所有子文件夹(&S)。" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:54 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:159 @@ -1192,7 +1198,7 @@ #, kde-format msgctxt "type of folder content" msgid "Journal" -msgstr "" +msgstr "日志" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:66 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:177 @@ -1208,7 +1214,7 @@ #, kde-format msgctxt "type of folder content" msgid "Freebusy" -msgstr "" +msgstr "忙碌空闲" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:70 #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:183 @@ -1216,7 +1222,7 @@ #, kde-format msgctxt "type of folder content" msgid "Files" -msgstr "" +msgstr "文件" #: pimcommonakonadi/collectionpage/collectiontypeutil.cpp:72 #, kde-format @@ -1227,27 +1233,27 @@ #: pimcommonakonadi/collectionpage/contenttypewidget.cpp:48 #, kde-format msgid "&Folder contents:" -msgstr "" +msgstr "文件夹内容(&F)：" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:45 #, kde-format msgid "Generate free/&busy and activate alarms for:" -msgstr "" +msgstr "为其生成闲/忙并激活闹钟(&B)：" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:53 #, kde-format msgid "Nobody" -msgstr "" +msgstr "没有人" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:54 #, kde-format msgid "Admins of This Folder" -msgstr "" +msgstr "此文件夹的管理员" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:55 #, kde-format msgid "All Readers of This Folder" -msgstr "" +msgstr "此文件夹的所有读者" #: pimcommonakonadi/collectionpage/incidencesforwidget.cpp:57 #, kde-format @@ -1281,14 +1287,14 @@ msgid "" "IMAP server not configured yet. Please configure the server in the IMAP " "account before setting up server-side subscription." -msgstr "" +msgstr "IMAP 服务器尚未配置。请在设置服务器端订阅前在 IMAP 账户里配置服务器。" #: pimcommonakonadi/manageserversidesubscription/manageserversidesubscriptionjob.cpp:92 #, kde-format msgid "" "Log in failed, please configure the IMAP account before setting up server-" "side subscription." -msgstr "" +msgstr "登录失败，请在设置服务器端订阅前先配置 IMAP 账户。" #: pimcommonakonadi/util/createresource.cpp:78 #, kde-format @@ -1339,19 +1345,19 @@ #, kde-format msgctxt "@title:window" msgid "Edit Note" -msgstr "" +msgstr "编辑便笺" #: pimcommonakonadi/widgets/annotationdialog.cpp:80 #, kde-format msgctxt "@action:button" msgid "Delete Note" -msgstr "" +msgstr "删除便笺" #: pimcommonakonadi/widgets/annotationdialog.cpp:84 #, kde-format msgctxt "@title:window" msgid "Add Note" -msgstr "" +msgstr "添加便签" #: pimcommonakonadi/widgets/annotationdialog.cpp:89 #, kde-format @@ -1362,19 +1368,19 @@ #, kde-format msgctxt "@label:listbox" msgid "Note type:" -msgstr "" +msgstr "便笺类型：" #: pimcommonakonadi/widgets/annotationdialog.cpp:103 #, kde-format msgctxt "@item:inlistbox" msgid "Private note" -msgstr "" +msgstr "私人便笺" #: pimcommonakonadi/widgets/annotationdialog.cpp:104 #, kde-format msgctxt "@item:inlistbox" msgid "Shared note" -msgstr "" +msgstr "分享便笺" #: pimcommonakonadi/widgets/annotationdialog.cpp:146 #, kde-format @@ -1385,4 +1391,4 @@ #, kde-format msgctxt "@title:window" msgid "Delete Note?" -msgstr "" +msgstr "删除便笺?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pimcommon-17.08.1/src/pimcommon/translator/googletranslator.cpp new/pimcommon-17.08.2/src/pimcommon/translator/googletranslator.cpp --- old/pimcommon-17.08.1/src/pimcommon/translator/googletranslator.cpp 2017-08-26 08:06:26.000000000 +0200 +++ new/pimcommon-17.08.2/src/pimcommon/translator/googletranslator.cpp 2017-09-28 06:45:58.000000000 +0200 @@ -176,6 +176,7 @@ void GoogleTranslator::slotTranslateFinished(QNetworkReply *reply) { + mResult.clear(); mJsonData = QString::fromUtf8(reply->readAll()); reply->deleteLater(); // jsonData contains arrays like this: ["foo",,"bar"]
