updated translation files

1 files changed, 1341 insertions, 870 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 5597dbe5..59774c7d 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: v1.0a\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-14 16:23-0700\n"
+"POT-Creation-Date: 2006-01-07 22:47-0800\n"
 "PO-Revision-Date: 2005-07-11 09:08-0600\n"
 "Last-Translator: Hongyi_Gao <hongyi_gao@hotmail.com>\n"
 "Language-Team: CHINESE <hongyi_gao@hotmail.com>\n"
@@ -20,577 +20,574 @@ msgstr ""
 msgid "Session Expired: please log in again at"
 msgstr "会话过期：请重新登录"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
-msgid "Enable"
-msgstr "允许"
-
-#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
-msgid "Disable"
-msgstr "禁止"
-
-#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
-msgid "Local"
-msgstr ""
-
-#: ../../lib/preferences.php:227
-msgid "Stream"
-msgstr ""
-
-#: ../../lib/preferences.php:230
-msgid "IceCast"
-msgstr ""
-
-#: ../../lib/preferences.php:233
-msgid "Downsample"
-msgstr ""
-
-#: ../../lib/preferences.php:236
-msgid "Music Player Daemon"
-msgstr ""
-
-#: ../../lib/preferences.php:239
-msgid "SlimServer"
-msgstr ""
-
-#: ../../lib/preferences.php:248
-msgid "M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:249
-msgid "Simple M3U"
-msgstr ""
-
-#: ../../lib/preferences.php:250
-msgid "PLS"
-msgstr ""
-
-#: ../../lib/preferences.php:251
-msgid "Asx"
-msgstr ""
-
-#: ../../lib/preferences.php:258
-msgid "English"
-msgstr "英文"
-
-#: ../../lib/preferences.php:259
-#, fuzzy
-msgid "British English"
-msgstr "英文"
-
-#: ../../lib/preferences.php:260
-msgid "German"
-msgstr "德文"
-
-#: ../../lib/preferences.php:261
-msgid "French"
-msgstr "法文"
-
-#: ../../lib/preferences.php:262
-msgid "Turkish"
-msgstr "土耳其语"
-
-#: ../../lib/preferences.php:263
-msgid "Spanish"
-msgstr ""
-
-#: ../../lib/preferences.php:264
-msgid "Norwegian"
-msgstr ""
-
-#: ../../lib/preferences.php:265
-msgid "Simplified Chinese"
-msgstr ""
-
-#: ../../lib/duplicates.php:80
-msgid "Find Duplicates"
-msgstr "查找重复文件"
-
-#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
-msgid "Search Type"
-msgstr "搜索方式"
-
-#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
-msgid "Title"
-msgstr "歌名"
-
-#: ../../lib/duplicates.php:97
-msgid "Artist and Title"
-msgstr "歌手和歌名"
-
-#: ../../lib/duplicates.php:102
-msgid "Artist, Album and Title"
-msgstr "歌手，歌名和专辑"
-
-#: ../../lib/duplicates.php:110 ../../templates/menu.inc:39
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-#: ../../templates/show_search_bar.inc:71
-msgid "Search"
-msgstr "搜索"
-
-#: ../../lib/general.lib.php:640
-msgid "Not Enough Data"
-msgstr ""
-
-#: ../../lib/search.php:52 ../../lib/search.php:68 ../../lib/search.php:84
-#: ../../lib/search.php:100 ../../lib/search.php:116 ../../lib/search.php:133
-#: ../../lib/search.php:145 ../../lib/search.php:161 ../../lib/search.php:177
-msgid "No Results Found"
-msgstr "没有找到"
-
-#: ../../lib/class/genre.class.php:278
-#, fuzzy
-msgid "Show Genres starting with"
-msgstr "<u>S</u>显示歌手名字前几位字符是"
-
-#: ../../lib/class/album.class.php:126
-msgid "Various"
-msgstr "群星"
-
-#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
-#: ../../lib/class/catalog.class.php:560
+#: ../../lib/class/catalog.class.php:281 ../../lib/class/catalog.class.php:566
+#: ../../lib/class/album.class.php:263
 msgid "Error: Unable to open"
 msgstr "错误：无法打开"
 
-#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
-#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
-#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
-#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
-#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
-#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
-msgid "updated to"
-msgstr "更新"
-
-#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
-#: ../../templates/show_uploads.inc:39
-msgid "Bitrate"
-msgstr "码率"
-
-#: ../../lib/class/song.class.php:283
-msgid "Rate"
-msgstr "级别"
-
-#: ../../lib/class/song.class.php:287
-msgid "Mode"
-msgstr "模式"
-
-#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
-#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
-msgid "Time"
-msgstr "时间"
-
-#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
-msgid "Track"
-msgstr "音轨"
-
-#: ../../lib/class/song.class.php:299
-msgid "Filesize"
-msgstr "文件大小"
-
-#: ../../lib/class/song.class.php:304 ../../templates/show_artists.inc:39
-#: ../../templates/show_artists.inc:62 ../../templates/show_songs.inc:34
-#: ../../templates/show_albums.inc:40 ../../templates/show_albums.inc:70
-#: ../../templates/show_mpdpl.inc:63 ../../templates/show_uploads.inc:35
-msgid "Artist"
-msgstr "歌手"
-
-#: ../../lib/class/song.class.php:309 ../../templates/show_songs.inc:35
-#: ../../templates/show_albums.inc:38 ../../templates/show_albums.inc:68
-#: ../../templates/show_mpdpl.inc:64 ../../templates/show_uploads.inc:36
-msgid "Album"
-msgstr "专辑"
-
-#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
-#: ../../templates/show_albums.inc:73
-msgid "Year"
-msgstr "年代"
-
-#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
-#: ../../templates/flag.inc:66
-msgid "Comment"
-msgstr "说明"
-
-#: ../../lib/class/song.class.php:322 ../../templates/show_genres.inc.php:36
-#: ../../templates/show_genre.inc.php:32 ../../templates/show_songs.inc:40
-#: ../../templates/show_browse_menu.inc:37 ../../templates/show_mpdpl.inc:67
-#: ../../templates/show_uploads.inc:37
-msgid "Genre"
-msgstr "类别"
-
-#: ../../lib/class/stream.class.php:198
-#, fuzzy
-msgid "Opened for writing"
-msgstr "准备写入"
-
-#: ../../lib/class/stream.class.php:203
-msgid "Error, cannot write"
-msgstr "错误：无法写入"
-
-#: ../../lib/class/stream.class.php:214
-msgid "Error, cannot write song in file"
-msgstr "错误：无法写入文件"
-
-#: ../../lib/class/stream.class.php:220
-msgid "Closed after write"
-msgstr "关闭"
-
-#: ../../lib/class/catalog.class.php:298
+#: ../../lib/class/catalog.class.php:304
 msgid "Error: Unable to change to directory"
 msgstr "错误：无法操作目录"
 
-#: ../../lib/class/catalog.class.php:321
+#: ../../lib/class/catalog.class.php:330
 msgid "Error: Unable to get filesize for"
 msgstr "错误：无法获得文件大小"
 
-#: ../../lib/class/catalog.class.php:340
-msgid "Added Playlist From"
-msgstr "添加自定义歌曲列表"
-
-#: ../../lib/class/catalog.class.php:359
+#: ../../lib/class/catalog.class.php:365
 msgid "Added"
 msgstr "已添加"
 
-#: ../../lib/class/catalog.class.php:371
+#: ../../lib/class/catalog.class.php:377
 msgid "is not readable by ampache"
 msgstr "无法读取"
 
-#: ../../lib/class/catalog.class.php:435
+#: ../../lib/class/catalog.class.php:441
 msgid "Found in ID3"
 msgstr "在ID3中找到"
 
-#: ../../lib/class/catalog.class.php:439
+#: ../../lib/class/catalog.class.php:445
 msgid "Found on Amazon"
 msgstr "在Amazon找到"
 
-#: ../../lib/class/catalog.class.php:443
+#: ../../lib/class/catalog.class.php:449
 msgid "Found in Folder"
 msgstr "在目录里找到"
 
-#: ../../lib/class/catalog.class.php:447
+#: ../../lib/class/catalog.class.php:453
 msgid "Found"
 msgstr "找到"
 
-#: ../../lib/class/catalog.class.php:450
+#: ../../lib/class/catalog.class.php:456
 msgid "Not Found"
 msgstr "没有找到"
 
-#: ../../lib/class/catalog.class.php:458
+#: ../../lib/class/catalog.class.php:464
 msgid "Searched"
 msgstr "已搜索"
 
-#: ../../lib/class/catalog.class.php:613
+#: ../../lib/class/catalog.class.php:622
 msgid "Starting Dump Album Art"
 msgstr "开始导出歌曲歌手"
 
-#: ../../lib/class/catalog.class.php:633
+#: ../../lib/class/catalog.class.php:642
 msgid "Written"
 msgstr "已写入"
 
-#: ../../lib/class/catalog.class.php:642
+#: ../../lib/class/catalog.class.php:651
 msgid "Error unable to open file for writting"
 msgstr "错误：无法写入文件"
 
-#: ../../lib/class/catalog.class.php:649
+#: ../../lib/class/catalog.class.php:658
 msgid "Album Art Dump Complete"
 msgstr "歌曲歌手导出结束"
 
-#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
-#: ../../albums.php:112
+#: ../../lib/class/catalog.class.php:659 ../../artists.php:64
+#: ../../albums.php:153
 msgid "Return"
 msgstr "返回"
 
-#: ../../lib/class/catalog.class.php:719
+#: ../../lib/class/catalog.class.php:728
 msgid "Starting Catalog Build"
 msgstr "开始重建曲库"
 
-#: ../../lib/class/catalog.class.php:724
+#: ../../lib/class/catalog.class.php:733
 msgid "Running Remote Sync"
 msgstr "运行远程同步"
 
-#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
-#: ../../admin/catalog.php:264
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:904
+msgid "Added Playlist From"
+msgstr "添加自定义歌曲列表"
+
+#: ../../lib/class/catalog.class.php:752 ../../lib/class/catalog.class.php:913
+#: ../../admin/catalog.php:258
 msgid "Starting Album Art Search"
 msgstr "开始搜索歌曲歌手"
 
-#: ../../lib/class/catalog.class.php:744
+#: ../../lib/class/catalog.class.php:762
 msgid "Catalog Finished"
 msgstr "曲库建立结束"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:932
 msgid "Total Time"
 msgstr "总时间"
 
-#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:762 ../../lib/class/catalog.class.php:933
 msgid "Total Songs"
 msgstr "全部歌曲"
 
-#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
+#: ../../lib/class/catalog.class.php:763 ../../lib/class/catalog.class.php:933
 msgid "Songs Per Seconds"
 msgstr "首歌／秒"
 
-#: ../../lib/class/catalog.class.php:779
-#: ../../lib/class/catalog.class.php:1476
+#: ../../lib/class/catalog.class.php:797
+#: ../../lib/class/catalog.class.php:1512
 msgid "Updated"
 msgstr "已更新"
 
-#: ../../lib/class/catalog.class.php:786
+#: ../../lib/class/catalog.class.php:804
 msgid "No Update Needed"
 msgstr "不用更新"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "Starting New Song Search on"
 msgstr "开始搜索新歌曲"
 
