Merge translation files from master branch.

1 files changed, 58 insertions, 69 deletions

diff --git a/po/uz/amarok.po b/po/uz/amarok.po
index 6c8c4d17..bc7e7e92 100644
--- a/po/uz/amarok.po
+++ b/po/uz/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: 2008-04-14 22:16+0200\n"
 "Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
 "Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
@@ -111,16 +111,16 @@ msgstr "E&kvalayzer"
 msgid "&Rescan Collection"
 msgstr "Toʻplamni &qaytadan sken qilish"
 
-#: actionclasses.cpp:211 app.cpp:440
+#: actionclasses.cpp:211 app.cpp:438
 msgid "Play/Pause"
 msgstr "Oʻynash/Vaqtincha toʻxtatish"
 
-#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:438
+#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:436
 #: playlistwindow.cpp:196
 msgid "Pause"
 msgstr "Vaqtincha toʻxtatish"
 
-#: actionclasses.cpp:238 app.cpp:436 playlistwindow.cpp:195
+#: actionclasses.cpp:238 app.cpp:434 playlistwindow.cpp:195
 msgid "Play"
 msgstr "Oʻynash"
 
@@ -311,159 +311,158 @@ msgstr ""
 "(C) 2002-2003, Mark Kretshmann (Mark Kretschmann)\n"
 "(C) 2003-2007, Amarok tuzuvchilari"
 
-#: app.cpp:394
+#: app.cpp:392
 msgid "Files/URLs to open"
 msgstr "Ochish uchun fayl/URL'lar"
 
-#: app.cpp:396
+#: app.cpp:394
 msgid "Skip backwards in playlist"
 msgstr "Qoʻshiq roʻyxatidagi oldingi qoʻshiqni oʻynash"
 
-#: app.cpp:398
+#: app.cpp:396
 msgid "Start playing current playlist"
 msgstr "Joriy qoʻshiq roʻyxatini oʻynab boshlash"
 
-#: app.cpp:400
+#: app.cpp:398
 msgid "Play if stopped, pause if playing"
 msgstr "Toʻxtagan boʻlsa oʻynash, oʻynayotgan boʻlsa vaqtincha toʻxtatish"
 
-#: app.cpp:401
+#: app.cpp:399
 msgid "Pause playback"
 msgstr "Oʻynashni vaqtincha toʻxtatish"
 
-#: app.cpp:403
+#: app.cpp:401
 msgid "Stop playback"
 msgstr "Oʻynashni toʻxtatish"
 
-#: app.cpp:405
+#: app.cpp:403
 msgid "Skip forwards in playlist"
 msgstr "Qoʻshiq roʻyxatidagi keyingi qoʻshiqni oʻynash"
 
-#: app.cpp:406
+#: app.cpp:404
 msgid "Additional options:"
 msgstr "Qoʻshimcha parametrlar:"
 
-#: app.cpp:408
+#: app.cpp:406
 msgid "Append files/URLs to playlist"
 msgstr "Qoʻshiq roʻyxatiga fayl/URL'lar qoʻshish"
 
-#: app.cpp:410
+#: app.cpp:408
 msgid "See append, available for backwards compatability"
 msgstr ""
 
-#: app.cpp:411
+#: app.cpp:409
 msgid "Queue URLs after the currently playing track"
 msgstr "URL'larni joriy qoʻshiqdan soʻng navbatga qoʻyish"
 
-#: app.cpp:413
+#: app.cpp:411
 msgid "Load URLs, replacing current playlist"
 msgstr ""
 
-#: app.cpp:415
+#: app.cpp:413
 msgid "Toggle the Playlist-window"
 msgstr "Qoʻshiq roʻyxatini koʻrsatish/bekitish"
 
-#: app.cpp:416
+#: app.cpp:414
 msgid "Run first-run wizard"
 msgstr "Yordamchini ishga tushirish"
 
-#: app.cpp:417
+#: app.cpp:415
 msgid "Use the <name> engine"
 msgstr ""
 
-#: app.cpp:418
+#: app.cpp:416
 msgid "Base for relative filenames/URLs"
 msgstr ""
 
-#: app.cpp:419
+#: app.cpp:417
 msgid "Play an AudioCD from <device>"
 msgstr ""
 
-#: app.cpp:444
+#: app.cpp:442
 msgid "Stop Playing After Current Track"
 msgstr "Joriy qoʻshiqdan soʻng oʻynashni toʻxtatish"
 
-#: app.cpp:446 playlistwindow.cpp:197
+#: app.cpp:444 playlistwindow.cpp:197
 msgid "Next Track"
 msgstr "Keyingi qoʻshiq"
 
-#: app.cpp:448 playlistwindow.cpp:194
+#: app.cpp:446 playlistwindow.cpp:194
 msgid "Previous Track"
 msgstr "Oldingi qoʻshiq"
 
