Merge translation files from master branch.

2 files changed, 138 insertions, 115 deletions

diff --git a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
index 7fdac47c721..9229c486907 100644
--- a/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
+++ b/tde-i18n-zh_CN/messages/tdebase/kcmcomponentchooser.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kcmcomponentchooser\n"
-"POT-Creation-Date: 2020-02-16 23:35+0100\n"
+"POT-Creation-Date: 2020-02-23 20:08+0100\n"
 "PO-Revision-Date: 2004-06-16 11:49+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -26,38 +26,33 @@ msgid ""
 "Your emails"
 msgstr "i18n-translation@lists.linux.net.cn"
 
-#: componentchooser.cpp:165
+#: componentchooser.cpp:166
 msgid "Select preferred email client:"
 msgstr "选择首选的电子邮件客户程序："
 
-#: componentchooser.cpp:271
-#, fuzzy
-msgid "Select preferred file manager application:"
-msgstr "选择首选的终端应用程序："
-
-#: componentchooser.cpp:342
+#: componentchooser.cpp:309
 msgid "Select preferred terminal application:"
 msgstr "选择首选的终端应用程序："
 
-#: componentchooser.cpp:437
+#: componentchooser.cpp:404
 msgid "Select preferred Web browser application:"
 msgstr "选择首选的 Web 浏览器应用程序："
 
-#: componentchooser.cpp:462
+#: componentchooser.cpp:429
 msgid "Unknown"
 msgstr "未知"
 
-#: componentchooser.cpp:477
+#: componentchooser.cpp:444
 msgid ""
 "<qt>You changed the default component of your choice. Do you want to save "
 "that change now?</qt>"
 msgstr "<qt>您更改了所选的默认组件，是否想要现在保存更改？</qt>"
 
-#: componentchooser.cpp:481
+#: componentchooser.cpp:448
 msgid "No description available"
 msgstr "没有可用的描述"
 
-#: componentchooser.cpp:492 componentchooser.cpp:497
+#: componentchooser.cpp:459 componentchooser.cpp:464
 msgid ""
 "Choose from the list below which component should be used by default for the "
 "%1 service."
@@ -91,7 +86,7 @@ msgid "in the following browser:"
 msgstr "在以下浏览器中："
 
 #: browserconfig_ui.ui:120 emailclientconfig_ui.ui:97
-#: filemanagerconfig_ui.ui:149 terminalemulatorconfig_ui.ui:149
+#: terminalemulatorconfig_ui.ui:149
 #, no-c-format
 msgid "..."
 msgstr "..."
@@ -219,31 +214,23 @@ msgstr "使用另外的电子邮件客户程序(&E)："
 msgid "Select this option if you want to use any other mail program."
 msgstr "如果您想要使用另外的邮件程序，请选择此选项。"
 
-#: filemanagerconfig_ui.ui:72
-#, fuzzy, no-c-format
-msgid "Use a different &file manager program:"
-msgstr "使用另外的终端程序(&T)："
-
-#: filemanagerconfig_ui.ui:97
-#, fuzzy, no-c-format
-msgid "&Use Konqueror as file manager application"
-msgstr "使用 Konsole 作为终端程序(&U)"
-
-#: filemanagerconfig_ui.ui:130
-#, fuzzy, no-c-format
+#: filemanagerconfig_ui.ui:36
+#, no-c-format
 msgid ""
-"Press this button to select your favorite file manager client. Please note "
-"that the file you select has to have the executable attribute set in order "
-"to be accepted.<br> "
+"The default file manager can be selected by changing the preferred "
+"application for mime type inode/directory in the File Associations control "
+"module"
 msgstr ""
-"单击此按钮可选择您喜爱的终端客户程序。请注意，您所选的文件必须已经设置了可执"
-"行属性才能被接受。<br>请注意，某些终端模拟程序无法接受您添加的命令行参数(例"
-"如：konsole -ls。)"
 
