Merge translation files from master branch.

1 files changed, 109 insertions, 96 deletions

diff --git a/po/nn/amarok.po b/po/nn/amarok.po
index c551b8f2..840d99a3 100644
--- a/po/nn/amarok.po
+++ b/po/nn/amarok.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: amarok\n"
-"POT-Creation-Date: 2019-07-14 02:50+0200\n"
+"POT-Creation-Date: 2019-07-18 02:06+0200\n"
 "PO-Revision-Date: 2007-08-15 19:09+0200\n"
 "Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
 "Language-Team: Norwegian Nynorsk <nn@li.org>\n"
@@ -121,16 +121,16 @@ msgstr "Lydb&alanse"
 msgid "&Rescan Collection"
 msgstr "&Bygg opp att samling"
 
-#: actionclasses.cpp:211 app.cpp:440
+#: actionclasses.cpp:211 app.cpp:438
 msgid "Play/Pause"
 msgstr "Spel/pause"
 
-#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:438
+#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:436
 #: playlistwindow.cpp:196
 msgid "Pause"
 msgstr "Pause"
 
-#: actionclasses.cpp:238 app.cpp:436 playlistwindow.cpp:195
+#: actionclasses.cpp:238 app.cpp:434 playlistwindow.cpp:195
 msgid "Play"
 msgstr "Spel"
 
@@ -326,146 +326,146 @@ msgstr ""
 "© 2002–2003 Mark Kretschmann\n"
 "© 2003–2007 Amarok-utviklingslaget"
 
-#: app.cpp:394
+#: app.cpp:392
 msgid "Files/URLs to open"
 msgstr "Filer og nettadresser som skal opnast"
 
-#: app.cpp:396
+#: app.cpp:394
 msgid "Skip backwards in playlist"
 msgstr "Hopp bakover i spelelista"
 
-#: app.cpp:398
+#: app.cpp:396
 msgid "Start playing current playlist"
 msgstr "Spel av gjeldande speleliste"
 
-#: app.cpp:400
+#: app.cpp:398
 msgid "Play if stopped, pause if playing"
 msgstr "Spel av viss stoppa. Pause viss spelar."
 
-#: app.cpp:401
+#: app.cpp:399
 msgid "Pause playback"
 msgstr "Pause i avspeling"
 
-#: app.cpp:403
+#: app.cpp:401
 msgid "Stop playback"
 msgstr "Stopp avspeling"
 
-#: app.cpp:405
+#: app.cpp:403
 msgid "Skip forwards in playlist"
 msgstr "Hopp framover i spelelista"
 
-#: app.cpp:406
+#: app.cpp:404
 msgid "Additional options:"
 msgstr "Fleire val:"
 
-#: app.cpp:408
+#: app.cpp:406
 msgid "Append files/URLs to playlist"
 msgstr "Legg filer og nettadresser til spelelista"
 
-#: app.cpp:410
+#: app.cpp:408
 msgid "See append, available for backwards compatability"
 msgstr "Sjå «append». Er berre tilgjengeleg for bakoverkompatibilitet."
 
-#: app.cpp:411
+#: app.cpp:409
 msgid "Queue URLs after the currently playing track"
 msgstr "Legg nettadresser i kø etter sporet som spelar"
 
-#: app.cpp:413
+#: app.cpp:411
 msgid "Load URLs, replacing current playlist"
 msgstr "Last inn adresser og erstatt gjeldande speleliste"
 
-#: app.cpp:415
+#: app.cpp:413
 msgid "Toggle the Playlist-window"
 msgstr "Kopla til/frå spelelistevindauge"
 
-#: app.cpp:416
+#: app.cpp:414
 msgid "Run first-run wizard"
 msgstr "Førstegongskøyringvegvisar"
 
-#: app.cpp:417
+#: app.cpp:415
 msgid "Use the <name> engine"
 msgstr "Bruk motoren <name>"
 
