Merge translation files from master branch.

2 files changed, 61 insertions, 61 deletions

diff --git a/tde-i18n-en_GB/messages/tdebase/tdeio_media.po b/tde-i18n-en_GB/messages/tdebase/tdeio_media.po
index 45e3b2a85cd..d74b44aba49 100644
--- a/tde-i18n-en_GB/messages/tdebase/tdeio_media.po
+++ b/tde-i18n-en_GB/messages/tdebase/tdeio_media.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_media\n"
-"POT-Creation-Date: 2019-01-23 23:16+0100\n"
+"POT-Creation-Date: 2019-08-15 03:07+0200\n"
 "PO-Revision-Date: 2005-11-04 14:19+0000\n"
 "Last-Translator: Malcolm Hunter <malcolm.hunter@gmx.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\n"
@@ -80,8 +80,8 @@ msgstr ""
 #: mediamanager/fstabbackend.cpp:104 mediamanager/fstabbackend.cpp:114
 #: mediamanager/halbackend.cpp:1595 mediamanager/halbackend.cpp:1617
 #: mediamanager/halbackend.cpp:1776 mediamanager/halbackend.cpp:1831
-#: mediamanager/tdehardwarebackend.cpp:1340
-#: mediamanager/tdehardwarebackend.cpp:1351
+#: mediamanager/tdehardwarebackend.cpp:1341
+#: mediamanager/tdehardwarebackend.cpp:1352
 #, c-format
 msgid "No such medium: %1"
 msgstr ""
@@ -118,12 +118,12 @@ msgstr "Remote Share"
 msgid "Hard Disk"
 msgstr "Hard Disk"
 
-#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:796
+#: mediamanager/halbackend.cpp:749 mediamanager/tdehardwarebackend.cpp:797
 #, fuzzy
 msgid "Unknown Drive"
 msgstr "Unknown"
 
-#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:826
+#: mediamanager/halbackend.cpp:761 mediamanager/tdehardwarebackend.cpp:827
 #, fuzzy
 msgid "Floppy Drive"
 msgstr "Floppy"
@@ -133,7 +133,7 @@ msgstr "Floppy"
 msgid "Zip Drive"
 msgstr "Zip Disk"
 
-#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:883
+#: mediamanager/halbackend.cpp:839 mediamanager/tdehardwarebackend.cpp:884
 msgid "Camera"
 msgstr "Camera"
 
@@ -176,22 +176,22 @@ msgid ""
 "before attempting to unmount the device again."
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1579
+#: mediamanager/halbackend.cpp:1381 mediamanager/tdehardwarebackend.cpp:1580
 msgid ""
 "Programs that were still using the device have been forcibly terminated. "
 "They are listed below."
 msgstr ""
 
 #: mediamanager/halbackend.cpp:1402 mediamanager/halbackend.cpp:1715
-#: mediamanager/tdehardwarebackend.cpp:1397
-#: mediamanager/tdehardwarebackend.cpp:1415
-#: mediamanager/tdehardwarebackend.cpp:1455
+#: mediamanager/tdehardwarebackend.cpp:1398
+#: mediamanager/tdehardwarebackend.cpp:1416
+#: mediamanager/tdehardwarebackend.cpp:1456
 msgid ""
 "Unfortunately, the device <b>%1</b> (%2) named <b>'%3'</b> and currently "
 "mounted at <b>%4</b> could not be unmounted. "
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1461
+#: mediamanager/halbackend.cpp:1408 mediamanager/tdehardwarebackend.cpp:1462
 msgid "The following error was returned by umount command:"
 msgstr ""
 
@@ -199,7 +199,7 @@ msgstr ""
 msgid "Permission denied"
 msgstr ""
 
-#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1223
+#: mediamanager/halbackend.cpp:1562 mediamanager/tdehardwarebackend.cpp:1224
 msgid "Cannot mount encrypted drives!"
 msgstr ""
 
@@ -242,141 +242,141 @@ msgstr ""
 msgid "Feature only available with HAL or TDE hardware backend"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:471
