Merge translation files from master branch.

1 files changed, 93 insertions, 96 deletions

diff --git a/po/zh_CN/amarok.po b/po/zh_CN/amarok.po
index 215e820c..9d492bb3 100644
--- a/po/zh_CN/amarok.po
+++ b/po/zh_CN/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-02-25 16:33+0800\n"
 "Last-Translator: Funda Wang <fundawang@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -117,16 +117,16 @@ msgstr "均衡器(&Q)"
 msgid "&Rescan Collection"
 msgstr "重新扫描收藏(&R)"
 
-#: actionclasses.cpp:211 app.cpp:440
+#: actionclasses.cpp:211 app.cpp:438
 msgid "Play/Pause"
 msgstr "播放/暂停"
 
-#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:438
+#: actionclasses.cpp:228 actionclasses.cpp:233 app.cpp:436
 #: playlistwindow.cpp:196
 msgid "Pause"
 msgstr "暂停"
 
-#: actionclasses.cpp:238 app.cpp:436 playlistwindow.cpp:195
+#: actionclasses.cpp:238 app.cpp:434 playlistwindow.cpp:195
 msgid "Play"
 msgstr "播放"
 
@@ -320,159 +320,158 @@ msgstr ""
 "(C) 2002-2003，Mark Kretschmann\n"
 "(C) 2003-2007，Amarok 开发团队"
 
-#: app.cpp:394
+#: app.cpp:392
 msgid "Files/URLs to open"
 msgstr "要打开的文件/URL"
 
-#: app.cpp:396
+#: app.cpp:394
 msgid "Skip backwards in playlist"
 msgstr "在播放列表中回退"
 
-#: app.cpp:398
+#: app.cpp:396
 msgid "Start playing current playlist"
 msgstr "开始播放当前播放列表"
 
-#: app.cpp:400
+#: app.cpp:398
 msgid "Play if stopped, pause if playing"
 msgstr "若停止则播放，若播放则停止"
 
-#: app.cpp:401
+#: app.cpp:399
 msgid "Pause playback"
 msgstr "暂停回放"
 
-#: app.cpp:403
+#: app.cpp:401
 msgid "Stop playback"
 msgstr "停止回放"
 
-#: app.cpp:405
+#: app.cpp:403
 msgid "Skip forwards in playlist"
 msgstr "在播放列表中快进"
 
-#: app.cpp:406
+#: app.cpp:404
 msgid "Additional options:"
 msgstr "额外选项："
 
-#: app.cpp:408
+#: app.cpp:406
 msgid "Append files/URLs to playlist"
 msgstr "追加文件/URL 到播放列表"
 
-#: 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 排队在目前播放音轨之后"
 
-#: app.cpp:413
+#: app.cpp:411
 msgid "Load URLs, replacing current playlist"
 msgstr "装入 URL，替换当前播放列表"
 
-#: app.cpp:415
+#: app.cpp:413
 msgid "Toggle the Playlist-window"
 msgstr "切换播放列表窗口"
 
-#: app.cpp:416
+#: app.cpp:414
 msgid "Run first-run wizard"
 msgstr "运行首次运行向导"
 
-#: app.cpp:417
+#: app.cpp:415
 msgid "Use the <name> engine"
 msgstr "使用 <name> 引擎"
 
-#: app.cpp:418
+#: app.cpp:416
 msgid "Base for relative filenames/URLs"
 msgstr "文件名/URL 相对路径的基础地址"
 
-#: app.cpp:419
+#: app.cpp:417
 msgid "Play an AudioCD from <device>"
 msgstr "从 <device> 播放音频 CD"
 
-#: app.cpp:444
+#: app.cpp:442
 msgid "Stop Playing After Current Track"
 msgstr "当前音轨后停止播放"
 
-#: app.cpp:446 playlistwindow.cpp:197
+#: app.cpp:444 playlistwindow.cpp:197
 msgid "Next Track"
 msgstr "下一音轨"
 
-#: app.cpp:448 playlistwindow.cpp:194
+#: app.cpp:446 playlistwindow.cpp:194
 msgid "Previous Track"
 msgstr "上一音轨"
 
-#: app.cpp:450
+#: app.cpp:448
 msgid "Increase Volume"
 msgstr "增加音量"
 
-#: app.cpp:452
+#: app.cpp:450
 msgid "Decrease Volume"
 msgstr "降低音量"
 
-#: app.cpp:454
+#: app.cpp:452
 msgid "Seek Forward"
 msgstr "快进"
 
-#: app.cpp:456
+#: app.cpp:454
 msgid "Seek Backward"
 msgstr "快退"
 
-#: app.cpp:458
+#: app.cpp:456
 msgid "Add Media..."
 msgstr "添加媒体..."
 
-#: app.cpp:460
+#: app.cpp:458
 msgid "Toggle Playlist Window"
 msgstr "切换播放列表窗口"
 
-#: app.cpp:463
+#: app.cpp:461
 msgid "Show OSD"
 msgstr "显示 OSD"
 