-#: app.cpp:418
+#: app.cpp:416
 msgid "Base for relative filenames/URLs"
 msgstr "Grunnstig for relative filnamn/adresser"
 
-#: app.cpp:419
+#: app.cpp:417
 msgid "Play an AudioCD from <device>"
 msgstr "Spel ein lyd-CD frå <device>"
 
-#: app.cpp:444
+#: app.cpp:442
 msgid "Stop Playing After Current Track"
 msgstr "Stopp avspeling etter dette sporet"
 
-#: app.cpp:446 playlistwindow.cpp:197
+#: app.cpp:444 playlistwindow.cpp:197
 msgid "Next Track"
 msgstr "Neste spor"
 
-#: app.cpp:448 playlistwindow.cpp:194
+#: app.cpp:446 playlistwindow.cpp:194
 msgid "Previous Track"
 msgstr "Førre spor"
 
-#: app.cpp:450
+#: app.cpp:448
 msgid "Increase Volume"
 msgstr "Høgare lyd"
 
-#: app.cpp:452
+#: app.cpp:450
 msgid "Decrease Volume"
 msgstr "Lågare lyd"
 
-#: app.cpp:454
+#: app.cpp:452
 msgid "Seek Forward"
 msgstr "Spol framover"
 
-#: app.cpp:456
+#: app.cpp:454
 msgid "Seek Backward"
 msgstr "Spol bakover"
 
-#: app.cpp:458
+#: app.cpp:456
 msgid "Add Media..."
 msgstr "Legg til medium …"
 
-#: app.cpp:460
+#: app.cpp:458
 msgid "Toggle Playlist Window"
 msgstr "Kopla til/frå spelelistevindauge"
 
-#: app.cpp:463
+#: app.cpp:461
 msgid "Show OSD"
 msgstr "Vis skjermmeldingar"
 
-#: app.cpp:466
+#: app.cpp:464
 msgid "Mute Volume"
 msgstr "Demp lyd"
 
-#: app.cpp:469
+#: app.cpp:467
 msgid "Rate Current Track: 1"
 msgstr "Gje sporet karakter: 1"
 
-#: app.cpp:471
+#: app.cpp:469
 msgid "Rate Current Track: 2"
 msgstr "Gje sporet karakter: 2"
 
-#: app.cpp:473
+#: app.cpp:471
 msgid "Rate Current Track: 3"
 msgstr "Gje sporet karakter: 3"
 
-#: app.cpp:475
+#: app.cpp:473
 msgid "Rate Current Track: 4"
 msgstr "Gje sporet karakter: 4"
 
-#: app.cpp:477
+#: app.cpp:475
 msgid "Rate Current Track: 5"
 msgstr "Gje sporet karakter: 5"
 
-#: app.cpp:561
+#: app.cpp:559
+#, fuzzy
 msgid ""
 "<p>You are using a system with multiple CPUs. Please note that Amarok may be "
 "unstable with this configuration.</p><p>If your system has hyperthreading, "
 "you can improve Amarok's stability by using the Linux kernel option 'NOHT', "
 "or by disabling <i>HyperThreading</i> in your BIOS setup.</p><p>More "
-"information can be found in the README file. For further assistance join us "
-"at #amarok on irc.freenode.net.</p>"
+"information can be found in the README file.</p>"
 msgstr ""
 "<p>Du brukar ei maskin med fleire prosessorar. Merk at Amarok derfor kan "
 "vera ustabil.</p><p>Viss maskina har hypertråding, kan forbetra stabiliteten "
@@ -473,17 +473,17 @@ msgstr ""
 "BIOS-oppsettet.</p><p>Du finn meir informasjon i LESMEG-fila. Du kan òg få "
 "hjelp på IRC-kanalen #amarok på irc.freenode.net.</p>"
 
-#: app.cpp:636 app.cpp:1077 app.cpp:1096 playlistbrowser.cpp:171
+#: app.cpp:633 app.cpp:1074 app.cpp:1093 playlistbrowser.cpp:171
 #: playlistbrowseritem.cpp:858
 msgid "Playlist"
 msgstr "Speleliste"
 