-#: ../../lib/class/catalog.class.php:860
+#: ../../lib/class/catalog.class.php:885
 msgid "catalog"
 msgstr "曲库"
 
-#: ../../lib/class/catalog.class.php:864
+#: ../../lib/class/catalog.class.php:889
 msgid "Running Remote Update"
 msgstr "运行远程更新"
 
-#: ../../lib/class/catalog.class.php:899
+#: ../../lib/class/catalog.class.php:932
 msgid "Catalog Update Finished"
 msgstr "曲库更新结束"
 
-#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
-#: ../../lib/mpd.php:49
+#: ../../lib/class/catalog.class.php:952 ../../lib/mpd.php:43
+#: ../../lib/mpd.php:52 ../../albums.php:74
 msgid "Error"
 msgstr "错误"
 
-#: ../../lib/class/catalog.class.php:919
+#: ../../lib/class/catalog.class.php:952
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "无法载入XMLRPC库，请确认是否允许XML-RPC"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Error connecting to"
 msgstr "错误：连接"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Code"
 msgstr "代码"
 
-#: ../../lib/class/catalog.class.php:958
-#: ../../lib/class/catalog.class.php:1009
+#: ../../lib/class/catalog.class.php:991
+#: ../../lib/class/catalog.class.php:1042
 msgid "Reason"
 msgstr "原因"
 
-#: ../../lib/class/catalog.class.php:974
+#: ../../lib/class/catalog.class.php:1007
 msgid "Completed updating remote catalog(s)"
 msgstr "远程曲库更新结束"
 
-#: ../../lib/class/catalog.class.php:1105
+#: ../../lib/class/catalog.class.php:1138
 msgid "Checking"
 msgstr "检查"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "Catalog Clean Done"
 msgstr "曲库被清空"
 
-#: ../../lib/class/catalog.class.php:1163
+#: ../../lib/class/catalog.class.php:1196
 msgid "files removed"
 msgstr "文件被删除"
 
-#: ../../lib/class/catalog.class.php:1436
+#: ../../lib/class/catalog.class.php:1469
 msgid "Updating the"
 msgstr "更新"
 
-#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1469 ../../templates/sidebar.inc.php:31
 msgid "Catalog"
 msgstr "曲库"
 
-#: ../../lib/class/catalog.class.php:1437
+#: ../../lib/class/catalog.class.php:1470
 msgid "songs found checking tag information."
 msgstr "找到歌曲检查标记信息"
 
-#: ../../lib/class/catalog.class.php:1484
+#: ../../lib/class/catalog.class.php:1520
 msgid " FOUND"
 msgstr "找到"
 
-#: ../../lib/class/catalog.class.php:1485
+#: ../../lib/class/catalog.class.php:1521
 msgid "Searching for new Album Art"
 msgstr "查找新歌曲歌手"
 
-#: ../../lib/class/catalog.class.php:1489
+#: ../../lib/class/catalog.class.php:1525
 msgid "Album Art Already Found"
 msgstr "已找到歌曲歌手"
 
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+#: ../../lib/class/artist.class.php:223
+msgid "Error: Name Identical"
+msgstr ""
+
+#: ../../lib/class/song.class.php:275 ../../lib/duplicates.php:113
+#: ../../templates/show_search.inc:66
+msgid "Title"
+msgstr "歌名"
+
+#: ../../lib/class/song.class.php:275 ../../lib/class/song.class.php:279
+#: ../../lib/class/song.class.php:283 ../../lib/class/song.class.php:287
+#: ../../lib/class/song.class.php:291 ../../lib/class/song.class.php:295
+#: ../../lib/class/song.class.php:299 ../../lib/class/song.class.php:304
+#: ../../lib/class/song.class.php:309 ../../lib/class/song.class.php:313
+#: ../../lib/class/song.class.php:317 ../../lib/class/song.class.php:322
+msgid "updated to"
+msgstr "更新"
+
+#: ../../lib/class/song.class.php:279 ../../templates/show_uploads.inc:39
+#: ../../templates/show_songs.inc:47 ../../templates/list_duplicates.inc:36
+msgid "Bitrate"
+msgstr "码率"
+
+#: ../../lib/class/song.class.php:283
+msgid "Rate"
+msgstr "级别"
+
+#: ../../lib/class/song.class.php:287
+msgid "Mode"
+msgstr "模式"
+
+#: ../../lib/class/song.class.php:291 ../../templates/show_uploads.inc:38
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_songs.inc:45
+msgid "Time"
+msgstr "时间"
+
+#: ../../lib/class/song.class.php:295 ../../templates/show_mpdpl.inc:65
+#: ../../templates/show_songs.inc:39 ../../templates/show_songs.inc:44
+msgid "Track"
+msgstr "音轨"
+
+#: ../../lib/class/song.class.php:299
+msgid "Filesize"
+msgstr "文件大小"
+
+#: ../../lib/class/song.class.php:304
+#: ../../templates/show_get_albumart.inc.php:33
+#: ../../templates/show_uploads.inc:35 ../../templates/show_mpdpl.inc:63
+#: ../../templates/show_songs.inc:42 ../../templates/show_artists.inc:39
+#: ../../templates/show_artists.inc:62 ../../templates/show_albums.inc:40
+#: ../../templates/show_albums.inc:70 ../../templates/list_duplicates.inc:33
+#: ../../templates/show_search.inc:71
+msgid "Artist"
+msgstr "歌手"
+
+#: ../../lib/class/song.class.php:309
+#: ../../templates/show_get_albumart.inc.php:41
+#: ../../templates/show_uploads.inc:36 ../../templates/show_mpdpl.inc:64
+#: ../../templates/show_songs.inc:43 ../../templates/show_albums.inc:38
+#: ../../templates/show_albums.inc:68 ../../templates/list_duplicates.inc:34
+#: ../../templates/show_search.inc:78
+msgid "Album"
+msgstr "专辑"
+
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
+#: ../../templates/show_albums.inc:73 ../../templates/show_search.inc:90
+msgid "Year"
+msgstr "年代"
+
+#: ../../lib/class/song.class.php:317 ../../templates/flag.inc:66
+#: ../../templates/list_flagged.inc:46
+msgid "Comment"
+msgstr "说明"
+
+#: ../../lib/class/song.class.php:322 ../../templates/show_genre.inc.php:32
+#: ../../templates/show_genres.inc.php:36 ../../templates/sidebar.inc.php:37
+#: ../../templates/show_uploads.inc:37 ../../templates/show_mpdpl.inc:67
+#: ../../templates/show_songs.inc:48 ../../templates/show_browse_menu.inc:37
+#: ../../templates/show_search.inc:83
+msgid "Genre"
+msgstr "类别"
+
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "准备写入"
+
+#: ../../lib/class/stream.class.php:203
+msgid "Error, cannot write"
+msgstr "错误：无法写入"
+
+#: ../../lib/class/stream.class.php:214
+msgid "Error, cannot write song in file"
+msgstr "错误：无法写入文件"
+
+#: ../../lib/class/stream.class.php:220
+msgid "Closed after write"
+msgstr "关闭"
+
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>S</u>显示歌手名字前几位字符是"
+
+#: ../../lib/class/album.class.php:151
+msgid "Various"
+msgstr "群星"
+
+#: ../../lib/duplicates.php:102
+msgid "Find Duplicates"
+msgstr "查找重复文件"
+
+#: ../../lib/duplicates.php:105
+msgid "Search Type"
+msgstr "搜索方式"
+
+#: ../../lib/duplicates.php:119
+msgid "Artist and Title"
+msgstr "歌手和歌名"
+
+#: ../../lib/duplicates.php:124
+msgid "Artist, Album and Title"
+msgstr "歌手，歌名和专辑"
+
+#: ../../lib/duplicates.php:132 ../../templates/sidebar.inc.php:97
+#: ../../templates/sidebar.inc.php:103 ../../templates/show_search_bar.inc:41
+#: ../../templates/menu.inc:39 ../../templates/show_search.inc:171
+msgid "Search"
+msgstr "搜索"
+
+#: ../../lib/preferences.php:252 ../../templates/show_users.inc:118
+msgid "Enable"
+msgstr "允许"
+
+#: ../../lib/preferences.php:253 ../../templates/show_users.inc:121
+#: ../../templates/list_duplicates.inc:31
+msgid "Disable"
+msgstr "禁止"
+
+#: ../../lib/preferences.php:265 ../../templates/add_catalog.inc:61
+msgid "Local"
+msgstr ""
+
+#: ../../lib/preferences.php:268
+msgid "Stream"
+msgstr ""
+
+#: ../../lib/preferences.php:271
+msgid "IceCast"
+msgstr ""
+
+#: ../../lib/preferences.php:274
+msgid "Downsample"
+msgstr ""
+
+#: ../../lib/preferences.php:277
+msgid "Music Player Daemon"
+msgstr ""
+
+#: ../../lib/preferences.php:280
+msgid "SlimServer"
+msgstr ""
+
+#: ../../lib/preferences.php:289
+msgid "M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:290
+msgid "Simple M3U"
+msgstr ""
+
+#: ../../lib/preferences.php:291
+msgid "PLS"
+msgstr ""
+
+#: ../../lib/preferences.php:292
+msgid "Asx"
+msgstr ""
+
+#: ../../lib/preferences.php:293
+msgid "RAM"
+msgstr ""
+
+#: ../../lib/mpd.php:43 ../../lib/mpd.php:52
 msgid "Could not add"
 msgstr "无法添加"
 
-#: ../../lib/Browser.php:867
-msgid "file"
-msgstr "文件"
+#: ../../lib/general.lib.php:675
+msgid "Not Enough Data"
+msgstr ""
 
-#: ../../lib/Browser.php:871
-msgid "File uploads not supported."
-msgstr "不支持文件上传"
+#: ../../lib/general.lib.php:897 ../../lib/general.lib.php:908
+msgid "English"
+msgstr "英文"
 
-#: ../../lib/Browser.php:889
-msgid "No file uploaded"
-msgstr "没有上传文件"
+#: ../../lib/general.lib.php:907
+msgid "German"
+msgstr "德文"
 
-#: ../../lib/Browser.php:896
-#, php-format
-msgid "There was a problem with the file upload: No %s was uploaded."
-msgstr "文件上传错误：没有上传 %s"
+#: ../../lib/general.lib.php:909
+#, fuzzy
+msgid "British English"
+msgstr "英文"
 
-#: ../../lib/Browser.php:901
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was larger than the maximum "
-"allowed size (%d bytes)."
-msgstr "文件上传错误：%s 大于最大允许上传大小（%d 字节）"
+#: ../../lib/general.lib.php:910
+msgid "Spanish"
+msgstr ""
 
-#: ../../lib/Browser.php:903
-#, php-format
-msgid ""
-"There was a problem with the file upload: The %s was only partially uploaded."
-msgstr "文件上传错误：%s 只上传了部分文件"
+#: ../../lib/general.lib.php:911
+msgid "French"
+msgstr "法文"
 
-#: ../../lib/ui.lib.php:199
-msgid "Playlist Actions"
-msgstr "自选歌曲列表操作"
+#: ../../lib/general.lib.php:912
+msgid "Italian"
+msgstr ""
 