-#: mediamanager/tdehardwarebackend.cpp:508
-#: mediamanager/tdehardwarebackend.cpp:741
+#: mediamanager/tdehardwarebackend.cpp:472
+#: mediamanager/tdehardwarebackend.cpp:509
+#: mediamanager/tdehardwarebackend.cpp:742
 #, fuzzy
 msgid "%1 Removable Device"
 msgstr "Removable Device"
 
-#: mediamanager/tdehardwarebackend.cpp:516
+#: mediamanager/tdehardwarebackend.cpp:517
 #, fuzzy
 msgid "Blank CD-ROM"
 msgstr "CD-ROM"
 
-#: mediamanager/tdehardwarebackend.cpp:525
+#: mediamanager/tdehardwarebackend.cpp:526
 msgid "Blank CD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:534
+#: mediamanager/tdehardwarebackend.cpp:535
 msgid "Blank CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:543
+#: mediamanager/tdehardwarebackend.cpp:544
 msgid "Blank Magneto-Optical CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:552
+#: mediamanager/tdehardwarebackend.cpp:553
 msgid "Blank Mount Ranier CD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:561
+#: mediamanager/tdehardwarebackend.cpp:562
 msgid "Blank Mount Ranier CD-RW-W"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:570
+#: mediamanager/tdehardwarebackend.cpp:571
 msgid "Blank DVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:579
+#: mediamanager/tdehardwarebackend.cpp:580
 msgid "Blank DVD-RAM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:588
+#: mediamanager/tdehardwarebackend.cpp:589
 msgid "Blank DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:597
+#: mediamanager/tdehardwarebackend.cpp:598
 msgid "Blank DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:606
+#: mediamanager/tdehardwarebackend.cpp:607
 msgid "Blank Dual Layer DVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:615
+#: mediamanager/tdehardwarebackend.cpp:616
 msgid "Blank Dual Layer DVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:624
+#: mediamanager/tdehardwarebackend.cpp:625
 msgid "Blank DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:633
+#: mediamanager/tdehardwarebackend.cpp:634
 msgid "Blank DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:642
+#: mediamanager/tdehardwarebackend.cpp:643
 msgid "Blank Dual Layer DVD+R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:651
+#: mediamanager/tdehardwarebackend.cpp:652
 msgid "Blank Dual Layer DVD+RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:660
+#: mediamanager/tdehardwarebackend.cpp:661
 msgid "Blank BD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:669
+#: mediamanager/tdehardwarebackend.cpp:670
 msgid "Blank BD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:678
+#: mediamanager/tdehardwarebackend.cpp:679
 msgid "Blank BD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:687
+#: mediamanager/tdehardwarebackend.cpp:688
 msgid "Blank HDDVD-ROM"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:696
+#: mediamanager/tdehardwarebackend.cpp:697
 msgid "Blank HDDVD-R"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:705
+#: mediamanager/tdehardwarebackend.cpp:706
 msgid "Blank HDDVD-RW"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:712
+#: mediamanager/tdehardwarebackend.cpp:713
 msgid "Audio CD"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:733
+#: mediamanager/tdehardwarebackend.cpp:734
 msgid "%1 Fixed Disk (%2)"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:840
+#: mediamanager/tdehardwarebackend.cpp:841
 #, fuzzy
 msgid "%1 Zip Disk"
 msgstr "Zip Disk"
 
-#: mediamanager/tdehardwarebackend.cpp:1203
-#: mediamanager/tdehardwarebackend.cpp:1383
+#: mediamanager/tdehardwarebackend.cpp:1204
+#: mediamanager/tdehardwarebackend.cpp:1384
 msgid "Internal error"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1230
+#: mediamanager/tdehardwarebackend.cpp:1231
 msgid ""
 "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
 "device and/or user privilege level<br>Corrupt data on storage device"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1232
-#: mediamanager/tdehardwarebackend.cpp:1307
-#: mediamanager/tdehardwarebackend.cpp:1399
-#: mediamanager/tdehardwarebackend.cpp:1417
+#: mediamanager/tdehardwarebackend.cpp:1233
+#: mediamanager/tdehardwarebackend.cpp:1308
+#: mediamanager/tdehardwarebackend.cpp:1400
+#: mediamanager/tdehardwarebackend.cpp:1418
 msgid "<p>Technical details:<br>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1305
