Merge translation files from master branch.

1 files changed, 66 insertions, 37 deletions

diff --git a/tde-i18n-en_GB/messages/tdelibs/tdeio.po b/tde-i18n-en_GB/messages/tdelibs/tdeio.po
index 2aef59cbebc..980f470bff1 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdeio.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdeio.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio\n"
-"POT-Creation-Date: 2021-01-06 18:05+0100\n"
+"POT-Creation-Date: 2021-01-20 21:05+0100\n"
 "PO-Revision-Date: 2006-12-07 23:48+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -4501,35 +4501,49 @@ msgstr ""
 "If you know who the authors of the server software are, submit the bug "
 "report directly to them."
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1151
 msgid "Timeout Error"
 msgstr "Timeout Error"
 
-#: 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 ""
-"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 Centre, by selecting Network -> Preferences."
 
-#: 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 "The server was too busy responding to other requests to respond."
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1177
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
-#: 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."
@@ -4537,11 +4551,11 @@ msgstr ""
 "The program on your computer which provides access to the <strong>%1</"
 "strong> protocol has reported an unknown error: %2."
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1186
 msgid "Unknown Interruption"
 msgstr "Unknown Interruption"
 
-#: 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."
@@ -4549,11 +4563,11 @@ msgstr ""
 "The program on your computer which provides access to the <strong>%1</"
 "strong> protocol has reported an interruption of an unknown type: %2."
 
-#: tdeio/global.cpp:1183
+#: tdeio/global.cpp:1195
 msgid "Could Not Delete Original File"
 msgstr "Could Not Delete Original File"
 
-#: 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</"
@@ -4563,11 +4577,11 @@ msgstr ""
 "likely at the end of a file move operation. The original file <strong>%1</"
 "strong> could not be deleted."
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1205
 msgid "Could Not Delete Temporary File"
 msgstr "Could Not Delete Temporary File"
 
-#: 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</"
@@ -4577,11 +4591,11 @@ msgstr ""
 "to save the new file while being downloaded. This temporary file <strong>%1</"
 "strong> could not be deleted."
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1215
 msgid "Could Not Rename Original File"
 msgstr "Could Not Rename Original File"
 
-#: 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."
@@ -4589,11 +4603,11 @@ msgstr ""
 "The requested operation required the renaming of the original file <strong>"
 "%1</strong>, however it could not be renamed."
 
-#: tdeio/global.cpp:1212
+#: tdeio/global.cpp:1224
 msgid "Could Not Rename Temporary File"
 msgstr "Could Not Rename Temporary File"
 
-#: 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."
@@ -4601,27 +4615,27 @@ msgstr ""
 "The requested operation required the creation of a temporary file <strong>"
 "%1</strong>, however it could not be created."
 
-#: tdeio/global.cpp:1221
+#: tdeio/global.cpp:1233
 msgid "Could Not Create Link"
 msgstr "Could Not Create Link"
 
-#: tdeio/global.cpp:1222
+#: tdeio/global.cpp:1234
 msgid "Could Not Create Symbolic Link"
 msgstr "Could Not Create Symbolic Link"
 
-#: tdeio/global.cpp:1223
+#: tdeio/global.cpp:1235
 msgid "The requested symbolic link %1 could not be created."
 msgstr "The requested symbolic link %1 could not be created."
 
-#: tdeio/global.cpp:1230
+#: tdeio/global.cpp:1242
 msgid "No Content"
 msgstr "No Content"
 
-#: tdeio/global.cpp:1235
+#: tdeio/global.cpp:1247
 msgid "Disk Full"
 msgstr "Disk Full"
 
-#: 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."
@@ -4629,7 +4643,7 @@ msgstr ""
 "The requested file <strong>%1</strong> could not be written to as there is "
 "inadequate disk space."
 
-#: 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 "
@@ -4639,11 +4653,11 @@ msgstr ""
 "archiving files to removable media storage such as CD-Recordable discs; or "
 "3) obtain more storage capacity."
 
-#: tdeio/global.cpp:1245
+#: tdeio/global.cpp:1257
 msgid "Source and Destination Files Identical"
 msgstr "Source and Destination Files Identical"
 
-#: 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."
@@ -4651,11 +4665,11 @@ msgstr ""
 "The operation could not be completed because the source and destination "
 "files are the same file."
 
-#: tdeio/global.cpp:1248
+#: tdeio/global.cpp:1260
 msgid "Choose a different filename for the destination file."
 msgstr "Choose a different filename for the destination file."
 
-#: tdeio/global.cpp:1259
+#: tdeio/global.cpp:1271
 msgid "Undocumented Error"
 msgstr "Undocumented Error"
 
@@ -6391,6 +6405,21 @@ msgstr ""
 "should be informed about the abilities of each application to handle these "
 "extensions and mimetypes.</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 ""
+#~ "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 Centre, by selecting Network -> Preferences."
+
 #, fuzzy
 #~| msgid "Unknown Error"
 #~ msgid "Unknown unmount error."