-#: app.cpp:678 app.cpp:1087 app.cpp:1109
+#: app.cpp:675 app.cpp:1084 app.cpp:1106
 #, c-format
 msgid "Amarok - %1"
 msgstr "Amarok – %1"
 
-#: app.cpp:986 collectionbrowser.cpp:1427 contextbrowser.cpp:938
+#: app.cpp:983 collectionbrowser.cpp:1427 contextbrowser.cpp:938
 #: contextbrowser.cpp:949 covermanager.cpp:498 covermanager.cpp:504
 #: filebrowser.cpp:171 mediadevice/daap/daapclient.cpp:260
 #: mediadevice/generic/genericmediadevice.cpp:943
@@ -494,17 +494,17 @@ msgstr "Amarok – %1"
 msgid "&Append to Playlist"
 msgstr "&Legg til i speleliste"
 
-#: app.cpp:988
+#: app.cpp:985
 msgid "Append && &Play"
 msgstr "&Legg til og spel"
 
-#: app.cpp:991 collectionbrowser.cpp:1428 contextbrowser.cpp:950
+#: app.cpp:988 collectionbrowser.cpp:1428 contextbrowser.cpp:950
 #: filebrowser.cpp:172 playlist.cpp:3849 playlistbrowseritem.cpp:1094
 #: playlistbrowseritem.cpp:2837 statistics.cpp:645
 msgid "&Queue Track"
 msgstr "&Legg spor i kø"
 
-#: app.cpp:1054
+#: app.cpp:1051
 msgid ""
 "<qt>Closing the main-window will keep Amarok running in the System Tray. Use "
 "<B>Quit</B> from the menu, or the Amarok tray-icon to exit the application.</"
@@ -514,26 +514,26 @@ msgstr ""
 "<b>Avslutt</b> frå <b>Fil</b>-menyen eller trauikonet for å avslutta "
 "programmet.</qt>"
 
-#: app.cpp:1056
+#: app.cpp:1053
 msgid "Docking in System Tray"
 msgstr "Legg i systemtrauet"
 
-#: app.cpp:1085
+#: app.cpp:1082
 msgid ""
 "_: state, as in playing\n"
 "Play"
 msgstr "Spelar"
 
-#: app.cpp:1091 engine/helix/helix-errors.cpp:67
+#: app.cpp:1088 engine/helix/helix-errors.cpp:67
 msgid "Paused"
 msgstr "Paused"
 
-#: app.cpp:1192 firstrunwizard.ui:16
+#: app.cpp:1189 firstrunwizard.ui:16
 #, no-c-format
 msgid "First-Run Wizard"
 msgstr "Føregongskøyring"
 
-#: app.cpp:1237
+#: app.cpp:1234
 msgid "Moving files to trash"
 msgstr "Flyttar filer til papirkorg"
 
@@ -1222,41 +1222,23 @@ msgstr "Samlingssøk for Amarok"
 msgid "(C) 2003-2006, The Amarok Developers"
 msgstr "© 2003–2007 Amarok-utviklarane"
 
-#: collectionscanner/main.cpp:36
-msgid ""
-"IRC:\n"
-"server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"
-"\n"
-"Feedback:\n"
-"amarok@kde.org"
-msgstr ""
-"IRC:\n"
-"Tenaren irc.freenode.net og kanalane #amarok, #amarok.de og #amarok.es\n"
-"\n"
-"Tilbakemeldingar:\n"
-"amarok@kde.org"
-
-#: collectionscanner/main.cpp:37
-msgid "http://amarok.kde.org"
-msgstr "http://amarok.kde.org/"
-
-#: collectionscanner/main.cpp:42
+#: collectionscanner/main.cpp:40
 msgid "Folders to scan"
 msgstr "Mapper å søkja gjennom"
 
-#: collectionscanner/main.cpp:44
+#: collectionscanner/main.cpp:42
 msgid "Scan folders recursively"
 msgstr "Søk òg i undermapper"
 
