Hello community, here is the log from the commit of package mailimporter for openSUSE:Factory checked in at 2018-03-20 21:41:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailimporter (Old) and /work/SRC/openSUSE:Factory/.mailimporter.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mailimporter" Tue Mar 20 21:41:52 2018 rev:24 rq:585656 version:17.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/mailimporter/mailimporter.changes 2018-02-12 10:05:26.782628126 +0100 +++ /work/SRC/openSUSE:Factory/.mailimporter.new/mailimporter.changes 2018-03-20 21:41:55.241515015 +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: + * None + +------------------------------------------------------------------- Old: ---- mailimporter-17.12.2.tar.xz New: ---- mailimporter-17.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailimporter.spec ++++++ --- /var/tmp/diff_new_pack.Y5sBzW/_old 2018-03-20 21:41:55.773495868 +0100 +++ /var/tmp/diff_new_pack.Y5sBzW/_new 2018-03-20 21:41:55.773495868 +0100 @@ -19,13 +19,13 @@ %bcond_without lang Name: mailimporter -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: Mail import functionality for KDE PIM -License: GPL-2.0 +License: GPL-2.0-only Group: Development/Libraries/C and C++ Url: http://www.kde.org Source0: %{name}-%{version}.tar.xz @@ -64,7 +64,7 @@ %package devel Summary: Development package for mailimporter -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ Requires: libKF5MailImporter5 = %{version} Requires: libKF5MailImporterAkonadi5 = %{version} @@ -74,7 +74,7 @@ %package -n libKF5MailImporter5 Summary: MailImporter library for kdepim -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name} >= %{version} @@ -84,7 +84,7 @@ %package -n libKF5MailImporterAkonadi5 Summary: MailImporter Akonadi based library for kdepim -License: LGPL-2.1+ +License: LGPL-2.1-or-later Group: System/Libraries Requires: %{name} >= %{version} ++++++ mailimporter-17.12.2.tar.xz -> mailimporter-17.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.2/CMakeLists.txt new/mailimporter-17.12.3/CMakeLists.txt --- old/mailimporter-17.12.2/CMakeLists.txt 2018-02-06 01:44:12.000000000 +0100 +++ new/mailimporter-17.12.3/CMakeLists.txt 2018-03-06 01:32:25.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(MailImporter VERSION ${PIM_VERSION}) @@ -26,11 +26,11 @@ set(MAILIMPORTER_LIB ${PIM_VERSION}) -set(AKONADIMIME_LIB_VERSION "5.7.2") -set(KDEPIM_LIB_VERSION "5.7.2") +set(AKONADIMIME_LIB_VERSION "5.7.3") +set(KDEPIM_LIB_VERSION "5.7.3") set(QT_REQUIRED_VERSION "5.8.0") -set(KMIME_LIB_VERSION "5.7.2") -set(AKONADI_VERSION "5.7.2") +set(KMIME_LIB_VERSION "5.7.3") +set(AKONADI_VERSION "5.7.3") find_package(Qt5 ${QT_REQUIRED_VERSION} CONFIG REQUIRED Widgets Test Xml) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.2/po/nb/libmailimporter.po new/mailimporter-17.12.3/po/nb/libmailimporter.po --- old/mailimporter-17.12.2/po/nb/libmailimporter.po 2018-02-06 01:44:11.000000000 +0100 +++ new/mailimporter-17.12.3/po/nb/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: kmailcvt\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; -"POT-Creation-Date: 2017-08-24 03:22+0200\n" +"POT-Creation-Date: 2017-11-03 03:13+0100\n" "PO-Revision-Date: 2013-09-30 12:12+0200\n" "Last-Translator: Bjørn Steensrud <bjor...@skogkatt.homelinux.org>\n" "Language-Team: Norwegian Bokmål <i18n...@lister.ping.uio.no>\n" @@ -48,15 +48,15 @@ #: mailimporter/filters/filterbalsa.cpp:109 #: mailimporter/filters/filterevolution.cpp:73 -#: mailimporter/filters/filterevolution_v2.cpp:95 -#: mailimporter/filters/filterevolution_v3.cpp:106 -#: mailimporter/filters/filterkmail_maildir.cpp:94 +#: mailimporter/filters/filterevolution_v2.cpp:94 +#: mailimporter/filters/filterevolution_v3.cpp:104 +#: mailimporter/filters/filterkmail_maildir.cpp:92 #: mailimporter/filters/filteroe.cpp:66 -#: mailimporter/filters/filteropera.cpp:183 +#: mailimporter/filters/filteropera.cpp:181 #: mailimporter/filters/filterplain.cpp:50 #: mailimporter/filters/filterpmail.cpp:53 -#: mailimporter/filters/filtersylpheed.cpp:140 -#: mailimporter/filters/filterthebat.cpp:91 +#: mailimporter/filters/filtersylpheed.cpp:137 +#: mailimporter/filters/filterthebat.cpp:89 #: mailimporter/filters/filterthunderbird.cpp:180 #, kde-format msgid "No directory selected." @@ -64,13 +64,13 @@ #: mailimporter/filters/filterbalsa.cpp:118 #: mailimporter/filters/filterevolution.cpp:82 -#: mailimporter/filters/filterevolution_v2.cpp:104 -#: mailimporter/filters/filterevolution_v3.cpp:115 -#: mailimporter/filters/filterkmail_maildir.cpp:103 -#: mailimporter/filters/filteropera.cpp:191 -#: mailimporter/filters/filterplain.cpp:60 -#: mailimporter/filters/filtersylpheed.cpp:149 -#: mailimporter/filters/filterthebat.cpp:100 +#: mailimporter/filters/filterevolution_v2.cpp:103 +#: mailimporter/filters/filterevolution_v3.cpp:113 +#: mailimporter/filters/filterkmail_maildir.cpp:101 +#: mailimporter/filters/filteropera.cpp:189 +#: mailimporter/filters/filterplain.cpp:59 +#: mailimporter/filters/filtersylpheed.cpp:146 +#: mailimporter/filters/filterthebat.cpp:98 #: mailimporter/filters/filterthunderbird.cpp:189 #, kde-format msgid "No files found for import." @@ -78,17 +78,17 @@ #: mailimporter/filters/filterbalsa.cpp:129 #: mailimporter/filters/filterevolution.cpp:95 -#: mailimporter/filters/filterevolution_v2.cpp:136 -#: mailimporter/filters/filterevolution_v3.cpp:126 -#: mailimporter/filters/filterkmail_maildir.cpp:113 +#: mailimporter/filters/filterevolution_v2.cpp:135 +#: mailimporter/filters/filterevolution_v3.cpp:124 +#: mailimporter/filters/filterkmail_maildir.cpp:111 #: mailimporter/filters/filtermailapp.cpp:139 #: mailimporter/filters/filtermailmangzip.cpp:143 #: mailimporter/filters/filtermbox.cpp:140 -#: mailimporter/filters/filteropera.cpp:150 +#: mailimporter/filters/filteropera.cpp:148 #: mailimporter/filters/filterplain.cpp:81 #: mailimporter/filters/filterpmail.cpp:77 -#: mailimporter/filters/filtersylpheed.cpp:161 -#: mailimporter/filters/filterthebat.cpp:111 +#: mailimporter/filters/filtersylpheed.cpp:158 +#: mailimporter/filters/filterthebat.cpp:109 #: mailimporter/filters/filterthunderbird.cpp:220 #, kde-format msgid "Finished importing emails from %1" @@ -96,13 +96,13 @@ #: mailimporter/filters/filterbalsa.cpp:132 #: mailimporter/filters/filterevolution.cpp:215 -#: mailimporter/filters/filterevolution_v2.cpp:138 -#: mailimporter/filters/filterevolution_v3.cpp:129 -#: mailimporter/filters/filterkmail_maildir.cpp:115 -#: mailimporter/filters/filteropera.cpp:152 +#: mailimporter/filters/filterevolution_v2.cpp:137 +#: mailimporter/filters/filterevolution_v3.cpp:127 +#: mailimporter/filters/filterkmail_maildir.cpp:113 +#: mailimporter/filters/filteropera.cpp:150 #: mailimporter/filters/filterplain.cpp:83 -#: mailimporter/filters/filtersylpheed.cpp:163 -#: mailimporter/filters/filterthebat.cpp:113 +#: mailimporter/filters/filtersylpheed.cpp:160 +#: mailimporter/filters/filterthebat.cpp:111 #: mailimporter/filters/filterthunderbird.cpp:222 #, kde-format msgid "1 duplicate message not imported" @@ -111,42 +111,42 @@ msgstr[1] "%1 duplikatmeldinger ble ikke importert" #: mailimporter/filters/filterbalsa.cpp:136 -#: mailimporter/filters/filterevolution_v2.cpp:141 -#: mailimporter/filters/filterevolution_v3.cpp:133 -#: mailimporter/filters/filterkmail_maildir.cpp:119 +#: mailimporter/filters/filterevolution_v2.cpp:140 +#: mailimporter/filters/filterevolution_v3.cpp:131 +#: mailimporter/filters/filterkmail_maildir.cpp:117 #: mailimporter/filters/filtermailapp.cpp:149 #: mailimporter/filters/filtermailmangzip.cpp:150 #: mailimporter/filters/filtermbox.cpp:147 #: mailimporter/filters/filteroe.cpp:116 -#: mailimporter/filters/filteropera.cpp:209 +#: mailimporter/filters/filteropera.cpp:207 #: mailimporter/filters/filterplain.cpp:86 -#: mailimporter/filters/filtersylpheed.cpp:167 -#: mailimporter/filters/filterthebat.cpp:117 +#: mailimporter/filters/filtersylpheed.cpp:164 +#: mailimporter/filters/filterthebat.cpp:115 #: mailimporter/filters/filterthunderbird.cpp:226 #, kde-format msgid "Finished import, canceled by user." msgstr "Ferdig å importere, avbrutt av brukeren." #: mailimporter/filters/filterbalsa.cpp:184 -#: mailimporter/filters/filterevolution_v3.cpp:181 +#: mailimporter/filters/filterevolution_v3.cpp:179 #, kde-format msgctxt "define folder name where we import evolution mails" msgid "Evolution-Import" msgstr "Evolution-mport" #: mailimporter/filters/filterbalsa.cpp:208 -#: mailimporter/filters/filterevolution_v3.cpp:205 -#: mailimporter/filters/filterkmail_maildir.cpp:186 -#: mailimporter/filters/filtersylpheed.cpp:246 -#: mailimporter/filters/filterthebat.cpp:228 +#: mailimporter/filters/filterevolution_v3.cpp:203 +#: mailimporter/filters/filterkmail_maildir.cpp:184 +#: mailimporter/filters/filtersylpheed.cpp:243 +#: mailimporter/filters/filterthebat.cpp:225 #, kde-format msgid "Import folder %1..." msgstr "Importer mappa %1 …" #: mailimporter/filters/filterbalsa.cpp:216 -#: mailimporter/filters/filterevolution_v3.cpp:213 +#: mailimporter/filters/filterevolution_v3.cpp:211 #: mailimporter/filters/filterplain.cpp:71 -#: mailimporter/filters/filtersylpheed.cpp:260 +#: mailimporter/filters/filtersylpheed.cpp:257 #, kde-format msgid "Could not import %1" msgstr "Kunne ikke importere %1" @@ -177,7 +177,7 @@ msgid "ClawsMail" msgstr "" -#: mailimporter/filters/filterclawsmail.cpp:106 +#: mailimporter/filters/filterclawsmail.cpp:105 #, kde-format msgctxt "define folder name where we will import clawsmail mails" msgid "ClawsMail-Import" @@ -215,16 +215,16 @@ msgstr "" #: mailimporter/filters/filterevolution.cpp:144 -#: mailimporter/filters/filterevolution_v2.cpp:201 -#: mailimporter/filters/filterlnotes.cpp:109 +#: mailimporter/filters/filterevolution_v2.cpp:200 +#: mailimporter/filters/filterlnotes.cpp:107 #: mailimporter/filters/filtermailapp.cpp:85 #: mailimporter/filters/filtermbox.cpp:67 -#: mailimporter/filters/filteropera.cpp:89 -#: mailimporter/filters/filterpmail.cpp:159 -#: mailimporter/filters/filterpmail.cpp:223 -#: mailimporter/filters/filterpmail.cpp:242 -#: mailimporter/filters/filterpmail.cpp:278 -#: mailimporter/filters/filterthebat.cpp:179 +#: mailimporter/filters/filteropera.cpp:87 +#: mailimporter/filters/filterpmail.cpp:158 +#: mailimporter/filters/filterpmail.cpp:222 +#: mailimporter/filters/filterpmail.cpp:241 +#: mailimporter/filters/filterpmail.cpp:277 +#: mailimporter/filters/filterthebat.cpp:177 #: mailimporter/filters/filterthunderbird.cpp:288 #, kde-format msgid "Unable to open %1, skipping" @@ -234,7 +234,7 @@ #: mailimporter/filters/filtermailapp.cpp:93 #: mailimporter/filters/filtermailmangzip.cpp:75 #: mailimporter/filters/filtermbox.cpp:73 -#: mailimporter/filters/filteropera.cpp:91 +#: mailimporter/filters/filteropera.cpp:89 #, kde-format msgid "Importing emails from %1..." msgstr "Importerer e-post fra %1 …" @@ -267,20 +267,20 @@ msgid "Evolution (v2)" msgstr "" -#: mailimporter/filters/filterevolution_v2.cpp:131 -#: mailimporter/filters/filterevolution_v2.cpp:170 +#: mailimporter/filters/filterevolution_v2.cpp:130 +#: mailimporter/filters/filterevolution_v2.cpp:169 #: mailimporter/filters/filterthunderbird.cpp:215 #: mailimporter/filters/filterthunderbird.cpp:254 #, kde-format msgid "Start import file %1..." msgstr "Start import av fila %1 …" -#: mailimporter/filters/filterevolution_v3.cpp:39 +#: mailimporter/filters/filterevolution_v3.cpp:37 #, kde-format msgid "Import Evolution 3.x Local Mails and Folder Structure" msgstr "Importer lokale e-poster og mappestrukturen fra Evolution 3.x" -#: mailimporter/filters/filterevolution_v3.cpp:41 +#: mailimporter/filters/filterevolution_v3.cpp:39 #, kde-format msgid "" "<p><b>Evolution 3.x import filter</b></p><p>Select the base directory of " @@ -293,7 +293,7 @@ "</p><p>Siden det er mulig å gjenopprette mappestrukturen, vil mappene bli " "lagret under «Evolution-Import».</p>" -#: mailimporter/filters/filterevolution_v3.cpp:59 +#: mailimporter/filters/filterevolution_v3.cpp:57 #, kde-format msgctxt "name of evolution application" msgid "Evolution (v3)" @@ -321,12 +321,12 @@ msgid "Icedove" msgstr "" -#: mailimporter/filters/filterkmail_maildir.cpp:41 +#: mailimporter/filters/filterkmail_maildir.cpp:39 #, kde-format msgid "Import KMail Maildirs and Folder Structure" msgstr "Importer e-post og mappestruktur fra KMail" -#: mailimporter/filters/filterkmail_maildir.cpp:43 +#: mailimporter/filters/filterkmail_maildir.cpp:41 #, kde-format msgid "" "<p><b>KMail import filter</b></p><p>Select the base directory of the KMail " @@ -338,17 +338,17 @@ "\"KMail-Import\" in your local folder.</p>" msgstr "" -#: mailimporter/filters/filterkmail_maildir.cpp:193 +#: mailimporter/filters/filterkmail_maildir.cpp:191 #, kde-format msgid "Could not import %1, duplicated message" msgstr "Kunne ikke importere %1, duplisert melding" -#: mailimporter/filters/filterkmailarchive.cpp:49 +#: mailimporter/filters/filterkmailarchive.cpp:47 #, kde-format msgid "Import KMail Archive File" msgstr "Importer KMail-arkivfil" -#: mailimporter/filters/filterkmailarchive.cpp:51 +#: mailimporter/filters/filterkmailarchive.cpp:49 #, kde-format msgid "" "<p><b>KMail Archive File Import Filter</b></p><p>This filter will import " @@ -359,84 +359,84 @@ "arkivfiler som tidligere er eksportert fra KMail.</p><p>Arkivfiler " "inneholder et fullstendig mappesubtre komprimert til en enkelt fil.</p>" -#: mailimporter/filters/filterkmailarchive.cpp:92 +#: mailimporter/filters/filterkmailarchive.cpp:90 #, kde-format msgid "Importing folder '%1'..." msgstr "Importerer mappa «%1» …" -#: mailimporter/filters/filterkmailarchive.cpp:119 +#: mailimporter/filters/filterkmailarchive.cpp:117 #, kde-format msgid "Unexpected subfolder %1 in folder %2." msgstr "Uventet undermappe %1 i mappa %2." -#: mailimporter/filters/filterkmailarchive.cpp:123 +#: mailimporter/filters/filterkmailarchive.cpp:121 #, kde-format msgid "No subfolder named 'cur' in folder %1." msgstr "Det er ingen undermappe som heter «cur» i mappa %1." -#: mailimporter/filters/filterkmailarchive.cpp:147 +#: mailimporter/filters/filterkmailarchive.cpp:145 #, kde-format msgid "Unexpected subdirectory named '%1'." msgstr "Uventet undermappe med navn «%1»." -#: mailimporter/filters/filterkmailarchive.cpp:178 +#: mailimporter/filters/filterkmailarchive.cpp:176 #, kde-format msgid "Select KMail Archive File to Import" msgstr "Velg en KMail arkivfil som skal importeres" -#: mailimporter/filters/filterkmailarchive.cpp:179 +#: mailimporter/filters/filterkmailarchive.cpp:177 #, kde-format msgid "KMail Archive Files " msgstr "" -#: mailimporter/filters/filterkmailarchive.cpp:181 +#: mailimporter/filters/filterkmailarchive.cpp:179 #, kde-format msgid "Please select an archive file that should be imported." msgstr "Velg en arkivfil som skal importeres." -#: mailimporter/filters/filterkmailarchive.cpp:190 +#: mailimporter/filters/filterkmailarchive.cpp:188 #, kde-format msgid "No archive selected." msgstr "" -#: mailimporter/filters/filterkmailarchive.cpp:204 +#: mailimporter/filters/filterkmailarchive.cpp:202 #, kde-format msgid "The file '%1' does not appear to be a valid archive." msgstr "Fila «%1» ser ikke ut til å være et gyldig arkiv." -#: mailimporter/filters/filterkmailarchive.cpp:209 +#: mailimporter/filters/filterkmailarchive.cpp:207 #, kde-format msgid "Unable to open archive file '%1'" msgstr "Klarer ikke å åpne arkivfila «%1»" -#: mailimporter/filters/filterkmailarchive.cpp:214 +#: mailimporter/filters/filterkmailarchive.cpp:212 #, kde-format msgid "Counting files in archive..." msgstr "Teller filer i arkivet …" -#: mailimporter/filters/filterkmailarchive.cpp:220 +#: mailimporter/filters/filterkmailarchive.cpp:218 #, kde-format msgid "Importing the archive file '%1' into the folder '%2' succeeded." msgstr "Fullført importering av arkivfila «%1» inn i mappa «%2»." -#: mailimporter/filters/filterkmailarchive.cpp:222 +#: mailimporter/filters/filterkmailarchive.cpp:220 #, kde-format msgid "1 message was imported." msgid_plural "%1 messages were imported." msgstr[0] "1 melding ble importert." msgstr[1] "%1 meldinger ble importert." -#: mailimporter/filters/filterkmailarchive.cpp:225 +#: mailimporter/filters/filterkmailarchive.cpp:223 #, kde-format msgid "Importing the archive failed." msgstr "Det lyktes ikke å importere arkivet." -#: mailimporter/filters/filterlnotes.cpp:45 +#: mailimporter/filters/filterlnotes.cpp:43 #, kde-format msgid "Import Lotus Notes Emails" msgstr "Importer e-post fra «Lotus Notes»" -#: mailimporter/filters/filterlnotes.cpp:47 +#: mailimporter/filters/filterlnotes.cpp:45 #, kde-format msgid "" "<p><b>Lotus Notes Structured Text mail import filter</b></p><p>This filter " @@ -456,12 +456,12 @@ "importerte meldinger havne i mapper under «LNotes-Import» i din lokale e-" "postmappe. Disse mappene vil få navn etter filene som e-postene kom fra</p>" -#: mailimporter/filters/filterlnotes.cpp:70 +#: mailimporter/filters/filterlnotes.cpp:68 #, kde-format msgid "All Files (*)" msgstr "Alle filer (*)" -#: mailimporter/filters/filterlnotes.cpp:72 +#: mailimporter/filters/filterlnotes.cpp:70 #: mailimporter/filters/filtermailapp.cpp:65 #: mailimporter/filters/filtermailmangzip.cpp:53 #: mailimporter/filters/filtermbox.cpp:54 @@ -469,19 +469,19 @@ msgid "No files selected." msgstr "Ingen filer valgt." -#: mailimporter/filters/filterlnotes.cpp:84 +#: mailimporter/filters/filterlnotes.cpp:82 #, kde-format msgid "Importing emails from %1" msgstr "Importerer e-post fra %1" -#: mailimporter/filters/filterlnotes.cpp:118 +#: mailimporter/filters/filterlnotes.cpp:116 #, kde-format msgctxt "Define folder name where we import lotus note mails" msgid "LNotes-Import" msgstr "LNotes-importer" -#: mailimporter/filters/filterlnotes.cpp:128 -#: mailimporter/filters/filterpmail.cpp:263 +#: mailimporter/filters/filterlnotes.cpp:126 +#: mailimporter/filters/filterpmail.cpp:262 #, kde-format msgid "Message %1" msgstr "Melding %1" @@ -662,13 +662,13 @@ msgid "Opera" msgstr "" -#: mailimporter/filters/filteropera.cpp:83 -#: mailimporter/filters/filterplain.cpp:62 +#: mailimporter/filters/filteropera.cpp:81 +#: mailimporter/filters/filterplain.cpp:61 #, kde-format msgid "Importing new mail files..." msgstr "Importerer nye e-postfiler …" -#: mailimporter/filters/filteropera.cpp:199 +#: mailimporter/filters/filteropera.cpp:197 #: mailimporter/filters/filterplain.cpp:56 #: mailimporter/filters/filterpmail.cpp:59 #, kde-format @@ -740,19 +740,19 @@ msgid "Importing 'UNIX' mail folders ('.mbx')..." msgstr "Importerer «UNIX» e-postmapper («.mbx») …" -#: mailimporter/filters/filterpmail.cpp:163 +#: mailimporter/filters/filterpmail.cpp:162 #, kde-format msgctxt "define folder name when we will import pegasus mail" msgid "PegasusMail-Import" msgstr "PegasusMail-Import" -#: mailimporter/filters/filterpmail.cpp:170 -#: mailimporter/filters/filterpmail.cpp:244 +#: mailimporter/filters/filterpmail.cpp:169 +#: mailimporter/filters/filterpmail.cpp:243 #, kde-format msgid "Importing %1" msgstr "Importerer %1" -#: mailimporter/filters/filterpmail.cpp:274 +#: mailimporter/filters/filterpmail.cpp:273 #, kde-format msgid "Parsing the folder structure..." msgstr "Tolker mappestrukturen …" @@ -773,12 +773,12 @@ "under: \"SeaMonkey-Import\".</p>" msgstr "" -#: mailimporter/filters/filtersylpheed.cpp:43 +#: mailimporter/filters/filtersylpheed.cpp:41 #, kde-format msgid "Import Sylpheed Maildirs and Folder Structure" msgstr "Importer e-post og mappestruktur fra Sylpheeds «Maildir»" -#: mailimporter/filters/filtersylpheed.cpp:45 +#: mailimporter/filters/filtersylpheed.cpp:43 #, kde-format msgid "" "<p><b>Sylpheed import filter</b></p><p>Select the base directory of the " @@ -793,24 +793,24 @@ "Import\" i din lokale e-postmappe.</p> <p>Dette filteret opprettholder også " "statusen på meldingene, f.eks. Ny eller Videresendt.</p>" -#: mailimporter/filters/filtersylpheed.cpp:65 +#: mailimporter/filters/filtersylpheed.cpp:63 #, kde-format msgctxt "name of sylpheed application" msgid "Sylpheed" msgstr "" -#: mailimporter/filters/filtersylpheed.cpp:204 +#: mailimporter/filters/filtersylpheed.cpp:201 #, kde-format msgctxt "define folder name where we will import sylpheed mails" msgid "Sylpheed-Import" msgstr "Sylpheed-import" -#: mailimporter/filters/filterthebat.cpp:43 +#: mailimporter/filters/filterthebat.cpp:41 #, kde-format msgid "Import The Bat! Mails and Folder Structure" msgstr "Importer e-post-meldinger og mappestruktur fra «The Bat!»" -#: mailimporter/filters/filterthebat.cpp:45 +#: mailimporter/filters/filterthebat.cpp:43 #, kde-format msgid "" "<p><b>The Bat! import filter</b></p><p>Select the base directory of the 'The " @@ -827,18 +827,18 @@ "gjenopprette mappestrukturen så vil mappene bli lagret under «The Bat." "import» i din lokale e-postmappe.</p>" -#: mailimporter/filters/filterthebat.cpp:223 +#: mailimporter/filters/filterthebat.cpp:220 #, kde-format msgctxt "Define folder where we will import thebat mails" msgid "TheBat-Import" msgstr "TheBat-import" -#: mailimporter/filters/filterthunderbird.cpp:34 +#: mailimporter/filters/filterthunderbird.cpp:33 #, kde-format msgid "Import Thunderbird/Mozilla Local Mails and Folder Structure" msgstr "Importer lokale meldinger og mappestruktur fra Thunderbird/Mozilla" -#: mailimporter/filters/filterthunderbird.cpp:36 +#: mailimporter/filters/filterthunderbird.cpp:35 #, kde-format msgid "" "<p><b>Thunderbird/Mozilla import filter</b></p><p>Select your base " @@ -855,19 +855,19 @@ "mapper.</p><p>Siden det er mulig å gjenopprette mappestrukturen, vil mappa " "bli lagret under «Thunderbird-Import»</p>" -#: mailimporter/filters/filterthunderbird.cpp:68 +#: mailimporter/filters/filterthunderbird.cpp:67 #, kde-format msgctxt "name of thunderbird application" msgid "Thunderbird" msgstr "" -#: mailimporter/othermailerutil.cpp:30 +#: mailimporter/othermailerutil.cpp:29 #, kde-format msgctxt "name of trojira application" msgid "Trojita" msgstr "" -#: mailimporter/othermailerutil.cpp:34 +#: mailimporter/othermailerutil.cpp:33 mailimporter/othermailerutil.cpp:37 #, kde-format msgctxt "name of geary application" msgid "Geary" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mailimporter-17.12.2/po/zh_CN/libmailimporter.po new/mailimporter-17.12.3/po/zh_CN/libmailimporter.po --- old/mailimporter-17.12.2/po/zh_CN/libmailimporter.po 2018-02-06 01:44:12.000000000 +0100 +++ new/mailimporter-17.12.3/po/zh_CN/libmailimporter.po 2018-03-06 01:32:25.000000000 +0100 @@ -13,7 +13,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2017-11-03 03:13+0100\n" -"PO-Revision-Date: 2018-02-04 20:33-0500\n" +"PO-Revision-Date: 2018-02-28 02:28-0500\n" "Last-Translator: guoyunhebrave <guoyunhebr...@gmail.com>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n"
