Merge translation files from master branch.

1 files changed, 64 insertions, 35 deletions

diff --git a/tde-i18n-zh_CN/messages/tdelibs/tdeio.po b/tde-i18n-zh_CN/messages/tdelibs/tdeio.po
index 61ef092e671..ff5523e7ea3 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: 2021-01-06 18:05+0100\n"
+"POT-Creation-Date: 2021-01-20 21:05+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"
@@ -4276,55 +4276,71 @@ msgid ""
 "report directly to them."
 msgstr "如果您知道服务器软件的作者是谁，请直接向他们提交错误报告。"
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1151
 msgid "Timeout Error"
 msgstr "超时错误"
 
-#: tdeio/global.cpp:1148
+#: tdeio/global.cpp:1152
 msgid ""
 "Although contact was made with the server, a response was not received "
 "within the amount of time allocated for the request as follows:"
-"<ul><li>Timeout for establishing a connection: %1 seconds</li><li>Timeout "
-"for receiving a response: %2 seconds</li><li>Timeout for accessing proxy "
-"servers: %3 seconds</li></ul>Please note that you can alter these timeout "
-"settings in the TDE Control Center, by selecting Network -> Preferences."
 msgstr ""
-"虽然已经联系了服务器，但在该请求所规定的时间内没有收到回应： <ul><li>建立连接"
-"超时：%1 秒</li><li>接收回应超时：%2 秒</li><li>访问代理服务器超时：%3 秒</"
-"li></ul>请注意， 您可以在 TDE 控制中心通过选择“网络”->“首选项”来改变这些超时"
-"设置。"
 
-#: tdeio/global.cpp:1159
+#: tdeio/global.cpp:1157
+msgid ""
+"_n: Timeout for establishing a connection: %1 second\n"
+"Timeout for establishing a connection: %1 seconds"
+msgstr ""
+
+#: tdeio/global.cpp:1161
+msgid ""
+"_n: Timeout for receiving a response: %1 second\n"
+"Timeout for receiving a response: %1 seconds"
+msgstr ""
+
+#: tdeio/global.cpp:1165
+msgid ""
+"_n: Timeout for accessing proxy servers: %1 second\n"
+"Timeout for accessing proxy servers: %1 seconds"
+msgstr ""
+
+#: tdeio/global.cpp:1168
+msgid ""
+"Please note that you can alter these timeout settings in the TDE Control "
+"Center, by selecting Network -> Preferences."
+msgstr ""
+
+#: tdeio/global.cpp:1170
 msgid "The server was too busy responding to other requests to respond."
 msgstr "服务器忙于响应其它请求，以致无法对该请求做出响应。"
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1177
 msgid "Unknown Error"
 msgstr "未知的错误"
 
-#: tdeio/global.cpp:1166
+#: tdeio/global.cpp:1178
 msgid ""
 "The program on your computer which provides access to the <strong>%1</"
 "strong> protocol has reported an unknown error: %2."
 msgstr ""
 "您的计算机上提供到 <strong>%1</strong> 协议访问的程序报告了一个未知错误：%2。"
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1186
 msgid "Unknown Interruption"
 msgstr "未知的中断"
 
-#: tdeio/global.cpp:1175
+#: tdeio/global.cpp:1187
 msgid ""
 "The program on your computer which provides access to the <strong>%1</"
 "strong> protocol has reported an interruption of an unknown type: %2."
 msgstr ""
 "您的计算机上提供到 <strong>%1</strong> 协议访问的程序报告了一个未知中断：%2。"
 
-#: tdeio/global.cpp:1183
+#: tdeio/global.cpp:1195
 msgid "Could Not Delete Original File"
 msgstr "无法删除原始文件"
 
-#: tdeio/global.cpp:1184
+#: tdeio/global.cpp:1196
 msgid ""
 "The requested operation required the deleting of the original file, most "
 "likely at the end of a file move operation. The original file <strong>%1</"
@@ -4333,11 +4349,11 @@ msgstr ""
 "所请求的操作需要删除原始文件，很可能是文件移动操作的最后步骤。原始文件 "
 "<strong>%1</strong> 无法被删除。"
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1205
 msgid "Could Not Delete Temporary File"
 msgstr "无法删除临时文件"
 
-#: tdeio/global.cpp:1194
+#: tdeio/global.cpp:1206
 msgid ""
 "The requested operation required the creation of a temporary file in which "
 "to save the new file while being downloaded. This temporary file <strong>%1</"
@@ -4346,55 +4362,55 @@ msgstr ""
 "所请求的操作需要创建一个临时文件来保存正在下载的新文件。临时文件 <strong>%1</"
 "strong> 无法被删除。"
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1215
 msgid "Could Not Rename Original File"
 msgstr "无法重命名原始文件"
 