-#: filemanagerconfig_ui.ui:152
-#, fuzzy, no-c-format
-msgid "Click here to browse for a file manager program."
-msgstr "单击此处浏览终端程序。"
+#: filemanagerconfig_ui.ui:66
+#, no-c-format
+msgid "Open File Associations module"
+msgstr ""
+
+#: filemanagerconfig_ui.ui:69
+#, no-c-format
+msgid "Click here to open the File Association control module."
+msgstr ""
 
 #: terminalemulatorconfig_ui.ui:72
 #, no-c-format
@@ -271,3 +258,39 @@ msgstr ""
 #, no-c-format
 msgid "Click here to browse for terminal program."
 msgstr "单击此处浏览终端程序。"
+
+#, fuzzy
+#~| msgid "Select preferred terminal application:"
+#~ msgid "Select preferred file manager application:"
+#~ msgstr "选择首选的终端应用程序："
+
+#, fuzzy
+#~| msgid "Use a different &terminal program:"
+#~ msgid "Use a different &file manager program:"
+#~ msgstr "使用另外的终端程序(&T)："
+
+#, fuzzy
+#~| msgid "&Use Konsole as terminal application"
+#~ msgid "&Use Konqueror as file manager application"
+#~ msgstr "使用 Konsole 作为终端程序(&U)"
+
+#, fuzzy
+#~| msgid ""
+#~| "Press this button to select your favorite terminal client. Please note "
+#~| "that the file you select has to have the executable attribute set in "
+#~| "order to be accepted.<br> Also note that some programs that utilize "
+#~| "Terminal Emulator will not work if you add command line arguments "
+#~| "(Example: konsole -ls)."
+#~ msgid ""
+#~ "Press this button to select your favorite file manager client. Please "
+#~ "note that the file you select has to have the executable attribute set in "
+#~ "order to be accepted.<br> "
+#~ msgstr ""
+#~ "单击此按钮可选择您喜爱的终端客户程序。请注意，您所选的文件必须已经设置了可"
+#~ "执行属性才能被接受。<br>请注意，某些终端模拟程序无法接受您添加的命令行参数"
+#~ "(例如：konsole -ls。)"
+
+#, fuzzy
+#~| msgid "Click here to browse for terminal program."
+#~ msgid "Click here to browse for a file manager program."
+#~ msgstr "单击此处浏览终端程序。"
diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po b/tde-i18n-zh_CN/messages/tdelibs/tdelibs.po
index 5e0bc3643a4..f16748435d5 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-02-16 23:31+0100\n"
+"POT-Creation-Date: 2020-02-23 21:04+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"
@@ -2464,7 +2464,7 @@ msgstr "视频"
 msgid "Mailbox"
 msgstr "邮箱"
 
-#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4169
+#: tdeabc/phonenumber.cpp:178 tdecore/tdehw/tdehardwaredevices.cpp:4175
 msgid "Modem"
 msgstr "调制解调器"
 
@@ -4526,61 +4526,61 @@ msgstr ""
 msgid "Connection attempt failed!<br>Secondary connection failure."
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1677
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:1676
 msgid "NetworkManager"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4684
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4683
 msgid "Connection name is invalid"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4696
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4695
 msgid "IPv4 address is invalid"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4705
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4704
 msgid "IPv6 address is invalid"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4717
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4716
 msgid "No SSID provided"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4727
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4762
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4726
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4761
 msgid "WEP key 0 has invalid length"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4734
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4769
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4733
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4768
 msgid "WEP key 1 has invalid length"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4741
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4776
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4740
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4775
 msgid "WEP key 2 has invalid length"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4748
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4783
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4747
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4782
 msgid "WEP key 3 has invalid length"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4754
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4789
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4796
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4753
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4788
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4795
 msgid "No WEP key(s) provided"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4804
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4803
 msgid "LEAP username and/or password not provided"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4815
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4814
 msgid "Hexadecimal length PSK contains non-hexadecimal characters"
 msgstr ""
 
-#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4821
+#: tdecore/tdehw/networkbackends/network-manager/network-manager.cpp:4820
 #, fuzzy
 msgid "No PSK provided"
 msgstr "没有选择提供者。"
@@ -4700,7 +4700,7 @@ msgid "Unknown Virtual Device"
 msgstr ""
 
 #: tdecore/tdehw/tdegenericdevice.cpp:330
