Merge translation files from master branch.

3 files changed, 40 insertions, 40 deletions

diff --git a/tde-i18n-en_GB/messages/tdenetwork/kopete.po b/tde-i18n-en_GB/messages/tdenetwork/kopete.po
index 9e992f425ef..891de1f2730 100644
--- a/tde-i18n-en_GB/messages/tdenetwork/kopete.po
+++ b/tde-i18n-en_GB/messages/tdenetwork/kopete.po
@@ -7,7 +7,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-03-12 17:38+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -3560,7 +3560,7 @@ msgid "Please enter the same password twice."
 msgstr "Please enter the same password twice."
 
 #: protocols/gadu/gaduregisteraccount.cpp:106
-#: protocols/jabber/ui/jabberregisteraccount.cpp:160
+#: protocols/jabber/ui/jabberregisteraccount.cpp:161
 msgid "Password entries do not match."
 msgstr "Password entries do not match."
 
@@ -3718,7 +3718,7 @@ msgid "&Manage Privacy..."
 msgstr "&Manage Privacy..."
 
 #: 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 "
@@ -5174,7 +5174,7 @@ msgid "Jabber Error"
 msgstr "Jabber Error"
 
 #: protocols/jabber/jabberaccount.cpp:430
-#: protocols/jabber/ui/jabberregisteraccount.cpp:271
+#: protocols/jabber/ui/jabberregisteraccount.cpp:272
 msgid "Jabber SSL Error"
 msgstr "Jabber SSL Error"
 
@@ -6119,7 +6119,7 @@ msgstr "Please enter a server name, or click Choose."
 msgid "Please enter a valid Jabber ID."
 msgstr "Please enter a valid 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 "
 "\"[email protected]\".  In your case for example \"username@%1\"."
@@ -6127,27 +6127,27 @@ msgstr ""
 "Unless you know what you are doing, your JID should be of the form "
 "\"[email protected]\".  In your case for example \"username@%1\"."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:247
+#: protocols/jabber/ui/jabberregisteraccount.cpp:248
 msgid "Connecting to server..."
 msgstr "Connecting to server..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:316
+#: protocols/jabber/ui/jabberregisteraccount.cpp:317
 msgid "Protocol error."
 msgstr "Protocol error."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:329
+#: protocols/jabber/ui/jabberregisteraccount.cpp:330
 msgid "Connected successfully, registering new account..."
 msgstr "Connected successfully, registering new account..."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:344
+#: protocols/jabber/ui/jabberregisteraccount.cpp:345
 msgid "Registration successful."
 msgstr "Registration successful."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:378
+#: protocols/jabber/ui/jabberregisteraccount.cpp:379
 msgid "Registration failed."
 msgstr "Registration failed."
 
-#: 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."
@@ -6155,7 +6155,7 @@ msgstr ""
 "Unable to create account on the server. The Jabber ID is probably already in "
 "use."
 
-#: protocols/jabber/ui/jabberregisteraccount.cpp:381
+#: protocols/jabber/ui/jabberregisteraccount.cpp:382
 msgid "Jabber Account Registration"
 msgstr "Jabber Account Registration"
 
diff --git a/tde-i18n-en_GB/messages/tdenetwork/krdc.po b/tde-i18n-en_GB/messages/tdenetwork/krdc.po
index 9fda1aed28a..7924c8d5b2d 100644
--- a/tde-i18n-en_GB/messages/tdenetwork/krdc.po
+++ b/tde-i18n-en_GB/messages/tdenetwork/krdc.po
@@ -6,7 +6,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-11-06 01:01+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -287,13 +287,13 @@ msgstr "Could not start rdesktop; make sure rdesktop is properly installed."
 msgid "rdesktop Failure"
 msgstr "rdesktop Failure"
 
-#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:470
+#: rdp/krdpview.cpp:367 vnc/kvncview.cpp:467
 msgid "Connection attempt to host failed."
 msgstr "Connection attempt to host failed."
 
-#: 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 "Connection Failure"
 
@@ -313,55 +313,55 @@ msgstr "yes"
 msgid "no"
 msgstr "no"
 
