Merge translation files from master branch.

1 files changed, 28 insertions, 28 deletions

diff --git a/tde-i18n-nb/messages/tdepim/tdeio_imap4.po b/tde-i18n-nb/messages/tdepim/tdeio_imap4.po
index b0b8216e06a..16737727854 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: 2020-05-11 04:03+0200\n"
+"POT-Creation-Date: 2020-12-16 16:52+0100\n"
 "PO-Revision-Date: 2007-03-17 15:36+0100\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -26,46 +26,46 @@ msgid ""
 "Your emails"
 msgstr ""
 
-#: imap4.cc:622
+#: imap4.cpp:622
 msgid "Message from %1 while processing '%2': %3"
 msgstr "Melding fra %1 under behandling av '%2': %3"
 
-#: imap4.cc:624
+#: imap4.cpp:624
 msgid "Message from %1: %2"
 msgstr "Melding fra %1: %2"
 
-#: imap4.cc:948
+#: imap4.cpp: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:950
+#: imap4.cpp:950
 msgid "Create Folder"
 msgstr "Opprett mappe"
 
-#: imap4.cc:951
+#: imap4.cpp:951
 msgid "&Messages"
 msgstr "&Meldinger"
 
-#: imap4.cc:951
+#: imap4.cpp:951
 msgid "&Subfolders"
 msgstr "&Undermapper"
 
-#: imap4.cc:1285
+#: imap4.cpp:1285
 msgid "Unsubscribe of folder %1 failed. The server returned: %2"
 msgstr "Klarte ikke stoppe abonnement på mappe %1. Tjeneren returnerte: %2"
 
-#: imap4.cc:1306
+#: imap4.cpp:1306
 msgid "Subscribe of folder %1 failed. The server returned: %2"
 msgstr "Klarte ikke starte abonnement på mappe %1. Tjeneren returnerte: %2"
 
-#: imap4.cc:1375 imap4.cc:1387 imap4.cc:1418
+#: imap4.cpp:1375 imap4.cpp:1387 imap4.cpp:1418
 msgid "Changing the flags of message %1 failed."
 msgstr "Klarte ikke endre flaggene på melding %1."
 
-#: imap4.cc:1464
+#: imap4.cpp: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:1483
+#: imap4.cpp: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:1500 imap4.cc:1527
+#: imap4.cpp:1500 imap4.cpp: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:1561
+#: imap4.cpp:1561
 msgid "Searching of folder %1 failed. The server returned: %2"
 msgstr "Søk i mappe %1 mislyktes. Tjeneren returnerte: %2"
 
-#: imap4.cc:1595
+#: imap4.cpp: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:1678
+#: imap4.cpp: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:1702
+#: imap4.cpp: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:1739
+#: imap4.cpp: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:2064
+#: imap4.cpp: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:2075
+#: imap4.cpp: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:2100
+#: imap4.cpp:2100
 msgid "Starting TLS failed."
 msgstr "Oppstart av TLS feilet."
 
-#: imap4.cc:2109
+#: imap4.cpp:2109
 msgid "LOGIN is disabled by the server."
 msgstr "Tjeneren har slått av LOGIN."
 
-#: imap4.cc:2116
+#: imap4.cpp:2116
 msgid "The authentication method %1 is not supported by the server."
 msgstr "Tjeneren støtter ikke autentiseringsmetoden %1."
 
-#: imap4.cc:2144
+#: imap4.cpp:2144
 msgid "Username and password for your IMAP account:"
 msgstr "Brukernavn og passord for din IMAP konto:"
 
-#: imap4.cc:2158
+#: imap4.cpp: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:2165
+#: imap4.cpp: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:2172
+#: imap4.cpp:2172
 msgid "SASL authentication is not compiled into tdeio_imap4."
 msgstr "SASL autentisering er ikke kompilert inn i tdeio_imap4."
 
-#: imap4.cc:2716
+#: imap4.cpp:2716
 msgid "Unable to open folder %1. The server replied: %2"
 msgstr "Kunne ikke åpne mappe %1. Tjeneren svarte: %2"