Merge translation files from master branch.

1 files changed, 109 insertions, 96 deletions

diff --git a/po/af/amarok.po b/po/af/amarok.po
index 1ee12aee..1869cba5 100644
--- a/po/af/amarok.po
+++ b/po/af/amarok.po
@@ -6,7 +6,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-01-16 16:13+0200\n"
 "Last-Translator: Frikkie Thirion <frikkie.thirion@deneloptronics.co.za>\n"
 "Language-Team: Afrikaans <translate-discuss-af@lists.sourceforge.net>\n"
@@ -125,16 +125,16 @@ msgstr "Band mengbank"
 msgid "&Rescan Collection"
 msgstr "Herskandeer die versameling"
 
-#: actionclasses.cpp:211 app.cpp:440
+#: actionclasses.cpp:211 app.cpp:438
 msgid "Play/Pause"
 msgstr "Speel/Pouse"
 
-#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:438
+#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:436
 #: playlistwindow.cpp:196
 msgid "Pause"
 msgstr "Pouse"
 
-#: actionclasses.cpp:238 app.cpp:436 playlistwindow.cpp:195
+#: actionclasses.cpp:238 app.cpp:434 playlistwindow.cpp:195
 msgid "Play"
 msgstr "Speel"
 
@@ -331,149 +331,148 @@ msgstr ""
 "(C) 2002-2003, Mark Kretschmann\n"
 "(C) 2003-2007, Die Amarok ontwikkeling span"
 
-#: app.cpp:394
+#: app.cpp:392
 msgid "Files/URLs to open"
 msgstr "Lêers/URLs om oop te maak"
 
-#: app.cpp:396
+#: app.cpp:394
 msgid "Skip backwards in playlist"
 msgstr "Spring terugwaarts in die speel lys"
 
-#: app.cpp:398
+#: app.cpp:396
 msgid "Start playing current playlist"
 msgstr "Begin om die huidige speel lys te speel"
 
-#: app.cpp:400
+#: app.cpp:398
 msgid "Play if stopped, pause if playing"
 msgstr "Speel as jy gestop is, pouse as jy besig is om te speel"
 
-#: app.cpp:401
+#: app.cpp:399
 msgid "Pause playback"
 msgstr "Pouse in terugspeel"
 
-#: app.cpp:403
+#: app.cpp:401
 msgid "Stop playback"
 msgstr "Stop terugspeel"
 
-#: app.cpp:405
+#: app.cpp:403
 msgid "Skip forwards in playlist"
 msgstr "Spring vorentoe in die speel lys"
 
-#: app.cpp:406
+#: app.cpp:404
 msgid "Additional options:"
 msgstr "Addisionele opsies:"
 
-#: app.cpp:408
+#: app.cpp:406
 msgid "Append files/URLs to playlist"
 msgstr "Voeg lêers/URLs agter aan speel lys by"
 
-#: app.cpp:410
+#: app.cpp:408
 msgid "See append, available for backwards compatability"
 msgstr ""
 "Kyk na die agter aan byvoeg opsie. Dit is beskikbaar vir terugwaartse "
 "aanpasbaarheid."
 
-#: app.cpp:411
+#: app.cpp:409
 msgid "Queue URLs after the currently playing track"
 msgstr "Plaas URLs in die wagtou na die huidige snit wat gespeel word."
 
-#: app.cpp:413
+#: app.cpp:411
 msgid "Load URLs, replacing current playlist"
 msgstr "Laai URLs en vervang die huidige speel lys met die resultaat"
 
-#: app.cpp:415
+#: app.cpp:413
 msgid "Toggle the Playlist-window"
 msgstr "Wissel die speel lys venster"
 
-#: app.cpp:416
+#: app.cpp:414
 msgid "Run first-run wizard"
 msgstr "Hardloop die eerste-hardloop assistent"
 
-#: app.cpp:417
+#: app.cpp:415
 msgid "Use the <name> engine"
 msgstr "Gebruik die enjin: <naam>"
 
-#: app.cpp:418
+#: app.cpp:416
 msgid "Base for relative filenames/URLs"
 msgstr "Basis wat vir relatiewe lêername/URLs gebruik moet word"
 
-#: app.cpp:419
+#: app.cpp:417
 msgid "Play an AudioCD from <device>"
 msgstr "Speel 'n oudio CD vanaf <toestel>"
 