-#: vnc/kvncview.cpp:216
+#: vnc/kvncview.cpp:224
 msgid "It is not possible to connect to a local desktop sharing service."
 msgstr "It is not possible to connect to a local desktop sharing service."
 
-#: vnc/kvncview.cpp:231
+#: vnc/kvncview.cpp:239
 #, c-format
 msgid "VNC Host Preferences for %1"
 msgstr "VNC Host Preferences for %1"
 
-#: vnc/kvncview.cpp:419
+#: vnc/kvncview.cpp:416
 msgid "Access to the system requires a password."
 msgstr "Access to the system requires a password."
 
-#: vnc/kvncview.cpp:475
+#: vnc/kvncview.cpp:472
 msgid "Remote host is using an incompatible protocol."
 msgstr "Remote host is using an incompatible protocol."
 
-#: vnc/kvncview.cpp:480
+#: vnc/kvncview.cpp:477
 msgid "The connection to the host has been interrupted."
 msgstr "The connection to the host has been interrupted."
 
-#: vnc/kvncview.cpp:485
+#: vnc/kvncview.cpp:482
 msgid "Connection failed. The server does not accept new connections."
 msgstr "Connection failed. The server does not accept new connections."
 
-#: vnc/kvncview.cpp:490
+#: vnc/kvncview.cpp:487
 msgid "Connection failed. A server with the given name cannot be found."
 msgstr "Connection failed. A server with the given name cannot be found."
 
-#: 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 "Connection failed. No server running at the given address and port."
 
-#: vnc/kvncview.cpp:504
+#: vnc/kvncview.cpp:501
 msgid "Authentication failed. Connection aborted."
 msgstr "Authentication failed. Connection aborted."
 
-#: vnc/kvncview.cpp:505
+#: vnc/kvncview.cpp:502
 msgid "Authentication Failure"
 msgstr "Authentication Failure"
 
-#: vnc/kvncview.cpp:509
+#: vnc/kvncview.cpp:506
 msgid "Unknown error."
 msgstr "Unknown error."
 
-#: vnc/kvncview.cpp:510
+#: vnc/kvncview.cpp:507
 msgid "Unknown Error"
 msgstr "Unknown Error"
 
diff --git a/tde-i18n-en_GB/messages/tdenetwork/krfb.po b/tde-i18n-en_GB/messages/tdenetwork/krfb.po
index 484fea59c52..4a09f5a8e7e 100644
--- a/tde-i18n-en_GB/messages/tdenetwork/krfb.po
+++ b/tde-i18n-en_GB/messages/tdenetwork/krfb.po
@@ -6,7 +6,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-01-19 13:08+0000\n"
 "Last-Translator: Andrew Coles <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -155,7 +155,7 @@ msgstr ""
 "Cannot find KInetD. The TDE daemon (kded) may have crashed or has not been "
 "started at all, or the installation failed."
 
-#: 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 "Desktop Sharing Error"
 
@@ -171,43 +171,43 @@ msgstr ""
 msgid "Personal Invitation"
 msgstr "Personal Invitation"
 
-#: krfb/rfbcontroller.cc:378
+#: krfb/rfbcontroller.cc:376
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (shared desktop)"
 
-#: krfb/rfbcontroller.cc:516
+#: krfb/rfbcontroller.cc:510
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "User accepts connection from %1"
 
-#: krfb/rfbcontroller.cc:530
+#: krfb/rfbcontroller.cc:523
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "User refuses connection from %1"
 
-#: krfb/rfbcontroller.cc:578
+#: krfb/rfbcontroller.cc:571
 #, c-format
 msgid "Closed connection: %1."
 msgstr "Closed connection: %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 "Failed login attempt from %1: wrong password"
 
-#: krfb/rfbcontroller.cc:748
+#: krfb/rfbcontroller.cc:741
 msgid "Connection refused from %1, already connected."
 msgstr "Connection refused from %1, already connected."
 
-#: krfb/rfbcontroller.cc:758
+#: krfb/rfbcontroller.cc:751
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "Accepted uninvited connection from %1"
 
-#: krfb/rfbcontroller.cc:766
+#: krfb/rfbcontroller.cc:759
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "Received connection from %1, on hold (waiting for confirmation)"
 
-#: 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."