-#: ../../lib/ui.lib.php:199
-msgid "New"
-msgstr "新建"
+#: ../../lib/general.lib.php:913
+msgid "Dutch"
+msgstr ""
 
-#: ../../lib/ui.lib.php:200
-msgid "View All"
-msgstr "全部显示"
+#: ../../lib/general.lib.php:914
+msgid "Turkish"
+msgstr "土耳其语"
 
-#: ../../lib/ui.lib.php:201
-msgid "Import"
-msgstr "导入"
+#: ../../lib/general.lib.php:915
+msgid "Simplified Chinese"
+msgstr ""
+
+#: ../../lib/general.lib.php:916
+msgid "Unknown"
+msgstr "未知"
+
+#: ../../lib/ui.lib.php:222
+#, fuzzy
+msgid "Error Access Denied"
+msgstr "用户访问控制级别"
 
-#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+#: ../../lib/ui.lib.php:299 ../../templates/sidebar.inc.php:69
+#: ../../templates/header.inc:51 ../../templates/menu.inc:35
 msgid "Browse"
 msgstr "浏览"
 
-#: ../../lib/ui.lib.php:303
+#: ../../lib/ui.lib.php:301
 msgid "Show w/o art"
 msgstr "不显示歌手"
 
-#: ../../lib/ui.lib.php:306
+#: ../../lib/ui.lib.php:304
 msgid "Show all"
 msgstr "全部显示"
 
-#: ../../lib/ui.lib.php:446
-msgid "No songs in this playlist."
-msgstr "此自选列表没有歌曲"
-
-#: ../../lib/ui.lib.php:592
+#: ../../lib/ui.lib.php:721
 #, fuzzy
 msgid "No Catalogs Found!"
 msgstr "没有找到"
 
-#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+#: ../../lib/ui.lib.php:722 ../../templates/add_catalog.inc:29
 msgid "Add a Catalog"
 msgstr "添加曲库"
 
-#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+#: ../../lib/ui.lib.php:723 ../../templates/show_local_catalog_info.inc.php:7
 msgid "Catalog Statistics"
 msgstr "曲库统计信息"
 
-#: ../../lib/ui.lib.php:630
+#: ../../lib/ui.lib.php:759
 msgid "day"
 msgstr "天"
 
-#: ../../lib/ui.lib.php:630
+#: ../../lib/ui.lib.php:759
 msgid "days"
 msgstr "天"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hour"
 msgstr "小时"
 
-#: ../../lib/ui.lib.php:632
+#: ../../lib/ui.lib.php:761
 msgid "hours"
 msgstr "小时"
 
-#: ../../lib/upload.php:225
+#: ../../lib/ui.lib.php:1053 ../../templates/sidebar.inc.php:128
+#: ../../templates/show_random_play_bar.inc.php:45
+#: ../../templates/show_artists.inc:55 ../../templates/show_random_play.inc:46
+#: ../../templates/show_albums.inc:58
+msgid "All"
+msgstr "全部"
+
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "文件"
+
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "不支持文件上传"
+
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "没有上传文件"
+
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "文件上传错误：没有上传 %s"
+
+#: ../../lib/Browser.php:901
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was larger than the maximum "
+"allowed size (%d bytes)."
+msgstr "文件上传错误：%s 大于最大允许上传大小（%d 字节）"
+
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "文件上传错误：%s 只上传了部分文件"
+
+#: ../../lib/upload.php:228
 #, fuzzy
 msgid "The file uploaded successfully"
 msgstr "没有上传文件"
 
-#: ../../lib/upload.php:226
+#: ../../lib/upload.php:229
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
 msgstr "上传文件大小超过php.ini里面max_filesize的限制"
 
-#: ../../lib/upload.php:227
+#: ../../lib/upload.php:230
 #, fuzzy
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
 msgstr "上传文件大小超过HTML表单里面MAX_FILE_SIZE的限制"
 
-#: ../../lib/upload.php:228
+#: ../../lib/upload.php:231
 #, fuzzy
 msgid "The uploaded file was only partially uploaded"
 msgstr "只上传了文件的部分内容"
 
-#: ../../lib/upload.php:229
+#: ../../lib/upload.php:232
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "文件没有上传"
 
-#: ../../lib/upload.php:230
+#: ../../lib/upload.php:233
 msgid "Missing a temporary folder"
 msgstr ""
 
-#: ../../modules/lib.php:708
-msgid "Public"
-msgstr "公开"
-
-#: ../../modules/lib.php:709
-msgid "Your Private"
-msgstr "私人"
-
-#: ../../modules/lib.php:710
-msgid "Other Private"
-msgstr "其他"
+#: ../../lib/rating.lib.php:55
+#, fuzzy
+msgid "Don't Play"
+msgstr "本地播放"
 
-#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
-msgid "View"
-msgstr "显示"
+#: ../../lib/rating.lib.php:58
+msgid "It's Pretty Bad"
+msgstr ""
 
-#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
-#: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
-msgid "Edit"
-msgstr "编辑"
+#: ../../lib/rating.lib.php:61
+msgid "It's Ok"
+msgstr ""
 
-#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
-#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
-msgid "Delete"
-msgstr "删除"
+#: ../../lib/rating.lib.php:64
+msgid "It's Pretty Good"
+msgstr ""
 
-#: ../../modules/lib.php:803 ../../templates/show_genres.inc.php:48
-#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
-#: ../../templates/show_albums.inc:57 ../../templates/show_artist.inc:78
-#: ../../templates/show_mpdplay.inc:50
-msgid "Play"
-msgstr "播放"
+#: ../../lib/rating.lib.php:67
+msgid "I Love It!"
+msgstr ""
 
-#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
-#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
-msgid "Random"
-msgstr "随机"
+#: ../../lib/rating.lib.php:70
+msgid "It's Insane"
+msgstr ""
 
-#: ../../modules/lib.php:810 ../../templates/show_songs.inc:110
-#: ../../templates/show_album.inc:61 ../../templates/show_albums.inc:61
-#: ../../templates/show_artist.inc:80
-msgid "Download"
-msgstr "下载"
+#: ../../lib/rating.lib.php:74
+msgid "Off the Charts!"
+msgstr ""
 
-#: ../../modules/lib.php:821
-msgid "There are no playlists of this type"
-msgstr "没有自定义播放列表"
+#: ../../lib/playlist.lib.php:73
+msgid "No songs in this playlist."
+msgstr "此自选列表没有歌曲"
 
-#: ../../modules/lib.php:856
+#: ../../modules/lib.php:537
 msgid "Create a new playlist"
 msgstr "新建自定义播放列表"
 
@@ -602,178 +599,153 @@ msgstr "管理用户"
 msgid "Add a new user"
 msgstr "添加新用户"
 
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+#: ../../admin/catalog.php:49 ../../templates/catalog.inc:63
 msgid "Add to Catalog(s)"
 msgstr "添加到曲库"
 
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+#: ../../admin/catalog.php:60 ../../templates/catalog.inc:64
 msgid "Add to all Catalogs"
 msgstr "添加所有到曲库"
 
-#: ../../admin/catalog.php:75
+#: ../../admin/catalog.php:69
 msgid "Error Connecting"
 msgstr "连接错误"
 
-#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+#: ../../admin/catalog.php:83 ../../templates/catalog.inc:70
 msgid "Update Catalog(s)"
 msgstr "更新曲库"
 
-#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+#: ../../admin/catalog.php:94 ../../templates/catalog.inc:71
 msgid "Update All Catalogs"
 msgstr "更新所有曲库"
 
-#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+#: ../../admin/catalog.php:126 ../../templates/catalog.inc:77
 msgid "Clean Catalog(s)"
 msgstr "清除曲库"
 
-#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+#: ../../admin/catalog.php:156 ../../templates/catalog.inc:78
 msgid "Clean All Catalogs"
 msgstr "清除所有曲库"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "Now Playing Cleared"
 msgstr "正在播放被取消"
 
-#: ../../admin/catalog.php:211
+#: ../../admin/catalog.php:206
 msgid "All now playing data has been cleared"
 msgstr "所有正在播放的数据被取消"
 
-#: ../../admin/catalog.php:216
+#: ../../admin/catalog.php:211
 msgid "Do you really want to clear your catalog?"
 msgstr "真的要清除曲库吗？"
 
-#: ../../admin/catalog.php:223
+#: ../../admin/catalog.php:218
 msgid "Do you really want to clear the statistics for this catalog?"
 msgstr "真的要清除这个曲库的统计信息吗？"
 
-#: ../../admin/catalog.php:241
+#: ../../admin/catalog.php:235
 msgid "Do you really want to delete this catalog?"
 msgstr "真的要删除曲库吗？"
 
-#: ../../admin/catalog.php:272
+#: ../../admin/catalog.php:266
 msgid "Album Art Search Finished"
 msgstr "歌曲歌手搜索结束"
 
-#: ../../admin/users.php:76 ../../admin/users.php:122
+#: ../../admin/users.php:72 ../../admin/users.php:119
 msgid "Error Username Required"
 msgstr "错误：请输入用户名"
 
-#: ../../admin/users.php:79 ../../admin/users.php:119
+#: ../../admin/users.php:75 ../../admin/users.php:115
 msgid "Error Passwords don't match"
 msgstr "错误：密码不匹配"
 
-#: ../../admin/users.php:136
+#: ../../admin/users.php:124 ../../register.php:136
+#, fuzzy
+msgid "Error Username already exists"
+msgstr "错误：请输入用户名"
+
+#: ../../admin/users.php:145
 msgid "Are you sure you want to permanently delete"
 msgstr "确定要永久删除？"
 
-#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+#: ../../admin/users.php:152 ../../templates/show_confirm_action.inc.php:29
+#: ../../templates/show_search.inc:107
 msgid "No"
 msgstr "否"
 
-#: ../../admin/users.php:145
+#: ../../admin/users.php:154
 msgid "User Deleted"
 msgstr "用户已删除"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Delete Error"
 msgstr "删除错误"
 
-#: ../../admin/users.php:148
+#: ../../admin/users.php:157
 msgid "Unable to delete last Admin User"
 msgstr "不能删除唯一的管理员"
 
-#: ../../admin/access.php:43
+#: ../../admin/access.php:40
 msgid "Do you really want to delete this Access Record?"
 msgstr "真的要删除这个访问许可吗？"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Entry Deleted"
 msgstr "数据被删除"
 
-#: ../../admin/access.php:51
+#: ../../admin/access.php:48
 msgid "Your Access List Entry has been removed"
 msgstr "访问许可被删除"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Entry Added"
 msgstr "记录被添加"
 
-#: ../../admin/access.php:61
+#: ../../admin/access.php:58
 msgid "Your new Access List Entry has been created"
 msgstr "新访问许可被添加"
 
-#: ../../admin/mail.php:98
+#: ../../admin/mail.php:94
 msgid "Mail to"
 msgstr "发电子邮件给"
 
-#: ../../admin/mail.php:109
+#: ../../admin/mail.php:105
 msgid "Subject"
 msgstr "标题"
 
-#: ../../admin/mail.php:116
+#: ../../admin/mail.php:112
 msgid "Message"
 msgstr "正文"
 