-#: app.cpp:444
+#: app.cpp:442
 msgid "Stop Playing After Current Track"
 msgstr "Stop met speel na die huidige snit"
 
-#: app.cpp:446 playlistwindow.cpp:197
+#: app.cpp:444 playlistwindow.cpp:197
 msgid "Next Track"
 msgstr "Volgende Snit"
 
-#: app.cpp:448 playlistwindow.cpp:194
+#: app.cpp:446 playlistwindow.cpp:194
 msgid "Previous Track"
 msgstr "Vorige Snit"
 
-#: app.cpp:450
+#: app.cpp:448
 msgid "Increase Volume"
 msgstr "Vermeeder Volume"
 
-#: app.cpp:452
+#: app.cpp:450
 msgid "Decrease Volume"
 msgstr "Verminder Volume"
 
-#: app.cpp:454
+#: app.cpp:452
 msgid "Seek Forward"
 msgstr "Soek aan"
 
-#: app.cpp:456
+#: app.cpp:454
 msgid "Seek Backward"
 msgstr "Soek terugwaarts"
 
-#: app.cpp:458
+#: app.cpp:456
 msgid "Add Media..."
 msgstr "Voeg Media by..."
 
-#: app.cpp:460
+#: app.cpp:458
 msgid "Toggle Playlist Window"
 msgstr "Wissel Speel lys venster"
 
-#: app.cpp:463
+#: app.cpp:461
 msgid "Show OSD"
 msgstr "Vertoon 'OSD'"
 
-#: app.cpp:466
+#: app.cpp:464
 msgid "Mute Volume"
 msgstr "Maak klank stil"
 
-#: app.cpp:469
+#: app.cpp:467
 msgid "Rate Current Track: 1"
 msgstr "Rang vir die huidige snit: 1"
 
-#: app.cpp:471
+#: app.cpp:469
 msgid "Rate Current Track: 2"
 msgstr "Rang vir die huidige snit: 2"
 
-#: app.cpp:473
+#: app.cpp:471
 msgid "Rate Current Track: 3"
 msgstr " Rang vir die huidige snit: 3"
 
-#: app.cpp:475
+#: app.cpp:473
 msgid "Rate Current Track: 4"
 msgstr "Rang vir die huidige snit: 4"
 
-#: app.cpp:477
+#: app.cpp:475
 msgid "Rate Current Track: 5"
 msgstr "Rang vir die huidige snit: 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>Jy het 'n stelsel wat veelvuldige verwerkers ('CPU's) bevat. Let daarop "
 "dat Amarok onstabiel met hierdie funksionaliteit kan wees.</p><p>As jy "
@@ -482,17 +481,17 @@ msgstr ""
 "informasie hieroor kan in die README lêer gevind word. Vir verdere bystand "
 "kan jy by #amarok op irc.freenode.net aanklop.</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 "Speel lys"
 
-#: 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
@@ -503,17 +502,17 @@ msgstr "Amarok - %1"
 msgid "&Append to Playlist"
 msgstr "Voeg agter aan die speel lys by"
 
-#: app.cpp:988
+#: app.cpp:985
 msgid "Append && &Play"
 msgstr "Voeg by en speel"
 
-#: 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 "Plaas Snitte in Wagtou"
 
-#: 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.</"
@@ -523,26 +522,26 @@ msgstr ""
 "skinkbord hardloop. Gebruik <b>Gaan uit</b> vanuit die kieslys of die "
 "skinkbord ikoon om Amarok toe te maak.</qt>"
 
-#: app.cpp:1056
+#: app.cpp:1053
 msgid "Docking in System Tray"
 msgstr "Koppel in stelsel skinkbord"
 
-#: app.cpp:1085
+#: app.cpp:1082
 msgid ""
 "_: state, as in playing\n"
 "Play"
 msgstr "Besig om te speel"
 
-#: app.cpp:1091 engine/helix/helix-errors.cpp:67
+#: app.cpp:1088 engine/helix/helix-errors.cpp:67
 msgid "Paused"
 msgstr "In pouse"
 
-#: app.cpp:1192 firstrunwizard.ui:16
+#: app.cpp:1189 firstrunwizard.ui:16
 #, no-c-format
 msgid "First-Run Wizard"
 msgstr "Eerste-keer-harloop Assistent"
 
-#: app.cpp:1237
+#: app.cpp:1234
 msgid "Moving files to trash"
 msgstr "Besig om lêers na die asblik te skuif"
 
