Merge translation files from master branch.

3 files changed, 106 insertions, 83 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index fd46d54402d..f83a4858ca8 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-07-21 21:14+0200\n"
+"POT-Creation-Date: 2020-02-03 00:48+0100\n"
 "PO-Revision-Date: 2005-06-10 18:14+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -153,7 +153,7 @@ msgid "Quick Actions"
 msgstr "快速动作"
 
 #: ../tdeioslave/http/kcookiejar/kcookiewin.cpp:270
-#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:4030
+#: bookmarks/kbookmarkmenu.cc:791 tdefile/kpropertiesdialog.cpp:4011
 #: tdeio/tdefileitem.cpp:948
 msgid "Name:"
 msgstr "名称："
@@ -163,7 +163,7 @@ msgstr "名称："
 msgid "Location:"
 msgstr "位置："
 
-#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3316
+#: bookmarks/kbookmarkmenu.cc:829 tdefile/kpropertiesdialog.cpp:3297
 msgid "&Add"
 msgstr "添加(&A)"
 
@@ -1168,7 +1168,7 @@ msgid "O&ther icons:"
 msgstr "其它图标(&T)："
 
 #: tdefile/kicondialog.cpp:283 tdefile/kpropertiesdesktopbase.ui:213
-#: tdefile/kpropertiesdialog.cpp:3715
+#: tdefile/kpropertiesdialog.cpp:3696
 #, no-c-format
 msgid "&Browse..."
 msgstr "浏览(&B)..."
@@ -1526,12 +1526,12 @@ msgstr "访问时间："
 msgid "Mounted on:"
 msgstr "挂载点："
 
-#: tdefile/kpropertiesdialog.cpp:1106 tdefile/kpropertiesdialog.cpp:2968
+#: tdefile/kpropertiesdialog.cpp:1106 tdefile/kpropertiesdialog.cpp:2949
 msgid "Free disk space:"
 msgstr "剩余磁盘空间："
 
 #: tdefile/kpropertiesdialog.cpp:1213 tdefile/kpropertiesdialog.cpp:1228
-#: tdefile/kpropertiesdialog.cpp:3128
+#: tdefile/kpropertiesdialog.cpp:3109
 #, no-c-format
 msgid ""
 "_: Available space out of total partition size (percent used)\n"
@@ -1572,10 +1572,10 @@ msgstr "已停止"
 msgid "The new file name is empty."
 msgstr "新文件名称为空。"
 
-#: tdefile/kpropertiesdialog.cpp:1489 tdefile/kpropertiesdialog.cpp:2685
-#: tdefile/kpropertiesdialog.cpp:2701 tdefile/kpropertiesdialog.cpp:2858
-#: tdefile/kpropertiesdialog.cpp:3156 tdefile/kpropertiesdialog.cpp:3440
-#: tdefile/kpropertiesdialog.cpp:3936 tdefile/kpropertiesdialog.cpp:4179
+#: tdefile/kpropertiesdialog.cpp:1489 tdefile/kpropertiesdialog.cpp:2682
+#: tdefile/kpropertiesdialog.cpp:2839 tdefile/kpropertiesdialog.cpp:3137
+#: tdefile/kpropertiesdialog.cpp:3421 tdefile/kpropertiesdialog.cpp:3917
+#: tdefile/kpropertiesdialog.cpp:4160
 msgid ""
 "<qt>Could not save properties. You do not have sufficient access to write to "
 "<b>%1</b>.</qt>"
@@ -1873,91 +1873,91 @@ msgstr "这些文件使用了高级权限。"
 msgid "U&RL"
 msgstr "U&RL"
 
-#: tdefile/kpropertiesdialog.cpp:2745
+#: tdefile/kpropertiesdialog.cpp:2726
 msgid "A&ssociation"
 msgstr "关联(&S)"
 
-#: tdefile/kpropertiesdialog.cpp:2754
+#: tdefile/kpropertiesdialog.cpp:2735
 msgid "Pattern ( example: *.html;*.htm )"
 msgstr "模式 (例如：*.html;*.htm)"
 