-#: ../../admin/mail.php:126
+#: ../../admin/mail.php:122
 msgid "Send Mail"
 msgstr "发送"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "Songs Disabled"
 msgstr "歌曲被禁止播放"
 
-#: ../../admin/song.php:68
+#: ../../admin/song.php:65
 msgid "The requested song(s) have been disabled"
 msgstr "请求的歌曲被禁止播放"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "Songs Enabled"
 msgstr "歌曲被允许播放"
 
-#: ../../admin/song.php:78
+#: ../../admin/song.php:75
 msgid "The requested song(s) have been enabled"
 msgstr "请求的歌曲被允许播放"
 
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/userform.inc:40 ../../templates/show_users.inc:40
-msgid "Username"
-msgstr "用户名"
-
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:48
-msgid "Full Name"
-msgstr "全名"
-
-#: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
-msgid "E-mail"
-msgstr "电子邮件"
-
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
-msgid "Password"
-msgstr "密码"
-
-#: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
-msgid "Confirm Password"
-msgstr "确认密码"
-
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "注册用户"
-
 #: ../../templates/show_install_account.inc.php:35
 #: ../../templates/show_install_config.inc:35
-#: ../../templates/show_install.inc:34
+#: ../../templates/show_install.inc:35
 msgid "Ampache Installation"
 msgstr "Ampache 安装"
 
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
-#: ../../templates/show_install.inc:36
+#: ../../templates/show_install.inc:37
 #, fuzzy
 msgid ""
 "This Page handles the installation of the Ampache database and the creation "
@@ -785,7 +757,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
-#: ../../templates/show_install.inc:39
+#: ../../templates/show_install.inc:40
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
 msgstr "已安装MySQL数据库，有能创建和更改数据库的用户帐号"
@@ -800,7 +772,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
-#: ../../templates/show_install.inc:42
+#: ../../templates/show_install.inc:43
 msgid ""
 "Once you have ensured that you have the above requirements please fill out "
 "the information below. You will only be asked for the required config "
@@ -812,7 +784,7 @@ msgstr ""
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
-#: ../../templates/show_install.inc:46
+#: ../../templates/show_install.inc:47
 msgid "Step 1 - Creating and Inserting the Ampache Database"
 msgstr "第一步 - 创建Ampache数据库并添加系统数据"
 
@@ -822,7 +794,7 @@ msgstr "第二步 - 创建ampache.cfg.php配置文件"
 
 #: ../../templates/show_install_account.inc.php:50
 #: ../../templates/show_install_config.inc:53
-#: ../../templates/show_install.inc:51
+#: ../../templates/show_install.inc:52
 msgid "Step 3 - Setup Initial Account"
 msgstr "第三步 - 初始化帐号"
 
@@ -832,11 +804,71 @@ msgid ""
 "account has been created you will be directed to the login page"
 msgstr "这一步创建初始管理员帐号。帐号创建完毕会转到登录页"
 
-#: ../../templates/show_install_account.inc.php:68
+#: ../../templates/show_install_account.inc.php:55
+#, fuzzy
+msgid "Create Admin Account"
+msgstr "新建帐号"
+
+#: ../../templates/show_install_account.inc.php:60
+#: ../../templates/show_user_registration.inc.php:109
+#: ../../templates/userform.inc:40 ../../templates/show_users.inc:43
+msgid "Username"
+msgstr "用户名"
+
+#: ../../templates/show_install_account.inc.php:64
+#: ../../templates/show_user_registration.inc.php:137
+#: ../../templates/userform.inc:63 ../../templates/show_login_form.inc:53
+msgid "Password"
+msgstr "密码"
+
+#: ../../templates/show_install_account.inc.php:69
 msgid "Create Account"
 msgstr "新建帐号"
 
+#: ../../templates/show_user_registration.inc.php:59
+#, fuzzy
+msgid "Ampache New User Registration"
+msgstr "Ampache 安装"
+
+#: ../../templates/show_user_registration.inc.php:74
+#, fuzzy
+msgid "User Agreement"
+msgstr "用户名"
+
+#: ../../templates/show_user_registration.inc.php:84
+#, fuzzy
+msgid "I Accept"
+msgstr "接受"
+
+#: ../../templates/show_user_registration.inc.php:101
+msgid "User Information"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:119
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "全名"
+
+#: ../../templates/show_user_registration.inc.php:128
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
+msgid "E-mail"
+msgstr "电子邮件"
+
+#: ../../templates/show_user_registration.inc.php:146
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
+msgid "Confirm Password"
+msgstr "确认密码"
+
+#: ../../templates/show_user_registration.inc.php:166
+msgid "Clear Info"
+msgstr ""
+
+#: ../../templates/show_user_registration.inc.php:167
+msgid "Register User"
+msgstr "注册用户"
+
 #: ../../templates/show_confirm_action.inc.php:28
+#: ../../templates/show_search.inc:106
 msgid "Yes"
 msgstr "是"
 
@@ -845,7 +877,8 @@ msgid "Importing a Playlist from a File"
 msgstr "从文件导入自定义播放列表"
 
 #: ../../templates/show_import_playlist.inc.php:29
-#: ../../templates/show_uploads.inc:41
+#: ../../templates/show_uploads.inc:41 ../../templates/list_duplicates.inc:38
+#: ../../templates/show_search.inc:95
 msgid "Filename"
 msgstr "文件名"
 
@@ -857,6 +890,36 @@ msgstr "自定义播放列表类型"
 msgid "Import Playlist"
 msgstr "导入播放列表"
 
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "显示"
+
+#: ../../templates/show_genre.inc.php:36 ../../templates/sidebar.inc.php:35
+#: ../../templates/sidebar.inc.php:136
+#: ../../templates/show_local_catalog_info.inc.php:18
+#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
+#: ../../templates/show_browse_menu.inc:36 ../../templates/show_search.inc:136
+msgid "Albums"
+msgstr "专辑"
+
+#: ../../templates/show_genre.inc.php:41 ../../templates/sidebar.inc.php:36
+#: ../../templates/sidebar.inc.php:135
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_browse_menu.inc:35 ../../templates/show_search.inc:137
+msgid "Artists"
+msgstr "歌手"
+
+#: ../../templates/show_genre.inc.php:46
+#: ../../templates/show_genres.inc.php:37 ../../templates/sidebar.inc.php:133
+#: ../../templates/show_random_play_bar.inc.php:49
+#: ../../templates/show_local_catalog_info.inc.php:26
+#: ../../templates/show_artists.inc:41 ../../templates/show_artists.inc:64
+#: ../../templates/show_albums.inc:41 ../../templates/show_albums.inc:71
+#: ../../templates/show_search.inc:135
+msgid "Songs"
+msgstr "歌曲"
+
 #: ../../templates/show_user.inc.php:26
 msgid "Changing User Information for"
 msgstr ""
@@ -892,10 +955,143 @@ msgstr ""
 msgid "Clear Stats"
 msgstr "清除状态"
 
+#: ../../templates/show_genres.inc.php:38 ../../templates/show_uploads.inc:32
+#: ../../templates/show_mpdpl.inc:68 ../../templates/show_songs.inc:50
+#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
+#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
+#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:42
+msgid "Action"
+msgstr "操作"
+
+#: ../../templates/show_genres.inc.php:48
+#: ../../templates/show_playlists.inc.php:63
+#: ../../templates/show_localplay.inc:41 ../../templates/show_artists.inc:54
+#: ../../templates/show_albums.inc:57 ../../templates/show_mpdplay.inc:64
+#: ../../templates/show_artist.inc:67
+msgid "Play"
+msgstr "播放"
+
+#: ../../templates/sidebar.inc.php:29
+msgid "Users"
+msgstr "用户"
+
+#: ../../templates/sidebar.inc.php:30
+msgid "Mail Users"
+msgstr "向用户发送邮件"
+
+#: ../../templates/sidebar.inc.php:32
+#, fuzzy
+msgid "Site Preferences"
+msgstr "更新设置"
+
+#: ../../templates/sidebar.inc.php:33
+#, fuzzy
+msgid "Access List"
+msgstr "访问控制列表"
+
+#: ../../templates/sidebar.inc.php:38
+#, fuzzy
+msgid "Lists"
+msgstr "歌手"
+
+#: ../../templates/sidebar.inc.php:45 ../../templates/menu.inc:29
+msgid "Home"
+msgstr "首页"
+
+#: ../../templates/sidebar.inc.php:49 ../../templates/menu.inc:63
+#: ../../templates/menu.inc:66
+msgid "Admin"
+msgstr "管理"
+
+#: ../../templates/sidebar.inc.php:66 ../../templates/menu.inc:40
+msgid "Preferences"
+msgstr "设置"
+
+#: ../../templates/sidebar.inc.php:85 ../../templates/menu.inc:43
+#: ../../templates/show_upload.inc:73
+msgid "Upload"
+msgstr "上传"
+
+#: ../../templates/sidebar.inc.php:89
+#: ../../templates/show_playlists.inc.php:28 ../../templates/menu.inc:38
+msgid "Playlists"
+msgstr "自定义文件列表"
+
+#: ../../templates/sidebar.inc.php:93 ../../templates/menu.inc:32
+msgid "Local Play"
+msgstr "本地播放"
+
+#: ../../templates/sidebar.inc.php:112
+#: ../../templates/show_playlists.inc.php:66
+#: ../../templates/show_artists.inc:56 ../../templates/show_albums.inc:59
+#: ../../templates/show_mpdplay.inc:114
+msgid "Random"
+msgstr "随机"
+
+#: ../../templates/sidebar.inc.php:134
+#: ../../templates/show_random_play_bar.inc.php:50
+msgid "Minutes"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:137
+#: ../../templates/show_random_play_bar.inc.php:53
+msgid "Less Played"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:141
+#: ../../templates/show_random_play_bar.inc.php:58
+msgid "Enqueue"
+msgstr ""
+
+#: ../../templates/sidebar.inc.php:146 ../../templates/menu.inc:75
+#: ../../templates/menu.inc:81 ../../templates/menu.inc:85
+msgid "Logout"
+msgstr "退出"
+
 #: ../../templates/show_confirmation.inc.php:30
 msgid "Continue"
 msgstr "继续"
 
+#: ../../templates/show_random_play_bar.inc.php:31
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "随机播放"
+
+#: ../../templates/show_random_play_bar.inc.php:51
+#, fuzzy
+msgid "Full Artists"
+msgstr "全部歌手"
+
+#: ../../templates/show_random_play_bar.inc.php:52
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "全部专辑"
+
+#: ../../templates/show_random_play_bar.inc.php:55
+msgid "from"
+msgstr ""
+
+#: ../../templates/show_random_play_bar.inc.php:59
+#, fuzzy
+msgid "Advanced"
+msgstr "已添加"
+
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "用户总数"
+
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "在线用户"
+
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "曲库大小"
+
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "曲库时间"
+
 #: ../../templates/show_play_selected.inc.php:49
 msgid "Play Selected"
 msgstr "播放选择的歌曲"
@@ -905,35 +1101,54 @@ msgstr "播放选择的歌曲"
 msgid "Download Selected"
 msgstr "播放选择的歌曲"
 