-#: collectionscanner/main.cpp:46
+#: collectionscanner/main.cpp:44
 msgid "Incremental Scan (modified folders only)"
 msgstr "Kontinuerleg søk (berre mapper som er endra)"
 
-#: collectionscanner/main.cpp:48
+#: collectionscanner/main.cpp:46
 msgid "Import playlist"
 msgstr "Importer speleliste"
 
-#: collectionscanner/main.cpp:50
+#: collectionscanner/main.cpp:48
 msgid "Restart the scanner at last position, after a crash"
 msgstr "Start samlingssøket på nytt att ved siste fil etter eit krasj"
 
@@ -12584,30 +12566,36 @@ msgstr "Filnamn"
 msgid "Select Best Possible Match"
 msgstr "Vel best moglege 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>"
+#~ "<p>You are using a system with multiple CPUs. Please note that Amarok may "
+#~ "be unstable with this configuration.</p><p>If your system has "
+#~ "hyperthreading, you can improve Amarok's stability by using the Linux "
+#~ "kernel option 'NOHT', or by disabling <i>HyperThreading</i> in your BIOS "
+#~ "setup.</p><p>More information can be found in the README file. For "
+#~ "further assistance join us at #amarok on irc.freenode.net.</p>"
 #~ msgstr ""
-#~ "Amarok brukar ein database med informasjon om musikken din. Om du ikkje "
-#~ "veit kva dette tyder, så berre trykk <i>Neste</i> no.\n"
-#~ "<p><b>MySQL</b> og <b>Postgresql</b> er raskare en <b>sqlite</b>, men "
-#~ "treng ekstra oppsett.</p>\n"
-#~ "<ul>\n"
-#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/MySQL_HowTo"
-#~ "\">Instruksjonar for oppsett av MySQL</a>.</li>\n"
-#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Postgresql_HowTo"
-#~ "\">Instruksjonar for oppsett av Postgresql</a>.</li>\n"
-#~ "</ul>"
+#~ "<p>Du brukar ei maskin med fleire prosessorar. Merk at Amarok derfor kan "
+#~ "vera ustabil.</p><p>Viss maskina har hypertråding, kan forbetra "
+#~ "stabiliteten ved å bruka kjernevalet «NOHT» eller ved å slå av "
+#~ "<i>HyperThreading</i> i BIOS-oppsettet.</p><p>Du finn meir informasjon i "
+#~ "LESMEG-fila. Du kan òg få hjelp på IRC-kanalen #amarok på irc.freenode."
+#~ "net.</p>"
+
+#~ msgid ""
+#~ "IRC:\n"
+#~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"
+#~ "\n"
+#~ "Feedback:\n"
+#~ "amarok@kde.org"
+#~ msgstr ""
+#~ "IRC:\n"
+#~ "Tenaren irc.freenode.net og kanalane #amarok, #amarok.de og #amarok.es\n"
+#~ "\n"
+#~ "Tilbakemeldingar:\n"
+#~ "amarok@kde.org"
+
+#~ msgid "http://amarok.kde.org"
+#~ msgstr "http://amarok.kde.org/"
 
 #, fuzzy
 #~ msgid "&Help"
@@ -12842,3 +12830,28 @@ msgstr "Vel best moglege treff"
 
 #~ msgid "Advanced"
 #~ msgstr "Avansert"
+
+#, 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 brukar ein database med informasjon om musikken din. Om du ikkje "
+#~ "veit kva dette tyder, så berre trykk <i>Neste</i> no.\n"
+#~ "<p><b>MySQL</b> og <b>Postgresql</b> er raskare en <b>sqlite</b>, men "
+#~ "treng ekstra oppsett.</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/MySQL_HowTo"
+#~ "\">Instruksjonar for oppsett av MySQL</a>.</li>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Postgresql_HowTo"
+#~ "\">Instruksjonar for oppsett av Postgresql</a>.</li>\n"
+#~ "</ul>"