-#: app.cpp:466
+#: app.cpp:464
 msgid "Mute Volume"
 msgstr "静音"
 
-#: app.cpp:469
+#: app.cpp:467
 msgid "Rate Current Track: 1"
 msgstr "对当前音轨评分：1"
 
-#: app.cpp:471
+#: app.cpp:469
 msgid "Rate Current Track: 2"
 msgstr "对当前音轨评分：2"
 
-#: app.cpp:473
+#: app.cpp:471
 msgid "Rate Current Track: 3"
 msgstr "对当前音轨评分：3"
 
-#: app.cpp:475
+#: app.cpp:473
 msgid "Rate Current Track: 4"
 msgstr "对当前音轨评分：4"
 
-#: app.cpp:477
+#: app.cpp:475
 msgid "Rate Current Track: 5"
 msgstr "对当前音轨评分：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 "播放列表"
 
-#: 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
@@ -483,17 +482,17 @@ msgstr "Amarok - %1"
 msgid "&Append to Playlist"
 msgstr "追加到播放列表(&A)"
 
-#: app.cpp:988
+#: app.cpp:985
 msgid "Append && &Play"
 msgstr "追加并播放(&P)"
 
-#: 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 "音轨排队(&Q)"
 
-#: 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.</"
@@ -502,26 +501,26 @@ msgstr ""
 "<qt>关闭主窗口仍然会使 Amarok 在系统托盘中运行。使用菜单或 Amarok 托盘图标中"
 "的<B>退出</B>命令可退出应用程序。</qt>"
 
-#: 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 "已暂停"
 
-#: app.cpp:1192 firstrunwizard.ui:16
+#: app.cpp:1189 firstrunwizard.ui:16
 #, no-c-format
 msgid "First-Run Wizard"
 msgstr "首次运行向导"
 
-#: app.cpp:1237
+#: app.cpp:1234
 msgid "Moving files to trash"
 msgstr "将文件移动到回收站"
 
@@ -1165,41 +1164,23 @@ msgstr "Amarok 的收藏扫描器"
 msgid "(C) 2003-2006, The Amarok Developers"
 msgstr "(C) 2003-2006，Amarok 开发团队"
 
-#: 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"
-"服务器：irc.freenode.net / 频道：#amarok #amarok.de\n"
-"\n"
-"反馈：\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 "要扫描的文件夹"
 
-#: collectionscanner/main.cpp:44
+#: collectionscanner/main.cpp:42
 msgid "Scan folders recursively"
 msgstr "递归扫描文件夹"
 
-#: 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 "导入播放列表"
 
-#: collectionscanner/main.cpp:50
+#: collectionscanner/main.cpp:48
 msgid "Restart the scanner at last position, after a crash"
 msgstr "崩溃时从上次的位置重新开始扫描"
 
@@ -12063,30 +12044,21 @@ msgstr "文件名"
 msgid "Select Best Possible Match"
 msgstr "选择最可能的匹配"
 
-#, 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>"
+#~ "IRC:\n"
+#~ "server: irc.freenode.net / channels: #amarok #amarok.de #amarok.es\n"
+#~ "\n"
+#~ "Feedback:\n"
+#~ "amarok@kde.org"
 #~ msgstr ""
-#~ "Amarok 使用数据库来存储关于您音乐的信息。如果您不确定应选择哪个的话，只需"
-#~ "单击下一步。\n"
-#~ "<p><b>MySQL</b> 或 <b>Postgresql</b> 要比 <b>sqlite</b> 快，但您需要进行额"
-#~ "外设置。</p>\n"
-#~ "<ul>\n"
-#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/MySQL_HowTo\">配置 "
-#~ "MySQL 的指示</a>。</li>\n"
-#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Postgresql_HowTo\">"
-#~ "配置 Postgresql 的指示</a>。</li>\n"
-#~ "</ul>"
+#~ "IRC:\n"
+#~ "服务器：irc.freenode.net / 频道：#amarok #amarok.de\n"
+#~ "\n"
+#~ "反馈：\n"
+#~ "amarok@kde.org"
+
+#~ msgid "http://amarok.kde.org"
+#~ msgstr "http://amarok.kde.org"
 
 #, fuzzy
 #~ msgid "&Help"
@@ -12305,3 +12277,28 @@ msgstr "选择最可能的匹配"
 
 #~ msgid "Advanced"
 #~ msgstr "高级"
+
+#, 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 使用数据库来存储关于您音乐的信息。如果您不确定应选择哪个的话，只需"
+#~ "单击下一步。\n"
+#~ "<p><b>MySQL</b> 或 <b>Postgresql</b> 要比 <b>sqlite</b> 快，但您需要进行额"
+#~ "外设置。</p>\n"
+#~ "<ul>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/MySQL_HowTo\">配置 "
+#~ "MySQL 的指示</a>。</li>\n"
+#~ "<li><a href=\"http://community.kde.org/Amarok/Archives/Postgresql_HowTo\">"
+#~ "配置 Postgresql 的指示</a>。</li>\n"
+#~ "</ul>"