Hello community, here is the log from the commit of package libksieve for openSUSE:Factory checked in at 2018-01-17 21:53:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksieve (Old) and /work/SRC/openSUSE:Factory/.libksieve.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksieve" Wed Jan 17 21:53:39 2018 rev:22 rq:564398 version:17.12.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libksieve/libksieve.changes 2017-12-18 08:54:40.624791234 +0100 +++ /work/SRC/openSUSE:Factory/.libksieve.new/libksieve.changes 2018-01-17 21:53:41.696177968 +0100 @@ -1,0 +2,11 @@ +Thu Jan 11 23:41:23 CET 2018 - lbeltr...@kde.org + +- Update to 17.12.1 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.1.php +- Changes since 17.12.0: + * We just need address header not all + * Fix Bug 381714 - Cancelling sieve management operation has no effect (kde#381714) + +------------------------------------------------------------------- Old: ---- libksieve-17.12.0.tar.xz New: ---- libksieve-17.12.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksieve.spec ++++++ --- /var/tmp/diff_new_pack.XpshDp/_old 2018-01-17 21:53:42.532138866 +0100 +++ /var/tmp/diff_new_pack.XpshDp/_new 2018-01-17 21:53:42.532138866 +0100 @@ -1,7 +1,7 @@ # # spec file for package libksieve # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without lang Name: libksieve -Version: 17.12.0 +Version: 17.12.1 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ libksieve-17.12.0.tar.xz -> libksieve-17.12.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/CMakeLists.txt new/libksieve-17.12.1/CMakeLists.txt --- old/libksieve-17.12.0/CMakeLists.txt 2017-12-08 02:04:12.000000000 +0100 +++ new/libksieve-17.12.1/CMakeLists.txt 2018-01-09 02:20:17.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.0") +set(PIM_VERSION "5.7.1") project(libksieve VERSION ${PIM_VERSION}) @@ -27,13 +27,13 @@ set(LIBKSIEVE_LIB_VERSION ${PIM_VERSION}) set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.7.0") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.0") -set(KMAILTRANSPORT_LIB_VERSION "5.7.0") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.0") -set(LIBKDEPIM_LIB_VERSION "5.7.0") -set(PIMCOMMON_LIB_VERSION "5.7.0") -set(KIMAP_LIB_VERSION "5.7.0") +set(KMIME_LIB_VERSION "5.7.1") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.1") +set(KMAILTRANSPORT_LIB_VERSION "5.7.1") +set(KPIMTEXTEDIT_LIB_VERSION "5.7.1") +set(LIBKDEPIM_LIB_VERSION "5.7.1") +set(PIMCOMMON_LIB_VERSION "5.7.1") +set(KIMAP_LIB_VERSION "5.7.1") 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) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/ca/libksieve.po new/libksieve-17.12.1/po/ca/libksieve.po --- old/libksieve-17.12.0/po/ca/libksieve.po 2017-12-08 02:04:10.000000000 +0100 +++ new/libksieve-17.12.1/po/ca/libksieve.po 2018-01-09 02:20:16.000000000 +0100 @@ -10,8 +10,8 @@ "Project-Id-Version: libksieve\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-01 02:59+0100\n" -"PO-Revision-Date: 2017-11-07 22:26+0100\n" -"Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" +"PO-Revision-Date: 2017-12-30 18:03+0100\n" +"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca\n" "MIME-Version: 1.0\n" @@ -179,12 +179,12 @@ #: ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.cpp:57 #, kde-format msgid "regex" -msgstr "exp reg" +msgstr "exp. reg." #: ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.cpp:58 #, kde-format msgid "not regex" -msgstr "sense exp reg" +msgstr "sense exp. reg." #: ksieveui/autocreatescripts/commonwidgets/selectmimetypecombobox.cpp:40 #, kde-format @@ -957,7 +957,7 @@ "La prova «cos» coincideix amb el contingut en el cos d'un missatge de correu " "electrònic, és a dir, qualsevol cosa després de la primera línia en blanc " "després de la capçalera. (La mateixa línia en blanc, si està present, no " -"serà consideradà com a part del cos)." +"serà considerada com a part del cos)." #: ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp:34 #, kde-format @@ -971,7 +971,7 @@ "the current date/time rather than a value extracted from the message header." msgstr "" "La prova data actual és similar a la prova data, excepte en què opera sobre " -"la data/hora actuals en lloc d'un valor extret de la capçalera del missatge." +"la data/hora actual en lloc d'un valor extret de la capçalera del missatge." #: ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp:35 #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:56 @@ -1105,7 +1105,7 @@ "headers, ignoring leading and trailing whitespace, matches any key." msgstr "" "La prova «capçalera» s'avalua com a cert si el valor de qualsevol de les " -"capçaleres anomenades, ignorant els espais en blanc inicial i final, " +"capçaleres anomenades, ignorant els espais en blanc inicials i finals, " "coincideix amb qualsevol clau." #: ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp:33 @@ -1531,7 +1531,7 @@ #: ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.cpp:40 #, kde-format msgid "KB" -msgstr "KB" +msgstr "kB" #: ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.cpp:41 #, kde-format @@ -2447,7 +2447,7 @@ #, kde-format msgid "Send out-of-office replies to mails coming from this domain only." msgstr "" -"Envia les respostes «for de l'oficina» només al correu entrant des d'aquest " +"Envia les respostes «fora de l'oficina» només al correu entrant des d'aquest " "domini." #. i18n: ectx: label, entry (OutOfOfficeReactToSpam), group (OutOfOffice) @@ -2455,7 +2455,7 @@ #, kde-format msgid "Allow out-of-office replies to be sent to messages marked as SPAM." msgstr "" -"Permet que s'enviïn les respostes «for de l'oficina» als missatges marcats " +"Permet que s'enviïn les respostes «fora de l'oficina» als missatges marcats " "com a correu brossa." #. i18n: ectx: label, entry (CheckOutOfOfficeOnStartup), group (OutOfOffice) @@ -2830,7 +2830,7 @@ "Yours sincerely,\n" "-- \"enter your name and email address here\"\n" msgstr "" -"Estaré fora de l'oficina fins el %1.\n" +"Estaré fora de l'oficina fins al %1.\n" "\n" "En cas d'urgència, si us plau, contacteu amb «substitut per absències»\n" "\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/ca@valencia/libksieve.po new/libksieve-17.12.1/po/ca@valencia/libksieve.po --- old/libksieve-17.12.0/po/ca@valencia/libksieve.po 2017-12-08 02:04:10.000000000 +0100 +++ new/libksieve-17.12.1/po/ca@valencia/libksieve.po 2018-01-09 02:20:16.000000000 +0100 @@ -10,8 +10,8 @@ "Project-Id-Version: libksieve\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-01 02:59+0100\n" -"PO-Revision-Date: 2017-11-07 22:26+0100\n" -"Last-Translator: Antoni Bella Pérez <antonibel...@yahoo.com>\n" +"PO-Revision-Date: 2017-12-30 18:03+0100\n" +"Last-Translator: Josep Ma. Ferrer <txe...@gmail.com>\n" "Language-Team: Catalan <kde-i18n...@kde.org>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" @@ -179,12 +179,12 @@ #: ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.cpp:57 #, kde-format msgid "regex" -msgstr "exp reg" +msgstr "exp. reg." #: ksieveui/autocreatescripts/commonwidgets/selectmatchtypecombobox.cpp:58 #, kde-format msgid "not regex" -msgstr "sense exp reg" +msgstr "sense exp. reg." #: ksieveui/autocreatescripts/commonwidgets/selectmimetypecombobox.cpp:40 #, kde-format @@ -956,7 +956,7 @@ "La prova «cos» coincideix amb el contingut en el cos d'un missatge de correu " "electrònic, és a dir, qualsevol cosa després de la primera línia en blanc " "després de la capçalera. (La mateixa línia en blanc, si està present, no " -"serà consideradà com a part del cos)." +"serà considerada com a part del cos)." #: ksieveui/autocreatescripts/sieveconditions/sieveconditioncurrentdate.cpp:34 #, kde-format @@ -970,7 +970,7 @@ "the current date/time rather than a value extracted from the message header." msgstr "" "La prova data actual és similar a la prova data, excepte en què opera sobre " -"la data/hora actuals en lloc d'un valor extret de la capçalera del missatge." +"la data/hora actual en lloc d'un valor extret de la capçalera del missatge." #: ksieveui/autocreatescripts/sieveconditions/sieveconditiondate.cpp:35 #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:56 @@ -1104,7 +1104,7 @@ "headers, ignoring leading and trailing whitespace, matches any key." msgstr "" "La prova «capçalera» s'avalua com a cert si el valor de qualsevol de les " -"capçaleres anomenades, ignorant els espais en blanc inicial i final, " +"capçaleres anomenades, ignorant els espais en blanc inicials i finals, " "coincideix amb qualsevol clau." #: ksieveui/autocreatescripts/sieveconditions/sieveconditionihave.cpp:33 @@ -1530,7 +1530,7 @@ #: ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.cpp:40 #, kde-format msgid "KB" -msgstr "KB" +msgstr "kB" #: ksieveui/autocreatescripts/sieveconditions/widgets/selectsizetypecombobox.cpp:41 #, kde-format @@ -2446,7 +2446,7 @@ #, kde-format msgid "Send out-of-office replies to mails coming from this domain only." msgstr "" -"Envia les respostes «for de l'oficina» només al correu entrant des d'este " +"Envia les respostes «fora de l'oficina» només al correu entrant des d'este " "domini." #. i18n: ectx: label, entry (OutOfOfficeReactToSpam), group (OutOfOffice) @@ -2454,7 +2454,7 @@ #, kde-format msgid "Allow out-of-office replies to be sent to messages marked as SPAM." msgstr "" -"Permet que s'envien les respostes «for de l'oficina» als missatges marcats " +"Permet que s'envien les respostes «fora de l'oficina» als missatges marcats " "com a correu brossa." #. i18n: ectx: label, entry (CheckOutOfOfficeOnStartup), group (OutOfOffice) @@ -2829,7 +2829,7 @@ "Yours sincerely,\n" "-- \"enter your name and email address here\"\n" msgstr "" -"Estaré fora de l'oficina fins el %1.\n" +"Estaré fora de l'oficina fins al %1.\n" "\n" "En cas d'urgència, per favor, contacteu amb «substitut per absències»\n" "\n" @@ -3177,55 +3177,3 @@ #, kde-format msgid "Unknown error" msgstr "Error desconegut" - -#~ msgid "New Script Name" -#~ msgstr "Nom de l'script nou" - -#~ msgid "Rename..." -#~ msgstr "Reanomena..." - -#~ msgid "Edit description..." -#~ msgstr "Edita la descripció..." - -#~ msgid "Select folder" -#~ msgstr "Selecciona la carpeta" - -#~ msgid "Syntax error." -#~ msgstr "Error de sintaxi." - -#~ msgid "Failed to get SieveJob list." -#~ msgstr "Ha fallat en recuperar la llista de tasques del «Sieve»." - -#~ msgid "Autogenerate Script..." -#~ msgstr "Autogenera l'script..." - -#~ msgid "SieveJob list failed." -#~ msgstr "Ha fallat la llista de «SieveJob»." - -#~| msgid "Save As..." -#~ msgid "Save As" -#~ msgstr "Desa com a" - -#~ msgid "" -#~ "*.siv|sieve files (*.siv)\n" -#~ "*|all files (*)" -#~ msgstr "" -#~ "*.siv|Fitxers de «Sieve» (*.siv)\n" -#~ "*|Tots els fitxers (*)" - -#~ msgid "Upload..." -#~ msgstr "Pujada..." - -#, fuzzy -#~| msgid "Autogenerate Script..." -#~ msgid "AutoCreateScripttest_Gui" -#~ msgstr "Autogenera l'script..." - -#, fuzzy -#~| msgid "Sieve Parsing" -#~ msgid "ScriptSieveParsingTest_Gui" -#~ msgstr "Anàlisi de «Sieve»" - -#~| msgid "Save As..." -#~ msgid "SaveAs..." -#~ msgstr "Desa com a..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/fr/libksieve.po new/libksieve-17.12.1/po/fr/libksieve.po --- old/libksieve-17.12.0/po/fr/libksieve.po 2017-12-08 02:04:10.000000000 +0100 +++ new/libksieve-17.12.1/po/fr/libksieve.po 2018-01-09 02:20:16.000000000 +0100 @@ -5,14 +5,14 @@ # Joëlle Cornavin <jcorna...@laposte.net>, 2010, 2011. # Geoffray Levasseur <geoffray.levasseurbran...@numericable.fr>, 2012, 2013, 2014. # xavier <xavier.besn...@neuf.fr>, 2012. -# Vincent Pinon <vpi...@kde.org>, 2017. +# Vincent Pinon <vpi...@kde.org>, 2017, 2018. # msgid "" msgstr "" "Project-Id-Version: libksieve\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-01 02:59+0100\n" -"PO-Revision-Date: 2017-09-20 09:46+0100\n" +"PO-Revision-Date: 2018-01-05 22:40+0100\n" "Last-Translator: Vincent Pinon <vpi...@kde.org>\n" "Language-Team: French <kde-francoph...@kde.org>\n" "Language: fr\n" @@ -726,8 +726,8 @@ "The \"stop\" action ends all processing. If the implicit keep has not been " "cancelled, then it is taken." msgstr "" -"L'action d'arrêt « stop » termine tous traitements. Si le « keep » implicite " -"n'a pas été annulé, il est alors conservé." +"L'action « stop » termine tous traitements. Si le « keep » implicite n'a pas " +"été annulé, il est alors conservé." #: ksieveui/autocreatescripts/sieveactions/sieveactionvacation.cpp:38 #, kde-format @@ -956,10 +956,10 @@ "specified part of the address, as modified by the comparator and the match " "keyword." msgstr "" -"Le test d'adresse « address » vérifie la correspondance des adresses " -"Internet dans les en-têtes structuré qui contiennent des adresses. Il renvoi " -"vrai si l'un des en-têtes contient l'une des clé dans la partie spécifiée de " -"l'adresse, telle que modifiée par le comparateur et le mot clé correspondant." +"Le test « address » vérifie la correspondance des adresses Internet dans les " +"en-têtes structuré qui contiennent des adresses. Il renvoi vrai si l'un des " +"en-têtes contient l'une des clé dans la partie spécifiée de l'adresse, telle " +"que modifiée par le comparateur et le mot clé correspondant." #: ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp:33 #, kde-format @@ -1040,9 +1040,9 @@ "by the name string and matches it to the values specified in the key-list " "argument." msgstr "" -"Le test d'environnement « environment » récupère les éléments d'informations " -"d'environnement spécifiés par le nom de la chaîne et la fait correspondre " -"aux valeurs spécifiées dans l'argument « key-list »." +"Le test « environment » accède aux éléments d'informations d'environnement " +"spécifiés par le nom de la chaîne et la fait correspondre aux valeurs " +"spécifiées dans l'argument « key-list »." #: ksieveui/autocreatescripts/sieveconditions/sieveconditionexists.cpp:35 #, kde-format @@ -2824,7 +2824,7 @@ "Please contact your system administrator." msgstr "" "Votre serveur ne contient pas le mot « vacances » dans la liste des " -"extensions Sieve prises en charge.Sans ce paramètre, il est impossible pour " +"extensions Sieve prises en charge. Sans ce paramètre, il est impossible pour " "KMail de mettre en place les réponses « En cas d'absence » pour vous. " "Veuillez contacter votre administrateur système." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/tr/kio_sieve.po new/libksieve-17.12.1/po/tr/kio_sieve.po --- old/libksieve-17.12.0/po/tr/kio_sieve.po 2017-12-08 02:04:11.000000000 +0100 +++ new/libksieve-17.12.1/po/tr/kio_sieve.po 2018-01-09 02:20:17.000000000 +0100 @@ -241,8 +241,8 @@ "Please enter your authentication details for your sieve account (usually the " "same as your email password):" msgstr "" -"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz " -"(genellikle e-posta parolanızla aynıdır):" +"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz (" +"genellikle e-posta parolanızla aynıdır):" #: sieve.cpp:1084 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/tr/libksieve.po new/libksieve-17.12.1/po/tr/libksieve.po --- old/libksieve-17.12.0/po/tr/libksieve.po 2017-12-08 02:04:11.000000000 +0100 +++ new/libksieve-17.12.1/po/tr/libksieve.po 2018-01-09 02:20:17.000000000 +0100 @@ -75,8 +75,8 @@ "Please enter your authentication details for your sieve account (usually the " "same as your email password):" msgstr "" -"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz " -"(genellikle e-posta parolanızla aynıdır):" +"Lütfen kevgir hesabınız için kimlik denetimi ayrıntılarını giriniz (" +"genellikle e-posta parolanızla aynıdır):" #: kmanagesieve/sessionthread.cpp:303 #, kde-format @@ -230,8 +230,8 @@ "Too many argument found for \"%1\", max value is %2, number of value found " "%3 for %4" msgstr "" -"\"%1\" için çok fazla bağımsız değişken bulundu, %2 maksimum değer, %4 için " -"%3 değeri bulundu" +"\"%1\" için çok fazla bağımsız değişken bulundu, %2 maksimum değer, %4 için %" +"3 değeri bulundu" #: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:144 #: ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp:123 @@ -544,8 +544,8 @@ "add new headers." msgstr "" "\"yeninden yönlendirme\" eylemi iletiyi başka bir kullanıcıya sağlanan " -"adreste gönderir, bunu bir e-posta yönlendirme özelliği gibi yapar. " -"\"yeniden yönlendirme\" eylemi ileti gövdesinde ya da var olan başlıklarda " +"adreste gönderir, bunu bir e-posta yönlendirme özelliği gibi yapar. \"" +"yeniden yönlendirme\" eylemi ileti gövdesinde ya da var olan başlıklarda " "herhangi bir değişiklik yapmaz, ancak yeni başlıklar ekleyebilir." #: ksieveui/autocreatescripts/sieveactions/sieveactionredirect.cpp:157 @@ -1249,8 +1249,8 @@ "mechanism." msgstr "" "\"spamtest\" testi yapan Sieve gerçeklemeleri yetenek mekanizmasıyla " -"birlikte kullanabilmek için belirteç olarak \"spamtest\" veya \"spamtestplus" -"\" kullanırlar." +"birlikte kullanabilmek için belirteç olarak \"spamtest\" veya \"" +"spamtestplus\" kullanırlar." #: ksieveui/autocreatescripts/sieveconditions/sieveconditiontrue.cpp:33 #, kde-format @@ -2168,8 +2168,8 @@ "Some errors were found during parsing. <a href=\"sieveerrordetails" "\">(Details...)</a>" msgstr "" -"Ayrıştırma sırasında bazı hatalar bulundu. <a href=\"sieveerrordetails" -"\">(Ayrıntılar...)</a>" +"Ayrıştırma sırasında bazı hatalar bulundu. <a href=\"sieveerrordetails\"" +">(Ayrıntılar...)</a>" #: ksieveui/editor/warningwidget/sieveeditorparsingmissingfeaturewarning.cpp:41 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/zh_CN/kio_sieve.po new/libksieve-17.12.1/po/zh_CN/kio_sieve.po --- old/libksieve-17.12.0/po/zh_CN/kio_sieve.po 2017-12-08 02:04:11.000000000 +0100 +++ new/libksieve-17.12.1/po/zh_CN/kio_sieve.po 2018-01-09 02:20:17.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-07-31 03:28+0200\n" -"PO-Revision-Date: 2017-11-09 08:21-0500\n" +"PO-Revision-Date: 2018-01-08 18:07-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -19,7 +19,7 @@ "X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/pim/kio_sieve.pot\n" +"X-Crowdin-File: /kf5-stable/messages/pim/kio_sieve.pot\n" #: sieve.cpp:330 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/po/zh_CN/libksieve.po new/libksieve-17.12.1/po/zh_CN/libksieve.po --- old/libksieve-17.12.0/po/zh_CN/libksieve.po 2017-12-08 02:04:11.000000000 +0100 +++ new/libksieve-17.12.1/po/zh_CN/libksieve.po 2018-01-09 02:20:17.000000000 +0100 @@ -4,7 +4,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-01 02:59+0100\n" -"PO-Revision-Date: 2017-11-09 08:21-0500\n" +"PO-Revision-Date: 2018-01-08 18:07-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" @@ -15,7 +15,7 @@ "X-Generator: crowdin.com\n" "X-Crowdin-Project: kdeorg\n" "X-Crowdin-Language: zh-CN\n" -"X-Crowdin-File: /kf5-trunk/messages/pim/libksieve.pot\n" +"X-Crowdin-File: /kf5-stable/messages/pim/libksieve.pot\n" #: kmanagesieve/session.cpp:115 #, kde-format @@ -386,7 +386,7 @@ #: ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp:44 #, kde-format msgid "Number of characters:" -msgstr "" +msgstr "字符数：" #: ksieveui/autocreatescripts/sieveactions/sieveactionextracttext.cpp:54 #, kde-format @@ -540,7 +540,7 @@ #: ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp:34 #, kde-format msgid "Replace" -msgstr "" +msgstr "替换" #: ksieveui/autocreatescripts/sieveactions/sieveactionreplace.cpp:53 #, kde-format @@ -1202,7 +1202,7 @@ #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:53 #, kde-format msgid "Year" -msgstr "" +msgstr "年" #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:54 #, kde-format @@ -1237,7 +1237,7 @@ #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:61 #, kde-format msgid "Time" -msgstr "" +msgstr "时间" #: ksieveui/autocreatescripts/sieveconditions/widgets/selectdatewidget.cpp:62 #, kde-format @@ -1626,7 +1626,7 @@ #: ksieveui/autocreatescripts/sievescriptlistbox.cpp:272 #, kde-format msgid "Rename" -msgstr "" +msgstr "重命名" #: ksieveui/autocreatescripts/sievescriptlistbox.cpp:459 #, kde-format @@ -1891,7 +1891,7 @@ #: ksieveui/editor/sieveeditormenubar.cpp:76 #, kde-format msgid "Debug Sieve Script..." -msgstr "" +msgstr "调试 Sieve 脚本..." #: ksieveui/editor/sieveeditormenubar.cpp:93 #, kde-format @@ -1926,7 +1926,7 @@ #, kde-format msgctxt "@action:inmenu" msgid "Close All Other Tabs" -msgstr "" +msgstr "关闭全部其它标签页" #: ksieveui/editor/sieveeditortabwidget.cpp:66 #, kde-format @@ -1977,7 +1977,7 @@ #: ksieveui/editor/sieveeditorwidget.cpp:68 #, kde-format msgid "Create Rules Graphically..." -msgstr "" +msgstr "以图形方式创建规则..." #: ksieveui/editor/sieveeditorwidget.cpp:84 #, kde-format @@ -2104,7 +2104,7 @@ #: ksieveui/editor/webengine/findbar/findbarbase.cpp:100 #, kde-format msgid "Phrase not found" -msgstr "" +msgstr "词语未找到" #: ksieveui/editor/webengine/sieveeditorwebengineview.cpp:57 #, kde-format @@ -2209,17 +2209,17 @@ #: ksieveui/managesievescriptsdialog.cpp:226 #, kde-format msgid "Uploading script to server for checking it, please wait..." -msgstr "" +msgstr "正在将脚本上传到服务器以检查，请稍候..." #: ksieveui/managesievescriptsdialog.cpp:272 #, kde-format msgid "The Sieve script was successfully uploaded." -msgstr "" +msgstr "筛选脚本已成功上传。" #: ksieveui/managesievescriptsdialog.cpp:273 #, kde-format msgid "Sieve Script Upload" -msgstr "" +msgstr "上传筛选脚本" #: ksieveui/managesievescriptsdialog.cpp:278 #, kde-format @@ -2228,6 +2228,9 @@ "The server responded:\n" "%1" msgstr "" +"上传 Sieve 脚本失败。\n" +"服务器回应：\n" +"%1" #: ksieveui/scriptsparsing/parsingresultdialog.cpp:41 #, kde-format @@ -2338,7 +2341,7 @@ #: ksieveui/sievescriptdebugger/sievescriptdebuggerresulteditor.cpp:53 #, kde-format msgid "Text Files (*.txt);;All Files (*)" -msgstr "" +msgstr "文本文件 (*.txt);;所有文件 (*)" #: ksieveui/sievescriptdebugger/sievescriptdebuggertextedit.cpp:45 #, kde-format @@ -2375,7 +2378,7 @@ #: ksieveui/templates/sievedefaulttemplate.cpp:58 #, kde-format msgid "Forward Message" -msgstr "" +msgstr "转发的信件" #: ksieveui/templates/sievedefaulttemplate.cpp:65 #, kde-format @@ -2395,7 +2398,7 @@ #: ksieveui/templates/sievetemplateeditdialog.cpp:48 #, kde-format msgid "Default template" -msgstr "" +msgstr "默认模板" #: ksieveui/templates/sievetemplateeditdialog.cpp:48 #, kde-format @@ -2405,7 +2408,7 @@ #: ksieveui/templates/sievetemplatewidget.cpp:112 #, kde-format msgid "You can drag and drop element on editor to import template" -msgstr "" +msgstr "您可以在编辑器上拖拽元素来导入模板" #: ksieveui/vacation/multiimapvacationdialog.cpp:61 #: ksieveui/vacation/vacation.cpp:113 @@ -2616,7 +2619,7 @@ #: ksieveui/widgets/custommanagesievewidget.cpp:58 #, kde-format msgid "No Sieve URL configured" -msgstr "" +msgstr "没有配置筛选 URL" #: ksieveui/widgets/managesievetreeview.cpp:27 #: ksieveui/widgets/managesievetreeview.cpp:42 @@ -2647,7 +2650,7 @@ #: ksieveui/widgets/managesievewidget.cpp:168 #, kde-format msgid "Deactivate Script" -msgstr "" +msgstr "取消激活脚本" #: ksieveui/widgets/managesievewidget.cpp:174 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp new/libksieve-17.12.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp --- old/libksieve-17.12.0/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp 2017-12-04 11:20:12.000000000 +0100 +++ new/libksieve-17.12.1/src/ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp 2017-12-31 12:37:49.000000000 +0100 @@ -57,7 +57,7 @@ selectMatchCombobox->setObjectName(QStringLiteral("matchtypecombobox")); grid->addWidget(selectMatchCombobox, 0, 0); - SelectHeaderTypeComboBox *selectHeaderType = new SelectHeaderTypeComboBox; + SelectHeaderTypeComboBox *selectHeaderType = new SelectHeaderTypeComboBox(true); connect(selectHeaderType, &SelectHeaderTypeComboBox::valueChanged, this, &SieveConditionAddress::valueChanged); selectHeaderType->setObjectName(QStringLiteral("headertypecombobox")); grid->addWidget(selectHeaderType, 0, 1); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.0/src/ksieveui/widgets/managesievewidget.cpp new/libksieve-17.12.1/src/ksieveui/widgets/managesievewidget.cpp --- old/libksieve-17.12.0/src/ksieveui/widgets/managesievewidget.cpp 2017-12-04 11:20:12.000000000 +0100 +++ new/libksieve-17.12.1/src/ksieveui/widgets/managesievewidget.cpp 2017-12-31 12:37:49.000000000 +0100 @@ -187,7 +187,7 @@ if (item) { const QList<KManageSieve::SieveJob *> jobs = mJobs.keys(item); for (KManageSieve::SieveJob *job : jobs) { - job->kill(); + job->kill(KJob::EmitResult); } } }
