Hello community, here is the log from the commit of package kdepim-addons for openSUSE:Factory checked in at 2019-02-14 14:16:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-addons (Old) and /work/SRC/openSUSE:Factory/.kdepim-addons.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-addons" Thu Feb 14 14:16:44 2019 rev:37 rq:673741 version:18.12.2 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-addons/kdepim-addons.changes 2019-01-21 10:12:30.110549163 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-addons.new.28833/kdepim-addons.changes 2019-02-14 14:16:54.280117131 +0100 @@ -1,0 +2,10 @@ +Sat Feb 09 08:25:00 UTC 2019 - [email protected] + +- Update to 18.12.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.2.php +- Changes since 18.12.1: + * Fix Bug 403174 - KAddressBook looses contact birthdays when merging two or more contacts (kde#403174) + +------------------------------------------------------------------- Old: ---- kdepim-addons-18.12.1.tar.xz New: ---- kdepim-addons-18.12.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-addons.spec ++++++ --- /var/tmp/diff_new_pack.lpQwvY/_old 2019-02-14 14:16:55.592116492 +0100 +++ /var/tmp/diff_new_pack.lpQwvY/_new 2019-02-14 14:16:55.592116492 +0100 @@ -21,7 +21,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kdepim-addons -Version: 18.12.1 +Version: 18.12.2 Release: 0 Summary: Addons for KDEPIM applications License: GPL-2.0-only ++++++ kdepim-addons-18.12.1.tar.xz -> kdepim-addons-18.12.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/CMakeLists.txt new/kdepim-addons-18.12.2/CMakeLists.txt --- old/kdepim-addons-18.12.1/CMakeLists.txt 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/CMakeLists.txt 2019-02-05 01:49:34.000000000 +0100 @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.1) -set(PIM_VERSION "5.10.1") +set(PIM_VERSION "5.10.2") project(kdepim-addons VERSION ${PIM_VERSION}) if(POLICY CMP0063) @@ -26,7 +26,7 @@ set(KDEPIMADDONS_LIB_VERSION "${KDEPIMADDONS_VERSION_NUMBER}") set(KDEPIMADDONS_LIB_SOVERSION "5") -set(AKONADINOTES_LIB_VERSION "5.10.1") +set(AKONADINOTES_LIB_VERSION "5.10.2") set(QT_REQUIRED_VERSION "5.9.0") @@ -69,30 +69,30 @@ find_package(KF5Prison ${KF5_VERSION} CONFIG REQUIRED) find_package(KF5Holidays ${KF5_VERSION} CONFIG REQUIRED) -set(MAILCOMMON_LIB_VERSION "5.10.1") -set(GRAVATAR_LIB_VERSION "5.10.1") -set(PIMCOMMON_LIB_VERSION "5.10.1") -set(GRANTLEETHEME_LIB_VERSION "5.10.1") -set(CALENDARSUPPORT_LIB_VERSION "5.10.1") -set(EVENTVIEW_LIB_VERSION "5.10.1") -set(LIBKDEPIM_LIB_VERSION "5.10.1") -set(KDEPIM_APPS_LIB_VERSION "5.10.1") -set(LIBKLEO_LIB_VERSION "5.10.1") -set(AKONADI_LIB_VERSION "5.10.1") -set(INCIDENCEEDITOR_LIB_VERSION "5.10.1") -set(KTNEF_LIB_VERSION "5.10.1") -set(MESSAGELIB_LIB_VERSION "5.10.1") -set(AKONADICALENDAR_LIB_VERSION "5.10.1") -set(CALENDAR_UTILS_VERSION "5.10.1") -set(KPIMTEXTEDIT_LIB_VERSION "5.10.1") -set(KIMAP_LIB_VERSION "5.10.1") -set(LIBKSIEVE_LIB_VERSION "5.10.1") -set(KMAILTRANSPORT_LIB_VERSION "5.10.1") -set(AKONADICONTACT_LIB_VERSION "5.10.1") -set(IMPORTWIZARD_LIB_VERSION "5.10.1") -set(MAILIMPORTER_LIB_VERSION "5.10.1") -set(KPIMPKPASS_LIB_VERSION "5.10.1") -set(KPIMITINERARY_LIB_VERSION "5.10.1") +set(MAILCOMMON_LIB_VERSION "5.10.2") +set(GRAVATAR_LIB_VERSION "5.10.2") +set(PIMCOMMON_LIB_VERSION "5.10.2") +set(GRANTLEETHEME_LIB_VERSION "5.10.2") +set(CALENDARSUPPORT_LIB_VERSION "5.10.2") +set(EVENTVIEW_LIB_VERSION "5.10.2") +set(LIBKDEPIM_LIB_VERSION "5.10.2") +set(KDEPIM_APPS_LIB_VERSION "5.10.2") +set(LIBKLEO_LIB_VERSION "5.10.2") +set(AKONADI_LIB_VERSION "5.10.2") +set(INCIDENCEEDITOR_LIB_VERSION "5.10.2") +set(KTNEF_LIB_VERSION "5.10.2") +set(MESSAGELIB_LIB_VERSION "5.10.2") +set(AKONADICALENDAR_LIB_VERSION "5.10.2") +set(CALENDAR_UTILS_VERSION "5.10.2") +set(KPIMTEXTEDIT_LIB_VERSION "5.10.2") +set(KIMAP_LIB_VERSION "5.10.2") +set(LIBKSIEVE_LIB_VERSION "5.10.2") +set(KMAILTRANSPORT_LIB_VERSION "5.10.2") +set(AKONADICONTACT_LIB_VERSION "5.10.2") +set(IMPORTWIZARD_LIB_VERSION "5.10.2") +set(MAILIMPORTER_LIB_VERSION "5.10.2") +set(KPIMPKPASS_LIB_VERSION "5.10.2") +set(KPIMITINERARY_LIB_VERSION "5.10.2") find_package(KF5CalendarUtils ${CALENDAR_UTILS_VERSION} CONFIG REQUIRED) find_package(KF5WebEngineViewer ${MESSAGELIB_LIB_VERSION} CONFIG REQUIRED) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/autotests/mergecontactstest.cpp new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/autotests/mergecontactstest.cpp --- old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/autotests/mergecontactstest.cpp 2019-01-06 08:44:42.000000000 +0100 +++ new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/autotests/mergecontactstest.cpp 2019-01-28 08:38:07.000000000 +0100 @@ -1121,10 +1121,13 @@ QTest::newRow("noWithOneNameConflict") << QString() << QString() << QStringLiteral("20150606") << false; QTest::newRow("noWithOneNameConflict1") << QString() << QStringLiteral("20150606") << QString() << false; QTest::newRow("noWithOneNameConflict2") << QStringLiteral("20150606") << QString() << QString() << false; - QTest::newRow("noConflictWithSameName") << QStringLiteral("20150606") << QStringLiteral("20150606") << QString() << false; - QTest::newRow("noConflictWithSameName2") << QStringLiteral("20150606") << QStringLiteral("20150606") << QStringLiteral("20150606") << false; + QTest::newRow("noConflictWithSameBirthday") << QStringLiteral("20150606") << QStringLiteral("20150606") << QString() << false; + QTest::newRow("noConflictWithSameBirthday2") << QStringLiteral("20150606") << QStringLiteral("20150606") << QStringLiteral("20150606") << false; QTest::newRow("conflict") << QStringLiteral("20150606") << QStringLiteral("20150608") << QStringLiteral("20150606") << true; QTest::newRow("conflict1") << QString() << QStringLiteral("20150606") << QStringLiteral("20150608") << true; + QTest::newRow("conflict2") << QStringLiteral("20150606") << QString() << QStringLiteral("20150608") << true; + QTest::newRow("conflict2") << QStringLiteral("20150606") << QStringLiteral("20150608") << QString() << true; + QTest::newRow("conflict4") << QStringLiteral("20180606") << QStringLiteral("20150608") << QStringLiteral("20150606") << true; } void MergeContactsTest::checkNeedManualSelectionWithBirthday() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/job/mergecontacts.cpp new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/job/mergecontacts.cpp --- old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/job/mergecontacts.cpp 2019-01-06 08:44:42.000000000 +0100 +++ new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/job/mergecontacts.cpp 2019-01-28 08:38:07.000000000 +0100 @@ -95,7 +95,7 @@ // Merge Phone const PhoneNumber::List listPhone = fromContact.phoneNumbers(); if (!listPhone.isEmpty()) { - PhoneNumber::List newContactsPhone = newContact.phoneNumbers(); + const PhoneNumber::List newContactsPhone = newContact.phoneNumbers(); for (const PhoneNumber &phone : listPhone) { if (!newContactsPhone.contains(phone)) { newContact.insertPhoneNumber(phone); @@ -106,7 +106,7 @@ // Merge Address const Address::List listAddress = fromContact.addresses(); if (!listAddress.isEmpty()) { - Address::List newContactsAddress = newContact.addresses(); + const Address::List newContactsAddress = newContact.addresses(); for (const Address &addr : listAddress) { if (!newContactsAddress.contains(addr)) { newContact.insertAddress(addr); @@ -117,7 +117,7 @@ // Merge Impp const Impp::List listImpp = fromContact.imppList(); if (!listImpp.isEmpty()) { - Impp::List newContactsImpp = newContact.imppList(); + const Impp::List newContactsImpp = newContact.imppList(); for (const Impp &impp : listImpp) { if (!newContactsImpp.contains(impp)) { newContact.insertImpp(impp); @@ -163,11 +163,15 @@ newContact.setPhoto(fromContact.photo()); } + // Merge Birthday + if (!newContact.birthday().isValid() && !fromContact.birthday().isValid()) { + newContact.setBirthday(fromContact.birthday()); + } + // Merge Logo if (newContact.logo().isEmpty() && !fromContact.logo().isEmpty()) { newContact.setLogo(fromContact.logo()); } - // Merge Birthday TODO // Merge Blog mergeCustomValue(fromContact, QStringLiteral("BlogFeed"), newContact); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp --- old/kdepim-addons-18.12.1/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp 2019-01-06 08:44:42.000000000 +0100 +++ new/kdepim-addons-18.12.2/kaddressbook/plugins/mergelib/searchduplicate/searchduplicateresultwidget.cpp 2019-01-28 08:38:07.000000000 +0100 @@ -116,11 +116,11 @@ } mMergeContact->setEnabled(false); - if (!conflictFound) { + if (conflictFound) { + mMergeContactWarning->animatedShow(); + } else { //Detect if conflict. mergeContact(); - } else { - mMergeContactWarning->animatedShow(); } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/plugins/webengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json new/kdepim-addons-18.12.2/plugins/webengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json --- old/kdepim-addons-18.12.1/plugins/webengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json 2019-01-06 08:44:42.000000000 +0100 +++ new/kdepim-addons-18.12.2/plugins/webengineurlinterceptor/donottrack/messageviewer_donottrackurlinterceptor.json 2019-01-28 08:38:07.000000000 +0100 @@ -48,7 +48,7 @@ "Name[pl]": "Nie śledź", "Name[pt]": "Não Seguir", "Name[pt_BR]": "Não rastrear", - "Name[ru]": "Не отслеживать", + "Name[ru]": "Запрет отслеживания", "Name[sk]": "Nesledovať", "Name[sl]": "Ne sledi mi", "Name[sr@ijekavian]": "Не прати ме", diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/fr/kaddressbook_importexportplugins.po new/kdepim-addons-18.12.2/po/fr/kaddressbook_importexportplugins.po --- old/kdepim-addons-18.12.1/po/fr/kaddressbook_importexportplugins.po 2019-01-08 01:19:58.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/fr/kaddressbook_importexportplugins.po 2019-02-05 01:49:23.000000000 +0100 @@ -7,21 +7,22 @@ # xavier <[email protected]>, 2012, 2013, 2014. # Sebastien Renard <[email protected]>, 2014, 2015. # Vincent Pinon <[email protected]>, 2017, 2018. +# Simon Depiets <[email protected]>, 2019. # msgid "" msgstr "" "Project-Id-Version: kcontactmanager\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2018-01-06 21:26+0100\n" -"Last-Translator: Vincent Pinon <[email protected]>\n" +"PO-Revision-Date: 2019-01-27 23:28+0800\n" +"Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -207,9 +208,7 @@ "séparateur de champ." #: csv/import/csvimportdialog.cpp:370 -#, fuzzy, kde-format -#| msgctxt "@option:radio Custum field separator" -#| msgid "Other" +#, kde-format msgctxt "@option:radio Custom field separator" msgid "Other" msgstr "Autre" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/fr/korganizer_plugins.po new/kdepim-addons-18.12.2/po/fr/korganizer_plugins.po --- old/kdepim-addons-18.12.1/po/fr/korganizer_plugins.po 2019-01-08 01:19:58.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/fr/korganizer_plugins.po 2019-02-05 01:49:23.000000000 +0100 @@ -16,21 +16,22 @@ # Sébastien Renard <[email protected]>, 2010, 2011, 2012, 2014, 2015. # Anne-Marie Mahfouf <[email protected]>, 2010. # Vincent Pinon <[email protected]>, 2018. +# Simon Depiets <[email protected]>, 2019. # msgid "" msgstr "" "Project-Id-Version: korganizer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-29 07:16+0100\n" -"PO-Revision-Date: 2018-02-02 07:51+0100\n" -"Last-Translator: Vincent Pinon <[email protected]>\n" +"PO-Revision-Date: 2019-01-30 00:54+0800\n" +"Last-Translator: Simon Depiets <[email protected]>\n" "Language-Team: French <[email protected]>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" "X-Environment: kde\n" "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" @@ -794,12 +795,10 @@ #: thisdayinhistory/thisdayinhistory.cpp:48 #: thisdayinhistory/thisdayinhistory.cpp:65 -#, fuzzy, kde-format -#| msgctxt "Localized Wikipedia website" -#| msgid "http://en.wikipedia.org/wiki/"; +#, kde-format msgctxt "Localized Wikipedia website" msgid "https://en.wikipedia.org/wiki/"; -msgstr "http://fr.wikipedia.org/wiki/"; +msgstr "https://fr.wikipedia.org/wiki/"; #: thisdayinhistory/thisdayinhistory.cpp:50 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/pl/kaddressbook_contacteditor.po new/kdepim-addons-18.12.2/po/pl/kaddressbook_contacteditor.po --- old/kdepim-addons-18.12.1/po/pl/kaddressbook_contacteditor.po 2019-01-08 01:20:01.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/pl/kaddressbook_contacteditor.po 2019-02-05 01:49:29.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Łukasz Wojniłowicz <[email protected]>, 2017. +# Łukasz Wojniłowicz <[email protected]>, 2017, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2017-10-22 06:01+0100\n" +"PO-Revision-Date: 2019-01-20 07:42+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" #: addresseditor/addressgrantleeobject.cpp:69 #: addresseditor/addressgrantleeobject.cpp:108 @@ -78,7 +78,7 @@ #: addresseditor/addresslocationwidget.cpp:144 #, kde-format msgid "Cancel" -msgstr "Anuluj" +msgstr "Zaniechaj" #: addresseditor/addresstypedialog.cpp:35 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/pl/messageviewer_semantic_plugin.po new/kdepim-addons-18.12.2/po/pl/messageviewer_semantic_plugin.po --- old/kdepim-addons-18.12.1/po/pl/messageviewer_semantic_plugin.po 2019-01-08 01:20:01.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/pl/messageviewer_semantic_plugin.po 2019-02-05 01:49:29.000000000 +0100 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Łukasz Wojniłowicz <[email protected]>, 2017, 2018. +# Łukasz Wojniłowicz <[email protected]>, 2017, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-06 07:26+0100\n" -"PO-Revision-Date: 2018-11-04 08:31+0100\n" +"PO-Revision-Date: 2019-01-20 07:42+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" #: html.cpp:2 html.cpp:6 html.cpp:10 html.cpp:18 html.cpp:22 #: templates/busreservation.html:41 templates/flightreservation.html:48 @@ -81,7 +81,7 @@ #: html.cpp:36 templates/actions.html:10 msgid "Cancel" -msgstr "Anuluj" +msgstr "Zaniechaj" #: html.cpp:38 templates/actions.html:12 msgid "Check-In" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/pl/messageviewer_text_calendar_plugin.po new/kdepim-addons-18.12.2/po/pl/messageviewer_text_calendar_plugin.po --- old/kdepim-addons-18.12.1/po/pl/messageviewer_text_calendar_plugin.po 2019-01-08 01:20:01.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/pl/messageviewer_text_calendar_plugin.po 2019-02-05 01:49:29.000000000 +0100 @@ -2,20 +2,20 @@ # translation of kmail_text_calendar_plugin.po to # Mikolaj Machowski <[email protected]>, 2004, 2005, 2008, 2009, 2010. # Marta Rybczyńska <[email protected]>, 2007, 2008. -# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2015, 2017. +# Łukasz Wojniłowicz <[email protected]>, 2011, 2012, 2015, 2017, 2019. msgid "" msgstr "" "Project-Id-Version: kmail_text_calendar_plugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2017-08-12 07:57+0100\n" +"PO-Revision-Date: 2019-01-20 07:12+0100\n" "Last-Translator: Łukasz Wojniłowicz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 19.03.70\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" @@ -259,12 +259,12 @@ #: text_calendar.cpp:826 #, kde-format msgid "Do you still want to cancel this task?" -msgstr "Czy nadal chcesz anulować to zadanie?" +msgstr "Czy nadal chcesz porzucić to zadanie?" #: text_calendar.cpp:828 #, kde-format msgid "Do you still want to cancel this invitation?" -msgstr "Czy nadal chcesz anulować to zaproszenie?" +msgstr "Czy nadal chcesz porzucić to zaproszenie?" #: text_calendar.cpp:831 #, kde-format @@ -284,12 +284,12 @@ #: text_calendar.cpp:840 #, kde-format msgid "Do you really want to cancel this task?" -msgstr "Czy na pewno chcesz anulować to zadanie?" +msgstr "Czy na pewno chcesz porzucić to zadanie?" #: text_calendar.cpp:842 #, kde-format msgid "Do you really want to cancel this invitation?" -msgstr "Czy na pewno chcesz anulować to zaproszenie?" +msgstr "Czy na pewno chcesz porzucić to zaproszenie?" #: text_calendar.cpp:847 #, kde-format @@ -365,7 +365,7 @@ "możesz im wysłać wiadomość e-mail.\n" "\n" "Czy chcesz wysłać organizatorowi wiadomość odnośnie tego zaproszenia?\n" -"Naciśnij przycisk [Anuluj], aby anulować operację zapisywania." +"Naciśnij przycisk [Zaniechaj], aby porzucić zapisywanie ." #: text_calendar.cpp:1334 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/ru/kaddressbook_contacteditor.po new/kdepim-addons-18.12.2/po/ru/kaddressbook_contacteditor.po --- old/kdepim-addons-18.12.1/po/ru/kaddressbook_contacteditor.po 2019-01-08 01:20:02.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/ru/kaddressbook_contacteditor.po 2019-02-05 01:49:31.000000000 +0100 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Alexander Potashev <[email protected]>, 2017. +# Alexander Yavorsky <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2017-12-17 15:31+0300\n" -"Last-Translator: Alexander Potashev <[email protected]>\n" +"PO-Revision-Date: 2019-01-19 15:14+0300\n" +"Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" @@ -16,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.1\n" #: addresseditor/addressgrantleeobject.cpp:69 #: addresseditor/addressgrantleeobject.cpp:108 @@ -63,12 +64,12 @@ #, kde-format msgctxt "street/postal" msgid "This is the preferred address" -msgstr "" +msgstr "Это предпочитаемый почтовый адрес" #: addresseditor/addresslocationwidget.cpp:127 #, kde-format msgid "Add Address" -msgstr "" +msgstr "Добавить почтовый адрес" #: addresseditor/addresslocationwidget.cpp:139 #, kde-format @@ -84,27 +85,27 @@ #, kde-format msgctxt "street/postal" msgid "Edit Address Type" -msgstr "" +msgstr "Изменение типа адреса" #: addresseditor/addresstypedialog.cpp:49 #, kde-format msgctxt "street/postal" msgid "Address Types" -msgstr "" +msgstr "Типы адреса" #: addresseditor/selectaddresstypecombobox.cpp:76 #, kde-format msgctxt "@item:inlistbox Category of contact info field" msgid "Other..." -msgstr "" +msgstr "Другой..." #: addresseditor/selectaddresstypecombobox.cpp:78 #, kde-format msgctxt "@item:inlistbox Category of contact info field" msgid "New Address Type" -msgstr "" +msgstr "Новый тип адреса" #: addresseditor/webengine/addresseslocationengineviewer.cpp:80 #, kde-format msgid "Do you really want to delete this address?" -msgstr "" +msgstr "Удалить этот адрес?" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/ru/messageviewerplugins.po new/kdepim-addons-18.12.2/po/ru/messageviewerplugins.po --- old/kdepim-addons-18.12.1/po/ru/messageviewerplugins.po 2019-01-08 01:20:02.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/ru/messageviewerplugins.po 2019-02-05 01:49:31.000000000 +0100 @@ -9,19 +9,20 @@ # Alexander Potashev <[email protected]>, 2010, 2011, 2014, 2015, 2016, 2017. # Julia Dronova <[email protected]>, 2012. # Alexander Lakhin <[email protected]>, 2013. +# Alexander Yavorsky <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kmail\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2017-10-09 12:28+0300\n" -"Last-Translator: Alexander Potashev <[email protected]>\n" +"PO-Revision-Date: 2019-01-19 13:20+0300\n" +"Last-Translator: Alexander Yavorsky <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" "Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.1\n" "Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n" "%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Environment: kde\n" @@ -188,8 +189,7 @@ msgstr "Создать новую задачу и закрыть эту панель." #: createtodoplugin/todoedit.cpp:110 -#, fuzzy, kde-format -#| msgid "Open &editor..." +#, kde-format msgid "Open &Editor..." msgstr "Открыть &редактор..." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/cryptopageplugin.po new/kdepim-addons-18.12.2/po/zh_CN/cryptopageplugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/cryptopageplugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/cryptopageplugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/customtoolsplugin.po new/kdepim-addons-18.12.2/po/zh_CN/customtoolsplugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/customtoolsplugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/customtoolsplugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/importwizard_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/importwizard_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/importwizard_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/importwizard_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_contacteditor.po new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_contacteditor.po --- old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_contacteditor.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_contacteditor.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:51\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_importexportplugins.po new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_importexportplugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_importexportplugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_importexportplugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -11,7 +11,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kaddressbook_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kaddressbook_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmail_editor_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmail_editor_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmail_editor_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmail_editor_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorconvertertext_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorconvertertext_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorconvertertext_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorconvertertext_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-24 07:07+0100\n" -"PO-Revision-Date: 2019-01-05 20:51\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorinit_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorinit_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorinit_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorinit_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorsendcheck_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorsendcheck_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmail_editorsendcheck_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmail_editorsendcheck_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmail_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmail_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmail_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmail_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/kmailtransport_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/kmailtransport_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/kmailtransport_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/kmailtransport_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/korganizer_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/korganizer_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/korganizer_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/korganizer_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-29 07:16+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/mailreader.po new/kdepim-addons-18.12.2/po/zh_CN/mailreader.po --- old/kdepim-addons-18.12.1/po/zh_CN/mailreader.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/mailreader.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_application_gnupgwks_plugin.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_application_gnupgwks_plugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_application_gnupgwks_plugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_application_gnupgwks_plugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_application_mstnef_plugin.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_application_mstnef_plugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_application_mstnef_plugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_application_mstnef_plugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_bodypartformatter_pkpass.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_bodypartformatter_pkpass.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_bodypartformatter_pkpass.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_bodypartformatter_pkpass.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:51\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_semantic_plugin.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_semantic_plugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_semantic_plugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_semantic_plugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2019-01-06 07:26+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_text_calendar_plugin.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_text_calendar_plugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_text_calendar_plugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_text_calendar_plugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -6,7 +6,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_text_vcard_plugin.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_text_vcard_plugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewer_text_vcard_plugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewer_text_vcard_plugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -8,7 +8,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewerheaderplugins.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewerheaderplugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewerheaderplugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewerheaderplugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/messageviewerplugins.po new/kdepim-addons-18.12.2/po/zh_CN/messageviewerplugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/messageviewerplugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/messageviewerplugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/pimeventsplugin.po new/kdepim-addons-18.12.2/po/zh_CN/pimeventsplugin.po --- old/kdepim-addons-18.12.1/po/zh_CN/pimeventsplugin.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/pimeventsplugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -3,7 +3,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/sieveeditor_plugins.po new/kdepim-addons-18.12.2/po/zh_CN/sieveeditor_plugins.po --- old/kdepim-addons-18.12.1/po/zh_CN/sieveeditor_plugins.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/sieveeditor_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_CN/webengineurlinterceptor.po new/kdepim-addons-18.12.2/po/zh_CN/webengineurlinterceptor.po --- old/kdepim-addons-18.12.1/po/zh_CN/webengineurlinterceptor.po 2019-01-08 01:20:03.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_CN/webengineurlinterceptor.po 2019-02-05 01:49:34.000000000 +0100 @@ -7,7 +7,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-12-22 07:20+0100\n" -"PO-Revision-Date: 2019-01-05 20:50\n" +"PO-Revision-Date: 2019-01-27 23:05\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_TW/importwizard_plugins.po new/kdepim-addons-18.12.2/po/zh_TW/importwizard_plugins.po --- old/kdepim-addons-18.12.1/po/zh_TW/importwizard_plugins.po 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_TW/importwizard_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -1,21 +1,21 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# pan93412 <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: importwizard_plugins\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-01-30 11:01+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 18.12.1\n" #: evolutionv1/evolutionv1importdata.cpp:59 #: evolutionv2/evolutionv2importdata.cpp:59 mailapp/mailappimportdata.cpp:62 @@ -23,7 +23,7 @@ #: pmail/pmailimportdata.cpp:62 thebat/thebatimportdata.cpp:61 #, kde-format msgid "Import in progress" -msgstr "" +msgstr "正在匯入" #: evolutionv1/evolutionv1importdata.cpp:67 #: evolutionv2/evolutionv2importdata.cpp:67 mailapp/mailappimportdata.cpp:69 @@ -31,4 +31,4 @@ #: pmail/pmailimportdata.cpp:69 thebat/thebatimportdata.cpp:68 #, kde-format msgid "Import finished" -msgstr "" +msgstr "匯入完成" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_TW/korganizer_plugins.po new/kdepim-addons-18.12.2/po/zh_TW/korganizer_plugins.po --- old/kdepim-addons-18.12.1/po/zh_TW/korganizer_plugins.po 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_TW/korganizer_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -1,27 +1,28 @@ # translation of korganizer.po to Chinese Traditional # Traditional Chinese Translation of korganizer # Copyright (C) 2000, 2006, 2007, 2008 Free Software Foundation, Inc. +# # Translator: Jing-Jong Shyue <[email protected]>, 2000. # Ping Yeh <[email protected]>, 2002. # Chao-Hsiung Liao <[email protected]>, 2002. # Franklin Weng <[email protected]>, 2008, 2010, 2011, 2012, 2013, 2015. # Frank Weng (a.k.a. Franklin) <[email protected]>, 2009. -# # Frank Weng (a.k.a. Franklin) <franklin at goodhorse dot idv dot tw>, 2006, 2007, 2008, 2009, 2010. # Franklin Weng <franklin at goodhorse dot idv dot tw>, 2007, 2008. +# pan93412 <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: korganizer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-29 07:16+0100\n" -"PO-Revision-Date: 2015-06-14 13:34+0800\n" -"Last-Translator: Franklin\n" -"Language-Team: Chinese Traditional <[email protected]>\n" +"PO-Revision-Date: 2019-01-19 19:50+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" +"Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 18.12.1\n" "Plural-Forms: nplurals=1; plural=0;\n" #: datenums/configdialog.cpp:39 @@ -755,12 +756,10 @@ #: thisdayinhistory/thisdayinhistory.cpp:48 #: thisdayinhistory/thisdayinhistory.cpp:65 -#, fuzzy, kde-format -#| msgctxt "Localized Wikipedia website" -#| msgid "http://en.wikipedia.org/wiki/"; +#, kde-format msgctxt "Localized Wikipedia website" msgid "https://en.wikipedia.org/wiki/"; -msgstr "http://zh.wikipedia.org/w/index.php?variant=zh-tw&title="; +msgstr "https://zh.wikipedia.org/wiki/"; #: thisdayinhistory/thisdayinhistory.cpp:50 #, kde-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_TW/messageviewer_bodypartformatter_pkpass.po new/kdepim-addons-18.12.2/po/zh_TW/messageviewer_bodypartformatter_pkpass.po --- old/kdepim-addons-18.12.1/po/zh_TW/messageviewer_bodypartformatter_pkpass.po 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_TW/messageviewer_bodypartformatter_pkpass.po 2019-02-05 01:49:34.000000000 +0100 @@ -1,22 +1,22 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# pan93412 <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: messageviewer_bodypartformatter_pkpass\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-01-19 19:46+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 18.12.1\n" #: html.cpp:2 templates/barcode.html:7 msgid "Unsupported barcode format." -msgstr "" +msgstr "條碼格式不支援。" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_TW/pimeventsplugin.po new/kdepim-addons-18.12.2/po/zh_TW/pimeventsplugin.po --- old/kdepim-addons-18.12.1/po/zh_TW/pimeventsplugin.po 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_TW/pimeventsplugin.po 2019-02-05 01:49:34.000000000 +0100 @@ -1,22 +1,22 @@ -# SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # +# pan93412 <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: pimeventsplugin\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" +"PO-Revision-Date: 2019-01-19 19:43+0800\n" +"Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Lokalize 18.12.1\n" #: PimEventsConfig.qml:62 msgid "Select Calendars" -msgstr "" +msgstr "選取行事曆" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kdepim-addons-18.12.1/po/zh_TW/sieveeditor_plugins.po new/kdepim-addons-18.12.2/po/zh_TW/sieveeditor_plugins.po --- old/kdepim-addons-18.12.1/po/zh_TW/sieveeditor_plugins.po 2019-01-08 01:20:04.000000000 +0100 +++ new/kdepim-addons-18.12.2/po/zh_TW/sieveeditor_plugins.po 2019-02-05 01:49:34.000000000 +0100 @@ -2,13 +2,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Franklin Weng <[email protected]>, 2017. -# pan93412 <[email protected]>, 2018. +# pan93412 <[email protected]>, 2018, 2019. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n"; "POT-Creation-Date: 2018-11-12 06:57+0100\n" -"PO-Revision-Date: 2018-07-10 14:32+0800\n" +"PO-Revision-Date: 2019-01-19 19:37+0800\n" "Last-Translator: pan93412 <[email protected]>\n" "Language-Team: Chinese <[email protected]>\n" "Language: zh_TW\n" @@ -16,13 +16,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Lokalize 2.0\n" +"X-Generator: Lokalize 18.12.1\n" #: emaillineedit/emaillineedit.cpp:46 -#, fuzzy, kde-format -#| msgid "Click on button for selecting emails..." +#, kde-format msgid "Click on button for selecting contacts..." -msgstr "點擊按鈕以選取 Email…" +msgstr "點擊按鈕以選取聯絡人…" #: emaillineedit/emaillineedit.cpp:51 #: regexeditorlineedit/regexpeditorlineedit.cpp:66
