Hello community,
here is the log from the commit of package pim-data-exporter for openSUSE:Factory checked in at 2017-10-23 16:51:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/pim-data-exporter (Old)
and /work/SRC/openSUSE:Factory/.pim-data-exporter.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pim-data-exporter"
Mon Oct 23 16:51:38 2017 rev:12 rq:534842 version:17.08.2
Changes:
--------
--- /work/SRC/openSUSE:Factory/pim-data-exporter/pim-data-exporter.changes 2017-09-11 16:23:23.415651748 +0200
+++ /work/SRC/openSUSE:Factory/.pim-data-exporter.new/pim-data-exporter.changes 2017-10-23 16:51:40.505224648 +0200
@@ -1,0 +2,10 @@
+Tue Oct 17 00:33:07 CEST 2017 - lbeltrame@kde.org
+
+- Update to 17.08.2
+ * New bugfix release
+ * For more details please see:
+ * https://www.kde.org/announcements/announce-applications-17.08.2.php
+- Changes since 17.08.1:
+ * None
+
+-------------------------------------------------------------------
Old:
----
pim-data-exporter-17.08.1.tar.xz
New:
----
pim-data-exporter-17.08.2.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ pim-data-exporter.spec ++++++
--- /var/tmp/diff_new_pack.yhAKdy/_old 2017-10-23 16:51:41.037199751 +0200
+++ /var/tmp/diff_new_pack.yhAKdy/_new 2017-10-23 16:51:41.041199564 +0200
@@ -19,7 +19,7 @@
%bcond_without lang
Name: pim-data-exporter
-Version: 17.08.1
+Version: 17.08.2
Release: 0
%define kf5_version 5.26.0
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
++++++ pim-data-exporter-17.08.1.tar.xz -> pim-data-exporter-17.08.2.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/CMakeLists.txt new/pim-data-exporter-17.08.2/CMakeLists.txt
--- old/pim-data-exporter-17.08.1/CMakeLists.txt 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/CMakeLists.txt 2017-10-10 02:17:24.000000000 +0200
@@ -32,7 +32,7 @@
endif()
-set(KDEPIM_VERSION_NUMBER "5.6.1")
+set(KDEPIM_VERSION_NUMBER "5.6.2")
set(KDEPIM_VERSION "${KDEPIM_VERSION_NUMBER}${KDEPIM_DEV_VERSION}")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/po/fi/pimsettingexporter.po new/pim-data-exporter-17.08.2/po/fi/pimsettingexporter.po
--- old/pim-data-exporter-17.08.1/po/fi/pimsettingexporter.po 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/po/fi/pimsettingexporter.po 2017-10-10 02:17:23.000000000 +0200
@@ -1,14 +1,14 @@
# KDE Finnish translation sprint participants:
# Jiri Grönroos , 2012.
-# Tommi Nieminen , 2012, 2013, 2015.
+# Tommi Nieminen , 2012, 2013, 2015, 2017.
# Lasse Liehu , 2013, 2014, 2015, 2016.
msgid ""
msgstr ""
"Project-Id-Version: backupmail\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-19 05:28+0200\n"
-"PO-Revision-Date: 2016-05-01 00:30+0200\n"
-"Last-Translator: Lasse Liehu \n"
+"PO-Revision-Date: 2017-09-08 10:52+0200\n"
+"Last-Translator: Tommi Nieminen \n"
"Language-Team: Finnish \n"
"Language: fi\n"
"MIME-Version: 1.0\n"
@@ -34,10 +34,9 @@
msgstr "PIM-asetusten viennin konsoli"
#: console/main.cpp:39
-#, fuzzy, kde-format
-#| msgid "Copyright © 2015-2016 pimsettingexporter authors"
+#, kde-format
msgid "Copyright © 2015-2017 pimsettingexporter authors"
-msgstr "Tekijänoikeudet © 2015–2016 pimsettingexporterin tekijät"
+msgstr "Tekijänoikeudet © 2015–2017 pimsettingexporterin tekijät"
#: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:56
#, kde-format
@@ -695,7 +694,7 @@
#: gui/dialog/showarchivestructuredialog.cpp:51
#, kde-format
msgid "Search..."
-msgstr ""
+msgstr "Etsi…"
#: gui/dialog/showarchivestructuredialog.cpp:60
#, kde-format
@@ -798,10 +797,9 @@
msgstr "PIM-asetusten vienti"
#: gui/pimsettingcommandlineoption.cpp:55
-#, fuzzy, kde-format
-#| msgid "Copyright © 2012-2016 pimsettingexporter authors"
+#, kde-format
msgid "Copyright © 2012-2017 pimsettingexporter authors"
-msgstr "Tekijänoikeudet © 2012–2016 pimsettingexporterin tekijät"
+msgstr "Tekijänoikeudet © 2012–2017 pimsettingexporterin tekijät"
#: gui/pimsettingcommandlineoption.cpp:59
#, kde-format
@@ -945,10 +943,9 @@
msgstr "Luo varmuuskopio"
#: gui/pimsettingexporterwindow.cpp:315
-#, fuzzy, kde-format
-#| msgid "Backing up resources..."
+#, kde-format
msgid "Backup in progress..."
-msgstr "Varmuuskopioidaan resursseja…"
+msgstr "Varmuuskopiointi käynnissä…"
#: gui/pimsettingexporterwindow.cpp:356
#, kde-format
@@ -970,10 +967,9 @@
msgstr "Zip-tiedosto (*.zip)"
#: gui/pimsettingexporterwindow.cpp:398
-#, fuzzy, kde-format
-#| msgid "Restore resources..."
+#, kde-format
msgid "Restore in progress..."
-msgstr "Palauta resurssit…"
+msgstr "Palautus käynnissä…"
#: gui/pimsettingsbackuprestoreui.cpp:40
#, kde-format
@@ -1006,10 +1002,9 @@
msgstr "Korvaa tiedosto aina"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:44
-#, fuzzy, kde-format
-#| msgid "Always Override File"
+#, kde-format
msgid "Always Override Directory"
-msgstr "Korvaa tiedosto aina"
+msgstr "Korvaa kansio aina"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:48
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/po/gl/pimsettingexporter.po new/pim-data-exporter-17.08.2/po/gl/pimsettingexporter.po
--- old/pim-data-exporter-17.08.1/po/gl/pimsettingexporter.po 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/po/gl/pimsettingexporter.po 2017-10-10 02:17:23.000000000 +0200
@@ -4,14 +4,14 @@
# Xosé , 2012, 2013, 2014.
# Adrian Chaves Fernandez , 2013, 2015, 2016.
# Marce Villarino , 2013, 2014.
+# Adrián Chaves (Gallaecio) , 2017.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-19 05:28+0200\n"
-"PO-Revision-Date: 2016-04-21 05:40+0100\n"
-"Last-Translator: Adrián Chaves Fernández (Gallaecio) \n"
+"PO-Revision-Date: 2017-09-28 21:50+0100\n"
+"Last-Translator: Adrián Chaves (Gallaecio) \n"
"Language-Team: Galician \n"
"Language: gl\n"
"MIME-Version: 1.0\n"
@@ -537,7 +537,7 @@
#: core/pimsettingbackupthread.cpp:51
#, kde-format
msgid "Impossible to open archive file."
-msgstr "Non é posíbel abrir o arquivo."
+msgstr "Non é posíbel abrir o ficheiro de arquivo."
#: core/pimsettingbackupthread.cpp:58
#, kde-format
@@ -921,7 +921,7 @@
#: gui/pimsettingexporterwindow.cpp:260 gui/pimsettingexporterwindow.cpp:305
#, kde-format
msgid "Zip file (*.zip)"
-msgstr "Arquivo ZIP (*.zip)"
+msgstr "Ficheiro Zip (*.zip)"
#: gui/pimsettingexporterwindow.cpp:273
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/po/ru/pimsettingexporter.po new/pim-data-exporter-17.08.2/po/ru/pimsettingexporter.po
--- old/pim-data-exporter-17.08.1/po/ru/pimsettingexporter.po 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/po/ru/pimsettingexporter.po 2017-10-10 02:17:23.000000000 +0200
@@ -2,13 +2,13 @@
# This file is distributed under the same license as the PACKAGE package.
#
# Alexander Lakhin , 2013.
-# Alexander Potashev , 2014, 2016.
+# Alexander Potashev , 2014, 2016, 2017.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-19 05:28+0200\n"
-"PO-Revision-Date: 2016-01-09 03:17+0300\n"
+"PO-Revision-Date: 2017-10-09 12:45+0300\n"
"Last-Translator: Alexander Potashev \n"
"Language-Team: Russian \n"
"Language: ru\n"
@@ -25,12 +25,12 @@
#, kde-format
msgctxt "NAME OF TRANSLATORS"
msgid "Your names"
-msgstr "Александр Лахин,Александр Поташев"
+msgstr "Александр Лахин,Александр Поташев,Александр Яворский"
#, kde-format
msgctxt "EMAIL OF TRANSLATORS"
msgid "Your emails"
-msgstr "exclusion@gmail.com,aspotashev@gmail.com"
+msgstr "exclusion@gmail.com,aspotashev@gmail.com,walker@mail.ru"
#: console/main.cpp:37 console/main.cpp:38
#, kde-format
@@ -38,12 +38,12 @@
msgstr "Консоль экспорта данных PIM"
#: console/main.cpp:39
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Copyright © 2012-2015 pimsettingexporter authors"
msgid "Copyright © 2015-2017 pimsettingexporter authors"
msgstr ""
"© Разработчики программы экспорта личных данных (pimsettingexporter), "
-"2012-2015"
+"2012-2017"
#: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:56
#, kde-format
@@ -58,12 +58,13 @@
#: console/main.cpp:43
#, kde-format
msgid "File to log information to."
-msgstr ""
+msgstr "Файл для записи журнала."
#: console/main.cpp:44
#, kde-format
msgid "Template file to define what data, settings to import or export."
msgstr ""
+"Файл шаблона, определяющий виды данных и параметров для импорта или экспорта."
#: console/main.cpp:45
#, kde-format
@@ -78,7 +79,7 @@
#: core/abstractimportexportjob.cpp:75
#, kde-format
msgid "Task Canceled"
-msgstr ""
+msgstr "Задание было отменено"
#: core/abstractimportexportjob.cpp:134
#, kde-format
@@ -111,17 +112,17 @@
msgstr "Копирование файла"
#: core/abstractimportexportjob.cpp:334
-#, fuzzy, kde-format
+#, kde-format
#| msgid "\"%1\" was copied."
msgid "\"%1\" was restored."
-msgstr "Файл «%1» скопирован."
+msgstr "Файл «%1» был восстановлен."
#: core/abstractimportexportjob.cpp:353 core/abstractimportexportjob.cpp:361
#: core/exportresourcearchivejob.cpp:94 core/pimsettingbackupthread.cpp:68
-#, fuzzy, kde-format
+#, kde-format
#| msgid "\"%1\" was backuped."
msgid "\"%1\" was backed up."
-msgstr "Файл «%1» заархивирован."
+msgstr "Файла «%1» добавлен в архив."
#: core/abstractimportexportjob.cpp:363 core/abstractimportexportjob.cpp:367
#: core/exportresourcearchivejob.cpp:96 core/pimsettingbackupthread.cpp:70
@@ -137,10 +138,10 @@
msgstr "Источники данных восстановлены."
#: core/abstractimportexportjob.cpp:434
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources restored."
msgid "No resources files found."
-msgstr "Ресурсы восстановлены."
+msgstr "Нет файла со списком источников данных Akonadi."
#: core/abstractimportexportjob.cpp:477
#, kde-format
@@ -148,10 +149,10 @@
msgstr ""
#: core/abstractimportexportjob.cpp:517
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources restored."
msgid "Resource '%1' created."
-msgstr "Ресурсы восстановлены."
+msgstr "Создан источник данных «%1»."
#: core/abstractimportexportjob.cpp:532
#, kde-format
@@ -159,30 +160,30 @@
msgstr "Не удалось синхронизировать %1."
#: core/abstractimportexportjob.cpp:537
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources restored."
msgid "Resource %1 synchronized."
-msgstr "Ресурсы восстановлены."
+msgstr "Источник данных %1 синхронизирован."
#: core/abstractimportexportjob.cpp:543
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources restored."
msgid "All resources synchronized."
-msgstr "Ресурсы восстановлены."
+msgstr "Все источники данных синхронизированы."
#: core/abstractimportexportjob.cpp:554
#, kde-format
msgid "Start synchronizing..."
-msgstr ""
+msgstr "Начало синхронизации..."
#: core/abstractimportexportjob.cpp:591
-#, fuzzy, kde-format
+#, kde-format
#| msgid "\"%1\" directory cannot be added to backup file."
msgid "Directory \"%1\" added to backup file."
-msgstr "Каталог «%1» не удалось добавить в архив."
+msgstr "Каталог «%1» добавлен в архив."
#: core/abstractimportexportjob.cpp:593
-#, fuzzy, kde-format
+#, kde-format
#| msgid "\"%1\" directory cannot be added to backup file."
msgid "Directory \"%1\" cannot be added to backup file."
msgstr "Каталог «%1» не удалось добавить в архив."
@@ -195,7 +196,7 @@
#: core/addressbook/exportaddressbookjob.cpp:47
#, kde-format
msgid "Export KAddressBook settings"
-msgstr "Экспорт данных KAddressBook"
+msgstr "Экспорт параметров KAddressBook"
#: core/addressbook/exportaddressbookjob.cpp:59
#: core/alarm/exportalarmjob.cpp:60 core/calendar/exportcalendarjob.cpp:61
@@ -228,15 +229,15 @@
msgstr "Архивация конфигурации завершена."
#: core/addressbook/importaddressbookjob.cpp:54
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import KAddressBook settings..."
msgid "Starting to import KAddressBook settings..."
-msgstr "Начало импорта данных KAddressBook..."
+msgstr "Начало импорта параметров KAddressBook..."
#: core/addressbook/importaddressbookjob.cpp:56
#, kde-format
msgid "Import KAddressBook settings"
-msgstr "Импорт данных KAddressBook"
+msgstr "Импорт параметров KAddressBook"
#: core/addressbook/importaddressbookjob.cpp:79
#: core/addressbook/importaddressbookjob.cpp:80
@@ -273,7 +274,7 @@
#: core/akregator/exportakregatorjob.cpp:42
#, kde-format
msgid "Export Akregator settings"
-msgstr "Экспорт данных Akregator"
+msgstr "Экспорт параметров Akregator"
#: core/akregator/exportakregatorjob.cpp:70
#: core/blogilo/exportblogilojob.cpp:67
@@ -288,21 +289,21 @@
#: core/akregator/exportakregatorjob.cpp:80
#: core/blogilo/exportblogilojob.cpp:76
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Mails backup done."
msgid "Data backup done."
-msgstr "Архивация почты завершена."
+msgstr "Архивация данных завершена."
#: core/akregator/importakregatorjob.cpp:44
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import Akregator settings..."
msgid "Starting to import Akregator settings..."
-msgstr "Начало импорта данных Akregator..."
+msgstr "Начало импорта параметров Akregator..."
#: core/akregator/importakregatorjob.cpp:47
#, kde-format
msgid "Import Akregator settings"
-msgstr "Импорт данных Akregator"
+msgstr "Импорт параметров Akregator"
#: core/akregator/importakregatorjob.cpp:86
#: core/blogilo/importblogilojob.cpp:83 core/notes/importnotesjob.cpp:120
@@ -324,29 +325,29 @@
#: core/alarm/exportalarmjob.cpp:48
#, kde-format
msgid "Export KAlarm settings"
-msgstr "Экспорт данных KAlarm"
+msgstr "Экспорт параметров KAlarm"
#: core/alarm/importalarmjob.cpp:55
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import KAlarm settings..."
msgid "Starting to import KAlarm settings..."
-msgstr "Начало импорта данных KAlarm..."
+msgstr "Начало импорта параметров KAlarm..."
#: core/alarm/importalarmjob.cpp:56
#, kde-format
msgid "Import KAlarm settings"
-msgstr "Импорт данных KAlarm"
+msgstr "Импорт параметров KAlarm"
#: core/archivestorage.cpp:57
#, kde-format
msgid "Archive cannot be opened in write mode."
-msgstr "Архив невозможно открыть для записи."
+msgstr "Не удалось открыть архив для записи."
#: core/archivestorage.cpp:59 core/utils.cpp:289
#: gui/dialog/showarchivestructuredialog.cpp:86
#, kde-format
msgid "Archive cannot be opened in read mode."
-msgstr "Архив невозможно открыть для чтения."
+msgstr "Не удалось открыть архив для чтения."
#: core/blogilo/exportblogilojob.cpp:41
#, kde-format
@@ -356,18 +357,18 @@
#: core/blogilo/exportblogilojob.cpp:42
#, kde-format
msgid "Export Blogilo settings"
-msgstr "Экспорт данных Blogilo"
+msgstr "Экспорт параметров Blogilo"
#: core/blogilo/importblogilojob.cpp:44
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import Blogilo settings..."
msgid "Starting to import Blogilo settings..."
-msgstr "Начало импорта данных Blogilo..."
+msgstr "Начало импорта параметров Blogilo..."
#: core/blogilo/importblogilojob.cpp:45
#, kde-format
msgid "Import Blogilo settings"
-msgstr "Импорт данных Blogilo"
+msgstr "Импорт параметров Blogilo"
#: core/calendar/exportcalendarjob.cpp:48
#, kde-format
@@ -377,18 +378,18 @@
#: core/calendar/exportcalendarjob.cpp:49
#, kde-format
msgid "Export KOrganizer settings"
-msgstr "Экспорт данных KOrganizer"
+msgstr "Экспорт параметров KOrganizer"
#: core/calendar/importcalendarjob.cpp:58
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import KOrganizer settings..."
msgid "Starting to import KOrganizer settings..."
-msgstr "Начало импорта данных KOrganizer..."
+msgstr "Начало импорта параметров KOrganizer..."
#: core/calendar/importcalendarjob.cpp:60
#, kde-format
msgid "Import KOrganizer settings"
-msgstr "Импорт данных KOrganizer"
+msgstr "Импорт параметров KOrganizer"
#: core/mail/exportmailjob.cpp:66
#, kde-format
@@ -398,7 +399,7 @@
#: core/mail/exportmailjob.cpp:67
#, kde-format
msgid "Export KMail settings"
-msgstr "Экспорт данных KMail"
+msgstr "Экспорт параметров KMail"
#: core/mail/exportmailjob.cpp:126
#, kde-format
@@ -452,15 +453,15 @@
msgstr "Файл профиля не удалось добавить в архив."
#: core/mail/importmailjob.cpp:73
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import KMail settings..."
msgid "Starting to import KMail settings..."
-msgstr "Начало импорта данных KMail..."
+msgstr "Начало импорта параметров KMail..."
#: core/mail/importmailjob.cpp:74
#, kde-format
msgid "Import KMail settings"
-msgstr "Импорт данных KMail"
+msgstr "Импорт параметров KMail"
#: core/mail/importmailjob.cpp:163 core/mail/importmailjob.cpp:169
#, kde-format
@@ -493,10 +494,10 @@
msgstr "Почта восстановлена."
#: core/mail/importmailjob.cpp:591
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Restore mails..."
msgid "Restore config..."
-msgstr "Восстановление почты..."
+msgstr "Восстановление параметров..."
#: core/mail/importmailjob.cpp:594
#, kde-format
@@ -504,7 +505,7 @@
msgstr "Файл filters в архиве не найден."
#: core/mail/importmailjob.cpp:875 core/mail/importmailjob.cpp:880
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Restore identities..."
msgid "Restoring identities..."
msgstr "Восстановление профилей..."
@@ -532,33 +533,33 @@
#: core/notes/exportnotesjob.cpp:47
#, kde-format
msgid "Export KNotes settings"
-msgstr "Экспорт данных KNotes"
+msgstr "Экспорт параметров KNotes"
#: core/notes/importnotesjob.cpp:75
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Start import KNotes settings..."
msgid "Starting to import KNotes settings..."
-msgstr "Начало импорта данных KNotes..."
+msgstr "Начало импорта параметров KNotes..."
#: core/notes/importnotesjob.cpp:78
#, kde-format
msgid "Import KNotes settings"
-msgstr "Импорт данных KNotes"
+msgstr "Импорт параметров KNotes"
#: core/pimsettingbackupthread.cpp:51
#, kde-format
msgid "Impossible to open archive file."
-msgstr ""
+msgstr "Не удалось открыть файл архива."
#: core/pimsettingbackupthread.cpp:58
#, kde-format
msgid "Impossible to backup \"%1\"."
-msgstr ""
+msgstr "Не удалось добавить «%1» в архив."
#: core/pimsettingsbackuprestore.cpp:98 core/pimsettingsbackuprestore.cpp:283
#, kde-format
msgid "No data selected."
-msgstr ""
+msgstr "Данные не выбраны."
#: core/pimsettingsbackuprestore.cpp:104 core/pimsettingsbackuprestore.cpp:289
#, kde-format
@@ -568,7 +569,7 @@
#: core/pimsettingsbackuprestore.cpp:113
#, kde-format
msgid "Starting to backup data in '%1'"
-msgstr ""
+msgstr "Начало архивации данных в «%1»."
#: core/pimsettingsbackuprestore.cpp:207
#, kde-format
@@ -578,12 +579,12 @@
#: core/pimsettingsbackuprestore.cpp:308
#, kde-format
msgid "Starting to restore data from '%1'"
-msgstr ""
+msgstr "Начало восстановления данных из «%1»."
#: core/pimsettingsbackuprestore.cpp:316
#, kde-format
msgid "Restoring data from '%1' done."
-msgstr ""
+msgstr "Восстановление данных из «%1» завершено."
#: core/utils.cpp:262 core/utils.cpp:270
#, kde-format
@@ -658,23 +659,23 @@
#: gui/dialog/backupfilestructureinfodialog.cpp:41
#, kde-format
msgid "Archive File Structure"
-msgstr ""
+msgstr "Структура файла архива"
#: gui/dialog/backupfilestructureinfodialog.cpp:43
#, kde-format
msgid "Backup Archive Structure:"
-msgstr ""
+msgstr "Структура архива:"
#: gui/dialog/backupfilestructureinfodialog.cpp:70
#, kde-format
msgid "backup-structure.txt file was not found."
-msgstr ""
+msgstr "Файл backup-structure.txt не найден."
#: gui/dialog/pimsettingexporterconfiguredialog.cpp:30
-#, fuzzy, kde-format
+#, kde-format
#| msgid "PIM Setting Exporter"
msgid "Configure PimSettingExporter"
-msgstr "Экспорт данных PIM"
+msgstr "Настройка программы экспорта данных PIM"
#: gui/dialog/selectiontypedialog.cpp:35
#, kde-format
@@ -684,7 +685,7 @@
#: gui/dialog/selectiontypedialog.cpp:53
#, kde-format
msgid "Use this template by default"
-msgstr ""
+msgstr "Использовать этот шаблон по умолчанию"
#: gui/dialog/selectiontypedialog.cpp:58
#: gui/dialog/synchronizeresourcedialog.cpp:53
@@ -711,7 +712,7 @@
#: gui/dialog/showarchivestructuredialog.cpp:42
#, kde-format
msgid "Show Archive Content on file \"%1\""
-msgstr ""
+msgstr "Просмотр содержимого архива из файла «%1»"
#: gui/dialog/showarchivestructuredialog.cpp:51
#, kde-format
@@ -721,13 +722,13 @@
#: gui/dialog/showarchivestructuredialog.cpp:60
#, kde-format
msgid "Save As Text..."
-msgstr ""
+msgstr "Сохранить как текст..."
#: gui/dialog/showarchivestructuredialog.cpp:77
#, kde-format
msgctxt "qfiledialog filter files text"
msgid "Text Files"
-msgstr ""
+msgstr "Текстовые файлы"
#: gui/dialog/showarchivestructuredialog.cpp:78
#, kde-format
@@ -738,28 +739,28 @@
#: gui/dialog/showarchivestructuredialog.cpp:86
#, kde-format
msgid "Cannot open archive"
-msgstr ""
+msgstr "Не удалось открыть архив"
#: gui/dialog/showarchivestructuredialog.cpp:91
#, kde-format
msgid "Info"
-msgstr ""
+msgstr "Сведения"
#: gui/dialog/showarchivestructuredialog.cpp:93
#, kde-format
msgid "This is not kdepim archive."
-msgstr ""
+msgstr "Это не архив kdepim."
#: gui/dialog/showarchivestructuredialog.cpp:93
#, kde-format
msgid "Show information"
-msgstr ""
+msgstr "Просмотр информации"
#: gui/dialog/synchronizeresourcedialog.cpp:35
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources"
msgid "Synchronize Resources"
-msgstr "Ресурсы"
+msgstr "Синхронизация источников данных"
#: gui/dialog/synchronizeresourcedialog.cpp:38
#, kde-format
@@ -767,12 +768,14 @@
"Some resources were added but data were not sync. Select resources that you "
"want to sync:"
msgstr ""
+"Некоторые источники данных были добавлены, но данные не были синхронизированы."
+" Выберите источники данных для синхронизации:"
#: gui/importexportprogressindicatorgui.cpp:49
#: gui/job/fullsynchronizeresourcesjob.cpp:56
#, kde-format
msgid "Cancel"
-msgstr ""
+msgstr "Отмена"
#: gui/importexportprogressindicatorgui.cpp:79
#, kde-format
@@ -802,15 +805,16 @@
msgstr "Каталог «%1» уже существует. Заменить его?"
#: gui/job/fullsynchronizeresourcesjob.cpp:58
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Resources"
msgid "Synchronize resources"
-msgstr "Ресурсы"
+msgstr "Синхронизация источников данных"
#: gui/job/fullsynchronizeresourcesjob.cpp:59
#, kde-format
msgid "Synchronize resources... It can take some time."
msgstr ""
+"Идёт синхронизация источников данных. Это может занять некоторое время..."
#: gui/pimsettingcommandlineoption.cpp:53
#: gui/pimsettingcommandlineoption.cpp:54
@@ -819,17 +823,18 @@
msgstr "Экспорт данных PIM"
#: gui/pimsettingcommandlineoption.cpp:55
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Copyright © 2012-2015 pimsettingexporter authors"
msgid "Copyright © 2012-2017 pimsettingexporter authors"
msgstr ""
-"© Разработчики программы экспорта личных данных (pimsettingexporter), "
-"2012-2015"
+"© Разработчики программы экспорта личных данных (pimsettingexporter),"
+" 2012-2017"
#: gui/pimsettingcommandlineoption.cpp:59
#, kde-format
msgid "Template file uses to define what data, settings to import or export"
msgstr ""
+"Файл шаблона, определяющий виды данных и параметры для импорта или экспорта"
#: gui/pimsettingcommandlineoption.cpp:60
#, kde-format
@@ -845,6 +850,8 @@
#, kde-format
msgid "File or url. The user will be asked whether to import or export."
msgstr ""
+"Файл или адрес URL. Пользователю будет показан диалог с вопросом: нужно ли"
+" выполнить импорт или экспорт."
#. i18n: ectx: Menu (file)
#: gui/pimsettingexporter.rc:4
@@ -861,22 +868,22 @@
#: gui/pimsettingexporterwindow.cpp:138
#, kde-format
msgid "Full sync starts..."
-msgstr ""
+msgstr "Начата полная синхронизация..."
#: gui/pimsettingexporterwindow.cpp:160
#, kde-format
msgid "Full sync finished."
-msgstr ""
+msgstr "Полная синхронизация завершена."
#: gui/pimsettingexporterwindow.cpp:168
#, kde-format
msgid "Full sync for \"%1\" done."
-msgstr ""
+msgstr "Полная синхронизация «%1» завершена."
#: gui/pimsettingexporterwindow.cpp:173
#, kde-format
msgid "Full sync for \"%1\" failed."
-msgstr ""
+msgstr "Ошибка полной синхронизации «%1»."
#: gui/pimsettingexporterwindow.cpp:178
#, kde-format
@@ -895,16 +902,16 @@
msgstr "Сведения о резервной копии"
#: gui/pimsettingexporterwindow.cpp:205
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Restore Data..."
msgid "Export Data..."
-msgstr "Восстановить данные..."
+msgstr "Экспортировать данные..."
#: gui/pimsettingexporterwindow.cpp:209
-#, fuzzy, kde-format
+#, kde-format
#| msgid "Restore Data..."
msgid "Import Data..."
-msgstr "Восстановить данные..."
+msgstr "Импортировать данные..."
#: gui/pimsettingexporterwindow.cpp:213
#, kde-format
@@ -914,17 +921,17 @@
#: gui/pimsettingexporterwindow.cpp:216
#, kde-format
msgid "Show Archive Structure Information..."
-msgstr ""
+msgstr "Показать информацию о структуре архива…"
#: gui/pimsettingexporterwindow.cpp:219
#, kde-format
msgid "Show Archive Information..."
-msgstr ""
+msgstr "Показать информацию об архиве…"
#: gui/pimsettingexporterwindow.cpp:222
#, kde-format
msgid "Show Information on current Archive..."
-msgstr ""
+msgstr "Показать информацию о текущем архиве…"
#: gui/pimsettingexporterwindow.cpp:260
#, kde-format
@@ -1010,14 +1017,17 @@
"additional data which will be skipped during import. Do you want to import "
"it?"
msgstr ""
+"Архив был создан более новой версией программы. Он может содержать"
+" дополнительные данные, которые будет пропущены во время импорта. Продолжить"
+" импорт?"
#: gui/pimsettingsbackuprestoreui.cpp:41
#, kde-format
msgid "Not correct version"
-msgstr ""
+msgstr "Неподдерживаемая версия"
#: gui/trayicon/pimsettingstrayicon.cpp:26
-#, fuzzy, kde-format
+#, kde-format
#| msgid "PIM Setting Exporter"
msgid "PimSettingExporter"
msgstr "Экспорт данных PIM"
@@ -1025,22 +1035,22 @@
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:33
#, kde-format
msgid "Import"
-msgstr ""
+msgstr "Импорт"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:40
#, kde-format
msgid "Always Override File"
-msgstr ""
+msgstr "Всегда заменять файл"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:44
#, kde-format
msgid "Always Override Directory"
-msgstr ""
+msgstr "Всегда заменять каталог"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:48
#, kde-format
msgid "Always Merge Config File"
-msgstr ""
+msgstr "Всегда объединять конфигурационный файл"
#: gui/widgets/selectiontypetreewidget.cpp:375
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/po/sr/pimsettingexporter.po new/pim-data-exporter-17.08.2/po/sr/pimsettingexporter.po
--- old/pim-data-exporter-17.08.1/po/sr/pimsettingexporter.po 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/po/sr/pimsettingexporter.po 2017-10-10 02:17:23.000000000 +0200
@@ -5,7 +5,7 @@
"Project-Id-Version: pimsettingexporter\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-19 05:28+0200\n"
-"PO-Revision-Date: 2017-08-25 14:46+0200\n"
+"PO-Revision-Date: 2017-09-28 18:00+0200\n"
"Last-Translator: Chusslove Illich \n"
"Language-Team: Serbian \n"
"Language: sr\n"
@@ -667,7 +667,7 @@
#: gui/dialog/backupfilestructureinfodialog.cpp:70
#, kde-format
msgid "backup-structure.txt file was not found."
-msgstr "Фајл <filename>backup-structure.txt</filename> није нађен."
+msgstr "Фајл ‘backup-structure.txt’ није нађен."
# >> @title:window
#: gui/dialog/pimsettingexporterconfiguredialog.cpp:30
@@ -887,8 +887,8 @@
"For restoring data, you must use \"pimsettingexporter\". Be careful it can "
"overwrite existing settings, data."
msgstr ""
-"За враћање података употребите <command>pimsettingexporter</command>. "
-"Пазите, може пребрисати постојеће поставке и податке."
+"За враћање података употребите pimsettingexporter. Пазите, може пребрисати "
+"постојеће поставке и податке."
# >> @title:window
#: gui/pimsettingexporterwindow.cpp:178
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/pim-data-exporter-17.08.1/po/zh_CN/pimsettingexporter.po new/pim-data-exporter-17.08.2/po/zh_CN/pimsettingexporter.po
--- old/pim-data-exporter-17.08.1/po/zh_CN/pimsettingexporter.po 2017-09-05 02:40:21.000000000 +0200
+++ new/pim-data-exporter-17.08.2/po/zh_CN/pimsettingexporter.po 2017-10-10 02:17:23.000000000 +0200
@@ -1,9 +1,13 @@
+# Copyright (C) YEAR This_file_is_part_of_KDE
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Weng Xuetian , 2013, 2015.
msgid ""
msgstr ""
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: http://bugs.kde.org\n"
"POT-Creation-Date: 2017-08-19 05:28+0200\n"
-"PO-Revision-Date: 2017-08-31 05:15-0400\n"
+"PO-Revision-Date: 2017-09-30 17:48-0400\n"
"Last-Translator: guoyunhebrave \n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
@@ -29,12 +33,12 @@
#: console/main.cpp:37 console/main.cpp:38
#, kde-format
msgid "PIM Setting Exporter Console"
-msgstr ""
+msgstr "个人信息管理设置导出器控制台"
#: console/main.cpp:39
#, kde-format
msgid "Copyright © 2015-2017 pimsettingexporter authors"
-msgstr ""
+msgstr "版权 © 2015-2017 pimsettingexporter 作者"
#: console/main.cpp:40 gui/pimsettingcommandlineoption.cpp:56
#, kde-format
@@ -49,27 +53,27 @@
#: console/main.cpp:43
#, kde-format
msgid "File to log information to."
-msgstr ""
+msgstr "记录日志信息的文件。"
#: console/main.cpp:44
#, kde-format
msgid "Template file to define what data, settings to import or export."
-msgstr ""
+msgstr "定义导入或导出数据,设置的临时文件。"
#: console/main.cpp:45
#, kde-format
msgid "Import the given file."
-msgstr ""
+msgstr "导入给定文件。"
#: console/main.cpp:46
#, kde-format
msgid "Export the given file."
-msgstr ""
+msgstr "导出给定文件。"
#: core/abstractimportexportjob.cpp:75
#, kde-format
msgid "Task Canceled"
-msgstr ""
+msgstr "任务已取消"
#: core/abstractimportexportjob.cpp:134
#, kde-format
@@ -104,7 +108,7 @@
#: core/abstractimportexportjob.cpp:334
#, kde-format
msgid "\"%1\" was restored."
-msgstr ""
+msgstr "“%1”被恢复。"
#: core/abstractimportexportjob.cpp:353 core/abstractimportexportjob.cpp:361
#: core/exportresourcearchivejob.cpp:94 core/pimsettingbackupthread.cpp:68
@@ -128,17 +132,17 @@
#: core/abstractimportexportjob.cpp:434
#, kde-format
msgid "No resources files found."
-msgstr ""
+msgstr "没有找到资源文件。"
#: core/abstractimportexportjob.cpp:477
#, kde-format
msgid "Unable to copy file"
-msgstr ""
+msgstr "无法复制文件"
#: core/abstractimportexportjob.cpp:517
#, kde-format
msgid "Resource '%1' created."
-msgstr ""
+msgstr "资源“%1”已被创建。"
#: core/abstractimportexportjob.cpp:532
#, kde-format
@@ -148,27 +152,27 @@
#: core/abstractimportexportjob.cpp:537
#, kde-format
msgid "Resource %1 synchronized."
-msgstr ""
+msgstr "资源“%1”已同步。"
#: core/abstractimportexportjob.cpp:543
#, kde-format
msgid "All resources synchronized."
-msgstr ""
+msgstr "所有资源已被同步。"
#: core/abstractimportexportjob.cpp:554
#, kde-format
msgid "Start synchronizing..."
-msgstr ""
+msgstr "开始同步..."
#: core/abstractimportexportjob.cpp:591
#, kde-format
msgid "Directory \"%1\" added to backup file."
-msgstr ""
+msgstr "目录“%1”已添加到备份文件。"
#: core/abstractimportexportjob.cpp:593
#, kde-format
msgid "Directory \"%1\" cannot be added to backup file."
-msgstr ""
+msgstr "目录“%1”无法被添加到备份文件。"
#: core/addressbook/exportaddressbookjob.cpp:46
#, kde-format
@@ -178,7 +182,7 @@
#: core/addressbook/exportaddressbookjob.cpp:47
#, kde-format
msgid "Export KAddressBook settings"
-msgstr ""
+msgstr "导出 KAddressBook 设置"
#: core/addressbook/exportaddressbookjob.cpp:59
#: core/alarm/exportalarmjob.cpp:60 core/calendar/exportcalendarjob.cpp:61
@@ -213,12 +217,12 @@
#: core/addressbook/importaddressbookjob.cpp:54
#, kde-format
msgid "Starting to import KAddressBook settings..."
-msgstr ""
+msgstr "正在开始导入 KAddressBook 设置..."
#: core/addressbook/importaddressbookjob.cpp:56
#, kde-format
msgid "Import KAddressBook settings"
-msgstr ""
+msgstr "导入 KAddressBook 设置"
#: core/addressbook/importaddressbookjob.cpp:79
#: core/addressbook/importaddressbookjob.cpp:80
@@ -237,7 +241,7 @@
#: core/notes/importnotesjob.cpp:86
#, kde-format
msgid "Restore configs..."
-msgstr ""
+msgstr "恢复配置..."
#: core/addressbook/importaddressbookjob.cpp:194
#: core/akregator/importakregatorjob.cpp:79 core/alarm/importalarmjob.cpp:170
@@ -255,7 +259,7 @@
#: core/akregator/exportakregatorjob.cpp:42
#, kde-format
msgid "Export Akregator settings"
-msgstr ""
+msgstr "导出 Akregator 设置"
#: core/akregator/exportakregatorjob.cpp:70
#: core/blogilo/exportblogilojob.cpp:67
@@ -277,24 +281,24 @@
#: core/akregator/importakregatorjob.cpp:44
#, kde-format
msgid "Starting to import Akregator settings..."
-msgstr ""
+msgstr "正在开始导入 Akregator 设置..."
#: core/akregator/importakregatorjob.cpp:47
#, kde-format
msgid "Import Akregator settings"
-msgstr ""
+msgstr "导入 Akregator 设置"
#: core/akregator/importakregatorjob.cpp:86
#: core/blogilo/importblogilojob.cpp:83 core/notes/importnotesjob.cpp:120
#, kde-format
msgid "Restore data..."
-msgstr ""
+msgstr "恢复数据..."
#: core/akregator/importakregatorjob.cpp:92
#: core/blogilo/importblogilojob.cpp:89 core/notes/importnotesjob.cpp:133
#, kde-format
msgid "Data restored."
-msgstr ""
+msgstr "数据已恢复。"
#: core/alarm/exportalarmjob.cpp:47
#, kde-format
@@ -304,17 +308,17 @@
#: core/alarm/exportalarmjob.cpp:48
#, kde-format
msgid "Export KAlarm settings"
-msgstr ""
+msgstr "导出 KAlarm 设置"
#: core/alarm/importalarmjob.cpp:55
#, kde-format
msgid "Starting to import KAlarm settings..."
-msgstr ""
+msgstr "正在开始导入 KAlarm 设置..."
#: core/alarm/importalarmjob.cpp:56
#, kde-format
msgid "Import KAlarm settings"
-msgstr ""
+msgstr "导入 KAlarm 设置"
#: core/archivestorage.cpp:57
#, kde-format
@@ -335,17 +339,17 @@
#: core/blogilo/exportblogilojob.cpp:42
#, kde-format
msgid "Export Blogilo settings"
-msgstr ""
+msgstr "导出 Blogilo 设置"
#: core/blogilo/importblogilojob.cpp:44
#, kde-format
msgid "Starting to import Blogilo settings..."
-msgstr ""
+msgstr "正在开始导入 Blogilo 设置..."
#: core/blogilo/importblogilojob.cpp:45
#, kde-format
msgid "Import Blogilo settings"
-msgstr ""
+msgstr "导入 Blogilo 设置"
#: core/calendar/exportcalendarjob.cpp:48
#, kde-format
@@ -355,27 +359,27 @@
#: core/calendar/exportcalendarjob.cpp:49
#, kde-format
msgid "Export KOrganizer settings"
-msgstr ""
+msgstr "导出 KOrganizer 设置"
#: core/calendar/importcalendarjob.cpp:58
#, kde-format
msgid "Starting to import KOrganizer settings..."
-msgstr ""
+msgstr "正在开始导出 KOrganizer 设置..."
#: core/calendar/importcalendarjob.cpp:60
#, kde-format
msgid "Import KOrganizer settings"
-msgstr ""
+msgstr "导入 KOrganizer 设置"
#: core/mail/exportmailjob.cpp:66
#, kde-format
msgid "Start export KMail settings..."
-msgstr ""
+msgstr "开始导出 KMail 设置..."
#: core/mail/exportmailjob.cpp:67
#, kde-format
msgid "Export KMail settings"
-msgstr ""
+msgstr "导出 KMail 设置"
#: core/mail/exportmailjob.cpp:126
#, kde-format
@@ -385,17 +389,17 @@
#: core/mail/exportmailjob.cpp:200
#, kde-format
msgid "Backing up transports..."
-msgstr ""
+msgstr "正在备份传输..."
#: core/mail/exportmailjob.cpp:205 core/mail/exportmailjob.cpp:217
#, kde-format
msgid "Transports backup done."
-msgstr ""
+msgstr "传输备份完成。"
#: core/mail/exportmailjob.cpp:219
#, kde-format
msgid "Transport file cannot be added to backup file."
-msgstr ""
+msgstr "传输文件无法被添加到备份文件中。"
#: core/mail/exportmailjob.cpp:280
#, kde-format
@@ -415,7 +419,7 @@
#: core/mail/exportmailjob.cpp:574
#, kde-format
msgid "vCard file \"%1\" cannot be saved."
-msgstr ""
+msgstr "vCard 文件“%1”无法被保存。"
#: core/mail/exportmailjob.cpp:587
#, kde-format
@@ -425,37 +429,37 @@
#: core/mail/exportmailjob.cpp:589
#, kde-format
msgid "Identity file cannot be added to backup file."
-msgstr ""
+msgstr "标识文件无法被添加到备份文件中。"
#: core/mail/importmailjob.cpp:73
#, kde-format
msgid "Starting to import KMail settings..."
-msgstr ""
+msgstr "正在开始导入 KMail 设置..."
#: core/mail/importmailjob.cpp:74
#, kde-format
msgid "Import KMail settings"
-msgstr ""
+msgstr "导入 KMail 设置"
#: core/mail/importmailjob.cpp:163 core/mail/importmailjob.cpp:169
#, kde-format
msgid "Restore transports..."
-msgstr ""
+msgstr "恢复传输..."
#: core/mail/importmailjob.cpp:167
#, kde-format
msgid "mailtransports file could not be found in the archive."
-msgstr ""
+msgstr "无法在归档中找到邮件传输文件。"
#: core/mail/importmailjob.cpp:247
#, kde-format
msgid "Transports restored."
-msgstr ""
+msgstr "传输已恢复。"
#: core/mail/importmailjob.cpp:249
#, kde-format
msgid "Failed to restore transports file."
-msgstr ""
+msgstr "恢复传输文件失败。"
#: core/mail/importmailjob.cpp:469 core/mail/importmailjob.cpp:471
#, kde-format
@@ -470,7 +474,7 @@
#: core/mail/importmailjob.cpp:591
#, kde-format
msgid "Restore config..."
-msgstr ""
+msgstr "恢复配置..."
#: core/mail/importmailjob.cpp:594
#, kde-format
@@ -480,7 +484,7 @@
#: core/mail/importmailjob.cpp:875 core/mail/importmailjob.cpp:880
#, kde-format
msgid "Restoring identities..."
-msgstr ""
+msgstr "正在恢复身份..."
#: core/mail/importmailjob.cpp:878
#, kde-format
@@ -505,62 +509,62 @@
#: core/notes/exportnotesjob.cpp:47
#, kde-format
msgid "Export KNotes settings"
-msgstr ""
+msgstr "导出 KNotes 设置"
#: core/notes/importnotesjob.cpp:75
#, kde-format
msgid "Starting to import KNotes settings..."
-msgstr ""
+msgstr "正在开始导入 KNotes 设置..."
#: core/notes/importnotesjob.cpp:78
#, kde-format
msgid "Import KNotes settings"
-msgstr ""
+msgstr "导入 Knotes 设置"
#: core/pimsettingbackupthread.cpp:51
#, kde-format
msgid "Impossible to open archive file."
-msgstr ""
+msgstr "不可能打开归档文件。"
#: core/pimsettingbackupthread.cpp:58
#, kde-format
msgid "Impossible to backup \"%1\"."
-msgstr ""
+msgstr "无法备份“%1”。"
#: core/pimsettingsbackuprestore.cpp:98 core/pimsettingsbackuprestore.cpp:283
#, kde-format
msgid "No data selected."
-msgstr ""
+msgstr "未选中数据。"
#: core/pimsettingsbackuprestore.cpp:104 core/pimsettingsbackuprestore.cpp:289
#, kde-format
msgid "Unable to open file \"%1\"."
-msgstr ""
+msgstr "无法打开文件“%1”。"
#: core/pimsettingsbackuprestore.cpp:113
#, kde-format
msgid "Starting to backup data in '%1'"
-msgstr ""
+msgstr "正在开始备份“%1”中的数据。"
#: core/pimsettingsbackuprestore.cpp:207
#, kde-format
msgid "Backup in '%1' done."
-msgstr ""
+msgstr "在“%1”中的备份完成。"
#: core/pimsettingsbackuprestore.cpp:308
#, kde-format
msgid "Starting to restore data from '%1'"
-msgstr ""
+msgstr "正在开始从“%1”恢复数据"
#: core/pimsettingsbackuprestore.cpp:316
#, kde-format
msgid "Restoring data from '%1' done."
-msgstr ""
+msgstr "从“%1”恢复数据完成。"
#: core/utils.cpp:262 core/utils.cpp:270
#, kde-format
msgid "Resource file \"%1\" cannot be added to backup file."
-msgstr ""
+msgstr "资源文件“%1”无法被添加到备份文件。"
#: core/utils.cpp:337
#, kde-format
@@ -645,7 +649,7 @@
#: gui/dialog/pimsettingexporterconfiguredialog.cpp:30
#, kde-format
msgid "Configure PimSettingExporter"
-msgstr ""
+msgstr "配置 PimSettingExporter"
#: gui/dialog/selectiontypedialog.cpp:35
#, kde-format
@@ -655,7 +659,7 @@
#: gui/dialog/selectiontypedialog.cpp:53
#, kde-format
msgid "Use this template by default"
-msgstr ""
+msgstr "默认使用此模板"
#: gui/dialog/selectiontypedialog.cpp:58
#: gui/dialog/synchronizeresourcedialog.cpp:53
@@ -682,7 +686,7 @@
#: gui/dialog/showarchivestructuredialog.cpp:42
#, kde-format
msgid "Show Archive Content on file \"%1\""
-msgstr ""
+msgstr "显示文件“%1”上的归档内容"
#: gui/dialog/showarchivestructuredialog.cpp:51
#, kde-format
@@ -698,13 +702,13 @@
#, kde-format
msgctxt "qfiledialog filter files text"
msgid "Text Files"
-msgstr ""
+msgstr "文本文件"
#: gui/dialog/showarchivestructuredialog.cpp:78
#, kde-format
msgctxt "@title:window"
msgid "Export Log File"
-msgstr ""
+msgstr "导出日志文件"
#: gui/dialog/showarchivestructuredialog.cpp:86
#, kde-format
@@ -729,14 +733,14 @@
#: gui/dialog/synchronizeresourcedialog.cpp:35
#, kde-format
msgid "Synchronize Resources"
-msgstr ""
+msgstr "同步资源"
#: gui/dialog/synchronizeresourcedialog.cpp:38
#, kde-format
msgid ""
"Some resources were added but data were not sync. Select resources that you "
"want to sync:"
-msgstr ""
+msgstr "一些资源被添加了但是数据尚未同步。请选择您要同步的资源:"
#: gui/importexportprogressindicatorgui.cpp:49
#: gui/job/fullsynchronizeresourcesjob.cpp:56
@@ -774,12 +778,12 @@
#: gui/job/fullsynchronizeresourcesjob.cpp:58
#, kde-format
msgid "Synchronize resources"
-msgstr ""
+msgstr "同步资源"
#: gui/job/fullsynchronizeresourcesjob.cpp:59
#, kde-format
msgid "Synchronize resources... It can take some time."
-msgstr ""
+msgstr "同步资源... 可能需要一些时间。"
#: gui/pimsettingcommandlineoption.cpp:53
#: gui/pimsettingcommandlineoption.cpp:54
@@ -790,12 +794,12 @@
#: gui/pimsettingcommandlineoption.cpp:55
#, kde-format
msgid "Copyright © 2012-2017 pimsettingexporter authors"
-msgstr ""
+msgstr "版权 © 2012-2017 pimsettingexporter 作者"
#: gui/pimsettingcommandlineoption.cpp:59
#, kde-format
msgid "Template file uses to define what data, settings to import or export"
-msgstr ""
+msgstr "定义导入或导出数据,设置的临时文件"
#: gui/pimsettingcommandlineoption.cpp:60
#, kde-format
@@ -805,12 +809,12 @@
#: gui/pimsettingcommandlineoption.cpp:61
#, kde-format
msgid "Export the given file"
-msgstr ""
+msgstr "导出给定文件"
#: gui/pimsettingcommandlineoption.cpp:62
#, kde-format
msgid "File or url. The user will be asked whether to import or export."
-msgstr ""
+msgstr "文件或链接。用户将被询问是否要导入或导出。"
#. i18n: ectx: Menu (file)
#: gui/pimsettingexporter.rc:4
@@ -827,22 +831,22 @@
#: gui/pimsettingexporterwindow.cpp:138
#, kde-format
msgid "Full sync starts..."
-msgstr ""
+msgstr "完整同步开始..."
#: gui/pimsettingexporterwindow.cpp:160
#, kde-format
msgid "Full sync finished."
-msgstr ""
+msgstr "完成同步完成。"
#: gui/pimsettingexporterwindow.cpp:168
#, kde-format
msgid "Full sync for \"%1\" done."
-msgstr ""
+msgstr "“%1”的完整同步完成。"
#: gui/pimsettingexporterwindow.cpp:173
#, kde-format
msgid "Full sync for \"%1\" failed."
-msgstr ""
+msgstr "“%1”的完整同步失败。"
#: gui/pimsettingexporterwindow.cpp:178
#, kde-format
@@ -850,6 +854,8 @@
"For restoring data, you must use \"pimsettingexporter\". Be careful it can "
"overwrite existing settings, data."
msgstr ""
+"为了恢复数据,您必须使用 pimsettingexporter。请额外小心,它可能会覆盖现有的设"
+"置和数据。"
#: gui/pimsettingexporterwindow.cpp:178
#, kde-format
@@ -859,12 +865,12 @@
#: gui/pimsettingexporterwindow.cpp:205
#, kde-format
msgid "Export Data..."
-msgstr ""
+msgstr "导出数据..."
#: gui/pimsettingexporterwindow.cpp:209
#, kde-format
msgid "Import Data..."
-msgstr ""
+msgstr "导入数据..."
#: gui/pimsettingexporterwindow.cpp:213
#, kde-format
@@ -874,17 +880,17 @@
#: gui/pimsettingexporterwindow.cpp:216
#, kde-format
msgid "Show Archive Structure Information..."
-msgstr ""
+msgstr "显示存档结构信息..."
#: gui/pimsettingexporterwindow.cpp:219
#, kde-format
msgid "Show Archive Information..."
-msgstr ""
+msgstr "显示存档信息..."
#: gui/pimsettingexporterwindow.cpp:222
#, kde-format
msgid "Show Information on current Archive..."
-msgstr ""
+msgstr "显示当前的归档的信息..."
#: gui/pimsettingexporterwindow.cpp:260
#, kde-format
@@ -894,7 +900,7 @@
#: gui/pimsettingexporterwindow.cpp:260 gui/pimsettingexporterwindow.cpp:305
#, kde-format
msgid "Zip file (*.zip)"
-msgstr ""
+msgstr "Zip 文件 (*.zip)"
#: gui/pimsettingexporterwindow.cpp:273
#, kde-format
@@ -909,13 +915,13 @@
#: gui/pimsettingexporterwindow.cpp:277
#, kde-format
msgid "HTML Files (*.html)"
-msgstr ""
+msgstr "HTML 文件 (*.html)"
#: gui/pimsettingexporterwindow.cpp:283
#, kde-format
msgid ""
"Before backing up data, it is recommended to quit all kdepim applications."
-msgstr ""
+msgstr "在备份数据之前,建议您退出所有 KDE PIM 应用程序。"
#: gui/pimsettingexporterwindow.cpp:283 gui/pimsettingexporterwindow.cpp:356
#, kde-format
@@ -930,14 +936,14 @@
#: gui/pimsettingexporterwindow.cpp:315
#, kde-format
msgid "Backup in progress..."
-msgstr ""
+msgstr "正在进行备份..."
#: gui/pimsettingexporterwindow.cpp:356
#, kde-format
msgid ""
"Before to restore data, close all kdepim applications. Do you want to "
"continue?"
-msgstr ""
+msgstr "在恢复数据之前,请关闭所有 KDE PIM 应用程序。您想继续吗?"
#: gui/pimsettingexporterwindow.cpp:364
#, kde-format
@@ -947,12 +953,12 @@
#: gui/pimsettingexporterwindow.cpp:366
#, kde-format
msgid "Zip File (*.zip)"
-msgstr ""
+msgstr "Zip 文件 (*.zip)"
#: gui/pimsettingexporterwindow.cpp:398
#, kde-format
msgid "Restore in progress..."
-msgstr ""
+msgstr "正在还原..."
#: gui/pimsettingsbackuprestoreui.cpp:40
#, kde-format
@@ -961,6 +967,8 @@
"additional data which will be skipped during import. Do you want to import "
"it?"
msgstr ""
+"归档是由新版本的程序生成的。它可能包含额外数据,在导入时将被跳过。您确定要导"
+"入吗?"
#: gui/pimsettingsbackuprestoreui.cpp:41
#, kde-format
@@ -970,7 +978,7 @@
#: gui/trayicon/pimsettingstrayicon.cpp:26
#, kde-format
msgid "PimSettingExporter"
-msgstr ""
+msgstr "PimSettingExporter"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:33
#, kde-format
@@ -980,19 +988,19 @@
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:40
#, kde-format
msgid "Always Override File"
-msgstr ""
+msgstr "总是覆盖文件"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:44
#, kde-format
msgid "Always Override Directory"
-msgstr ""
+msgstr "总是覆盖目录"
#: gui/widgets/pimsettingexporterconfigurewidget.cpp:48
#, kde-format
msgid "Always Merge Config File"
-msgstr ""
+msgstr "总是合并配置文件"
#: gui/widgets/selectiontypetreewidget.cpp:375
#, kde-format
msgid "Template Files (*.xml)"
-msgstr ""
+msgstr "模板文件 (*.xml)"