+#: mediamanager/tdehardwarebackend.cpp:1306
 msgid ""
 "<qt>Unable to mount this device.<p>Potential reasons include:<br>Improper "
 "device and/or user privilege level<br>Corrupt data on storage "
 "device<br>Incorrect encryption password"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1411
+#: mediamanager/tdehardwarebackend.cpp:1412
 msgid ""
 "<qt>The device <b>%1</b> (%2) named <b>'%3'</b> and currently mounted at <b>"
 "%4</b> can not be unmounted at this time.<p>%5<p><b>Would you like to "
@@ -384,7 +384,7 @@ msgid ""
 "lost</i>"
 msgstr ""
 
-#: mediamanager/tdehardwarebackend.cpp:1538
+#: mediamanager/tdehardwarebackend.cpp:1539
 msgid ""
 "Programs still using the device have been detected. They are listed below. "
 "You have to close them or change their working directory before attempting "
diff --git a/tde-i18n-en_GB/messages/tdenetwork/krfb.po b/tde-i18n-en_GB/messages/tdenetwork/krfb.po
index 4a09f5a8e7e..e6e98473214 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-23 23:20+0100\n"
+"POT-Creation-Date: 2019-08-15 03:08+0200\n"
 "PO-Revision-Date: 2005-01-19 13:08+0000\n"
 "Last-Translator: Andrew Coles <andrew_coles@yahoo.co.uk>\n"
 "Language-Team: British English <kde-en-gb@kde.me.uk>\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:885
+#: krfb/main.cpp:116 krfb/main.cpp:123 krfb/rfbcontroller.cc:938
 msgid "Desktop Sharing Error"
 msgstr "Desktop Sharing Error"
 
@@ -171,43 +171,43 @@ msgstr ""
 msgid "Personal Invitation"
 msgstr "Personal Invitation"
 
-#: krfb/rfbcontroller.cc:376
+#: krfb/rfbcontroller.cc:429
 msgid "%1@%2 (shared desktop)"
 msgstr "%1@%2 (shared desktop)"
 
-#: krfb/rfbcontroller.cc:510
+#: krfb/rfbcontroller.cc:563
 #, c-format
 msgid "User accepts connection from %1"
 msgstr "User accepts connection from %1"
 
-#: krfb/rfbcontroller.cc:523
+#: krfb/rfbcontroller.cc:576
 #, c-format
 msgid "User refuses connection from %1"
 msgstr "User refuses connection from %1"
 
-#: krfb/rfbcontroller.cc:571
+#: krfb/rfbcontroller.cc:624
 #, c-format
 msgid "Closed connection: %1."
 msgstr "Closed connection: %1."
 
-#: krfb/rfbcontroller.cc:700 krfb/rfbcontroller.cc:705
+#: krfb/rfbcontroller.cc:753 krfb/rfbcontroller.cc:758
 msgid "Failed login attempt from %1: wrong password"
 msgstr "Failed login attempt from %1: wrong password"
 
-#: krfb/rfbcontroller.cc:741
+#: krfb/rfbcontroller.cc:794
 msgid "Connection refused from %1, already connected."
 msgstr "Connection refused from %1, already connected."
 
-#: krfb/rfbcontroller.cc:751
+#: krfb/rfbcontroller.cc:804
 #, c-format
 msgid "Accepted uninvited connection from %1"
 msgstr "Accepted uninvited connection from %1"
 
-#: krfb/rfbcontroller.cc:759
+#: krfb/rfbcontroller.cc:812
 msgid "Received connection from %1, on hold (waiting for confirmation)"
 msgstr "Received connection from %1, on hold (waiting for confirmation)"
 
-#: krfb/rfbcontroller.cc:884
+#: krfb/rfbcontroller.cc:937
 msgid ""
 "Your X11 Server does not support the required XTest extension version 2.2. "
 "Sharing your desktop is not possible."