-#: tdeio/global.cpp:1204
+#: tdeio/global.cpp:1216
 msgid ""
 "The requested operation required the renaming of the original file <strong>"
 "%1</strong>, however it could not be renamed."
 msgstr ""
 "所请求的操作需要重命名原始文件 <strong>%1</strong>， 但是它无法被重命名。"
 
-#: tdeio/global.cpp:1212
+#: tdeio/global.cpp:1224
 msgid "Could Not Rename Temporary File"
 msgstr "无法重命名临时文件"
 
-#: tdeio/global.cpp:1213
+#: tdeio/global.cpp:1225
 msgid ""
 "The requested operation required the creation of a temporary file <strong>"
 "%1</strong>, however it could not be created."
 msgstr "所请求的操作需要创建临时文件<strong>%1</strong>，但是该文件无法创建。"
 
-#: tdeio/global.cpp:1221
+#: tdeio/global.cpp:1233
 msgid "Could Not Create Link"
 msgstr "无法创建链接"
 
-#: tdeio/global.cpp:1222
+#: tdeio/global.cpp:1234
 msgid "Could Not Create Symbolic Link"
 msgstr "无法创建符号链接"
 
-#: tdeio/global.cpp:1223
+#: tdeio/global.cpp:1235
 msgid "The requested symbolic link %1 could not be created."
 msgstr "所请求的符号链接 %1 无法被创建。"
 
-#: tdeio/global.cpp:1230
+#: tdeio/global.cpp:1242
 msgid "No Content"
 msgstr "无内容"
 
-#: tdeio/global.cpp:1235
+#: tdeio/global.cpp:1247
 msgid "Disk Full"
 msgstr "磁盘已满"
 
-#: tdeio/global.cpp:1236
+#: tdeio/global.cpp:1248
 msgid ""
 "The requested file <strong>%1</strong> could not be written to as there is "
 "inadequate disk space."
 msgstr ""
 "所请求的文件 <strong>%1</strong> 无法被写入，原因是没有足够的磁盘空间。"
 
-#: tdeio/global.cpp:1238
+#: tdeio/global.cpp:1250
 msgid ""
 "Free up enough disk space by 1) deleting unwanted and temporary files; 2) "
 "archiving files to removable media storage such as CD-Recordable discs; or "
@@ -4403,21 +4419,21 @@ msgstr ""
 "释放足够磁盘空间，方法有：1) 删除不想要的和临时的文件；2) 把文件归档到 CD-R "
 "之类的可移介质上；或3) 获取更多贮存容量。"
 
-#: tdeio/global.cpp:1245
+#: tdeio/global.cpp:1257
 msgid "Source and Destination Files Identical"
 msgstr "源文件和目标文件是同一文件"
 
-#: tdeio/global.cpp:1246
+#: tdeio/global.cpp:1258
 msgid ""
 "The operation could not be completed because the source and destination "
 "files are the same file."
 msgstr "由于源文件和目标文件是同一文件，操作无法完成。"
 
-#: tdeio/global.cpp:1248
+#: tdeio/global.cpp:1260
 msgid "Choose a different filename for the destination file."
 msgstr "为目标文件选择另一个文件名。"
 
-#: tdeio/global.cpp:1259
+#: tdeio/global.cpp:1271
 msgid "Undocumented Error"
 msgstr "未记录在文档中的错误"
 
@@ -6089,6 +6105,19 @@ msgstr ""
 "一种图像 <u>image/x-bmp</u>。要哪个应用程序应该打开哪种类型的文件，您系统通知"
 "系统每个应用程序可处理哪些扩展名和 MIME 类型。</p>"
 
+#~ msgid ""
+#~ "Although contact was made with the server, a response was not received "
+#~ "within the amount of time allocated for the request as follows:"
+#~ "<ul><li>Timeout for establishing a connection: %1 seconds</li><li>Timeout "
+#~ "for receiving a response: %2 seconds</li><li>Timeout for accessing proxy "
+#~ "servers: %3 seconds</li></ul>Please note that you can alter these timeout "
+#~ "settings in the TDE Control Center, by selecting Network -> Preferences."
+#~ msgstr ""
+#~ "虽然已经联系了服务器，但在该请求所规定的时间内没有收到回应： <ul><li>建立"
+#~ "连接超时：%1 秒</li><li>接收回应超时：%2 秒</li><li>访问代理服务器超时："
+#~ "%3 秒</li></ul>请注意， 您可以在 TDE 控制中心通过选择“网络”->“首选项”来改"
+#~ "变这些超时设置。"
+
 #, fuzzy
 #~| msgid "Unknown Error"
 #~ msgid "Unknown unmount error."