-#: tdefile/kpropertiesdialog.cpp:2766 tdeio/kmimetypechooser.cpp:75
+#: tdefile/kpropertiesdialog.cpp:2747 tdeio/kmimetypechooser.cpp:75
 msgid "Mime Type"
 msgstr "MIME 类型"
 
-#: tdefile/kpropertiesdialog.cpp:2777 tdeio/kmimetypechooser.cpp:80
+#: tdefile/kpropertiesdialog.cpp:2758 tdeio/kmimetypechooser.cpp:80
 msgid "Comment"
 msgstr "备注"
 
-#: tdefile/kpropertiesdialog.cpp:2787
+#: tdefile/kpropertiesdialog.cpp:2768
 msgid "Left click previews"
 msgstr "左键单击预览"
 
-#: tdefile/kpropertiesdialog.cpp:2906
+#: tdefile/kpropertiesdialog.cpp:2887
 msgid "De&vice"
 msgstr "设备(&V)"
 
-#: tdefile/kpropertiesdialog.cpp:2936
+#: tdefile/kpropertiesdialog.cpp:2917
 msgid "Device (/dev/fd0):"
 msgstr "设备 (/dev/fd0)："
 
-#: tdefile/kpropertiesdialog.cpp:2937
+#: tdefile/kpropertiesdialog.cpp:2918
 msgid "Device:"
 msgstr "设备："
 
-#: tdefile/kpropertiesdialog.cpp:2947
+#: tdefile/kpropertiesdialog.cpp:2928
 msgid "Read only"
 msgstr "只读"
 
-#: tdefile/kpropertiesdialog.cpp:2951
+#: tdefile/kpropertiesdialog.cpp:2932
 msgid "File system:"
 msgstr "文件系统："
 
-#: tdefile/kpropertiesdialog.cpp:2959
+#: tdefile/kpropertiesdialog.cpp:2940
 msgid "Mount point (/mnt/floppy):"
 msgstr "挂载点 (/mnt/floppy)："
 
-#: tdefile/kpropertiesdialog.cpp:2960
+#: tdefile/kpropertiesdialog.cpp:2941
 msgid "Mount point:"
 msgstr "挂载点："
 
-#: tdefile/kpropertiesdialog.cpp:2991
+#: tdefile/kpropertiesdialog.cpp:2972
 msgid "Unmounted Icon"
 msgstr "设备卸载后图标"
 
-#: tdefile/kpropertiesdialog.cpp:3188 tdefile/kpropertiesdialog.cpp:3996
+#: tdefile/kpropertiesdialog.cpp:3169 tdefile/kpropertiesdialog.cpp:3977
 msgid "&Application"
 msgstr "应用程序(&A)"
 
-#: tdefile/kpropertiesdialog.cpp:3313
+#: tdefile/kpropertiesdialog.cpp:3294
 #, c-format
 msgid "Add File Type for %1"
 msgstr "为 %1 添加文件类型"
 
-#: tdefile/kpropertiesdialog.cpp:3317 tdefile/kpropertiesdialog.cpp:3318
+#: tdefile/kpropertiesdialog.cpp:3298 tdefile/kpropertiesdialog.cpp:3299
 msgid ""
 "Add the selected file types to\n"
 "the list of supported file types."
 msgstr "将选中的文件类型添加到支持的文件类型中。"
 
-#: tdefile/kpropertiesdialog.cpp:3512 tdefile/kpropertiesdialog.cpp:3968
+#: tdefile/kpropertiesdialog.cpp:3493 tdefile/kpropertiesdialog.cpp:3949
 msgid "Only executables on local file systems are supported."
 msgstr "只支持本地文件系统上的可执行文件。"
 
-#: tdefile/kpropertiesdialog.cpp:3524
+#: tdefile/kpropertiesdialog.cpp:3505
 #, c-format
 msgid "Advanced Options for %1"
 msgstr "%1 的高级选项"
 
-#: tdefile/kpropertiesdialog.cpp:3683
+#: tdefile/kpropertiesdialog.cpp:3664
 msgid "E&xecute"
 msgstr "执行(&X)"
 
