Merge translation files from master branch.

1 files changed, 26 insertions, 26 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index f9e4208db08..7c8a82e5417 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2020-08-19 23:01+0200\n"
+"POT-Creation-Date: 2020-09-02 23:02+0200\n"
 "PO-Revision-Date: 2006-04-30 16:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -1764,31 +1764,31 @@ msgstr "TDE 守护进程"
 msgid "TDE Daemon - triggers Sycoca database updates when needed"
 msgstr "TDE 守护进程 - 在需要的时候触发 Sycoca 数据库的更新"
 
-#: kded/khostname.cpp:41
+#: kded/khostname.cpp:43
 msgid "Old hostname"
 msgstr "旧主机名"
 
-#: kded/khostname.cpp:42
+#: kded/khostname.cpp:44
 msgid "New hostname"
 msgstr "新主机名"
 
-#: kded/khostname.cpp:79
+#: kded/khostname.cpp:81
 msgid "Error: HOME environment variable not set.\n"
 msgstr "错误：没有设置 HOME 环境变量。\n"
 
-#: kded/khostname.cpp:88
+#: kded/khostname.cpp:90
 msgid "Error: DISPLAY environment variable not set.\n"
 msgstr "错误：没有设置 DISPLAY 环境变量。\n"
 
-#: kded/khostname.cpp:369
+#: kded/khostname.cpp:371
 msgid "KDontChangeTheHostName"
 msgstr "KDontChangeTheHostName"
 
-#: kded/khostname.cpp:370
+#: kded/khostname.cpp:372
 msgid "Informs TDE about a change in hostname"
 msgstr "通知 TDE 主机名更改"
 
-#: kded/khostname.cpp:372 kded/tde-menu.cpp:119 kded/tdebuildsycoca.cpp:724
+#: kded/khostname.cpp:374 kded/tde-menu.cpp:119 kded/tdebuildsycoca.cpp:724
 #: kded/tdebuildsycoca.cpp:725 tdeui/tdeaboutdialog.cpp:90
 msgid "Author"
 msgstr "作者"
@@ -7606,74 +7606,74 @@ msgstr "自动检测"
 msgid "Synchronize on logout"
 msgstr ""
 
-#: tdersync/tdersync.cpp:468 tdersync/tdersync.cpp:516
-#: tdersync/tdersync.cpp:583 tdersync/tdersync.cpp:592
-#: tdersync/tdersync.cpp:645 tdersync/tdersync.cpp:658
-#: tdersync/tdersync.cpp:966
+#: tdersync/tdersync.cpp:470 tdersync/tdersync.cpp:518
+#: tdersync/tdersync.cpp:585 tdersync/tdersync.cpp:594
+#: tdersync/tdersync.cpp:647 tdersync/tdersync.cpp:660
+#: tdersync/tdersync.cpp:968
 msgid "Remote Folder Synchronization"
 msgstr ""
 
-#: tdersync/tdersync.cpp:475 tdersync/tdersync.cpp:599
+#: tdersync/tdersync.cpp:477 tdersync/tdersync.cpp:601
 msgid "Synchronizing Folder..."
 msgstr ""
 
-#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#: tdersync/tdersync.cpp:503 tdersync/tdersync.cpp:626
 #, fuzzy
 msgid "Remote authorization required"
 msgstr "需要确认"
 
-#: tdersync/tdersync.cpp:501 tdersync/tdersync.cpp:624
+#: tdersync/tdersync.cpp:503 tdersync/tdersync.cpp:626
 #, fuzzy
 msgid "Please input"
 msgstr "清除输入"
 
-#: tdersync/tdersync.cpp:587
+#: tdersync/tdersync.cpp:589
 msgid "An error ocurred on the remote system"
 msgstr ""
 
-#: tdersync/tdersync.cpp:687
+#: tdersync/tdersync.cpp:689
 #, fuzzy
 msgid "User Intervention Required"
 msgstr "需要确认"
 
-#: tdersync/tdersync.cpp:687
+#: tdersync/tdersync.cpp:689
 #, fuzzy
 msgid "Use &Local File"
 msgstr "打开文件"
 
-#: tdersync/tdersync.cpp:687
+#: tdersync/tdersync.cpp:689
 msgid "Use &Remote File"
 msgstr ""
 
-#: tdersync/tdersync.cpp:687 tdespell2/ui/tdespell2ui.ui:254
+#: tdersync/tdersync.cpp:689 tdespell2/ui/tdespell2ui.ui:254
 #: tdeui/tdespellui.ui:209
 #, no-c-format
 msgid "&Ignore"
 msgstr "忽略(&I)"
 
-#: tdersync/tdersync.cpp:694
+#: tdersync/tdersync.cpp:696
 msgid "WARNING: Both the local and remote file have been modified"
 msgstr ""
 
-#: tdersync/tdersync.cpp:694
+#: tdersync/tdersync.cpp:696
 #, fuzzy
 msgid "Local"
 msgstr "位置"
 
-#: tdersync/tdersync.cpp:694
+#: tdersync/tdersync.cpp:696
 #, fuzzy
 msgid "Remote"
 msgstr "删除"
 
-#: tdersync/tdersync.cpp:694
+#: tdersync/tdersync.cpp:696
 msgid "Please select the file to duplicate (the other will be overwritten)"
 msgstr ""
 
-#: tdersync/tdersync.cpp:694
+#: tdersync/tdersync.cpp:696
 msgid "Or, select Ignore to skip synchronization of this file for now"
 msgstr ""
 
-#: tdersync/tdersync.cpp:966
+#: tdersync/tdersync.cpp:968
 msgid "Configuring Remote Folder Synchronization"
 msgstr ""