From f2ffa1d8417a9d42538c03f5d6589a3a2cc21754 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Mon, 11 Feb 2019 04:30:40 +0100
Subject: Merge translation files from master branch.

---
 po/nb/amarok.po | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'po/nb')

diff --git a/po/nb/amarok.po b/po/nb/amarok.po
index 7e62b6fb..e9311d58 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: 2019-01-13 19:06+0100\n"
+"POT-Creation-Date: 2019-02-11 02:41+0100\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"
@@ -740,9 +740,9 @@ msgstr "Sett opp samling"
 #: 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: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
+#: 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
 #: 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
@@ -1106,7 +1106,7 @@ msgid "Flat View Columns"
 msgstr "Flatvisningskolonner"
 
 #: collectionbrowser.cpp:4040 collectiondb.cpp:2165 collectiondb.cpp:2230
-#: collectiondb.cpp:7050 collectiondb.cpp:7140 collectiondb.cpp:7190
+#: collectiondb.cpp:7051 collectiondb.cpp:7141 collectiondb.cpp:7191
 #: covermanager.cpp:132 covermanager.cpp:439 covermanager.cpp:942
 #: database_refactor/collectiondb.cpp:1120
 #: mediadevice/generic/genericmediadevice.cpp:541
@@ -1183,11 +1183,11 @@ msgstr "fra"
 msgid "Updating database"
 msgstr "Oppdaterer database"
 
-#: collectiondb.cpp:6465
+#: collectiondb.cpp:6466
 msgid "MySQL reported the following error:<br>"
 msgstr "MySQL meldte om denne feilen:<br>"
 
-#: collectiondb.cpp:6466
+#: collectiondb.cpp:6467
 msgid ""
 "<p>You can configure MySQL in the Collection section under Settings-"
 ">Configure Amarok</p>"
@@ -1195,11 +1195,11 @@ msgstr ""
 "<p>Du kan sette opp MySQL under «Innstillinger -> Sett opp Amarok -> "
 "Samling».</p>"
 
-#: collectiondb.cpp:6632
+#: collectiondb.cpp:6633
 msgid "Postgresql reported the following error:<br>"
 msgstr "Postgresql meldte om denne feilen:<br>"
 
-#: collectiondb.cpp:6633
+#: collectiondb.cpp:6634
 msgid ""
 "<p>You can configure Postgresql in the Collection section under Settings-"
 ">Configure Amarok</p>"
-- 
cgit v1.2.1