-#: tdefile/kpropertiesdialog.cpp:3690
+#: tdefile/kpropertiesdialog.cpp:3671
 msgid "Comman&d:"
 msgstr "命令(&D)："
 
-#: tdefile/kpropertiesdialog.cpp:3699
+#: tdefile/kpropertiesdialog.cpp:3680
 msgid ""
 "Following the command, you can have several place holders which will be "
 "replaced with the actual values when the actual program is run:\n"
@@ -1983,53 +1983,53 @@ msgstr ""
 "%m - 小图标\n"
 "%c - 标题"
 
-#: tdefile/kpropertiesdialog.cpp:3720
+#: tdefile/kpropertiesdialog.cpp:3701
 msgid "Panel Embedding"
 msgstr "面板嵌入"
 
-#: tdefile/kpropertiesdialog.cpp:3729
+#: tdefile/kpropertiesdialog.cpp:3710
 msgid "&Execute on click:"
 msgstr "在单击时执行(&E)："
 
-#: tdefile/kpropertiesdialog.cpp:3737
+#: tdefile/kpropertiesdialog.cpp:3718
 msgid "&Window title:"
 msgstr "窗口标题(&W)："
 
-#: tdefile/kpropertiesdesktopadvbase.ui:55 tdefile/kpropertiesdialog.cpp:3757
+#: tdefile/kpropertiesdesktopadvbase.ui:55 tdefile/kpropertiesdialog.cpp:3738
 #, no-c-format
 msgid "&Run in terminal"
 msgstr "在终端中运行(&R)"
 
-#: tdefile/kpropertiesdesktopadvbase.ui:77 tdefile/kpropertiesdialog.cpp:3772
+#: tdefile/kpropertiesdesktopadvbase.ui:77 tdefile/kpropertiesdialog.cpp:3753
 #, no-c-format
 msgid "Do not &close when command exits"
 msgstr "命令退出时不关闭(&C)"
 
-#: tdefile/kpropertiesdesktopadvbase.ui:66 tdefile/kpropertiesdialog.cpp:3776
+#: tdefile/kpropertiesdesktopadvbase.ui:66 tdefile/kpropertiesdialog.cpp:3757
 #, no-c-format
 msgid "&Terminal options:"
 msgstr "终端选项(&T)："
 
-#: tdefile/kpropertiesdesktopadvbase.ui:106 tdefile/kpropertiesdialog.cpp:3796
+#: tdefile/kpropertiesdesktopadvbase.ui:106 tdefile/kpropertiesdialog.cpp:3777
 #, no-c-format
 msgid "Ru&n as a different user"
 msgstr "以不同的用户运行(&N)"
 
-#: tdefile/kpropertiesdesktopadvbase.ui:134 tdefile/kpropertiesdialog.cpp:3799
+#: tdefile/kpropertiesdesktopadvbase.ui:134 tdefile/kpropertiesdialog.cpp:3780
 #: tdeio/passdlg.cpp:108
 #, no-c-format
 msgid "&Username:"
 msgstr "用户名(&U)："
 
-#: tdefile/kpropertiesdialog.cpp:4037
+#: tdefile/kpropertiesdialog.cpp:4018
 msgid "Description:"
 msgstr "描述："
 
-#: tdefile/kpropertiesdialog.cpp:4043
+#: tdefile/kpropertiesdialog.cpp:4024
 msgid "Comment:"
 msgstr "注释："
 
-#: tdefile/kpropertiesdialog.cpp:4049
+#: tdefile/kpropertiesdialog.cpp:4030
 msgid "File types:"
 msgstr "文件类型："
 
@@ -2225,7 +2225,7 @@ msgstr "简要视图"
 msgid "Parent Folder"
 msgstr "父文件夹"
 
-#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:60
+#: tdefile/tdediroperator.cpp:1264 tdefile/tdefilespeedbar.cpp:47
 msgid "Home Folder"
 msgstr "主文件夹"
 
