Merge translation files from master branch.

1 files changed, 45 insertions, 20 deletions

diff --git a/translations/messages/nn.po b/translations/messages/nn.po
index 8ba0ad9..9212344 100644
--- a/translations/messages/nn.po
+++ b/translations/messages/nn.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2020-11-22 18:59+0800\n"
+"POT-Creation-Date: 2020-12-19 11:10+0900\n"
 "PO-Revision-Date: 2007-01-22 20:19+0100\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -45,20 +45,20 @@ msgstr ""
 msgid "BasKet Note Pads"
 msgstr "Korgnotat"
 
-#: src/aboutdata.cpp:42
+#: src/aboutdata.cpp:40
 #, fuzzy
 msgid "Maintainer"
 msgstr "Forfattar og vedlikeheldar."
 
-#: src/aboutdata.cpp:46
+#: src/aboutdata.cpp:44
 msgid "Original Author"
 msgstr ""
 
-#: src/aboutdata.cpp:50
+#: src/aboutdata.cpp:48
 msgid "Basket encryption, Kontact integration, KnowIt importer"
 msgstr "Krypteringsstøtte, Kontakt-integrering og KnowIt-import."
 
-#: src/aboutdata.cpp:54
+#: src/aboutdata.cpp:52
 msgid ""
 "Baskets auto lock, save-status icon, HTML copy/paste, basket name tooltip, "
 "drop to basket name"
@@ -66,7 +66,7 @@ msgstr ""
 "Automatisk låsing, lagrestatusikon, kopiering og innliming av HTML, "
 "verktøytips for korgnamn og dra-og-slepp-støtte."
 
-#: src/aboutdata.cpp:58 src/basketproperties.cpp:65 src/newbasketdialog.cpp:107
+#: src/aboutdata.cpp:56 src/basketproperties.cpp:65 src/newbasketdialog.cpp:107
 msgid "Icon"
 msgstr "Ikon."
 
@@ -1441,10 +1441,10 @@ msgid "Allow Tabulations"
 msgstr "Tillèt tabulatorar"
 
 #: src/formatimporter.cpp:136
+#, fuzzy
 msgid ""
-"<p>Folder mirroring is not possible anymore (see <a href='http://basket.kde."
-"org/'>basket.kde.org</a> for more information).</p><p>The folder <b>%1</b> "
-"has been copied for the basket needs. You can either delete this folder or "
+"<p>Folder mirroring is not possible anymore.</p><p>The folder <b>%1</b> has "
+"been copied for the basket needs. You can either delete this folder or "
 "delete the basket, or use both. But remember that modifying one will not "
 "modify the other anymore as they are now separate entities.</p>"
 msgstr ""
@@ -2458,12 +2458,11 @@ msgid "Justified"
 msgstr "Blokkjuster"
 
 #: src/notefactory.cpp:449
+#, fuzzy
 msgid ""
 "<p>%1 doesn't support the data you've dropped.<br>It however created a "
 "generic note, allowing you to drag or copy it to an application that "
-"understand it.</p><p>If you want the support of these data, please contact "
-"developer or visit the <a href=\"http://basket.kde.org/dropdb.php\">BasKet "
-"Drop Database</a>.</p>"
+"understand it.</p>"
 msgstr ""
 "<p>%1 støttar ikkje data­typen du har komme med.<br>Programmet har derfor "
 "oppretta eit generelt notat, som du kan dra eller kopiera til eit program "
@@ -2471,35 +2470,35 @@ msgstr ""
 "data, kan du kontakta program­utviklaren eller vitja <a href=\"http://basket."
 "kde.org/dropdb.php\">datatype-basen for programet</a>.</p>"
 
-#: src/notefactory.cpp:453
+#: src/notefactory.cpp:451
 msgid "Unsupported MIME Type(s)"
 msgstr "Ikkje støtta MIME-type/-typar"
 
-#: src/notefactory.cpp:507
+#: src/notefactory.cpp:505
 msgid "&Move Here\tShift"
 msgstr "&Flytt her\tShift"
 
-#: src/notefactory.cpp:508
+#: src/notefactory.cpp:506
 msgid "&Copy Here\tCtrl"
 msgstr "&Kopier her\tCtrl"
 
-#: src/notefactory.cpp:509
+#: src/notefactory.cpp:507
 msgid "&Link Here\tCtrl+Shift"
 msgstr "&Lag lenkje her\tCtrl + Shift"
 
-#: src/notefactory.cpp:511
+#: src/notefactory.cpp:509
 msgid "C&ancel\tEscape"
 msgstr "&Avbryt\tEscape"
 
-#: src/notefactory.cpp:995
+#: src/notefactory.cpp:993
 msgid "Import Icon as Image"
 msgstr "Importer ikon som bilete"
 
-#: src/notefactory.cpp:995
+#: src/notefactory.cpp:993
 msgid "Choose the size of the icon to import as an image:"
 msgstr "Vel storleiken på ikonet du vil importera som bilete:"
 
-#: src/notefactory.cpp:1008
+#: src/notefactory.cpp:1006
 msgid "Load File Content into a Note"
 msgstr "Lagra filinnhald som notat"
 
@@ -3643,3 +3642,29 @@ msgstr "Alt+E"
 #~ msgstr ""
 #~ "Hugs at det er like viktig for oss å få veta kva du liker med programmet "
 #~ "som kva du ikkje liker."
+
+#~ msgid ""
+#~ "<p>Folder mirroring is not possible anymore (see <a href='http://basket."
+#~ "kde.org/'>basket.kde.org</a> for more information).</p><p>The folder <b>"
+#~ "%1</b> has been copied for the basket needs. You can either delete this "
+#~ "folder or delete the basket, or use both. But remember that modifying one "
+#~ "will not modify the other anymore as they are now separate entities.</p>"
+#~ msgstr ""
+#~ "<p>Mappespegling er ikkje lenger mogleg (sjå <a href='http://basket.kde."
+#~ "org/'>basket.kde.org</a> for meir informasjon).</p><p>Mappa <b>%1</b> er "
+#~ "derfor kopiert til korga. Du kan anten sletta denne mappa, sletta korga "
+#~ "eller bruka begge. Men merk at endringar i eine ikkje vil spegla seg i "
+#~ "den andre, då dei no er to forskjellige objekt.</p>"
+
+#~ msgid ""
+#~ "<p>%1 doesn't support the data you've dropped.<br>It however created a "
+#~ "generic note, allowing you to drag or copy it to an application that "
+#~ "understand it.</p><p>If you want the support of these data, please "
+#~ "contact developer or visit the <a href=\"http://basket.kde.org/dropdb.php"
+#~ "\">BasKet Drop Database</a>.</p>"
+#~ msgstr ""
+#~ "<p>%1 støttar ikkje data­typen du har komme med.<br>Programmet har derfor "
+#~ "oppretta eit generelt notat, som du kan dra eller kopiera til eit program "
+#~ "som forstår det.</p><p>Viss du ønskjer at programmet skal støtta denne "
+#~ "typen data, kan du kontakta program­utviklaren eller vitja <a href="
+#~ "\"http://basket.kde.org/dropdb.php\">datatype-basen for programet</a>.</p>"