Merge translation files from master branch.

3 files changed, 40 insertions, 40 deletions

diff --git a/tde-i18n-nn/messages/tdenetwork/kopete.po b/tde-i18n-nn/messages/tdenetwork/kopete.po
index f097c537d87..846ccbcde0a 100644
--- a/tde-i18n-nn/messages/tdenetwork/kopete.po
+++ b/tde-i18n-nn/messages/tdenetwork/kopete.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: kopete\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2006-11-19 10:31+0100\n"
 "Last-Translator: Håvard Korsvoll <korsvoll@skulelinux.no>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -3541,7 +3541,7 @@ msgid "Please enter the same password twice."
 msgstr "Oppgje samme passord to gonger."
 
 #: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
 msgid "Password entries do not match."
 msgstr "Passorda stemmer ikkje overens."
 
@@ -3700,7 +3700,7 @@ msgid "&Manage Privacy..."
 msgstr "&Handter personvern …"
 
 #: protocols/groupwise/gwaccount.cpp:251 protocols/jabber/jabberaccount.cpp:428
-#: protocols/jabber/ui/jabberregisteraccount.cpp:269
+#: protocols/jabber/ui/jabberregisteraccount.cpp:270
 #, fuzzy
 msgid ""
 "SSL support could not be initialized for account %1. This is most likely "
@@ -5163,7 +5163,7 @@ msgid "Jabber Error"
 msgstr "Jabberfeil"
 
 #: protocols/jabber/jabberaccount.cpp:430
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#: protocols/jabber/ui/jabberregisteraccount.cpp:272
 msgid "Jabber SSL Error"
 msgstr "Jabber SSL-feil"
 
@@ -6105,7 +6105,7 @@ msgstr "Oppgje tenarnamn eller trykk Velg."
 msgid "Please enter a valid Jabber ID."
 msgstr "Oppgje ein gyldig Jabber-ID."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:192
+#: protocols/jabber/ui/jabberregisteraccount.cpp:193
 msgid ""
 "Unless you know what you are doing, your JID should be of the form "
 "\"username@server.com\".  In your case for example \"username@%1\"."
@@ -6113,27 +6113,27 @@ msgstr ""
 "Viss du ikkje veit godt kva du gjer, så bør JID-en din vera på formen "
 "«brukarnamn@tenar.com». I ditt tilfelle til dømes «brukernavn@%1»."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
 msgid "Connecting to server..."
 msgstr "Koplar til tenar …"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:316
+#: protocols/jabber/ui/jabberregisteraccount.cpp:317
 msgid "Protocol error."
 msgstr "Protokollfeil."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:329
+#: protocols/jabber/ui/jabberregisteraccount.cpp:330
 msgid "Connected successfully, registering new account..."
 msgstr "Kopla til, registrerer ny konto …"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
 msgid "Registration successful."
 msgstr "Registrering vellukka."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
 msgid "Registration failed."
 msgstr "Registrering mislukkast."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:380
+#: protocols/jabber/ui/jabberregisteraccount.cpp:381
 msgid ""
 "Unable to create account on the server. The Jabber ID is probably already in "
 "use."
@@ -6141,7 +6141,7 @@ msgstr ""
 "Klarte ikkje oppretta ein konto på tenaren. Jabber-ID-en var truleg i bruk "
 "frå før."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:381
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
 msgid "Jabber Account Registration"
 msgstr "Jabber kontoregistrering"
 
diff --git a/tde-i18n-nn/messages/tdenetwork/krdc.po b/tde-i18n-nn/messages/tdenetwork/krdc.po
index cad449a2d82..c3fee7c268c 100644
--- a/tde-i18n-nn/messages/tdenetwork/krdc.po
+++ b/tde-i18n-nn/messages/tdenetwork/krdc.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krdc\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2005-09-27 19:54+0200\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -287,13 +287,13 @@ msgstr "Klarte ikkje starta rdesktop. Sjå til at rdesktop er rett installert."
 msgid "rdesktop Failure"
 msgstr "rdesktop-feil"
 
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "Det lukkast ikkje å kopla til verten."
 