-#: tdecore/tdehw/tdehardwaredevices.cpp:4268
+#: tdecore/tdehw/tdehardwaredevices.cpp:4274
 #, fuzzy
 msgid "Unknown Device"
 msgstr "未知字段"
@@ -4709,231 +4709,231 @@ msgstr "未知字段"
 msgid "Disconnected %1 Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3693
-#: tdecore/tdehw/tdehardwaredevices.cpp:3773
-#: tdecore/tdehw/tdehardwaredevices.cpp:3785
+#: tdecore/tdehw/tdehardwaredevices.cpp:3699
+#: tdecore/tdehw/tdehardwaredevices.cpp:3779
+#: tdecore/tdehw/tdehardwaredevices.cpp:3791
 #, fuzzy
 msgid "Unknown PCI Device"
 msgstr "未知字段"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3803
-#: tdecore/tdehw/tdehardwaredevices.cpp:3883
-#: tdecore/tdehw/tdehardwaredevices.cpp:3895
+#: tdecore/tdehw/tdehardwaredevices.cpp:3809
+#: tdecore/tdehw/tdehardwaredevices.cpp:3889
+#: tdecore/tdehw/tdehardwaredevices.cpp:3901
 #, fuzzy
 msgid "Unknown USB Device"
 msgstr "未知字段"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3924
-#: tdecore/tdehw/tdehardwaredevices.cpp:3965
+#: tdecore/tdehw/tdehardwaredevices.cpp:3930
+#: tdecore/tdehw/tdehardwaredevices.cpp:3971
 #, fuzzy
 msgid "Unknown PNP Device"
 msgstr "未知字段"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:3994
-#: tdecore/tdehw/tdehardwaredevices.cpp:4035
+#: tdecore/tdehw/tdehardwaredevices.cpp:4000
+#: tdecore/tdehw/tdehardwaredevices.cpp:4041
 msgid "Unknown Monitor Device"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4124
+#: tdecore/tdehw/tdehardwaredevices.cpp:4130
 #, fuzzy
 msgid "Root"
 msgstr "无 CA 根"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4127
+#: tdecore/tdehw/tdehardwaredevices.cpp:4133
 #, fuzzy
 msgid "System Root"
 msgstr "系统菜单"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4130
+#: tdecore/tdehw/tdehardwaredevices.cpp:4136
 msgid "CPU"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4133
+#: tdecore/tdehw/tdehardwaredevices.cpp:4139
 #, fuzzy
 msgid "Graphics Processor"
 msgstr "地理位置"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4136
+#: tdecore/tdehw/tdehardwaredevices.cpp:4142
 msgid "RAM"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4139
+#: tdecore/tdehw/tdehardwaredevices.cpp:4145
 msgid "Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4142
+#: tdecore/tdehw/tdehardwaredevices.cpp:4148
 msgid "I2C Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4145
+#: tdecore/tdehw/tdehardwaredevices.cpp:4151
 msgid "MDIO Bus"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4148
+#: tdecore/tdehw/tdehardwaredevices.cpp:4154
 #, fuzzy
 msgid "Mainboard"
 msgstr "主工具栏"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4151
+#: tdecore/tdehw/tdehardwaredevices.cpp:4157
 msgid "Disk"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4154
+#: tdecore/tdehw/tdehardwaredevices.cpp:4160
 msgid "SCSI"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4157
+#: tdecore/tdehw/tdehardwaredevices.cpp:4163
 msgid "Storage Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4160
+#: tdecore/tdehw/tdehardwaredevices.cpp:4166
 msgid "Mouse"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4163
+#: tdecore/tdehw/tdehardwaredevices.cpp:4169
 msgid "Keyboard"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4166
+#: tdecore/tdehw/tdehardwaredevices.cpp:4172
 msgid "HID"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4172
+#: tdecore/tdehw/tdehardwaredevices.cpp:4178
 msgid "Monitor and Display"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4175
+#: tdecore/tdehw/tdehardwaredevices.cpp:4181
 msgid "Network"
 msgstr ""
 
 #: ../dependencies/tqt3/src/dialogs/qprintdialog.cpp:1033
-#: tdecore/tdehw/tdehardwaredevices.cpp:4178
+#: tdecore/tdehw/tdehardwaredevices.cpp:4184
 #, fuzzy
 msgid "Printer"
 msgstr "打印"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4181
