Merge translation files from master branch.

2 files changed, 30 insertions, 30 deletions

diff --git a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
index 2b94aa0e5b6..f540a93827f 100644
--- a/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-en_GB/messages/tdelibs/tdelibs.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdelibs\n"
-"POT-Creation-Date: 2019-03-03 18:57+0100\n"
+"POT-Creation-Date: 2019-04-28 23:56+0200\n"
 "PO-Revision-Date: 2006-12-07 23:42+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -296,7 +296,7 @@ msgstr "OK"
 #: ../dependencies/tqt3/src/dialogs/qerrormessage.cpp:174
 #: ../dependencies/tqt3/src/dialogs/qfiledialog.cpp:2561
 #: ../dependencies/tqt3/src/dialogs/qfiledialog.cpp:4667 common_texts.cpp:67
-#: tdecore/kdebug.cpp:339 tdecore/tdeapplication.cpp:1625
+#: tdecore/kdebug.cpp:341 tdecore/tdeapplication.cpp:1625
 #: tdecore/tdeapplication.cpp:2685 tdecore/tdeapplication.cpp:2720
 #: tdecore/tdeapplication.cpp:2991 tdecore/tdeapplication.cpp:3016
 #: tdeui/kdialogbase.cpp:908 tdeui/kstdguiitem.cpp:99
diff --git a/tde-i18n-en_GB/messages/tdepim/tdeio_imap4.po b/tde-i18n-en_GB/messages/tdepim/tdeio_imap4.po
index 10ed01b12ae..002a9e007ca 100644
--- a/tde-i18n-en_GB/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-en_GB/messages/tdepim/tdeio_imap4.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tdeio_imap4\n"
-"POT-Creation-Date: 2018-12-15 18:41+0100\n"
+"POT-Creation-Date: 2019-04-28 20:29+0200\n"
 "PO-Revision-Date: 2005-11-06 01:17+0000\n"
 "Last-Translator: Malcolm Hunter <[email protected]>\n"
 "Language-Team: British English <[email protected]>\n"
@@ -26,15 +26,15 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: imap4.cc:613
+#: imap4.cc:622
 msgid "Message from %1 while processing '%2': %3"
 msgstr "Message from %1 while processing '%2': %3"
 
-#: imap4.cc:615
+#: imap4.cc:624
 msgid "Message from %1: %2"
 msgstr "Message from %1: %2"
 
-#: imap4.cc:936
+#: imap4.cc:948
 msgid ""
 "The following folder will be created on the server: %1 What do you want to "
 "store in this folder?"
@@ -42,31 +42,31 @@ msgstr ""
 "The following folder will be created on the server: %1 What do you want to "
 "store in this folder?"
 
-#: imap4.cc:938
+#: imap4.cc:950
 msgid "Create Folder"
 msgstr "Create Folder"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Messages"
 msgstr "&Messages"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Subfolders"
 msgstr "&Subfolders"
 
-#: imap4.cc:1273
+#: imap4.cc:1285
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr "Unsubscribe of folder %1 failed. The server returned: %2"
 
-#: imap4.cc:1294
+#: imap4.cc:1306
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr "Subscribe of folder %1 failed. The server returned: %2"
 
-#: imap4.cc:1363 imap4.cc:1375 imap4.cc:1406
+#: imap4.cc:1375 imap4.cc:1387 imap4.cc:1418
 msgid "Changing the flags of message %1 failed."
 msgstr "Changing the flags of message %1 failed."
 
-#: imap4.cc:1452
+#: imap4.cc:1464
 msgid ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
@@ -74,7 +74,7 @@ msgstr ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 
-#: imap4.cc:1471
+#: imap4.cc:1483
 msgid ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
@@ -82,7 +82,7 @@ msgstr ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
 
-#: imap4.cc:1488 imap4.cc:1515
+#: imap4.cc:1500 imap4.cc:1527
 msgid ""
 "Retrieving the Access Control List on folder %1 failed. The server returned: "
 "%2"
@@ -90,27 +90,27 @@ msgstr ""
 "Retrieving the Access Control List on folder %1 failed. The server returned: "
 "%2"
 
-#: imap4.cc:1549
+#: imap4.cc:1561
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr "Searching of folder %1 failed. The server returned: %2"
 
-#: imap4.cc:1583
+#: imap4.cc:1595
 #, fuzzy
 msgid "Custom command %1:%2 failed. The server returned: %3"
 msgstr "Subscribe of folder %1 failed. The server returned: %2"
 
-#: imap4.cc:1666
+#: imap4.cc:1678
 msgid "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 msgstr ""
 "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 
-#: imap4.cc:1690
+#: imap4.cc:1702
 msgid ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 msgstr ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 
-#: imap4.cc:1727
+#: imap4.cc:1739
 #, fuzzy
 msgid ""
 "Retrieving the quota root information on folder %1 failed. The server "
@@ -118,7 +118,7 @@ msgid ""
 msgstr ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 
-#: imap4.cc:2052
+#: imap4.cc:2064
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -126,7 +126,7 @@ msgstr ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
 
-#: imap4.cc:2063
+#: imap4.cc:2075
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -134,23 +134,23 @@ msgstr ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
 
-#: imap4.cc:2088
+#: imap4.cc:2100
 msgid "Starting TLS failed."
 msgstr "Starting TLS failed."
 
-#: imap4.cc:2097
+#: imap4.cc:2109
 msgid "LOGIN is disabled by the server."
 msgstr ""
 
-#: imap4.cc:2104
+#: imap4.cc:2116
 msgid "The authentication method %1 is not supported by the server."
 msgstr "The authentication method %1 is not supported by the server."
 
-#: imap4.cc:2132
+#: imap4.cc:2144
 msgid "Username and password for your IMAP account:"
 msgstr "Username and password for your IMAP account:"
 
-#: imap4.cc:2146
+#: imap4.cc:2158
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
 "The server %1 replied:\n"
@@ -160,7 +160,7 @@ msgstr ""
 "The server %1 replied:\n"
 "%2"
 
-#: imap4.cc:2153
+#: imap4.cc:2165
 msgid ""
 "Unable to authenticate via %1.\n"
 "The server %2 replied:\n"
@@ -170,11 +170,11 @@ msgstr ""
 "The server %2 replied:\n"
 "%3"
 
-#: imap4.cc:2160
+#: imap4.cc:2172
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr "SASL authentication is not compiled into tdeio_imap4."
 
-#: imap4.cc:2704
+#: imap4.cc:2716
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Unable to open folder %1. The server replied: %2"