-#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:217 vnc/kvncview.cpp:471
-#: vnc/kvncview.cpp:476 vnc/kvncview.cpp:481 vnc/kvncview.cpp:486
-#: vnc/kvncview.cpp:491 vnc/kvncview.cpp:496
+#: rdp/krdpview.cpp:368 vnc/kvncview.cpp:225 vnc/kvncview.cpp:468
+#: vnc/kvncview.cpp:473 vnc/kvncview.cpp:478 vnc/kvncview.cpp:483
+#: vnc/kvncview.cpp:488 vnc/kvncview.cpp:493
 msgid "Connection Failure"
 msgstr "Tilkopling mislukkast"
 
@@ -313,55 +313,55 @@ msgstr "ja"
 msgid "no"
 msgstr "nei"
 
-#: vnc/kvncview.cpp:216
+#: vnc/kvncview.cpp:224
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "Kan ikkje kopla til ei lokal teneste for skrivebordsdeling."
 
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "VNC-vertsinnstillingar for %1"
 
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "Du treng passord for å få tilgang til dette systemet."
 
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "Den andre verten brukar ein protokoll som ikkje er kompatibel."
 
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "Sambandet til verten er avbrote."
 
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "Tilkopling mislukkast. Tenaren godtek ikkje nye samband."
 
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "Tilkopling mislukkast. Fann ingen tenar med det valde namnet."
 
-#: vnc/kvncview.cpp:495
+#: vnc/kvncview.cpp:492
 #, fuzzy
 msgid ""
 "Connection failed. No server running at the given address and port. Verify "
 "the KDED TDE Internet Daemon is running at the remote server."
 msgstr "Tilkopling mislukkast. Ingen tenar ved den valde adressa og porten."
 
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "Autentisering mislukkast. Tilkopling avbroten."
 
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "Autentisering mislukkast"
 
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "Ukjend feil."
 
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "Ukjend feil"
 
diff --git a/tde-i18n-nn/messages/tdenetwork/krfb.po b/tde-i18n-nn/messages/tdenetwork/krfb.po
index dadb51d3110..459436a41ba 100644
--- a/tde-i18n-nn/messages/tdenetwork/krfb.po
+++ b/tde-i18n-nn/messages/tdenetwork/krfb.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: krfb\n"
-"POT-Creation-Date: 2019-01-13 18:51+0100\n"
+"POT-Creation-Date: 2019-01-23 23:20+0100\n"
 "PO-Revision-Date: 2004-02-29 20:54+0100\n"
 "Last-Translator: Gaute Hvoslef Kvalnes <gaute@verdsveven.com>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -160,7 +160,7 @@ msgstr ""
 "Finn ikkje KInetD. TDE-nissen (kded) kan ha stoppa eller er kanskje ikkje "
 "starta i det heile. Det kan òg henda at installasjonen er ufullstendig."
 
-#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:894
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:885
 msgid "Desktop Sharing Error"
 msgstr "Feil ved skrivebordsdeling"
 
@@ -176,43 +176,43 @@ msgstr ""
 msgid "Personal Invitation"
 msgstr "Personleg invitasjon"
 
-#: krfb/rfbcontroller.cc:378
+#: krfb/rfbcontroller.cc:376
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (delt skrivebord)"
 
-#: krfb/rfbcontroller.cc:516
+#: krfb/rfbcontroller.cc:510
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "Brukar godtek tilkopling frå %1"
 
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "Brukar nektar tilkopling frå %1"
 
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
 #, c-format
 msgid "Closed connection: %1."
 msgstr "Fråkopla: %1."
 
-#: krfb/rfbcontroller.cc:705 krfb/rfbcontroller.cc:710
+#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
 msgid "Failed login attempt from %1: wrong password"
 msgstr "Mislukka innloggingsforsøk frå %1: Feil passord"
 
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
 msgid "Connection refused from %1, already connected."
 msgstr "Tilkopling frå %1 nekta, er kopla til frå før."
 
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "Godteken, ikkje invitert tilkopling frå %1"
 
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "Motteke tilkopling frå %1, ventar (på stadfesting)"
 
-#: krfb/rfbcontroller.cc:893
+#: krfb/rfbcontroller.cc:884
 msgid ""
 "Your X11 Server does not support the required XTest extension version 2.2. "
 "Sharing your desktop is not possible."