Merge translation files from master branch.

1 files changed, 68 insertions, 39 deletions

diff --git a/tde-i18n-nn/messages/tdelibs/tdeio.po b/tde-i18n-nn/messages/tdelibs/tdeio.po
index 1e733a5f718..98ca20acf3d 100644
--- a/tde-i18n-nn/messages/tdelibs/tdeio.po
+++ b/tde-i18n-nn/messages/tdelibs/tdeio.po
@@ -6,7 +6,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: 2007-08-09 17:17+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -4476,35 +4476,49 @@ msgstr ""
 "Dersom du veit kven som har laga programmet på tenaren, kan du senda "
 "feilrapporten direkte til dei."
 
-#: tdeio/global.cpp:1147
+#: tdeio/global.cpp:1151
 msgid "Timeout Error"
 msgstr "Tidsgrensefeil"
 
-#: 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 ""
-"Sjølv om det vart oppretta kontakt med tenaren, kom det ikkje noko svar "
-"innan den fastsette tida: <ul><li>Tidsgrense for oppretting av samband: %1 "
-"sekund</li> <li>Tidsgrense for mottak av svar: %2 sekund</li> <li>Tidsgrense "
-"for tilgang til mellomtenarar: %3 sekund</li></ul> Hugs at du kan endra "
-"desse tidsgrensene i TDE-kontrollsenteret, ved å velja Nettverk -"
-">Innstillingar."
-
-#: 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 "Tenaren var for oppteken med å svara på andre førespurnader."
 
-#: tdeio/global.cpp:1165
+#: tdeio/global.cpp:1177
 msgid "Unknown Error"
 msgstr "Ukjend feil"
 
-#: 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."
@@ -4512,11 +4526,11 @@ msgstr ""
 "Programmet som gjev tilgang til <strong>%1</strong>-protokollen har "
 "rapportert ein intern feil: %2."
 
-#: tdeio/global.cpp:1174
+#: tdeio/global.cpp:1186
 msgid "Unknown Interruption"
 msgstr "Ukjend avbrot"
 
-#: 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."
@@ -4524,11 +4538,11 @@ msgstr ""
 "Programmet som gjev tilgang til <strong>%1</strong>-protokollen har "
 "rapportert eit avbrot av ein ukjend type: %2."
 
-#: tdeio/global.cpp:1183
+#: tdeio/global.cpp:1195
 msgid "Could Not Delete Original File"
 msgstr "Klarte ikkje sletta den opphavlege fila"
 
-#: 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</"
@@ -4538,11 +4552,11 @@ msgstr ""
 "fordi fila skulle flyttast. Den opphavlege fila <strong>%1</strong> kunne "
 "ikkje slettast."
 
-#: tdeio/global.cpp:1193
+#: tdeio/global.cpp:1205
 msgid "Could Not Delete Temporary File"
 msgstr "Klarte ikkje sletta den mellombelse fila"
 
-#: 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</"
@@ -4552,11 +4566,11 @@ msgstr ""
 "nye fila vert lagra under nedlastinga. Denne mellombelse fila <strong>%1</"
 "strong> kunne ikkje slettast."
 
-#: tdeio/global.cpp:1203
+#: tdeio/global.cpp:1215
 msgid "Could Not Rename Original File"
 msgstr "Klarte ikkje endra namnet på den opphavlege fila"
 
-#: 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."
@@ -4564,11 +4578,11 @@ msgstr ""
 "Den førespurde operasjonen kravde at namnet på den opphavlege fila <strong>"
 "%1</strong> skulle endrast, men det lot seg ikkje gjera."
 
-#: tdeio/global.cpp:1212
+#: tdeio/global.cpp:1224
 msgid "Could Not Rename Temporary File"
 msgstr "Klarte ikkje endra namnet på den mellombelse fila"
 
-#: 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."
@@ -4576,27 +4590,27 @@ msgstr ""
 "Den førespurde operasjonen kravde at ei mellombels fil <strong>%1</strong> "
 "skulle opprettast, men det lot seg ikkje gjera."
 
-#: tdeio/global.cpp:1221
+#: tdeio/global.cpp:1233
 msgid "Could Not Create Link"
 msgstr "Klarte ikkje oppretta lenkje"
 
-#: tdeio/global.cpp:1222
+#: tdeio/global.cpp:1234
 msgid "Could Not Create Symbolic Link"
 msgstr "Klarte ikkje oppretta symbolsk lenkje"
 
-#: tdeio/global.cpp:1223
+#: tdeio/global.cpp:1235
 msgid "The requested symbolic link %1 could not be created."
 msgstr "Den førespurde symbolske lenkja %1 kunne ikkje opprettast."
 
-#: tdeio/global.cpp:1230
+#: tdeio/global.cpp:1242
 msgid "No Content"
 msgstr "Utan innhald"
 
-#: tdeio/global.cpp:1235
+#: tdeio/global.cpp:1247
 msgid "Disk Full"
 msgstr "Full disk "
 
-#: 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."
@@ -4604,7 +4618,7 @@ msgstr ""
 "Den førespurde fila <strong>%1</strong> kunne ikkje skrivast til sidan det "
 "ikkje er nok diskplass."
 
-#: 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 "
@@ -4613,22 +4627,22 @@ msgstr ""
 "Lag meir ledig diskplass ved å 1) sletta filer du ikkje treng; 2) arkivera "
 "filer med CD-brennar eller liknande; eller 3) skaffa deg meir diskplass."
 
-#: tdeio/global.cpp:1245
+#: tdeio/global.cpp:1257
 msgid "Source and Destination Files Identical"
 msgstr "Kjelda og målet er den same fila."
 
-#: 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 ""
 "Operasjonen kunne ikkje fullførast fordi kjelda og målet er den same fila."
 
-#: tdeio/global.cpp:1248
+#: tdeio/global.cpp:1260
 msgid "Choose a different filename for the destination file."
 msgstr "Vel eit anna filnamn for målfila."
 
-#: tdeio/global.cpp:1259
+#: tdeio/global.cpp:1271
 msgid "Undocumented Error"
 msgstr "Udokumentert feil"
 
@@ -6362,6 +6376,21 @@ msgstr ""
 "skal opna kvar filtype, må systemet få melding om kva kvar enkelt "
 "applikasjon han handtera av fil-etternamn og mimetypar.</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 ""
+#~ "Sjølv om det vart oppretta kontakt med tenaren, kom det ikkje noko svar "
+#~ "innan den fastsette tida: <ul><li>Tidsgrense for oppretting av samband: "
+#~ "%1 sekund</li> <li>Tidsgrense for mottak av svar: %2 sekund</li> "
+#~ "<li>Tidsgrense for tilgang til mellomtenarar: %3 sekund</li></ul> Hugs at "
+#~ "du kan endra desse tidsgrensene i TDE-kontrollsenteret, ved å velja "
+#~ "Nettverk ->Innstillingar."
+
 #, fuzzy
 #~| msgid "Unknown Error"
 #~ msgid "Unknown unmount error."