Hello community, here is the log from the commit of package libksieve for openSUSE:Factory checked in at 2018-03-20 21:41:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libksieve (Old) and /work/SRC/openSUSE:Factory/.libksieve.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libksieve" Tue Mar 20 21:41:41 2018 rev:24 rq:585652 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libksieve/libksieve.changes 2018-02-12 10:05:14.555068827 +0100 +++ /work/SRC/openSUSE:Factory/.libksieve.new/libksieve.changes 2018-03-20 21:41:43.581934674 +0100 @@ -1,0 +2,10 @@ +Thu Mar 08 23:52:23 CET 2018 - lbeltr...@kde.org + +- Update to 17.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.3.php +- Changes since 17.12.2: + * Fix autotest + +------------------------------------------------------------------- Old: ---- libksieve-17.12.2.tar.xz New: ---- libksieve-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libksieve.spec ++++++ --- /var/tmp/diff_new_pack.dPsBHm/_old 2018-03-20 21:41:44.137914662 +0100 +++ /var/tmp/diff_new_pack.dPsBHm/_new 2018-03-20 21:41:44.141914518 +0100 @@ -19,13 +19,13 @@ %bcond_without lang Name: libksieve -Version: 17.12.2 +Version: 17.12.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) %{!?_kapp_version: %global _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} Summary: Sieve and Managesieve support library for KDE PIM -License: GPL-2.0 and LGPL-2.1+ +License: GPL-2.0-only AND LGPL-2.1-or-later Group: System/Libraries Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz @@ -92,7 +92,7 @@ %package devel Summary: Development package for libksieve -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/KDE Requires: libksieve = %{version} ++++++ libksieve-17.12.2.tar.xz -> libksieve-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/CMakeLists.txt new/libksieve-17.12.3/CMakeLists.txt --- old/libksieve-17.12.2/CMakeLists.txt 2018-02-06 01:44:03.000000000 +0100 +++ new/libksieve-17.12.3/CMakeLists.txt 2018-03-06 01:32:12.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.7.2") +set(PIM_VERSION "5.7.3") 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.2") -set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.2") -set(KMAILTRANSPORT_LIB_VERSION "5.7.2") -set(KPIMTEXTEDIT_LIB_VERSION "5.7.2") -set(LIBKDEPIM_LIB_VERSION "5.7.2") -set(PIMCOMMON_LIB_VERSION "5.7.2") -set(KIMAP_LIB_VERSION "5.7.2") +set(KMIME_LIB_VERSION "5.7.3") +set(IDENTITYMANAGEMENT_LIB_VERSION "5.7.3") +set(KMAILTRANSPORT_LIB_VERSION "5.7.3") +set(KPIMTEXTEDIT_LIB_VERSION "5.7.3") +set(LIBKDEPIM_LIB_VERSION "5.7.3") +set(PIMCOMMON_LIB_VERSION "5.7.3") +set(KIMAP_LIB_VERSION "5.7.3") 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.2/po/fi/libksieve.po new/libksieve-17.12.3/po/fi/libksieve.po --- old/libksieve-17.12.2/po/fi/libksieve.po 2018-02-06 01:44:02.000000000 +0100 +++ new/libksieve-17.12.3/po/fi/libksieve.po 2018-03-06 01:32:11.000000000 +0100 @@ -4,7 +4,7 @@ # Author: Artnay # Author: Lliehu # Ilpo Kantonen <i...@iki.fi>, 2006. -# Tommi Nieminen <transla...@legisign.org>, 2011, 2012, 2013, 2015, 2016, 2017. +# Tommi Nieminen <transla...@legisign.org>, 2011, 2012, 2013, 2015, 2016, 2017, 2018. # Lasse Liehu <lasse.li...@gmail.com>, 2012, 2013, 2014, 2015, 2016. # Jiri Grönroos <jiri.gronroos+...@iki.fi>, 2012. msgid "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/po/nb/libksieve.po new/libksieve-17.12.3/po/nb/libksieve.po --- old/libksieve-17.12.2/po/nb/libksieve.po 2018-02-06 01:44:02.000000000 +0100 +++ new/libksieve-17.12.3/po/nb/libksieve.po 2018-03-06 01:32:12.000000000 +0100 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: libksieve\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-09-04 03:09+0200\n" +"POT-Creation-Date: 2017-11-01 02:59+0100\n" "PO-Revision-Date: 2014-04-26 10:23+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -20,14 +20,14 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: kmanagesieve/session.cpp:116 +#: kmanagesieve/session.cpp:115 #, kde-format msgid "Cannot use TLS since the underlying Qt library does not support it." msgstr "" "TLS kan ikke brukes fordi det ikke støttes av det underliggende Qt-" "biblioteket." -#: kmanagesieve/session.cpp:122 +#: kmanagesieve/session.cpp:121 #, kde-format msgid "" "TLS encryption was requested, but your Sieve server does not advertise TLS " @@ -39,22 +39,22 @@ "sine muligheter.\n" "Du kan forsøke å innlede TLS-forhandlinger likevel, eller avbryte handlinga." -#: kmanagesieve/session.cpp:124 +#: kmanagesieve/session.cpp:123 #, kde-format msgid "Server Does Not Advertise TLS" msgstr "Denne tjeneren støtter ikke TLS." -#: kmanagesieve/session.cpp:124 +#: kmanagesieve/session.cpp:123 #, kde-format msgid "&Start TLS nonetheless" msgstr "&Start TLS likevel" -#: kmanagesieve/session.cpp:126 +#: kmanagesieve/session.cpp:125 #, kde-format msgid "TLS encryption requested, but not supported by server." msgstr "Det er bedt om TLS-kryptering, men tjeneren støtter det ikke." -#: kmanagesieve/session.cpp:167 +#: kmanagesieve/session.cpp:166 #, kde-format msgid "" "The server does not seem to support TLS. Disable TLS if you want to connect " @@ -63,12 +63,12 @@ "Det ser ut til at tjeneren ikke støtter TLS. Slå av TLS om du vil koble til " "uten kryptering." -#: kmanagesieve/session.cpp:276 +#: kmanagesieve/session.cpp:275 #, kde-format msgid "Sieve Authentication Details" msgstr "Sieve autentiseringsdetaljer" -#: kmanagesieve/session.cpp:277 +#: kmanagesieve/session.cpp:276 #, kde-format msgid "" "Please enter your authentication details for your sieve account (usually the " @@ -77,7 +77,7 @@ "Skriv dine autentiseringsopplysninger for din sievekonto (vanligvis det " "samme som passordet til e-posten):" -#: kmanagesieve/sessionthread.cpp:304 +#: kmanagesieve/sessionthread.cpp:303 #, kde-format msgid "" "Authentication failed.\n" @@ -211,17 +211,17 @@ msgid "Help" msgstr "Hjelp" -#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:130 +#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:129 #, kde-format msgid "An unknown tag \"%1\" was found during parsing action \"%2\"." msgstr "En ukjent tagg «%1» ble funnet da handlingen «%2» ble tolket." -#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:135 +#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:134 #, kde-format msgid "An unknown tag value \"%1\" was found during parsing action \"%2\"." msgstr "En ukjent taggverdi «%1» ble funnet da handlingen «%2» ble tolket." -#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:140 +#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:139 #: ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp:113 #, kde-format msgid "" @@ -231,7 +231,7 @@ "Fant for mange argumenter for «%1», største verdi er %2, fant %3 verdier " "for %4" -#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:145 +#: ksieveui/autocreatescripts/sieveactions/sieveaction.cpp:144 #: ksieveui/autocreatescripts/sieveconditions/sievecondition.cpp:123 #, kde-format msgid "A feature \"%1\" in condition \"%2\" is not supported by server" @@ -865,24 +865,24 @@ msgid "Length" msgstr "Lengde" -#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:75 +#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:74 #, kde-format msgid "Please select an action." msgstr "Velg en handling." -#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:154 -#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:126 +#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:153 +#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:125 #, kde-format msgid "Add comment" msgstr "Legg til kommentar" -#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:290 -#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:238 +#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:289 +#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:237 #, kde-format msgid "Script contains unsupported feature \"%1\"" msgstr "" -#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:428 +#: ksieveui/autocreatescripts/sieveactionwidgetlister.cpp:427 #, kde-format msgid "We detected a loop if in a loop if. It's not supported" msgstr "Fant en if-løkke inni en if-løkke. Det er ikke støttet" @@ -897,24 +897,24 @@ msgid "An unknown tag value \"%1\" was found during parsing condition \"%2\"." msgstr "En ukjent taggverdi «%1» ble funnet mens betingelsen «%2» ble tolket." -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:37 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:36 #, kde-format msgid "Address" msgstr "Adresse" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:66 -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:68 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:65 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:67 #, kde-format msgid "address:" msgstr "adresse:" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:73 -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:75 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:72 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:74 #, kde-format msgid "Use ; to separate emails" msgstr "Bruk ; som skilletegn mellom e-poster" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:108 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionaddress.cpp:107 #, kde-format msgid "" "The \"address\" test matches Internet addresses in structured headers that " @@ -927,12 +927,12 @@ "meldingshode inneholder en nøkkel i den oppgitte adressedelen, som endret " "med komparatoren og nøkkelordet match." -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp:34 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp:33 #, kde-format msgid "Body" msgstr "Kropp" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp:99 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionbody.cpp:98 #, kde-format msgid "" "The body test matches content in the body of an email message, that is, " @@ -973,12 +973,12 @@ "Dato-testen finner samsvar med dato/tid-informasjon hentet fra meldingshoder " "som inneholder slike verdier." -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:38 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:37 #, kde-format msgid "Envelope" msgstr "Konvolutt" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:119 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionenvelope.cpp:118 #, kde-format msgid "" "The \"envelope\" test is true if the specified part of the [SMTP] (or " @@ -1071,17 +1071,17 @@ "«hasflag»-testen blir Sann hvis noen av variablene samsvarer med et flagg-" "navn." -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:36 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:35 #, kde-format msgid "Header" msgstr "Meldingshode" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:60 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:59 #, kde-format msgid "With value:" msgstr "Med verdi:" -#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:90 +#: ksieveui/autocreatescripts/sieveconditions/sieveconditionheader.cpp:89 #, kde-format msgid "" "The \"header\" test evaluates to true if the value of any of the named " @@ -1305,17 +1305,17 @@ msgid "detail" msgstr "detalj" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:48 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:47 #, kde-format msgid "raw" msgstr "rå" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:49 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:48 #, kde-format msgid "content" msgstr "innhold" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:50 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectbodytypewidget.cpp:49 #, kde-format msgid "text" msgstr "tekst" @@ -1460,42 +1460,42 @@ msgid "Parameters" msgstr "Parametre" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:70 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:69 #, kde-format msgid "Value" msgstr "Verdi" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:71 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:70 #, kde-format msgid "Count" msgstr "Antall" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:76 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:75 #, kde-format msgid "Greater than" msgstr "Større enn" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:77 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:76 #, kde-format msgid "Greater than or equal" msgstr "Større enn eller lik" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:78 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:77 #, kde-format msgid "Less than" msgstr "Mindre enn" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:79 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:78 #, kde-format msgid "Less than or equal" msgstr "Mindre enn eller lik" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:80 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:79 #, kde-format msgid "Equal to" msgstr "Lik" -#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:81 +#: ksieveui/autocreatescripts/sieveconditions/widgets/selectrelationalmatchtype.cpp:80 #, kde-format msgid "Not equal to" msgstr "Ikke lik" @@ -1520,7 +1520,7 @@ msgid "GB" msgstr "GB" -#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:68 +#: ksieveui/autocreatescripts/sieveconditionwidgetlister.cpp:67 #, kde-format msgid "Please select an condition." msgstr "Velg en betingelse." @@ -1588,43 +1588,43 @@ "deklarere det globalt, så betegner navnet en særskilt, ikke-global variabel " "inne i det skriptet." -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:58 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:57 #, kde-format msgid "personal" msgstr "personlig" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:59 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:58 #, kde-format msgid "global" msgstr "global" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:73 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:72 #, kde-format msgid "Unknown location type \"%1\" during parsing includes" msgstr "Ukjent stedstype «%1» mens inkluderinger ble tolket" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:147 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:146 #, kde-format msgid "Include:" msgstr "Inkluder:" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:153 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:152 #: ksieveui/templates/sievetemplateeditdialog.cpp:68 #, kde-format msgid "Name:" msgstr "Navn:" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:161 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:160 #, kde-format msgid "Optional" msgstr "Valgfri" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:165 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:164 #, kde-format msgid "Once" msgstr "En gang" -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:233 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:231 #, kde-format msgid "" "The \"include\" command takes an optional \"location\" parameter, an " @@ -1636,7 +1636,7 @@ "«:once», en parameter «:optional» – alle valgfrie – og en streng som " "argument som viser navnet på skriptet som skal tas med for behandling her." -#: ksieveui/autocreatescripts/sieveincludewidget.cpp:355 +#: ksieveui/autocreatescripts/sieveincludewidget.cpp:353 #, kde-format msgid "We can not add more includes elements." msgstr "Flere inkluderinger kan ikke legges til." @@ -1686,83 +1686,84 @@ msgid "Description" msgstr "Beskrivelse" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:139 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:137 #, kde-format msgctxt "Move selected filter up." msgid "Up" msgstr "Opp" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:140 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:138 #, kde-format msgctxt "Move selected filter down." msgid "Down" msgstr "Ned" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:141 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:139 #, kde-format msgctxt "Move selected filter to the top." msgid "Top" msgstr "Øverst" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:142 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:140 #, kde-format msgctxt "Move selected filter to the bottom." msgid "Bottom" msgstr "Nederst" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:155 -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:248 -#: ksieveui/widgets/managesievewidget.cpp:227 -#: ksieveui/widgets/managesievewidget.cpp:233 -#: ksieveui/widgets/managesievewidget.cpp:248 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:153 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:246 +#: ksieveui/widgets/managesievewidget.cpp:224 +#: ksieveui/widgets/managesievewidget.cpp:230 +#: ksieveui/widgets/managesievewidget.cpp:245 #, kde-format msgid "New Script" msgstr "Nytt skript" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:162 -#: ksieveui/widgets/managesievewidget.cpp:168 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:160 +#: ksieveui/widgets/managesievewidget.cpp:165 #, kde-format msgid "Delete Script" msgstr "Slett skript" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:166 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:164 +#: ksieveui/widgets/managesievewidget.cpp:404 #: ksieveui/widgets/managesievewidget.cpp:432 #, kde-format msgid "Rename Script" msgstr "" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:173 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:171 #, kde-format msgid "Edit Script Description" msgstr "" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:248 -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:274 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:246 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:272 #, kde-format msgid "Add new name:" msgstr "Legg til nytt navn:" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:259 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:257 #, kde-format msgid "Do you want to delete \"%1\" script?" msgstr "Vil du fjerne skriptet «%1»?" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:259 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:257 #, kde-format msgid "Delete script" msgstr "Slett skript" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:274 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:272 #, kde-format msgid "Rename" msgstr "Endre navn" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:461 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:459 #, kde-format msgid "forEveryPart is not supported by your server" msgstr "Tjeneren støtter ikke forEveryPart" -#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:559 +#: ksieveui/autocreatescripts/sievescriptlistbox.cpp:557 #, kde-format msgid "Script part %1" msgstr "Skript del %1" @@ -1894,7 +1895,7 @@ msgstr "Innhold av skriptet «%1»:\n" #: ksieveui/debug/sievedebugdialog.cpp:182 -#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:73 +#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:71 #: ksieveui/managesievescriptsdialog.cpp:192 #, kde-format msgid "" @@ -1906,11 +1907,9 @@ #: ksieveui/debug/sievedebugdialog.cpp:185 #, kde-format msgid "" -"(This script is empty.)\n" +"(This script is empty)\n" "\n" msgstr "" -"(Dette skriptet er tomt.)\n" -"\n" #: ksieveui/debug/sievedebugdialog.cpp:188 #, kde-format @@ -1952,17 +1951,20 @@ #: ksieveui/debug/sievedebugdialog.cpp:229 #, kde-format msgid "" -"Active script: %1\n" +"Active script: '%1'\n" "\n" msgstr "" -"Aktivt skript: %1\n" -"\n" -#: ksieveui/editor/sieveeditor.cpp:48 +#: ksieveui/editor/sieveeditor.cpp:49 #, kde-format msgid "Edit Sieve Script" msgstr "Rediger Sieve-skript" +#: ksieveui/editor/sieveeditor.cpp:191 +#, kde-format +msgid "Script is modified. Do you want to close editor ?" +msgstr "" + #: ksieveui/editor/sieveeditorabstractwidget.cpp:43 #, kde-format msgid "Sieve Files (*.siv);;All Files (*)" @@ -2094,48 +2096,48 @@ msgid "Show result from \"check syntax\"" msgstr "" -#: ksieveui/editor/sieveeditortextmodewidget.cpp:228 +#: ksieveui/editor/sieveeditortextmodewidget.cpp:227 #, kde-format msgid "Error during parsing" msgstr "Feil under tolking" -#: ksieveui/editor/sieveeditorwidget.cpp:64 +#: ksieveui/editor/sieveeditorwidget.cpp:61 #, kde-format msgid "Check Syntax" msgstr "Kontroller syntaks" -#: ksieveui/editor/sieveeditorwidget.cpp:69 +#: ksieveui/editor/sieveeditorwidget.cpp:66 #, kde-format msgid "Import..." msgstr "Importer …" -#: ksieveui/editor/sieveeditorwidget.cpp:71 +#: ksieveui/editor/sieveeditorwidget.cpp:68 #, kde-format msgid "Create Rules Graphically..." msgstr "" -#: ksieveui/editor/sieveeditorwidget.cpp:88 +#: ksieveui/editor/sieveeditorwidget.cpp:84 #, kde-format msgid "Share..." msgstr "" -#: ksieveui/editor/sieveeditorwidget.cpp:131 +#: ksieveui/editor/sieveeditorwidget.cpp:128 #, kde-format msgid "Script name:" msgstr "Skriptnavn:" -#: ksieveui/editor/sieveeditorwidget.cpp:390 +#: ksieveui/editor/sieveeditorwidget.cpp:394 #, kde-format msgctxt "Default description for the source" msgid "My Sieve Script" msgstr "Mitt Sieve-skript" -#: ksieveui/editor/sieveeditorwidget.cpp:428 +#: ksieveui/editor/sieveeditorwidget.cpp:430 #, kde-format msgid "Simple Mode" msgstr "" -#: ksieveui/editor/sieveeditorwidget.cpp:428 +#: ksieveui/editor/sieveeditorwidget.cpp:430 #, kde-format msgid "Advanced Mode" msgstr "" @@ -2145,7 +2147,7 @@ msgid "Sieve server supports:" msgstr "" -#: ksieveui/editor/sievetextedit.cpp:304 +#: ksieveui/editor/sievetextedit.cpp:300 #, kde-format msgid "Help about: '%1'" msgstr "Hjelp om: «%1»" @@ -2259,7 +2261,7 @@ msgstr "Det oppsto en ukjent feil." #: ksieveui/managescriptsjob/generateglobalscriptjob.cpp:60 -#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:57 +#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:55 #, kde-format msgid "Path is not specified." msgstr "Stien er ikke oppgitt." @@ -2280,32 +2282,32 @@ "%1" msgstr "" -#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:78 +#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:76 #, kde-format msgid "Script is empty." msgstr "Skriptet er tomt." -#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:86 +#: ksieveui/managescriptsjob/parseuserscriptjob.cpp:84 #, kde-format msgid "Script parsing error" msgstr "Tolkefeil i skriptet" -#: ksieveui/managescriptsjob/renamescriptjob.cpp:78 +#: ksieveui/managescriptsjob/renamescriptjob.cpp:76 #, kde-format msgid "Impossible to start job" msgstr "" -#: ksieveui/managescriptsjob/renamescriptjob.cpp:88 +#: ksieveui/managescriptsjob/renamescriptjob.cpp:86 #, kde-format msgid "An error occurred during loading the sieve script." msgstr "" -#: ksieveui/managescriptsjob/renamescriptjob.cpp:104 +#: ksieveui/managescriptsjob/renamescriptjob.cpp:102 #, kde-format msgid "An error occurred during saving the sieve script." msgstr "" -#: ksieveui/managescriptsjob/renamescriptjob.cpp:115 +#: ksieveui/managescriptsjob/renamescriptjob.cpp:113 #, kde-format msgid "An error occurred during deleting the sieve script." msgstr "" @@ -2337,28 +2339,28 @@ msgstr "Skru av" #: ksieveui/managesievescriptsdialog.cpp:193 -#: ksieveui/managesievescriptsdialog.cpp:278 +#: ksieveui/managesievescriptsdialog.cpp:279 #: ksieveui/widgets/managesievewidget.cpp:486 #, kde-format msgid "Sieve Error" msgstr "Sieve-feil" -#: ksieveui/managesievescriptsdialog.cpp:225 +#: ksieveui/managesievescriptsdialog.cpp:226 #, kde-format msgid "Uploading script to server for checking it, please wait..." msgstr "" -#: ksieveui/managesievescriptsdialog.cpp:271 +#: ksieveui/managesievescriptsdialog.cpp:272 #, kde-format msgid "The Sieve script was successfully uploaded." msgstr "Sieve-skriptet ble lastet opp." -#: ksieveui/managesievescriptsdialog.cpp:272 +#: ksieveui/managesievescriptsdialog.cpp:273 #, kde-format msgid "Sieve Script Upload" msgstr "Last opp Sieve-skript" -#: ksieveui/managesievescriptsdialog.cpp:277 +#: ksieveui/managesievescriptsdialog.cpp:278 #, kde-format msgid "" "Uploading the Sieve script failed.\n" @@ -2631,12 +2633,12 @@ "Sieve-skript ble installert på tjeneren.\n" "Fraværsmeldinger er nå skrudd av." -#: ksieveui/vacation/vacationcheckjob.cpp:120 +#: ksieveui/vacation/vacationcheckjob.cpp:121 #, kde-format msgid "ParseUserScriptJob failed: %1" msgstr "" -#: ksieveui/vacation/vacationcheckjob.cpp:136 +#: ksieveui/vacation/vacationcheckjob.cpp:137 #, kde-format msgid "" "Failed to get the list of Sieve scripts.\n" @@ -2644,7 +2646,7 @@ "%1" msgstr "" -#: ksieveui/vacation/vacationcreatescriptjob.cpp:160 +#: ksieveui/vacation/vacationcreatescriptjob.cpp:159 #, kde-format msgid "" "Sieve script installed successfully on the server '%1'.\n" @@ -2653,7 +2655,7 @@ "Sieve-skript ble installert på tjeneren «%1».\n" "Fraværsmeldinger er nå skrudd på." -#: ksieveui/vacation/vacationcreatescriptjob.cpp:162 +#: ksieveui/vacation/vacationcreatescriptjob.cpp:161 #, kde-format msgid "" "Sieve script installed successfully on the server '%1'.\n" @@ -2662,60 +2664,60 @@ "Sieve-skript ble installert på tjeneren «%1».\n" "Fraværsmeldinger er nå skrudd av." -#: ksieveui/vacation/vacationeditwidget.cpp:58 +#: ksieveui/vacation/vacationeditwidget.cpp:57 #, kde-format msgid "Configure vacation notifications to be sent:" msgstr "Oppsett av ferievarsel som skal sendes:" -#: ksieveui/vacation/vacationeditwidget.cpp:65 +#: ksieveui/vacation/vacationeditwidget.cpp:64 #, kde-format msgid "&Activate vacation notifications" msgstr "Slå &på ferievarsler" -#: ksieveui/vacation/vacationeditwidget.cpp:81 +#: ksieveui/vacation/vacationeditwidget.cpp:80 #, kde-format msgid "&Subject of the vacation mail:" msgstr "" -#: ksieveui/vacation/vacationeditwidget.cpp:107 +#: ksieveui/vacation/vacationeditwidget.cpp:106 #, kde-format msgid "Start date:" msgstr "Startdato:" -#: ksieveui/vacation/vacationeditwidget.cpp:135 +#: ksieveui/vacation/vacationeditwidget.cpp:134 #, kde-format msgid "End date:" msgstr "Sluttdato:" -#: ksieveui/vacation/vacationeditwidget.cpp:153 -#: ksieveui/vacation/vacationeditwidget.cpp:291 +#: ksieveui/vacation/vacationeditwidget.cpp:152 +#: ksieveui/vacation/vacationeditwidget.cpp:290 #, kde-format msgid " day" msgid_plural " days" msgstr[0] " dag" msgstr[1] " dager" -#: ksieveui/vacation/vacationeditwidget.cpp:155 +#: ksieveui/vacation/vacationeditwidget.cpp:154 #, kde-format msgid "&Resend notification only after:" msgstr "&Send varsel på ny bare etter:" -#: ksieveui/vacation/vacationeditwidget.cpp:166 +#: ksieveui/vacation/vacationeditwidget.cpp:165 #, kde-format msgid "&Send responses for these addresses:" msgstr "&Send varsler til disse adressene:" -#: ksieveui/vacation/vacationeditwidget.cpp:191 +#: ksieveui/vacation/vacationeditwidget.cpp:189 #, kde-format msgid "&Action for incoming mails:" msgstr "" -#: ksieveui/vacation/vacationeditwidget.cpp:199 +#: ksieveui/vacation/vacationeditwidget.cpp:197 #, kde-format msgid "Do not send vacation replies to spam messages" msgstr "Ikke send meldingskvitteringerer som svar på søppelpost" -#: ksieveui/vacation/vacationeditwidget.cpp:206 +#: ksieveui/vacation/vacationeditwidget.cpp:204 #, kde-format msgid "Only react to mail coming from domain" msgstr "Reager bare på e-post som kommer fra domene" @@ -2808,62 +2810,57 @@ msgid "Network down." msgstr "Nettverket er nede." -#: ksieveui/widgets/managesievewidget.cpp:165 +#: ksieveui/widgets/managesievewidget.cpp:162 #, kde-format msgid "Edit Script..." msgstr "Rediger skript …" -#: ksieveui/widgets/managesievewidget.cpp:166 +#: ksieveui/widgets/managesievewidget.cpp:163 #, kde-format msgid "Rename Script..." msgstr "" -#: ksieveui/widgets/managesievewidget.cpp:171 +#: ksieveui/widgets/managesievewidget.cpp:168 #, kde-format msgid "Deactivate Script" msgstr "Skru av skript" -#: ksieveui/widgets/managesievewidget.cpp:177 +#: ksieveui/widgets/managesievewidget.cpp:174 #, kde-format msgid "New Script..." msgstr "Nytt skript …" -#: ksieveui/widgets/managesievewidget.cpp:221 +#: ksieveui/widgets/managesievewidget.cpp:218 #, kde-format msgid "New Sieve Script" msgstr "Nytt Sieve-skript" -#: ksieveui/widgets/managesievewidget.cpp:222 +#: ksieveui/widgets/managesievewidget.cpp:219 #, kde-format msgid "Please enter a name for the new Sieve script:" msgstr "Skriv inn et navn for det nye Sieve-skriptet:" -#: ksieveui/widgets/managesievewidget.cpp:223 +#: ksieveui/widgets/managesievewidget.cpp:220 #, kde-format msgid "unnamed" msgstr "uten navn" -#: ksieveui/widgets/managesievewidget.cpp:227 +#: ksieveui/widgets/managesievewidget.cpp:224 #, kde-format msgid "Empty name is not a valid name" msgstr "" -#: ksieveui/widgets/managesievewidget.cpp:233 +#: ksieveui/widgets/managesievewidget.cpp:230 #, kde-format msgid "You cannot use protected name." msgstr "Du kan ikke bruke et beskyttet navn." -#: ksieveui/widgets/managesievewidget.cpp:247 +#: ksieveui/widgets/managesievewidget.cpp:244 #, kde-format msgid "Script name already used \"%1\"." msgstr "Skriptnavnet «%1» er brukt fra før." -#: ksieveui/widgets/managesievewidget.cpp:408 -#, kde-format -msgid "New Script Name" -msgstr "" - -#: ksieveui/widgets/managesievewidget.cpp:408 +#: ksieveui/widgets/managesievewidget.cpp:404 #, kde-format msgid "Script Name:" msgstr "" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/po/sl/libksieve.po new/libksieve-17.12.3/po/sl/libksieve.po --- old/libksieve-17.12.2/po/sl/libksieve.po 2018-02-06 01:44:03.000000000 +0100 +++ new/libksieve-17.12.3/po/sl/libksieve.po 2018-03-06 01:32:12.000000000 +0100 @@ -10,7 +10,7 @@ "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: 2018-01-18 17:57+0100\n" +"PO-Revision-Date: 2018-02-18 12:18+0100\n" "Last-Translator: Andrej Mernik <andr...@ubuntu.si>\n" "Language-Team: Slovenian <lugos-...@lugos.si>\n" "Language: sl\n" @@ -2222,7 +2222,7 @@ #: ksieveui/editor/webengine/findbar/findbarbase.cpp:69 #, kde-format msgid "Jump to next match" -msgstr "Pojdi na naslednje ujemajoče se besedilo" +msgstr "Pojdi na naslednje ujemanje" #: ksieveui/editor/webengine/findbar/findbarbase.cpp:74 #, kde-format @@ -2233,7 +2233,7 @@ #: ksieveui/editor/webengine/findbar/findbarbase.cpp:75 #, kde-format msgid "Jump to previous match" -msgstr "Pojdi na predhodno ujemajoče se besedilo" +msgstr "Pojdi na predhodno ujemanje" #: ksieveui/editor/webengine/findbar/findbarbase.cpp:81 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/po/zh_CN/kio_sieve.po new/libksieve-17.12.3/po/zh_CN/kio_sieve.po --- old/libksieve-17.12.2/po/zh_CN/kio_sieve.po 2018-02-06 01:44:03.000000000 +0100 +++ new/libksieve-17.12.3/po/zh_CN/kio_sieve.po 2018-03-06 01:32:12.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: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/po/zh_CN/libksieve.po new/libksieve-17.12.3/po/zh_CN/libksieve.po --- old/libksieve-17.12.2/po/zh_CN/libksieve.po 2018-02-06 01:44:03.000000000 +0100 +++ new/libksieve-17.12.3/po/zh_CN/libksieve.po 2018-03-06 01:32:12.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: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:27-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libksieve-17.12.2/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp new/libksieve-17.12.3/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp --- old/libksieve-17.12.2/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp 2018-02-02 07:16:28.000000000 +0100 +++ new/libksieve-17.12.3/src/ksieveui/autocreatescripts/autotests/selectheadertypecomboboxtest.cpp 2018-03-02 08:48:41.000000000 +0100 @@ -82,7 +82,7 @@ QTest::addColumn<bool>("readOnly"); QTest::newRow("empty") << QString() << 0 << QString() << false << false; QTest::newRow("empty only header") << QString() << 0 << QString() << false << false; - QTest::newRow("from") << QStringLiteral("from") << 8 << QStringLiteral("From") << false << true; + QTest::newRow("from") << QStringLiteral("from") << 9 << QStringLiteral("From") << false << true; } void SelectHeaderTypeComboBoxTest::shouldSetCode()