@@ -2636,45 +2636,45 @@ msgstr ""
 "试图取消文件夹“%1”的共享时发生了错误。请确定 Perl 脚本“fileshareset”已设置了 "
 "suid root。"
 
-#: tdefile/tdefilespeedbar.cpp:49
+#: tdefile/tdefilespeedbar.cpp:48
 msgid "Desktop"
 msgstr "桌面"
 
-#: tdefile/tdefilespeedbar.cpp:56
+#: tdefile/tdefilespeedbar.cpp:49
 msgid "Documents"
 msgstr "文档"
 
-#: tdefile/tdefilespeedbar.cpp:65
-msgid "Storage Media"
-msgstr "存储介质"
-
-#: tdefile/tdefilespeedbar.cpp:100
+#: tdefile/tdefilespeedbar.cpp:50
 msgid "Downloads"
 msgstr ""
 
-#: tdefile/tdefilespeedbar.cpp:102
+#: tdefile/tdefilespeedbar.cpp:51
 msgid "Music"
 msgstr ""
 
-#: tdefile/tdefilespeedbar.cpp:104
+#: tdefile/tdefilespeedbar.cpp:52
 #, fuzzy
 msgid "Pictures"
 msgstr "全部图片"
 
-#: tdefile/tdefilespeedbar.cpp:106
-msgid "Videos"
-msgstr ""
+#: tdefile/tdefilespeedbar.cpp:53
+#, fuzzy
+msgid "Public"
+msgstr "公钥："
 
-#: tdefile/tdefilespeedbar.cpp:108
+#: tdefile/tdefilespeedbar.cpp:54
 msgid "Templates"
 msgstr ""
 
-#: tdefile/tdefilespeedbar.cpp:110
-#, fuzzy
-msgid "Public"
-msgstr "公钥："
+#: tdefile/tdefilespeedbar.cpp:55
+msgid "Videos"
+msgstr ""
+
+#: tdefile/tdefilespeedbar.cpp:60
+msgid "Storage Media"
+msgstr "存储介质"
 
-#: tdefile/tdefilespeedbar.cpp:115
+#: tdefile/tdefilespeedbar.cpp:66
 msgid "Network Folders"
 msgstr "网络文件夹"
 
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index dcea0f5c0d5..a2dd311e98b 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-01-27 03:46+0100\n"
+"POT-Creation-Date: 2020-02-03 00:45+0100\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"
@@ -2540,7 +2540,7 @@ msgstr "个人"
 msgid "Undefined"
 msgstr "未定义"
 
-#: tdeabc/secrecy.cpp:71
+#: tdeabc/secrecy.cpp:71 tdecore/tdeglobalsettings.cpp:164
 msgid "Public"
 msgstr "公共"
 
@@ -4297,7 +4297,38 @@ msgstr "配置文件“%1”不可写。\n"
 msgid "Please contact your system administrator."
 msgstr "请联系您的系统管理员。"
 
-#: tdecore/tdeglobalsettings.cpp:587
+#: tdecore/tdeglobalsettings.cpp:144
+#, fuzzy
+msgid "Desktop"
+msgstr "桌面 %1"
+
+#: tdecore/tdeglobalsettings.cpp:148
+#, fuzzy
+msgid "Documents"
+msgstr "备注"
+
+#: tdecore/tdeglobalsettings.cpp:152 tdenewstuff/downloaddialog.cpp:290
+msgid "Downloads"
+msgstr "下载数"
+
+#: tdecore/tdeglobalsettings.cpp:156
+msgid "Music"
+msgstr ""
+
+#: tdecore/tdeglobalsettings.cpp:160
+msgid "Pictures"
+msgstr ""
+
+#: tdecore/tde-config.cpp.cmake:186 tdecore/tdeglobalsettings.cpp:168
+msgid "Templates"
+msgstr "模板"
+
+#: tdecore/tdeglobalsettings.cpp:172
+#, fuzzy
+msgid "Videos"
+msgstr "视频"
+
+#: tdecore/tdeglobalsettings.cpp:657
 msgid "Trash"
 msgstr "回收站"
 