-#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+#: ../../templates/show_play_selected.inc.php:55
 msgid "Flag Selected"
 msgstr "标记选择"
 
-#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+#: ../../templates/show_play_selected.inc.php:56
 msgid "Edit Selected"
 msgstr "编辑选择"
 
-#: ../../templates/show_play_selected.inc.php:63
+#: ../../templates/show_play_selected.inc.php:64
 msgid "Set Track Numbers"
 msgstr "设置音轨号"
 
-#: ../../templates/show_play_selected.inc.php:64
+#: ../../templates/show_play_selected.inc.php:65
 msgid "Remove Selected Tracks"
 msgstr "清除音轨号"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Playlist"
 msgstr "播放列表"
 
-#: ../../templates/show_play_selected.inc.php:70
+#: ../../templates/show_play_selected.inc.php:71
 msgid "Add to"
 msgstr "添加到"
 
-#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+#: ../../templates/show_play_selected.inc.php:73
+#: ../../templates/show_playlists.inc.php:51
+msgid "View"
+msgstr "显示"
+
+#: ../../templates/show_play_selected.inc.php:74
+#: ../../templates/show_playlists.inc.php:55 ../../templates/show_users.inc:58
+#: ../../templates/show_users.inc:102
+msgid "Edit"
+msgstr "编辑"
+
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:99
+msgid "Newest Artist Additions"
+msgstr "最新添加的歌手"
+
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:106
+msgid "Newest Album Additions"
+msgstr "最新添加的专辑"
+
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:82
 msgid "Most Popular Artists"
 msgstr "最流行的歌手"
 
-#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:61
 msgid "Most Popular Albums"
 msgstr "最流行的专辑"
 
@@ -942,120 +1157,232 @@ msgstr "最流行的专辑"
 msgid "Most Popular Genres"
 msgstr "最流行的歌曲"
 
-#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:89
 msgid "Most Popular Songs"
 msgstr "最流行的歌曲"
 
-#: ../../templates/show_local_catalog_info.inc.php:10
-msgid "Total Users"
-msgstr "用户总数"
+#: ../../templates/show_get_albumart.inc.php:28
+msgid "Customize Search"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:14
-msgid "Connected Users"
-msgstr "在线用户"
+#: ../../templates/show_get_albumart.inc.php:49
+msgid "Direct URL to Image"
+msgstr ""
 
-#: ../../templates/show_local_catalog_info.inc.php:18
-#: ../../templates/show_genre.inc.php:36 ../../templates/show_artists.inc:42
-#: ../../templates/show_artists.inc:65 ../../templates/show_browse_menu.inc:36
-msgid "Albums"
+#: ../../templates/show_get_albumart.inc.php:59
+msgid "Get Art"
+msgstr "获取歌手信息"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#: ../../templates/show_rename_artist.inc.php:51
+#, fuzzy
+msgid "Rename"
+msgstr "用户名"
+
+#: ../../templates/show_rename_artist.inc.php:33
+#, fuzzy
+msgid "to"
+msgstr "停止"
+
+#: ../../templates/show_rename_artist.inc.php:40
+#: ../../templates/show_search.inc:144
+msgid "OR"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:42
+msgid "Insert current"
+msgstr ""
+
+#: ../../templates/show_rename_artist.inc.php:47
+#, fuzzy
+msgid "Update id3 tags"
+msgstr "从标记更新"
+
+#: ../../templates/show_artist_box.inc.php:26
+msgid "Albums by"
 msgstr "专辑"
 
-#: ../../templates/show_local_catalog_info.inc.php:22
-#: ../../templates/show_genre.inc.php:41
-#: ../../templates/show_browse_menu.inc:35
-msgid "Artists"
+#: ../../templates/show_artist_box.inc.php:34
+msgid "Show All Songs By"
+msgstr "显示所有歌曲"
+
+#: ../../templates/show_artist_box.inc.php:35
+msgid "Play All Songs By"
+msgstr "播放所有歌曲"
+
+#: ../../templates/show_artist_box.inc.php:36
+msgid "Play Random Songs By"
+msgstr "随机播放歌曲"
+
+#: ../../templates/show_artist_box.inc.php:38
+#: ../../templates/show_album.inc:72
+msgid "Update from tags"
+msgstr "从标记更新"
+
+#: ../../templates/show_artist_box.inc.php:39
+#, fuzzy
+msgid "Rename Artist"
 msgstr "歌手"
 
-#: ../../templates/show_local_catalog_info.inc.php:26
-#: ../../templates/show_genres.inc.php:37
-#: ../../templates/show_genre.inc.php:46 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "歌曲"
+#: ../../templates/show_playlists.inc.php:31
+#, fuzzy
+msgid "Playlist Name"
+msgstr "自定义播放列表类型"
 
-#: ../../templates/show_local_catalog_info.inc.php:30
-msgid "Catalog Size"
-msgstr "曲库大小"
+#: ../../templates/show_playlists.inc.php:32
+#, fuzzy
+msgid "# Songs"
+msgstr "歌曲"
 
-#: ../../templates/show_local_catalog_info.inc.php:34
-msgid "Catalog Time"
-msgstr "曲库时间"
+#: ../../templates/show_playlists.inc.php:33
+msgid "Owner"
+msgstr ""
 
-#: ../../templates/show_genres.inc.php:38 ../../templates/show_artists.inc:43
-#: ../../templates/show_artists.inc:67 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-#: ../../templates/show_access_list.inc:51 ../../templates/show_artist.inc:55
-#: ../../templates/show_mpdpl.inc:68 ../../templates/show_uploads.inc:32
-msgid "Action"
+#: ../../templates/show_playlists.inc.php:34
+#, fuzzy
+msgid "Actions"
 msgstr "操作"
 
-#: ../../templates/show_genre.inc.php:32
+#: ../../templates/show_playlists.inc.php:58
+#: ../../templates/show_uploads.inc:50 ../../templates/catalog.inc:57
+#: ../../templates/show_users.inc:70
+msgid "Delete"
+msgstr "删除"
+
+#: ../../templates/show_playlists.inc.php:71
+#: ../../templates/show_songs.inc:140 ../../templates/show_album.inc:75
+#: ../../templates/show_albums.inc:61 ../../templates/show_artist.inc:69
+msgid "Download"
+msgstr "下载"
+
+#: ../../templates/show_playlist_box.inc.php:33
+msgid "Playlist Actions"
+msgstr "自选歌曲列表操作"
+
+#: ../../templates/show_playlist_box.inc.php:34
 #, fuzzy
-msgid "Viewing"
-msgstr "显示"
+msgid "Create New Playlist"
+msgstr "新建自定义播放列表"
 
-#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
-msgid "Newest Artist Additions"
-msgstr "最新添加的歌手"
+#: ../../templates/show_playlist_box.inc.php:35
+#, fuzzy
+msgid "View All Playlists"
+msgstr "新建自定义播放列表"
 
-#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
-msgid "Newest Album Additions"
-msgstr "最新添加的专辑"
+#: ../../templates/show_playlist_box.inc.php:36
+#, fuzzy
+msgid "Import From File"
+msgstr "从文件导入自定义播放列表"
+
+#: ../../templates/show_playlist_box.inc.php:38
+#, fuzzy
+msgid "Normalize Tracks"
+msgstr "总音轨数"
+
+#: ../../templates/show_playlist_box.inc.php:39
+#, fuzzy
+msgid "Play This Playlist"
+msgstr "播放自定义列表"
 
-#: ../../localplay.php:79
+#: ../../templates/show_preference_box.inc.php:44
+msgid "Preference"
+msgstr "设置"
+
+#: ../../templates/show_preference_box.inc.php:45
+msgid "Value"
+msgstr "值"
+
+#: ../../templates/show_preference_box.inc.php:47
+msgid "Apply to All"
+msgstr "全部应用"
+
+#: ../../templates/show_preference_box.inc.php:54
+msgid "description"
+msgstr ""
+
+#: ../../templates/show_object_rating.inc.php:25
+#: ../../templates/show_songs.inc:52
+#, fuzzy
+msgid "Rating"
+msgstr "编辑中"
+
+#: ../../localplay.php:81
 msgid "Unknown action requested"
 msgstr "未知操作"
 
-#: ../../artists.php:48
-msgid "All songs by"
-msgstr "全部歌曲"
+#: ../../browse.php:48 ../../albums.php:168 ../../albums.php:174
+#: ../../albums.php:181 ../../albums.php:186 ../../albums.php:192
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>S</u>只显示如下开头的专辑："
+
+#: ../../browse.php:78 ../../artists.php:128 ../../artists.php:132
+#: ../../artists.php:138 ../../artists.php:151
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>S</u>显示歌手名字前几位字符是"
+
+#: ../../search.php:45
+msgid "Error: No Keyword Entered"
+msgstr ""
 
-#: ../../artists.php:57 ../../albums.php:106
+#: ../../tv.php:76 ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: ../../artists.php:58 ../../albums.php:147
 msgid "Starting Update from Tags"
 msgstr "开始从文件标记获取信息"
 
-#: ../../artists.php:62 ../../albums.php:111
+#: ../../artists.php:63 ../../albums.php:152
 msgid "Update From Tags Complete"
 msgstr "从标记信息更新结束"
 
-#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
-#: ../../artists.php:95
-#, fuzzy
-msgid "Show Artists starting with"
-msgstr "<u>S</u>显示歌手名字前几位字符是"
-
-#: ../../amp-mpd.php:176 ../../playlist.php:135
+#: ../../amp-mpd.php:171 ../../playlist.php:63
 msgid "New Playlist"
 msgstr "新建自定义播放列表"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "所有者 "
+#: ../../playlist.php:46
+#, fuzzy
+msgid "Playlist Deleted"
+msgstr "播放选择的歌曲"
 
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "编辑自定义播放列表"
+#: ../../playlist.php:46
+#, fuzzy
+msgid "The Requested Playlist has been deleted"
+msgstr "请求的歌曲被允许播放"
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "播放自定义列表"
+#: ../../playlist.php:56
+#, fuzzy
+msgid "Are you sure you want to delete this playlist"
+msgstr "确定要永久删除？"
 
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "随机播放"
+#: ../../playlist.php:112
+#, fuzzy
+msgid "Playlist Created"
+msgstr "自定义播放列表已更新"
+
+#: ../../playlist.php:112
+msgid " has been created"
+msgstr ""
+
+#: ../../playlist.php:121
+#, fuzzy
+msgid "Remote Selected Tracks"
+msgstr "清除音轨号"
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
+#: ../../playlist.php:139
+#, fuzzy
+msgid "Playlist Updated"
 msgstr "自定义播放列表已更新"
 
-#: ../../index.php:41
-msgid "Welcome to"
-msgstr "欢迎来到"
+#: ../../playlist.php:139
+msgid " has been updated"
+msgstr ""
 
-#: ../../index.php:43
-msgid "you are currently logged in as"
-msgstr "你登录为用户"
+#: ../../flag.php:38
+msgid "Flagging song completed."
+msgstr "标记完成"
 
 #: ../../user.php:45
 msgid "Error: Password Does Not Match or Empty"
@@ -1065,10 +1392,6 @@ msgstr "错误：无效或空密码"
 msgid "Error: Insufficient Rights"
 msgstr "错误：没有足够权限"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "标记完成"