@@ -1235,41 +1234,23 @@ msgstr "Versameling skandeerder vir Amarok"
 msgid "(C) 2003-2006, The Amarok Developers"
 msgstr "(C) 2003-2006, Die Amarok ontwikkeling span"
 
-#: 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"
-"bediener:irc.freenode.net / kanale: #amarok #amarok.de #amarok.es\n"
-"\n"
-"Terugvoer:\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 "Gidse om te skandeer"
 
-#: collectionscanner/main.cpp:44
+#: collectionscanner/main.cpp:42
 msgid "Scan folders recursively"
 msgstr "Skandeer gidse rekursief"
 
-#: collectionscanner/main.cpp:46
+#: collectionscanner/main.cpp:44
 msgid "Incremental Scan (modified folders only)"
 msgstr "Inkrementele Skandering (slegs op gidse wat verander het)"
 
-#: collectionscanner/main.cpp:48
+#: collectionscanner/main.cpp:46
 msgid "Import playlist"
 msgstr "Voer speel lyste in"
 
-#: collectionscanner/main.cpp:50
+#: collectionscanner/main.cpp:48
 msgid "Restart the scanner at last position, after a crash"
 msgstr ""
 "Laat skandeer by die laaste posisie voortgaan, voordat Amarok omgeval het."
@@ -12784,29 +12765,35 @@ msgstr "Kies beste moontlike ooreenstemming"
 
 #, 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 gebruik 'n databasis om informasie oor jou musiek te stoor. As jy "
-#~ "nie seker is watter een om te gebruik nie, kan jy net <i>Volgende</i> "
-#~ "druk.\n"
-#~ "<p><b>MySQL</b> of <b>PostgreSQL</b> is vinniger as <b>sqlite</b>, maar "
-#~ "benodig addisionele opstelling.</p>\n"
-#~ "<ul>\n"
-#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/MySQL_HowTo"
-#~ "\">Instruksies om MySQL op te stel</a>.</li>\n"
-#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/Postgresql_HowTo"
-#~ "\">Instruksies om PostgreSQL op te stel</a>.</li>\n"
-#~ "</ul>"
+#~ "<p>Jy het 'n stelsel wat veelvuldige verwerkers ('CPU's) bevat. Let "
+#~ "daarop dat Amarok onstabiel met hierdie funksionaliteit kan wees.</"
+#~ "p><p>As jy probleme ervaar, maak van die Linux kernel opsie 'NOHT' "
+#~ "gebruik of deaktiveer <i>HyperThreading</i> in jou BIOS opstelling.</"
+#~ "p><p>Meer informasie hieroor kan in die README lêer gevind word. Vir "
+#~ "verdere bystand kan jy by #amarok op irc.freenode.net aanklop.</p>"
+
+#~ msgid ""
+#~ "IRC:\n"
+#~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"
+#~ "\n"
+#~ "Feedback:\n"
+#~ "amarok@kde.org"
+#~ msgstr ""
+#~ "IRC:\n"
+#~ "bediener:irc.freenode.net / kanale: #amarok #amarok.de #amarok.es\n"
+#~ "\n"
+#~ "Terugvoer:\n"
+#~ "amarok@kde.org"
+
+#~ msgid "http://amarok.kde.org"
+#~ msgstr "http://amarok.kde.org"
 
 #, fuzzy
 #~ msgid "&Help"
@@ -13129,3 +13116,29 @@ msgstr "Kies beste moontlike ooreenstemming"
 #~ msgstr ""
 #~ "Aktiveer tussen uitdoof tussen snitte. Hierdie opsie aktiveer ook die "
 #~ "uitdoof van en na stilte, bv. as die stop knoppie gedruk word."
+
+#, 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 gebruik 'n databasis om informasie oor jou musiek te stoor. As jy "
+#~ "nie seker is watter een om te gebruik nie, kan jy net <i>Volgende</i> "
+#~ "druk.\n"
+#~ "<p><b>MySQL</b> of <b>PostgreSQL</b> is vinniger as <b>sqlite</b>, maar "
+#~ "benodig addisionele opstelling.</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/MySQL_HowTo"
+#~ "\">Instruksies om MySQL op te stel</a>.</li>\n"
+#~ "<li><a href=\"http://amarok.kde.org/amarokwiki/index.php/Postgresql_HowTo"
+#~ "\">Instruksies om PostgreSQL op te stel</a>.</li>\n"
+#~ "</ul>"