@@ -6818,10 +6849,6 @@ msgstr "最新"
 msgid "Rating"
 msgstr "评分"
 
-#: tdenewstuff/downloaddialog.cpp:290
-msgid "Downloads"
-msgstr "下载数"
-
 #: tdenewstuff/downloaddialog.cpp:296
 msgid "Release Date"
 msgstr "放出日期"
@@ -10460,10 +10487,6 @@ msgstr "服务类型"
 msgid "Application sounds"
 msgstr "应用程序声音"
 
-#: tdecore/tde-config.cpp.cmake:186
-msgid "Templates"
-msgstr "模板"
-
 #: tdecore/tde-config.cpp.cmake:187
 msgid "Wallpapers"
 msgstr "壁纸"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
index 0cc4320044b..ece41a11cc1 100644
--- a/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
+++ b/tde-i18n-zh_CN/messages/tdelibs/tdeprint.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
-"POT-Creation-Date: 2019-07-21 20:16+0200\n"
+"POT-Creation-Date: 2020-02-02 23:49+0100\n"
 "PO-Revision-Date: 2005-05-17 00:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -3647,7 +3647,7 @@ msgstr "空文件名。"
 msgid "Jobs"
 msgstr "作业"
 
-#: management/kmconfigjobs.cpp:34 management/kmjobviewer.cpp:699
+#: management/kmconfigjobs.cpp:34 management/kmjobviewer.cpp:711
 msgid "Print Job Settings"
 msgstr "打印作业设置"
 
@@ -3656,7 +3656,7 @@ msgid "Jobs Shown"
 msgstr "显示的作业"
 
 #: management/kmconfigjobs.cpp:41 management/kmjobviewer.cpp:170
-#: management/kmjobviewer.cpp:336
+#: management/kmjobviewer.cpp:341
 msgid "Unlimited"
 msgstr "无限制"
 
@@ -3931,7 +3931,7 @@ msgstr "没有打印机"
 
 #: management/kmjobviewer.cpp:138 management/kmjobviewer.cpp:177
 #: management/kmjobviewer.cpp:194 management/kmjobviewer.cpp:210
-#: management/kmjobviewer.cpp:356 management/kmjobviewer.cpp:543
+#: management/kmjobviewer.cpp:361 management/kmjobviewer.cpp:555
 msgid "All Printers"
 msgstr "全部打印机"
 
@@ -3941,7 +3941,7 @@ msgid "Print Jobs for %1"
 msgstr "%1 的打印作业"
 
 #: management/kmjobviewer.cpp:170 management/kmjobviewer.cpp:172
-#: management/kmjobviewer.cpp:336
+#: management/kmjobviewer.cpp:341
 #, c-format
 msgid "Max.: %1"
 msgstr "最大：%1"
@@ -4016,30 +4016,30 @@ msgstr "刷新"
 msgid "Keep window permanent"
 msgstr "永久保留窗口"
 
-#: management/kmjobviewer.cpp:479
+#: management/kmjobviewer.cpp:491
 msgid ""
 "Unable to perform action \"%1\" on selected jobs. Error received from "
 "manager:"
 msgstr "无法在选中的作业上执行动作“%1”。从管理程序收到的错误为："
 
-#: management/kmjobviewer.cpp:491
+#: management/kmjobviewer.cpp:503
 msgid "Hold"
 msgstr "暂停"
 
-#: management/kmjobviewer.cpp:496
+#: management/kmjobviewer.cpp:508
 msgid "Resume"
 msgstr "继续"
 
-#: management/kmjobviewer.cpp:506
+#: management/kmjobviewer.cpp:518
 msgid "Restart"
 msgstr "重新启动"
 
-#: management/kmjobviewer.cpp:514
+#: management/kmjobviewer.cpp:526
 #, c-format
 msgid "Move to %1"
 msgstr "移到 %1"
 
-#: management/kmjobviewer.cpp:674
+#: management/kmjobviewer.cpp:686
 msgid "Operation failed."
 msgstr "操作失败。"