-
 #: ../../albums.php:44
 msgid "Album Art Cleared"
 msgstr "歌曲歌手被删除"
@@ -1077,35 +1400,104 @@ msgstr "歌曲歌手被删除"
 msgid "Album Art information has been removed form the database"
 msgstr "歌曲歌手信息被从数据库消除"
 
-#: ../../albums.php:78
-msgid "Album Art Located"
-msgstr "找到歌曲歌手信息"
-
-#: ../../albums.php:78
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr "在Amazon找到歌曲歌手信息。如果正确，请按下面的\"重置歌曲歌手\""
-
-#: ../../albums.php:86 ../../albums.php:96
-msgid "Get Art"
-msgstr "获取歌手信息"
+#: ../../albums.php:74
+msgid "No Amazon Developer Key set, amazon album art searching will not work"
+msgstr ""
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid "Album Art Not Located"
 msgstr "找不到歌曲歌手信息"
 
-#: ../../albums.php:90
+#: ../../albums.php:104
 msgid ""
 "Album Art could not be located at this time. This may be due to Amazon being "
 "busy, or the album not being present in their collection."
 msgstr "现在无法找到歌曲歌手信息。"
 
-#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
-#: ../../albums.php:145 ../../albums.php:150
+#: ../../albums.php:137
 #, fuzzy
-msgid "Show Albums starting with"
-msgstr "<u>S</u>只显示如下开头的专辑："
+msgid "Album Art Inserted"
+msgstr "歌曲歌手被删除"
+
+#: ../../ratings.php:33
+#, fuzzy
+msgid "Rating Updated"
+msgstr "快速更新"
+
+#: ../../ratings.php:33
+msgid "Your rating for this object has been updated"
+msgstr ""
+
+#: ../../register.php:79
+#, fuzzy
+msgid "Error Captcha Required"
+msgstr "错误：请输入用户名"
+
+#: ../../register.php:86
+msgid "Error Captcha Failed"
+msgstr ""
+
+#: ../../register.php:93
+msgid "You <U>must</U> accept the user agreement"
+msgstr ""
+
+#: ../../register.php:98
+msgid "You did not enter a username"
+msgstr ""
+
+#: ../../register.php:102
+msgid "Please fill in your full name (Firstname Lastname)"
+msgstr ""
+
+#: ../../register.php:128
+#, fuzzy
+msgid "You must enter a password"
+msgstr "输入密码"
+
+#: ../../register.php:132
+#, fuzzy
+msgid "Your passwords do not match"
+msgstr "错误：密码不匹配"
+
+#: ../../register.php:150
+#, fuzzy
+msgid "Error: Insert Failed"
+msgstr "错误：没有足够权限"
+
+#: ../../register.php:165
+msgid "Registration Complete"
+msgstr ""
+
+#: ../../activate.php:42
+msgid "No user with this name registered"
+msgstr ""
+
+#: ../../activate.php:46
+msgid "The validation key used isn't correct."
+msgstr ""
+
+#: ../../activate.php:51
+#, fuzzy
+msgid "User activated"
+msgstr "用户已删除"
+
+#: ../../activate.php:51
+msgid "This User ID is activated and can be used"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:42
+msgid ""
+"[print_tags.php.inc]\n"
+"This commandline script will display the tag information for the specified "
+"filename as it will \n"
+"appear to Ampache. \n"
+"        \n"
+msgstr ""
+
+#: ../../bin/print_tags.php.inc:48
+#, fuzzy
+msgid "Filename:"
+msgstr "文件名"
 
 #: ../../bin/quarantine_migration.php.inc:49
 #, fuzzy
@@ -1170,19 +1562,138 @@ msgstr "错误"
 msgid "!\n"
 msgstr ""
 
+#: ../../templates/show_admin_index.inc:27
+#, fuzzy
+msgid "User Management"
+msgstr "用户名"
+
+#: ../../templates/show_admin_index.inc:28
+msgid "E-mail Management"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "曲库名"
+
+#: ../../templates/show_admin_index.inc:30
+msgid "Admin Preferences"
+msgstr "管理员设置"
+
+#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:95
+msgid "Access Lists"
+msgstr "访问控制列表"
+
+#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:94
+msgid "Add a catalog"
+msgstr "添加曲库"
+
+#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:99
+msgid "Clear Now Playing"
+msgstr "清除正在播放信息"
+
+#: ../../templates/show_admin_index.inc:36
+#, fuzzy
+msgid "Add Access List Entry"
+msgstr "访问控制列表"
+
+#: ../../templates/show_admin_index.inc:40
+msgid "Common Functions"
+msgstr ""
+
+#: ../../templates/show_admin_index.inc:43
+#, fuzzy
+msgid "Admin Sections"
+msgstr "管理区"
+
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "状态"
+
+#: ../../templates/show_uploads.inc:34 ../../templates/flag.inc:58
+#: ../../templates/list_flagged.inc:41 ../../templates/list_duplicates.inc:32
+msgid "Song"
+msgstr "歌曲"
+
+#: ../../templates/show_uploads.inc:40 ../../templates/show_songs.inc:46
+#: ../../templates/list_duplicates.inc:37
+msgid "Size"
+msgstr "大小"
+
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "用户"
+
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "日期"
+
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "添加"
+
+#: ../../templates/show_mpdpl.inc:43
+#, fuzzy
+msgid "MPD Server Playlist"
+msgstr "服务器播放列表"
+
+#: ../../templates/show_mpdpl.inc:45 ../../templates/show_mpdpl.inc:175
+msgid "Refresh the Playlist Window"
+msgstr "刷新列表窗口"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "Click to shuffle (randomize) the playlist"
+msgstr "点击随机（乱序）播放列表"
+
+#: ../../templates/show_mpdpl.inc:47 ../../templates/show_mpdpl.inc:177
+msgid "shuffle"
+msgstr "乱序"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:178
+#, fuzzy
+msgid "Click to the clear the playlist"
+msgstr "点击清除播放列表"
+
+#: ../../templates/show_mpdpl.inc:52 ../../templates/show_mpdpl.inc:182
+msgid "Click to the remove all except the Now Playing"
+msgstr ""
+
+#: ../../templates/show_mpdpl.inc:62 ../../templates/show_songs.inc:41
+msgid "Song title"
+msgstr "歌曲名"
+
+#: ../../templates/flag.inc:43
+msgid "Flag song"
+msgstr "标记歌曲"
+
+#: ../../templates/flag.inc:45
+msgid ""
+"Flag the following song as having one of the problems listed below.  Site "
+"admins will then take the appropriate action for the flagged files."
+msgstr "把下面的歌曲标记成某个如下列表显示的问题之一，以便管理员采取相应动作。"
+
+#: ../../templates/flag.inc:62
+msgid "Reason to flag"
+msgstr "标记原因"
+
+#: ../../templates/flag.inc:73
+msgid "Flag Song"
+msgstr "标记歌曲"
+
 #: ../../templates/customize_catalog.inc:24
 msgid "Settings for catalog in"
 msgstr "曲库设置在"
 
-#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:40
 msgid "Auto-inserted Fields"
 msgstr "自动添加的字段"
 
-#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:41
 msgid "album name"
 msgstr "专辑名"
 
-#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:42
 msgid "artist name"
 msgstr "歌手名"
 
@@ -1190,27 +1701,27 @@ msgstr "歌手名"
 msgid "catalog path"
 msgstr "曲库路径"
 
-#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:43
 msgid "id3 comment"
 msgstr "id3 说明"
 
-#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:44
 msgid "genre"
 msgstr "类型"
 
-#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:45
 msgid "track number (padded with leading 0)"
 msgstr "音轨号（前面用0补足）"
 
-#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:46
 msgid "song title"
 msgstr "歌曲名"
 
-#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:47
 msgid "year"
 msgstr "年代"
 
-#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:48
 msgid "other"
 msgstr "其他"
 
@@ -1222,11 +1733,11 @@ msgstr "ID3 设置命令"
 msgid "Filename pattern"
 msgstr "文件模板"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "Folder Pattern"
 msgstr "目录模板"
 
-#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:75
 msgid "(no leading or ending '/')"
 msgstr "(开头和结束不要带'/')"
 
@@ -1234,51 +1745,6 @@ msgstr "(开头和结束不要带'/')"
 msgid "Save Catalog Settings"
 msgstr "保存曲库设置信息"
 
-#: ../../templates/show_admin_index.inc:27
-#, fuzzy
-msgid "User Management"
-msgstr "用户名"
-
-#: ../../templates/show_admin_index.inc:28
-msgid "E-mail Management"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:29
-#, fuzzy
-msgid "Catalog Managment"
-msgstr "曲库名"
-
-#: ../../templates/show_admin_index.inc:30 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "管理员设置"
-
-#: ../../templates/show_admin_index.inc:31 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "访问控制列表"
-
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "添加曲库"
-
-#: ../../templates/show_admin_index.inc:35 ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "清除正在播放信息"
-
-#: ../../templates/show_admin_index.inc:36
-#, fuzzy
-msgid "Add Access List Entry"
-msgstr "访问控制列表"
-
-#: ../../templates/show_admin_index.inc:40
-msgid "Common Functions"
-msgstr ""
-
-#: ../../templates/show_admin_index.inc:43
-#, fuzzy
-msgid "Admin Sections"
-msgstr "管理区"
-
 #: ../../templates/show_test.inc:29
 msgid "Ampache Debug"
 msgstr ""
@@ -1342,7 +1808,7 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_test.inc:116
-#: ../../templates/show_install_config.inc:87
+#: ../../templates/show_install_config.inc:88
 msgid "Ampache.cfg.php Exists"
 msgstr "Ampache.cfg.php已存在"
 
@@ -1354,7 +1820,7 @@ msgid ""
 msgstr ""
 
 #: ../../templates/show_test.inc:137
-#: ../../templates/show_install_config.inc:104
+#: ../../templates/show_install_config.inc:105
 msgid "Ampache.cfg.php Configured?"
 msgstr "Ampache.cfg.php已配置？"
 
@@ -1400,20 +1866,20 @@ msgid "Playback"
 msgstr "播放"
 
 #: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
-#: ../../templates/show_mpdplay.inc:48
+#: ../../templates/show_mpdplay.inc:62
 msgid "Prev"
 msgstr "后退"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:63
 msgid "Stop"
 msgstr "停止"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:65
 msgid "Pause"
 msgstr "暂停"
 
 #: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
-#: ../../templates/show_mpdplay.inc:52
+#: ../../templates/show_mpdplay.inc:66
 msgid "Next"
 msgstr "前进"
 
@@ -1433,7 +1899,7 @@ msgstr "减少音量"
 msgid "Clear queue"
 msgstr "清除队列"
 
-#: ../../templates/add_catalog.inc:30
+#: ../../templates/add_catalog.inc:31
 msgid ""
 "In the form below enter either a local path (i.e. /data/music) or the URL to "
 "a remote Ampache installation (i.e http://theotherampache.com)"
@@ -1441,60 +1907,55 @@ msgstr ""
 "请在如下表单里面填入本地路径（例如 /data/music），或者指向远程Ampache的一个"
 "URL（例如 http://theotherampache.com）"
 
