Merge translation files from master branch.

1 files changed, 68 insertions, 39 deletions

diff --git a/tde-i18n-cy/messages/tdelibs/tdeio.po b/tde-i18n-cy/messages/tdelibs/tdeio.po
index 994275fd359..95b5d086333 100644
--- a/tde-i18n-cy/messages/tdelibs/tdeio.po
+++ b/tde-i18n-cy/messages/tdelibs/tdeio.po
@@ -14,7 +14,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: 2004-01-16 09:20+0000\n"
 "Last-Translator: KD at KGyfieithu <kyfieithu@dotmon.com>\n"
 "Language-Team: Cymraeg <cy@li.org>\n"
@@ -4596,35 +4596,49 @@ msgstr ""
 "Os wyddoch pwy yw awduron y feddalwedd weinydd, cyflwynwch yr adrodd nam yn "
 "uniongyrchol iddynt."
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1151
 msgid "Timeout Error"
 msgstr "Gwall goramser"
 
-#: 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 ""
-"Er gwnaed cyswllt efo'r gweinydd, ni dderbynnir ymateb tu mewn y faint o "
-"amser sydd wedi ei neilltuo am yr ymateb fel a ganlyn:<ul><li>Goramser am "
-"sefydlu cysylltiad: %1 eiliad</li><li>Goramser am dderbyn ymateb: %2 eiliad</"
-"li><li>Goramser am gyrchu gweinyddion dirprwy: %3 eiliad</li></ul>  Noder y "
-"gallwch newid y gosodiadau goramser yn y Ganolfan Rheoli TDE, drwy ddewis "
-"Rhwydwaith -> Hoffiannau."
-
-#: tdeio/global.cpp:1159
+msgstr ""
+
+#: 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 "Roedd y gweinydd yn rhy brysur yn ymateb i geisiadau eraill i ymateb."
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1177
 msgid "Unknown Error"
 msgstr "Gwall Anhysbys"
 
-#: 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."
@@ -4632,11 +4646,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>%1</"
 "strong> wedi adrodd gwall mewnol: %2."
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1186
 msgid "Unknown Interruption"
 msgstr "Ymyriad Anhysbys"
 
-#: 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."
@@ -4644,11 +4658,11 @@ msgstr ""
 "Mae'r rhaglen ar y gweinydd sy'n darparu cyrchiad i'r protocol <strong>%1</"
 "strong> wedi adrodd ymyriad o fath anhysbys: %2."
 
-#: tdeio/global.cpp:1183
+#: tdeio/global.cpp:1195
 msgid "Could Not Delete Original File"
 msgstr "Methu Dileu Ffeil Gwreiddiol"
 
-#: 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</"
@@ -4658,11 +4672,11 @@ msgstr ""
 "ddiwedd gweithrediad symud ffeil, mwy na thebyg.  Ni ellid dileu'r ffeil "
 "gwreiddiol <strong>%1</strong>."
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1205
 msgid "Could Not Delete Temporary File"
 msgstr "Methu Dileu Ffeil Dros Dro"
 
-#: 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</"
@@ -4672,11 +4686,11 @@ msgstr ""
 "newydd  wrth iddo gael ei lawrlwytho.  Ni ellid dileu'r ffeil dros dro "
 "<strong>%1</strong>."
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1215
 msgid "Could Not Rename Original File"
 msgstr "Methu Ail-enwi Ffeil Gwreiddiol"
 
-#: 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."
@@ -4684,11 +4698,11 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen ail-enwi'r ffeil gwreiddiol <strong>"
 "%1</strong>.  Ond ni ellid ail-enwi'r ffeil."
 
-#: tdeio/global.cpp:1212
+#: tdeio/global.cpp:1224
 msgid "Could Not Rename Temporary File"
 msgstr "Methu Ail-enwi Ffeil Dro Dro"
 
-#: 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."
@@ -4696,27 +4710,27 @@ msgstr ""
 "Roedd gan y weithrediad ceisiedig angen greu ffeil dros dro <strong>%1</"
 "strong>.  Ond ni ellid creu'r ffeil."
 
-#: tdeio/global.cpp:1221
+#: tdeio/global.cpp:1233
 msgid "Could Not Create Link"
 msgstr "Methu Creu Cyswllt"
 
-#: tdeio/global.cpp:1222
+#: tdeio/global.cpp:1234
 msgid "Could Not Create Symbolic Link"
 msgstr "Methu Creu Cyswllt Symbolaidd"
 
-#: tdeio/global.cpp:1223
+#: tdeio/global.cpp:1235
 msgid "The requested symbolic link %1 could not be created."
 msgstr "Methu creu y cyswllt symbolaidd %1 a ofynwyd amdano."
 
-#: tdeio/global.cpp:1230
+#: tdeio/global.cpp:1242
 msgid "No Content"
 msgstr "Dim Cynnwys"
 
-#: tdeio/global.cpp:1235
+#: tdeio/global.cpp:1247
 msgid "Disk Full"
 msgstr "Disg Llawn"
 
-#: 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."
@@ -4724,7 +4738,7 @@ msgstr ""
 "Ni ellid ysgrifennu at y ffeil ceisiedig <strong>%1</strong> gan fod diffyg "
 "lle ar y ddisg."
 
-#: 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 "
@@ -4734,11 +4748,11 @@ msgstr ""
 "2) archifo ffeiliau i gronfa cyfryngau symudadwy fel disgiau CD-Cofnodi; neu "
 "3) darganfod mwy o le cronfa."
 
-#: tdeio/global.cpp:1245
+#: tdeio/global.cpp:1257
 msgid "Source and Destination Files Identical"
 msgstr "Ffeiliau Tarddiad a Cyrchfan yn Unwy"
 
-#: 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."
@@ -4746,12 +4760,12 @@ msgstr ""
 "Methu cwblhau'r gweithrediad gan fod ffeil tarddiad a ffeil cyrchfan yr un "
 "un ffeil."
 
-#: tdeio/global.cpp:1248
+#: tdeio/global.cpp:1260
 #, fuzzy
 msgid "Choose a different filename for the destination file."
 msgstr "Dewiswch enw ffeil gwahanol i'r ffeil cyrchfan."
 
-#: tdeio/global.cpp:1259
+#: tdeio/global.cpp:1271
 msgid "Undocumented Error"
 msgstr "Gwall Heb ei Ddogfennu"
 
@@ -6458,6 +6472,21 @@ msgid ""
 "extensions and mimetypes.</p>"
 msgstr ""
 
+#~ 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 ""
+#~ "Er gwnaed cyswllt efo'r gweinydd, ni dderbynnir ymateb tu mewn y faint o "
+#~ "amser sydd wedi ei neilltuo am yr ymateb fel a ganlyn:<ul><li>Goramser am "
+#~ "sefydlu cysylltiad: %1 eiliad</li><li>Goramser am dderbyn ymateb: %2 "
+#~ "eiliad</li><li>Goramser am gyrchu gweinyddion dirprwy: %3 eiliad</li></"
+#~ "ul>  Noder y gallwch newid y gosodiadau goramser yn y Ganolfan Rheoli "
+#~ "TDE, drwy ddewis Rhwydwaith -> Hoffiannau."
+
 #, fuzzy
 #~| msgid "Unknown error"
 #~ msgid "Unknown unmount error."