From 667eed09e282b08747e65a0db9a94992321ef441 Mon Sep 17 00:00:00 2001
From: Automated System <slavek.banko@axis.cz>
Date: Mon, 15 Jul 2019 02:15:57 +0200
Subject: Merge translation files from master branch.

---
 po/nb/amarok.po | 40 +++++++++++++++++++++++++++++++++-------
 1 file changed, 33 insertions(+), 7 deletions(-)

(limited to 'po/nb')

diff --git a/po/nb/amarok.po b/po/nb/amarok.po
index 3b608c8c..89ee624a 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-02-11 02:41+0100\n"
+"POT-Creation-Date: 2019-07-14 02:50+0200\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"
@@ -9022,8 +9022,8 @@ msgid ""
 "You need the moodbar package installed from your distro repositories to "
 "enable the moodbar feature."
 msgstr ""
-"Du må ha <a href='http://community.kde.org/Amarok/Archives/Moodbar'>stemningspakka</a> "
-"installert for å kunne bruke stemningsstolpen."
+"Du må ha <a href='http://community.kde.org/Amarok/Archives/"
+"Moodbar'>stemningspakka</a> installert for å kunne bruke stemningsstolpen."
 
 #: Options1.ui:432
 #, no-c-format
@@ -11583,10 +11583,11 @@ msgid ""
 "<p><b>MySQL</b> or <b>Postgresql</b> are faster than <b>sqlite</b>, but "
 "require additional setup.</p>\n"
 "<ul>\n"
-"<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/User_Guides/MySQL_HowTo"
-"\">Instructions for configuring MySQL</a>.</li>\n"
-"<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/User_Guides/"
-"PostgreSQL_HowTo\">Instructions for configuring Postgresql</a>.</li>\n"
+"<li><a href=\"https://community.kde.org/Amarok/Archives/Amarok_1.4/"
+"User_Guide/MySQL_HowTo\">Instructions for configuring MySQL</a>.</li>\n"
+"<li><a href=\"https://community.kde.org/Amarok/Archives/Amarok_1.4/"
+"User_Guide/PostgreSQLHowTo\">Instructions for configuring Postgresql</a>.</"
+"li>\n"
 "</ul>"
 msgstr ""
 "Amarok bruker en database for å lagre informasjon om musikken din. Bare "
@@ -12632,6 +12633,31 @@ msgstr "Filnavn"
 msgid "Select Best Possible Match"
 msgstr "Velg best mulige treff"
 
+#, fuzzy
+#~ msgid ""
+#~ "Amarok uses a database to store information about your music. If you are "
+#~ "not sure which to use, press Next.\n"
+#~ "<p><b>MySQL</b> or <b>Postgresql</b> are faster than <b>sqlite</b>, but "
+#~ "require additional setup.</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/"
+#~ "User_Guides/MySQL_HowTo\">Instructions for configuring MySQL</a>.</li>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Amarok_1.4/"
+#~ "User_Guides/PostgreSQL_HowTo\">Instructions for configuring Postgresql</"
+#~ "a>.</li>\n"
+#~ "</ul>"
+#~ msgstr ""
+#~ "Amarok bruker en database for å lagre informasjon om musikken din. Bare "
+#~ "trykk på «neste» hvis du ikke er sikker på hvilken du vil bruke.\n"
+#~ "<p><b>MySQL</b> eller <b>Postgresql</b> er raskere enn <b>sqlite</b>, men "
+#~ "trenger ekstra oppsett.</p>\n"
+#~ "<ul> \n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/MySQL_HowTo"
+#~ "\">Instruksjoner for oppsett av MySQL</a> (Engelsk).</li>\n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/Postgresql_HowTo"
+#~ "\">Instruksjoner for oppsett av Postgresql</a> (Engelsk).</li>\n"
+#~ "</ul>"
+
 #, fuzzy
 #~ msgid "&Help"
 #~ msgstr "(Hjelp)"
-- 
cgit v1.2.1