Merge translation files from master branch.

3 files changed, 40 insertions, 40 deletions

diff --git a/tde-i18n-nb/messages/tdenetwork/kopete.po b/tde-i18n-nb/messages/tdenetwork/kopete.po
index 155047d60d0..3562f01d342 100644
--- a/tde-i18n-nb/messages/tdenetwork/kopete.po
+++ b/tde-i18n-nb/messages/tdenetwork/kopete.po
@@ -11,7 +11,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: 2007-02-06 07:28+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -3540,7 +3540,7 @@ msgid "Please enter the same password twice."
 msgstr "Oppgi samme passord to ganger."
 
 #: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
 msgid "Password entries do not match."
 msgstr "Passordene stemmer ikke."
 
@@ -3698,7 +3698,7 @@ msgid "&Manage Privacy..."
 msgstr "&Håndter 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 "
@@ -5149,7 +5149,7 @@ msgid "Jabber Error"
 msgstr "Jabber-feil"
 
 #: 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"
 
@@ -6081,7 +6081,7 @@ msgstr "Oppgi et tjenernavn, eller trykk Velg."
 msgid "Please enter a valid Jabber ID."
 msgstr "Oppgi et 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\"."
@@ -6089,27 +6089,27 @@ msgstr ""
 "Hvis du ikke vet godt hva du gjør, så bør din JID være på formen "
 "«brukernavn@tjener.com». I ditt tilfelle for eksempel «brukernavn@%1»."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
 msgid "Connecting to server..."
 msgstr "Kobler til tjener …"
 
-#: 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 "Vellykket tilkobling, registrerer ny konto …"
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
 msgid "Registration successful."
 msgstr "Registrering vellykket."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
 msgid "Registration failed."
 msgstr "Registrering mislyktes."
 
-#: 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."
@@ -6117,7 +6117,7 @@ msgstr ""
 "Klarte ikke opprette en konto på tjeneren. Jabber-ID-en er antakelig i bruk "
 "fra 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-nb/messages/tdenetwork/krdc.po b/tde-i18n-nb/messages/tdenetwork/krdc.po
index 531cf2cabcf..f5f0e36b386 100644
--- a/tde-i18n-nb/messages/tdenetwork/krdc.po
+++ b/tde-i18n-nb/messages/tdenetwork/krdc.po
@@ -10,7 +10,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: 2007-02-06 07:31+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-no@lister.ping.uio.no>\n"
@@ -293,13 +293,13 @@ msgstr "Klarte ikke starte rdesktop, se til at rdesktop er korrekt installert."
 msgid "rdesktop Failure"
 msgstr "Tilkobling mislyktes"
 
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "Det lyktes ikke å koble 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 "Tilkobling mislyktes"
 
@@ -319,37 +319,37 @@ 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 "Det er ikke mulig å koble til en lokal skrivebordsdeling."
 
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "VNC vertsinnstillinger for %1"
 
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "Det kreves passord for tilgang til dette systemet."
 
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "Den andre verten bruker en protokoll som ikke er kompatibel."
 
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "Forbindelsen til verten er blitt avbrutt."
 
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "Tilkobling mislyktes. Tjeneren godtar ikke nye tilkoblinger."
 
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr ""
 "Tilkobling mislyktes. Kunne ikke finne en tjener med det oppgitte navnet."
 
-#: vnc/kvncview.cpp:495
+#: vnc/kvncview.cpp:492
 #, fuzzy
 msgid ""
 "Connection failed. No server running at the given address and port. Verify "
@@ -358,19 +358,19 @@ msgstr ""
 "Tilkobling mislyktes. Det var ingen tjener ved den oppgitte adressen og "
 "porten."
 
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "Autentisering mislyktes.Tilkobling avbrutt."
 
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "Autentisering mislykket"
 
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "Ukjent feil."
 
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "Ukjent feil"
 
diff --git a/tde-i18n-nb/messages/tdenetwork/krfb.po b/tde-i18n-nb/messages/tdenetwork/krfb.po
index 44a3ac8cc71..9884bc7ec9c 100644
--- a/tde-i18n-nb/messages/tdenetwork/krfb.po
+++ b/tde-i18n-nb/messages/tdenetwork/krfb.po
@@ -11,7 +11,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: 2005-05-21 19:46+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -159,7 +159,7 @@ msgstr ""
 "Finner ikke KInetD. TDE-nissen (kded) kan ha stoppet eller er kanskje ikke "
 "startet i det hele tatt, eller installasjonen har feil."
 
-#: 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 i Skrivebordsdeling"
 
@@ -175,43 +175,43 @@ msgstr ""
 msgid "Personal Invitation"
 msgstr "Personlig 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 "Bruker godtar tilkobling fra %1"
 
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "Bruker nekter tilkobling fra %1"
 
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
 #, c-format
 msgid "Closed connection: %1."
 msgstr "Frakoblet: %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 "Mislykket logginn-forsøk fra %1, feil passord"
 
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
 msgid "Connection refused from %1, already connected."
 msgstr "Tilkobling fra %1 nektet, er allerede tilkoblet."
 
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "Godtatt uinvitert tilkobling fra %1"
 
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "Mottatt forbindelse fra %1, venter (på bekreftelse)"
 
-#: 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."