-#: ../../templates/add_catalog.inc:36
+#: ../../templates/add_catalog.inc:37
 msgid "Catalog Name"
 msgstr "曲库名"
 
-#: ../../templates/add_catalog.inc:53
+#: ../../templates/add_catalog.inc:54
 msgid "Path"
 msgstr "路径"
 
-#: ../../templates/add_catalog.inc:57
+#: ../../templates/add_catalog.inc:58
 msgid "Catalog Type"
 msgstr "曲库类型"
 
-#: ../../templates/add_catalog.inc:61
+#: ../../templates/add_catalog.inc:62
 msgid "Remote"
 msgstr "远程"
 
-#: ../../templates/add_catalog.inc:66
+#: ../../templates/add_catalog.inc:67
 msgid "ID3 Set Command"
 msgstr "ID3 设置命令"
 
-#: ../../templates/add_catalog.inc:70
+#: ../../templates/add_catalog.inc:71
 msgid "Filename Pattern"
 msgstr "文件模板"
 
-#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+#: ../../templates/add_catalog.inc:79 ../../templates/catalog.inc:101
 msgid "Gather Album Art"
 msgstr "搜集歌曲歌手"
 
-#: ../../templates/add_catalog.inc:82
+#: ../../templates/add_catalog.inc:83
 msgid "ID3V2 Tags"
 msgstr "ID3V2 标记"
 
-#: ../../templates/add_catalog.inc:85
+#: ../../templates/add_catalog.inc:86
 msgid "Amazon"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:88
+#: ../../templates/add_catalog.inc:89
 msgid "File Folder"
 msgstr "文件目录"
 
-#: ../../templates/add_catalog.inc:95
+#: ../../templates/add_catalog.inc:96
 msgid "Build Playlists from m3u Files"
 msgstr "从m3u文件建立自定义播放列表"
 
-#: ../../templates/add_catalog.inc:102
+#: ../../templates/add_catalog.inc:103
 msgid "Add Catalog"
 msgstr "添加曲库"
 
-#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
-#: ../../templates/show_uploads.inc:34
-msgid "Song"
-msgstr "歌曲"
-
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:49
 msgid "Flag"
 msgstr "标记"
 
@@ -1518,29 +1979,29 @@ msgstr "接受"
 msgid "Reject"
 msgstr "拒绝"
 
-#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
-#: ../../templates/show_random_play.inc:46
-msgid "All"
-msgstr "全部"
-
-#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
-msgid "Song title"
-msgstr "歌曲名"
+#: ../../templates/header.inc:49
+#, fuzzy
+msgid "You are currently logged in as"
+msgstr "你登录为用户"
 
-#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
-msgid "Size"
-msgstr "大小"
+#: ../../templates/header.inc:58
+msgid "Go!"
+msgstr ""
 
-#: ../../templates/show_songs.inc:113
+#: ../../templates/show_songs.inc:143
 msgid "Direct Link"
 msgstr "直接下载"
 
-#: ../../templates/show_songs.inc:131
+#: ../../templates/show_songs.inc:166
 msgid "Total"
 msgstr "总共"
 
+#: ../../templates/show_search_bar.inc:36 ../../templates/show_search.inc:54
+msgid "Search Ampache"
+msgstr "搜索"
+
 #: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
+#: ../../templates/show_install.inc:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.php.dist file"
@@ -1548,7 +2009,7 @@ msgstr ""
 "你的WWW服务器能读取/sql/ampache.sql文件，以及/config/ampache.cfg.php.dist文件"
 
 #: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
+#: ../../templates/show_install.inc:51
 msgid "Step 2 - Creating the Ampache.cfg.php file"
 msgstr "第二步 - 创建ampache.cfg.php配置文件"
 
@@ -1561,89 +2022,69 @@ msgstr ""
 "这一步创建基本配置信息。会首先尝试直接写到你的WWW服务器上。如果访问拒绝，会提"
 "示你下载这个配置文件保存到/config目录去。"
 
-#: ../../templates/show_install_config.inc:59
+#: ../../templates/show_install_config.inc:60
 msgid "Web Path"
 msgstr "网页路径"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
+#: ../../templates/show_install_config.inc:64
+#: ../../templates/show_install.inc:59
 msgid "Desired Database Name"
 msgstr "数据库名"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
+#: ../../templates/show_install_config.inc:68
+#: ../../templates/show_install.inc:63
 msgid "MySQL Hostname"
 msgstr "MySQL主机"
 
-#: ../../templates/show_install_config.inc:71
+#: ../../templates/show_install_config.inc:72
 msgid "MySQL Username"
 msgstr "MySQL用户"
 
-#: ../../templates/show_install_config.inc:75
+#: ../../templates/show_install_config.inc:76
 msgid "MySQL Password"
 msgstr "MySQL密码"
 
-#: ../../templates/show_install_config.inc:80
+#: ../../templates/show_install_config.inc:81
 msgid "Write Config"
 msgstr "写入配置"
 
-#: ../../templates/show_install_config.inc:124
+#: ../../templates/show_install_config.inc:125
 msgid "Check for Config"
 msgstr "检查配置"
 
-#: ../../templates/show_album.inc:53
+#: ../../templates/show_album.inc:67
 msgid "Play Album"
 msgstr "播放专辑"
 
-#: ../../templates/show_album.inc:54
+#: ../../templates/show_album.inc:68
 msgid "Play Random from Album"
 msgstr "随机从专辑播放"
 
-#: ../../templates/show_album.inc:55
+#: ../../templates/show_album.inc:69
 msgid "Reset Album Art"
 msgstr "重置歌曲歌手"
 
-#: ../../templates/show_album.inc:56
+#: ../../templates/show_album.inc:70
 msgid "Find Album Art"
 msgstr "查找歌曲歌手"
 
-#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
-msgid "Update from tags"
-msgstr "从标记更新"
-
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "Editing"
 msgstr "编辑中"
 
-#: ../../templates/show_preferences.inc:31
+#: ../../templates/show_preferences.inc:42
 msgid "preferences"
 msgstr "设置"
 
-#: ../../templates/show_preferences.inc:33
+#: ../../templates/show_preferences.inc:44
 msgid "Rebuild Preferences"
 msgstr "重建设置"
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "设置"
-
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "值"
-
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "类型"
-
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "全部应用"
-
-#: ../../templates/show_preferences.inc:83
+#: ../../templates/show_preferences.inc:73
 msgid "Update Preferences"
 msgstr "更新设置"
 
-#: ../../templates/show_preferences.inc:87
+#: ../../templates/show_preferences.inc:77
 msgid "Cancel"
 msgstr "取消"
 
@@ -1667,7 +2108,35 @@ msgstr "添加用户"
 msgid "Update User"
 msgstr "更新用户"
 
-#: ../../templates/show_install.inc:48
+#: ../../templates/show_random_play.inc:34
+msgid "Item count"
+msgstr "数量"
+
+#: ../../templates/show_random_play.inc:49
+msgid "From genre"
+msgstr "类型"
+
+#: ../../templates/show_random_play.inc:58
+msgid "Standard"
+msgstr ""
+
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "没播放过的优先"
+
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "全部歌手"
+
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "曲库"
+
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "随机播放"
+
+#: ../../templates/show_install.inc:49
 msgid ""
 "This step creates and inserts the Ampache database, as such please provide a "
 "mysql account with database creation rights. This step may take a while "
@@ -1676,35 +2145,30 @@ msgstr ""
 "这一步创建Ampache数据库并初始化数据。请提供一个有建立数据库权限的MySQL帐号。"
 "这一步可能会需要比较长一段时间，就看你机器快不快了"
 
-#: ../../templates/show_install.inc:65
+#: ../../templates/show_install.inc:67
 msgid "MySQL Administrative Username"
 msgstr "MySQL管理用户名"
 
-#: ../../templates/show_install.inc:69
+#: ../../templates/show_install.inc:71
 msgid "MySQL Administrative Password"
 msgstr "MySQL管理用户密码"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "添加数据库"
-
-#: ../../templates/flag.inc:43
-msgid "Flag song"
-msgstr "标记歌曲"
+#: ../../templates/show_install.inc:75
+msgid "Create Database User for New Database"
+msgstr ""
 
-#: ../../templates/flag.inc:45
-msgid ""
-"Flag the following song as having one of the problems listed below.  Site "
-"admins will then take the appropriate action for the flagged files."
-msgstr "把下面的歌曲标记成某个如下列表显示的问题之一，以便管理员采取相应动作。"
+#: ../../templates/show_install.inc:80
+#, fuzzy
+msgid "Ampache Database Username"
+msgstr "数据库名"
 
-#: ../../templates/flag.inc:62
-msgid "Reason to flag"
-msgstr "标记原因"
+#: ../../templates/show_install.inc:84
+msgid "Ampache Database User Password"
+msgstr ""
 
-#: ../../templates/flag.inc:73
-msgid "Flag Song"
-msgstr "标记歌曲"
+#: ../../templates/show_install.inc:89
+msgid "Insert Database"
+msgstr "添加数据库"
 
 #: ../../templates/show_add_access.inc:31
 msgid "Add Access for a Host"
@@ -1733,98 +2197,62 @@ msgstr "等级"
 msgid "Add Host"
 msgstr "添加主机"
 
-#: ../../templates/catalog.inc:33
+#: ../../templates/catalog.inc:30
 msgid ""
 "Error: ICONV not found, ID3V2 Tags will not import correctly. See <a href="
 "\"http://php.oregonstate.edu/iconv\">Iconv</a> for information on getting "
 "ICONV"
 msgstr ""
 
-#: ../../templates/catalog.inc:42
+#: ../../templates/catalog.inc:39
 msgid "Update Catalogs"
 msgstr "更新曲库"
 
-#: ../../templates/catalog.inc:68
+#: ../../templates/catalog.inc:65
 msgid "Fast Add"
 msgstr "快速添加"
 
-#: ../../templates/catalog.inc:75
+#: ../../templates/catalog.inc:72
 msgid "Fast Update"
 msgstr "快速更新"
 
-#: ../../templates/catalog.inc:88
+#: ../../templates/catalog.inc:85
 msgid "You don't have any catalogs."
 msgstr "你没有任何曲库"
 
-#: ../../templates/catalog.inc:99
+#: ../../templates/catalog.inc:96
 msgid "Show Duplicate Songs"
 msgstr "显示重复的歌曲"
 
-#: ../../templates/catalog.inc:100
+#: ../../templates/catalog.inc:97
 msgid "Show Disabled Songs"
 msgstr "显示被禁止的歌曲"
 
-#: ../../templates/catalog.inc:101
+#: ../../templates/catalog.inc:98
 msgid "Clear Catalog Stats"
 msgstr "清除曲库统计信息"
 
-#: ../../templates/catalog.inc:103
+#: ../../templates/catalog.inc:100
 msgid "Dump Album Art"
 msgstr "删除歌曲歌手"
 
-#: ../../templates/catalog.inc:105
+#: ../../templates/catalog.inc:102
 msgid "View flagged songs"
 msgstr "显示已标记的歌曲"
 
-#: ../../templates/catalog.inc:106
+#: ../../templates/catalog.inc:103
 msgid "Catalog Tools"
 msgstr "曲库工具"
 
