Merge translation files from master branch.r14.0.10

1 files changed, 21 insertions, 21 deletions

diff --git a/po/nb/amarok.po b/po/nb/amarok.po
index 0bb24b33..0c4db805 100644
--- a/po/nb/amarok.po
+++ b/po/nb/amarok.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
-"POT-Creation-Date: 2021-02-07 16:19+0100\n"
+"POT-Creation-Date: 2021-03-10 18:20+0000\n"
 "PO-Revision-Date: 2007-04-09 15:28+0200\n"
 "Last-Translator: Bjørn Steensrud <bjornst@powertech.no>\n"
 "Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@@ -737,11 +737,11 @@ msgstr "Sett opp samling"
 
 #: collectionbrowser.cpp:1123 collectionbrowser.cpp:1135
 #: collectionbrowser.cpp:3967 collectionbrowser.cpp:3978
-#: collectionbrowser.cpp:4271 collectiondb.cpp:2395 collectiondb.cpp:2414
-#: collectiondb.cpp:2432 collectiondb.cpp:2453 collectiondb.cpp:2471
-#: collectiondb.cpp:7036 collectiondb.cpp:7092 collectiondb.cpp:7126
-#: collectiondb.cpp:7175 collectiondb.cpp:7229 collectiondb.cpp:7258
-#: collectiondb.cpp:7310 collectiondb.cpp:7348 collectiondb.cpp:7376
+#: collectionbrowser.cpp:4271 collectiondb.cpp:2394 collectiondb.cpp:2413
+#: collectiondb.cpp:2431 collectiondb.cpp:2452 collectiondb.cpp:2470
+#: collectiondb.cpp:7035 collectiondb.cpp:7091 collectiondb.cpp:7125
+#: collectiondb.cpp:7174 collectiondb.cpp:7228 collectiondb.cpp:7257
+#: collectiondb.cpp:7309 collectiondb.cpp:7347 collectiondb.cpp:7375
 #: contextbrowser.cpp:1409 contextbrowser.cpp:1444 contextbrowser.cpp:1647
 #: contextbrowser.cpp:1693 contextbrowser.cpp:2688 contextbrowser.cpp:2717
 #: contextbrowser.cpp:2723 contextbrowser.cpp:2851 contextbrowser.cpp:2879
@@ -1104,8 +1104,8 @@ msgstr ""
 msgid "Flat View Columns"
 msgstr "Flatvisningskolonner"
 
-#: collectionbrowser.cpp:4040 collectiondb.cpp:2165 collectiondb.cpp:2230
-#: collectiondb.cpp:7051 collectiondb.cpp:7141 collectiondb.cpp:7191
+#: collectionbrowser.cpp:4040 collectiondb.cpp:2164 collectiondb.cpp:2229
+#: collectiondb.cpp:7050 collectiondb.cpp:7140 collectiondb.cpp:7190
 #: covermanager.cpp:132 covermanager.cpp:439 covermanager.cpp:942
 #: database_refactor/collectiondb.cpp:1120
 #: mediadevice/generic/genericmediadevice.cpp:541
@@ -1119,7 +1119,7 @@ msgstr "Flatvisningskolonner"
 msgid "Various Artists"
 msgstr "Diverse artister"
 
-#: collectiondb.cpp:1752
+#: collectiondb.cpp:1751
 #, c-format
 msgid ""
 "_n: One item\n"
@@ -1128,13 +1128,13 @@ msgstr ""
 "Ett element\n"
 "%n elementer"
 
-#: collectiondb.cpp:1757
+#: collectiondb.cpp:1756
 msgid ""
 "_: X songs from X albums\n"
 "%2 from %1"
 msgstr "%2 fra %1"
 
-#: collectiondb.cpp:1758
+#: collectiondb.cpp:1757
 #, c-format
 msgid ""
 "_n: one album\n"
@@ -1143,7 +1143,7 @@ msgstr ""
 "Ett album\n"
 "%n album"
 
-#: collectiondb.cpp:1762
+#: collectiondb.cpp:1761
 #, c-format
 msgid ""
 "_n: One song\n"
@@ -1152,7 +1152,7 @@ msgstr ""
 "En melodi\n"
 "%n melodier"
 
-#: collectiondb.cpp:1765
+#: collectiondb.cpp:1764
 #, c-format
 msgid ""
 "_n: One playlist\n"
@@ -1161,7 +1161,7 @@ msgstr ""
 "En spilleliste\n"
 "%n spillelister"
 
-#: collectiondb.cpp:1767
+#: collectiondb.cpp:1766
 #, c-format
 msgid ""
 "_n: One remote file\n"
@@ -1170,23 +1170,23 @@ msgstr ""
 "En fil på nettverket\n"
 "%n filer på nettverket"
 
-#: collectiondb.cpp:1769
+#: collectiondb.cpp:1768
 msgid "Unknown item"
 msgstr "Ukjent element"
 
-#: collectiondb.cpp:3584
+#: collectiondb.cpp:3583
 msgid "from"
 msgstr "fra"
 
-#: collectiondb.cpp:5354 collectiondb.cpp:5363
+#: collectiondb.cpp:5353 collectiondb.cpp:5362
 msgid "Updating database"
 msgstr "Oppdaterer database"
 
-#: collectiondb.cpp:6466
+#: collectiondb.cpp:6465
 msgid "MySQL reported the following error:<br>"
 msgstr "MySQL meldte om denne feilen:<br>"
 
-#: collectiondb.cpp:6467
+#: collectiondb.cpp:6466
 msgid ""
 "<p>You can configure MySQL in the Collection section under Settings-"
 ">Configure Amarok</p>"
@@ -1194,11 +1194,11 @@ msgstr ""
 "<p>Du kan sette opp MySQL under «Innstillinger -> Sett opp Amarok -> "
 "Samling».</p>"
 
-#: collectiondb.cpp:6633
+#: collectiondb.cpp:6632
 msgid "Postgresql reported the following error:<br>"
 msgstr "Postgresql meldte om denne feilen:<br>"
 
-#: collectiondb.cpp:6634
+#: collectiondb.cpp:6633
 msgid ""
 "<p>You can configure Postgresql in the Collection section under Settings-"
 ">Configure Amarok</p>"