-#: app.cpp:450
+#: app.cpp:448
 msgid "Increase Volume"
 msgstr "Tovushni koʻpaytirish"
 
-#: app.cpp:452
+#: app.cpp:450
 msgid "Decrease Volume"
 msgstr "Tovushni pasaytirish"
 
-#: app.cpp:454
+#: app.cpp:452
 msgid "Seek Forward"
 msgstr "Oldinga qidirish"
 
-#: app.cpp:456
+#: app.cpp:454
 msgid "Seek Backward"
 msgstr "Orqaga qidirish"
 
-#: app.cpp:458
+#: app.cpp:456
 msgid "Add Media..."
 msgstr "Qoʻshiqni qoʻshish..."
 
-#: app.cpp:460
+#: app.cpp:458
 msgid "Toggle Playlist Window"
 msgstr "Qoʻshiq roʻyxatini koʻrsatish/bekitish"
 
-#: app.cpp:463
+#: app.cpp:461
 msgid "Show OSD"
 msgstr ""
 
-#: app.cpp:466
+#: app.cpp:464
 msgid "Mute Volume"
 msgstr "Tovushni oʻchirish"
 
-#: app.cpp:469
+#: app.cpp:467
 msgid "Rate Current Track: 1"
 msgstr "Joriy qoʻshiqqa ovoz berish: 1"
 
-#: app.cpp:471
+#: app.cpp:469
 msgid "Rate Current Track: 2"
 msgstr "Joriy qoʻshiqqa ovoz berish: 2"
 
-#: app.cpp:473
+#: app.cpp:471
 msgid "Rate Current Track: 3"
 msgstr "Joriy qoʻshiqqa ovoz berish: 3"
 
-#: app.cpp:475
+#: app.cpp:473
 msgid "Rate Current Track: 4"
 msgstr "Joriy qoʻshiqqa ovoz berish: 4"
 
-#: app.cpp:477
+#: app.cpp:475
 msgid "Rate Current Track: 5"
 msgstr "Joriy qoʻshiqqa ovoz berish: 5"
 
-#: app.cpp:561
+#: app.cpp:559
 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 ""
 
-#: 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 "Qoʻshiq roʻyxati"
 
-#: 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
@@ -474,43 +473,43 @@ msgstr "Amarok - %1"
 msgid "&Append to Playlist"
 msgstr "&Qoʻshiq roʻyxatiga qoʻshish"
 
-#: app.cpp:988
+#: app.cpp:985
 msgid "Append && &Play"
 msgstr "Qoʻshish &va oʻynash"
 
-#: 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 "Qoʻshiqni &navbatga qoʻyish"
 
-#: 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.</"
 "qt>"
 msgstr ""
 
-#: app.cpp:1056
+#: app.cpp:1053
 msgid "Docking in System Tray"
 msgstr ""
 
-#: app.cpp:1085
+#: app.cpp:1082
 msgid ""
 "_: state, as in playing\n"
 "Play"
 msgstr ""
 
-#: app.cpp:1091 engine/helix/helix-errors.cpp:67
+#: app.cpp:1088 engine/helix/helix-errors.cpp:67
 msgid "Paused"
 msgstr "Vaqtincha toʻxtatilgan"
 
-#: app.cpp:1192 firstrunwizard.ui:16
+#: app.cpp:1189 firstrunwizard.ui:16
 #, no-c-format
 msgid "First-Run Wizard"
 msgstr "Yordamchi"
 
-#: app.cpp:1237
+#: app.cpp:1234
 msgid "Moving files to trash"
 msgstr ""
 
@@ -1175,36 +1174,23 @@ msgstr ""
 msgid "(C) 2003-2006, The Amarok Developers"
 msgstr "(C) 2003-2007, Amarok tuzuvchilari"
 
-#: 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 ""
-
-#: 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 ""
 
-#: collectionscanner/main.cpp:44
+#: collectionscanner/main.cpp:42
 msgid "Scan folders recursively"
 msgstr "Jildlarni rekursiv sken qilish"
 
-#: collectionscanner/main.cpp:46
+#: collectionscanner/main.cpp:44
 msgid "Incremental Scan (modified folders only)"
 msgstr ""
 
-#: collectionscanner/main.cpp:48
+#: collectionscanner/main.cpp:46
 msgid "Import playlist"
 msgstr "Qoʻshiq roʻyxatini import qilish"
 
-#: collectionscanner/main.cpp:50
+#: collectionscanner/main.cpp:48
 msgid "Restart the scanner at last position, after a crash"
 msgstr ""
 
@@ -12054,6 +12040,9 @@ msgstr "Faylning nomi"
 msgid "Select Best Possible Match"
 msgstr ""
 
+#~ msgid "http://amarok.kde.org"
+#~ msgstr "http://amarok.kde.org"
+
 #, fuzzy
 #~ msgid "Off"
 #~ msgstr "&Oʻchirilgan"