Merge translation files from master branch.

2 files changed, 30 insertions, 30 deletions

diff --git a/tde-i18n-nb/messages/tdelibs/tdelibs.po b/tde-i18n-nb/messages/tdelibs/tdelibs.po
index e659f636f51..731d97fb9b1 100644
--- a/tde-i18n-nb/messages/tdelibs/tdelibs.po
+++ b/tde-i18n-nb/messages/tdelibs/tdelibs.po
@@ -9,7 +9,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: 2007-08-19 20:08+0200\n"
 "Last-Translator: Knut Yrvin <[email protected]>\n"
 "Language-Team:  <[email protected]>\n"
@@ -301,7 +301,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-nb/messages/tdepim/tdeio_imap4.po b/tde-i18n-nb/messages/tdepim/tdeio_imap4.po
index 108ed3d71b2..5caac5001bf 100644
--- a/tde-i18n-nb/messages/tdepim/tdeio_imap4.po
+++ b/tde-i18n-nb/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: 2007-03-17 15:36+0100\n"
 "Last-Translator: Bjørn Steensrud <[email protected]>\n"
 "Language-Team: Norwegian Bokmål <[email protected]>\n"
@@ -26,46 +26,46 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: imap4.cc:613
+#: imap4.cc:622
 msgid "Message from %1 while processing '%2': %3"
 msgstr "Melding fra %1 under behandling av '%2': %3"
 
-#: imap4.cc:615
+#: imap4.cc:624
 msgid "Message from %1: %2"
 msgstr "Melding fra %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?"
 msgstr ""
 "Denne mappa blir opprettet på tjeneren: «%1». Hva vil du lagre i denne mappa?"
 
-#: imap4.cc:938
+#: imap4.cc:950
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Messages"
 msgstr "&Meldinger"
 
-#: imap4.cc:939
+#: imap4.cc:951
 msgid "&Subfolders"
 msgstr "&Undermapper"
 
-#: imap4.cc:1273
+#: imap4.cc:1285
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr "Klarte ikke stoppe abonnement på mappe %1. Tjeneren returnerte: %2"
 
-#: imap4.cc:1294
+#: imap4.cc:1306
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr "Klarte ikke starte abonnement på mappe %1. Tjeneren returnerte: %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 "Klarte ikke endre flaggene på melding %1."
 
-#: imap4.cc:1452
+#: imap4.cc:1464
 msgid ""
 "Setting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
@@ -73,7 +73,7 @@ msgstr ""
 "Klarte ikke sette opp tilgangskontroll-lista til mappe %1 for bruker %2. "
 "Tjenerenreturnerte: %3"
 
-#: imap4.cc:1471
+#: imap4.cc:1483
 msgid ""
 "Deleting the Access Control List on folder %1 for user %2 failed. The server "
 "returned: %3"
@@ -81,7 +81,7 @@ msgstr ""
 "Klarte ikke slette tilgangskontroll-lista til mappe %1 for bruker %2 feilet. "
 "Tjeneren returnerte: %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"
@@ -89,33 +89,33 @@ msgstr ""
 "Klarte ikke hente tilgangskontroll-lista til mappe %1. Tjeneren returnerte: "
 "%2"
 
-#: imap4.cc:1549
+#: imap4.cc:1561
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr "Søk i mappe %1 mislyktes. Tjeneren returnerte: %2"
 
-#: imap4.cc:1583
+#: imap4.cc:1595
 #, fuzzy
 msgid "Custom command %1:%2 failed. The server returned: %3"
 msgstr "Klarte ikke starte abonnement på mappe %1. Tjeneren returnerte: %2"
 
-#: imap4.cc:1666
+#: imap4.cc:1678
 msgid "Setting the annotation %1 on folder %2  failed. The server returned: %3"
 msgstr ""
 "Klarte ikke sette inn kommentar %1 til mappe %2. Tjeneren returnerte: %3"
 
-#: imap4.cc:1690
+#: imap4.cc:1702
 msgid ""
 "Retrieving the annotation %1 on folder %2 failed. The server returned: %3"
 msgstr "Klarte ikke hente kommentar %1 til mappe %2. Tjeneren returnerte: %3"
 
-#: imap4.cc:1727
+#: imap4.cc:1739
 msgid ""
 "Retrieving the quota root information on folder %1 failed. The server "
 "returned: %2"
 msgstr ""
 "Klarte ikke hente rot-kvoteinformasjon om mappa %1. Tjeneren returnerte: %2"
 
-#: imap4.cc:2052
+#: imap4.cc:2064
 msgid ""
 "The server %1 supports neither IMAP4 nor IMAP4rev1.\n"
 "It identified itself with: %2"
@@ -123,7 +123,7 @@ msgstr ""
 "Tjeneren %1 støtter hverken IMAP4 eller IMAP4rev1.\n"
 "Det identifiserer seg som: %2"
 
-#: imap4.cc:2063
+#: imap4.cc:2075
 msgid ""
 "The server does not support TLS.\n"
 "Disable this security feature to connect unencrypted."
@@ -131,23 +131,23 @@ msgstr ""
 "Tjeneren støtter ikke TLS.\n"
 "Slå av denne sikkerhetsanordningen for å koble til ukryptert."
 
-#: imap4.cc:2088
+#: imap4.cc:2100
 msgid "Starting TLS failed."
 msgstr "Oppstart av TLS feilet."
 
-#: imap4.cc:2097
+#: imap4.cc:2109
 msgid "LOGIN is disabled by the server."
 msgstr "Tjeneren har slått av LOGIN."
 
-#: imap4.cc:2104
+#: imap4.cc:2116
 msgid "The authentication method %1 is not supported by the server."
 msgstr "Tjeneren støtter ikke autentiseringsmetoden %1."
 
-#: imap4.cc:2132
+#: imap4.cc:2144
 msgid "Username and password for your IMAP account:"
 msgstr "Brukernavn og passord for din IMAP konto:"
 
-#: imap4.cc:2146
+#: imap4.cc:2158
 msgid ""
 "Unable to login. Probably the password is wrong.\n"
 "The server %1 replied:\n"
@@ -157,7 +157,7 @@ msgstr ""
 "Tjeneren «%1» svarte:\n"
 "%2"
 
-#: imap4.cc:2153
+#: imap4.cc:2165
 msgid ""
 "Unable to authenticate via %1.\n"
 "The server %2 replied:\n"
@@ -167,11 +167,11 @@ msgstr ""
 "Tjeneren «%2» svarte:\n"
 "%3"
 
-#: imap4.cc:2160
+#: imap4.cc:2172
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr "SASL autentisering er ikke kompilert inn i tdeio_imap4."
 
-#: imap4.cc:2704
+#: imap4.cc:2716
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Kunne ikke åpne mappe %1. Tjeneren svarte: %2"