-#: ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "用户"
-
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "向用户发送邮件"
-
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "首页"
-
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "本地播放"
-
-#: ../../templates/menu.inc:38
-msgid "Playlists"
-msgstr "自定义文件列表"
-
-#: ../../templates/menu.inc:40
-msgid "Preferences"
-msgstr "设置"
-
-#: ../../templates/menu.inc:43 ../../templates/show_upload.inc:73
-msgid "Upload"
-msgstr "上传"
-
-#: ../../templates/menu.inc:63 ../../templates/menu.inc:66
-msgid "Admin"
-msgstr "管理"
-
 #: ../../templates/menu.inc:73 ../../templates/menu.inc:79
 msgid "Account"
 msgstr "帐号"
 
 #: ../../templates/menu.inc:74 ../../templates/menu.inc:80
+#: ../../templates/show_users.inc:64 ../../templates/show_users.inc:112
 msgid "Stats"
 msgstr "状态"
 
-#: ../../templates/menu.inc:75 ../../templates/menu.inc:81
-#: ../../templates/menu.inc:85
-msgid "Logout"
-msgstr "退出"
-
 #: ../../templates/show_upload.inc:30
 msgid "Uploading Music to Ampache"
 msgstr ""
@@ -1837,9 +2265,54 @@ msgstr ""
 msgid "max_upload_size"
 msgstr ""
 
-#: ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
-msgstr "正在播放"
+#: ../../templates/show_users.inc:40
+msgid "Fullname"
+msgstr "全名"
+
+#: ../../templates/show_users.inc:48
+msgid "Last Seen"
+msgstr "最后一次"
+
+#: ../../templates/show_users.inc:53
+#, fuzzy
+msgid "Registration Date"
+msgstr "注册用户"
+
+#: ../../templates/show_users.inc:61 ../../templates/show_users.inc:107
+msgid "Prefs"
+msgstr "设置"
+
+#: ../../templates/show_users.inc:67
+msgid "Access"
+msgstr "权限"
+
+#: ../../templates/show_users.inc:73
+msgid "On-line"
+msgstr "在线"
+
+#: ../../templates/show_users.inc:126
+msgid "delete"
+msgstr "删除"
+
+#: ../../templates/list_duplicates.inc:28
+#, fuzzy
+msgid "Duplicate Songs"
+msgstr "显示重复的歌曲"
+
+#: ../../templates/list_duplicates.inc:35
+msgid "Length"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid "You don"
+msgstr ""
+
+#: ../../templates/list_duplicates.inc:74
+msgid ""
+"); ?></p>\n"
+"<?php  } ?>\n"
+"</form>\n"
+msgstr ""
 
 #: ../../templates/show_login_form.inc:49
 #: ../../templates/show_login_form.inc:63
@@ -1850,6 +2323,11 @@ msgstr "登录"
 msgid "Remember Me"
 msgstr "登录保留直到关闭"
 
+#: ../../templates/show_login_form.inc:72
+#, fuzzy
+msgid "Register"
+msgstr "注册用户"
+
 #: ../../templates/show_access_list.inc:34
 msgid "Host Access to Your Catalog"
 msgstr "曲库访问权限"
@@ -1870,181 +2348,177 @@ msgstr "结束地址"
 msgid "Revoke"
 msgstr "收回"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-msgstr "全名"
-
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "最后一次"
-
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "设置"
-
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr "权限"
-
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "在线"
+#: ../../templates/show_search.inc:57
+msgid "Keywords"
+msgstr ""
 
-#: ../../templates/show_users.inc:105
-msgid "delete"
-msgstr "删除"
+#: ../../templates/show_search.inc:102
+#, fuzzy
+msgid "Played"
+msgstr "播放"
 
-#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
-msgid "Search Ampache"
-msgstr "搜索"
+#: ../../templates/show_search.inc:110
+#, fuzzy
+msgid "Min Bitrate"
+msgstr "码率"
 
-#: ../../templates/show_search.inc:41
+#: ../../templates/show_search.inc:132
 msgid "Object Type"
 msgstr "目标类型"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "专辑"
+#: ../../templates/show_search.inc:138
+#, fuzzy
+msgid "Genres"
+msgstr "类别"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "显示所有歌曲"
+#: ../../templates/show_search.inc:141
+msgid "Operator"
+msgstr ""
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "播放所有歌曲"
+#: ../../templates/show_search.inc:145
+msgid "AND"
+msgstr ""
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "随机播放歌曲"
+#: ../../templates/show_search.inc:150
+#, fuzzy
+msgid "Method"
+msgstr "模式"
 
-#: ../../templates/show_artist.inc:49
-msgid "Select"
-msgstr "选择"
+#: ../../templates/show_search.inc:153
+msgid "Fuzzy"
+msgstr ""
 
-#: ../../templates/show_artist.inc:51
-msgid "Cover"
-msgstr "封面"
+#: ../../templates/show_search.inc:154
+msgid "Exact"
+msgstr ""
 
-#: ../../templates/show_artist.inc:52
-msgid "Album Name"
-msgstr "专辑名"
+#: ../../templates/show_search.inc:157
+msgid "Maxium Results"
+msgstr ""
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Year"
-msgstr "专辑年代"
+#: ../../templates/show_search.inc:160
+msgid "Unlimited"
+msgstr ""
 
-#: ../../templates/show_artist.inc:54
-msgid "Total Tracks"
-msgstr "总音轨数"
+#: ../../templates/show_search.inc:172
+msgid "Reset Form"
+msgstr ""
+
+#: ../../templates/show_search.inc:184
+msgid "Save Search As Track on"
+msgstr ""
+
+#: ../../templates/show_search.inc:186
+msgid "Save"
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:38
+#: ../../templates/show_mpdplay.inc:39
 msgid "MPD Play Control"
 msgstr "MPD播放控制"
 
-#: ../../templates/show_mpdplay.inc:71
+#: ../../templates/show_mpdplay.inc:100
 msgid "Loop"
 msgstr "循环"
 
-#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
+#: ../../templates/show_mpdplay.inc:107 ../../templates/show_mpdplay.inc:120
 msgid "On"
 msgstr "开"
 
-#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
+#: ../../templates/show_mpdplay.inc:108 ../../templates/show_mpdplay.inc:121
 msgid "Off"
 msgstr "关"
 
-#: ../../templates/show_mpdplay.inc:114
+#: ../../templates/show_mpdplay.inc:134
 #, fuzzy
 msgid "Now Playing :"
 msgstr "正在播放"
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "On Deck "
 msgstr ""
 
-#: ../../templates/show_mpdplay.inc:138
+#: ../../templates/show_mpdplay.inc:163
 msgid "(in "
 msgstr ""
 
-#: ../../templates/show_mpdpl.inc:45
-#, fuzzy
-msgid "MPD Server Playlist"
-msgstr "服务器播放列表"
+#: ../../templates/show_artist.inc:36
+msgid "Select"
+msgstr "选择"
 
-#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
-msgid "Refresh the Playlist Window"
-msgstr "刷新列表窗口"
+#: ../../templates/show_artist.inc:38
+msgid "Cover"
+msgstr "封面"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "Click to shuffle (randomize) the playlist"
-msgstr "点击随机（乱序）播放列表"
+#: ../../templates/show_artist.inc:39
+msgid "Album Name"
+msgstr "专辑名"
 
-#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
-msgid "shuffle"
-msgstr "乱序"
+#: ../../templates/show_artist.inc:40
+msgid "Album Year"
+msgstr "专辑年代"
+
+#: ../../templates/show_artist.inc:41
+msgid "Total Tracks"
+msgstr "总音轨数"
 
-#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#: ../../templates/show_big_art.inc:31
 #, fuzzy
-msgid "Click to the clear the playlist"
-msgstr "点击清除播放列表"
+msgid "Album Art"
+msgstr "查找歌曲歌手"
 
-#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
-msgid "Click to the remove all except the Now Playing"
+#: ../../templates/show_big_art.inc:35
+msgid "Click to close window"
 msgstr ""
 
-#: ../../templates/show_uploads.inc:33
-#, fuzzy
-msgid "Status"
-msgstr "状态"
+#~ msgid "No Results Found"
+#~ msgstr "没有找到"
 
-#: ../../templates/show_uploads.inc:42
-msgid "User"
-msgstr "用户"
+#~ msgid "New"
+#~ msgstr "新建"
 
-#: ../../templates/show_uploads.inc:43
-msgid "Date"
-msgstr "日期"
+#~ msgid "View All"
+#~ msgstr "全部显示"
 
-#: ../../templates/show_uploads.inc:49
-msgid "Add"
-msgstr "添加"
+#~ msgid "Import"
+#~ msgstr "导入"
 
-#: ../../templates/show_random_play.inc:28
-msgid "Play Random Selection"
-msgstr "随机播放"
+#~ msgid "Public"
+#~ msgstr "公开"
 
-#: ../../templates/show_random_play.inc:34
-msgid "Item count"
-msgstr "数量"
+#~ msgid "Your Private"
+#~ msgstr "私人"
 
-#: ../../templates/show_random_play.inc:49
-msgid "From genre"
-msgstr "类型"
+#~ msgid "Other Private"
+#~ msgstr "其他"
 
-#: ../../templates/show_random_play.inc:58
-msgid "Standard"
-msgstr ""
+#~ msgid "There are no playlists of this type"
+#~ msgstr "没有自定义播放列表"
 
-#: ../../templates/show_random_play.inc:59
-msgid "Favor Unplayed"
-msgstr "没播放过的优先"
+#~ msgid "All songs by"
+#~ msgstr "全部歌曲"
 
-#: ../../templates/show_random_play.inc:60
-msgid "Full Albums"
-msgstr "全部专辑"
+#~ msgid "owned by"
+#~ msgstr "所有者 "
 
-#: ../../templates/show_random_play.inc:61
-msgid "Full Artist"
-msgstr "全部歌手"
+#~ msgid "Edit Playlist"
+#~ msgstr "编辑自定义播放列表"
 
-#: ../../templates/show_random_play.inc:66
-msgid "from catalog"
-msgstr "曲库"
+#~ msgid "Play Random"
+#~ msgstr "随机播放"
 
-#: ../../templates/show_random_play.inc:75
-msgid "Play Random Songs"
-msgstr "随机播放"
+#~ msgid "Welcome to"
+#~ msgstr "欢迎来到"
+
+#~ msgid "Album Art Located"
+#~ msgstr "找到歌曲歌手信息"
+
+#~ msgid ""
+#~ "Album Art information has been located in Amazon. If incorrect, click "
+#~ "\"Reset Album Art\" below to remove the artwork."
+#~ msgstr "在Amazon找到歌曲歌手信息。如果正确，请按下面的\"重置歌曲歌手\""
+
+#~ msgid "Type"
+#~ msgstr "类型"
 
 #~ msgid "<u>S</u>how all albums"
 #~ msgstr "<u>S</u>显示所有专辑"
@@ -2061,9 +2535,6 @@ msgstr "随机播放"
 #~ msgid "Successfully-Cataloged"
 #~ msgstr "成功－加入曲库"
 
-#~ msgid "Unknown"
-#~ msgstr "未知"
-
 #~ msgid "Quarantined"
 #~ msgstr "隔离"