+#: tdecore/tdehw/tdehardwaredevices.cpp:4187
 msgid "Scanner"
 msgstr ""
 
-#: tdeabc/scripts/entrylist:83 tdecore/tdehw/tdehardwaredevices.cpp:4184
+#: tdeabc/scripts/entrylist:83 tdecore/tdehw/tdehardwaredevices.cpp:4190
 msgid "Sound"
 msgstr "声音"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4187
+#: tdecore/tdehw/tdehardwaredevices.cpp:4193
 #, fuzzy
 msgid "Video Capture"
 msgstr "视频工具栏"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4190
+#: tdecore/tdehw/tdehardwaredevices.cpp:4196
 msgid "IEEE1394"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4193
+#: tdecore/tdehw/tdehardwaredevices.cpp:4199
 msgid "PCMCIA"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4196
+#: tdecore/tdehw/tdehardwaredevices.cpp:4202
 msgid "Camera"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4199
+#: tdecore/tdehw/tdehardwaredevices.cpp:4205
 #, fuzzy
 msgid "Text I/O"
 msgstr "仅文字"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4202
+#: tdecore/tdehw/tdehardwaredevices.cpp:4208
 msgid "Serial Communications Controller"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4205
+#: tdecore/tdehw/tdehardwaredevices.cpp:4211
 msgid "Parallel Port"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4208
+#: tdecore/tdehw/tdehardwaredevices.cpp:4214
 msgid "Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4211
+#: tdecore/tdehw/tdehardwaredevices.cpp:4217
 #, fuzzy
 msgid "Backlight"
 msgstr "后退"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4214
+#: tdecore/tdehw/tdehardwaredevices.cpp:4220
 msgid "Battery"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4217
+#: tdecore/tdehw/tdehardwaredevices.cpp:4223
 msgid "Power Supply"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4220
+#: tdecore/tdehw/tdehardwaredevices.cpp:4226
 #, fuzzy
 msgid "Docking Station"
 msgstr "方向"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4223
+#: tdecore/tdehw/tdehardwaredevices.cpp:4229
 #, fuzzy
 msgid "Thermal Sensor"
 msgstr "常规设置"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4226
+#: tdecore/tdehw/tdehardwaredevices.cpp:4232
 msgid "Thermal Control"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4229
+#: tdecore/tdehw/tdehardwaredevices.cpp:4235
 #: tdecore/tdehw/tdenetworkconnections.cpp:781
 msgid "Bluetooth"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4232
+#: tdecore/tdehw/tdehardwaredevices.cpp:4238
 msgid "Bridge"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4235
+#: tdecore/tdehw/tdehardwaredevices.cpp:4241
 msgid "Platform"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4238
+#: tdecore/tdehw/tdehardwaredevices.cpp:4244
 msgid "Cryptography"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4241
+#: tdecore/tdehw/tdehardwaredevices.cpp:4247
 msgid "Platform Event"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4244
+#: tdecore/tdehw/tdehardwaredevices.cpp:4250
 #, fuzzy
 msgid "Platform Input"
 msgstr "清除输入"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4247
+#: tdecore/tdehw/tdehardwaredevices.cpp:4253
 msgid "Plug and Play"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4250
+#: tdecore/tdehw/tdehardwaredevices.cpp:4256
 #, fuzzy
 msgid "Other ACPI"
 msgstr "其它"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4253
+#: tdecore/tdehw/tdehardwaredevices.cpp:4259
 #, fuzzy
 msgid "Other USB"
 msgstr "其它"
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4256
+#: tdecore/tdehw/tdehardwaredevices.cpp:4262
 msgid "Other Multimedia"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4259
+#: tdecore/tdehw/tdehardwaredevices.cpp:4265
 msgid "Other Peripheral"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4262
+#: tdecore/tdehw/tdehardwaredevices.cpp:4268
 msgid "Other Sensor"
 msgstr ""
 
-#: tdecore/tdehw/tdehardwaredevices.cpp:4265
+#: tdecore/tdehw/tdehardwaredevices.cpp:4271
 msgid "Other Virtual"
 msgstr ""