whole bunch of last-min fixes for Alpha2 release

1 files changed, 1348 insertions, 1167 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 9b3c0cee..5597dbe5 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-07-11 09:08-0600\n"
+"POT-Creation-Date: 2005-08-14 16:23-0700\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"
@@ -16,769 +16,581 @@ msgstr ""
 "Content-Type: text/plain; charset=GBK\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ../../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 ../../modules/class/song.php:253
-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:38
-#: ../../templates/show_search.inc:37 ../../templates/show_search.inc:83
-msgid "Search"
-msgstr "搜索"
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-#: ../../modules/class/catalog.php:902
-msgid "Error"
-msgstr "错误"
-
-#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
-msgid "Could not add"
-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/ui.php:180
-msgid "Playlist Actions"
-msgstr "自选歌曲列表操作"
-
-#: ../../lib/ui.php:180
-msgid "New"
-msgstr "新建"
-
-#: ../../lib/ui.php:181
-msgid "View All"
-msgstr "全部显示"
-
-#: ../../lib/ui.php:182
-msgid "Import"
-msgstr "导入"
-
-#: ../../lib/ui.php:282
-msgid "Browse"
-msgstr "浏览"
-
-#: ../../lib/ui.php:284
-msgid "Show w/o art"
-msgstr "不显示歌手"
-
-#: ../../lib/ui.php:287
-msgid "Show all"
-msgstr "全部显示"
-
-#: ../../lib/ui.php:393
-msgid "No songs in this playlist."
-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 "没有找到"
+#: ../../play/index.php:50
+msgid "Session Expired: please log in again at"
+msgstr "会话过期：请重新登录"
 
-#: ../../lib/preferences.php:210 ../../templates/show_users.inc:97
+#: ../../lib/preferences.php:211 ../../templates/show_users.inc:97
 msgid "Enable"
 msgstr "允许"
 
-#: ../../lib/preferences.php:211 ../../templates/show_users.inc:100
+#: ../../lib/preferences.php:212 ../../templates/show_users.inc:100
 msgid "Disable"
 msgstr "禁止"
 
-#: ../../lib/preferences.php:223 ../../templates/add_catalog.inc:60
+#: ../../lib/preferences.php:224 ../../templates/add_catalog.inc:60
 msgid "Local"
 msgstr ""
 
-#: ../../lib/preferences.php:226
+#: ../../lib/preferences.php:227
 msgid "Stream"
 msgstr ""
 
-#: ../../lib/preferences.php:229
+#: ../../lib/preferences.php:230
 msgid "IceCast"
 msgstr ""
 
-#: ../../lib/preferences.php:232
+#: ../../lib/preferences.php:233
 msgid "Downsample"
 msgstr ""
 
-#: ../../lib/preferences.php:235
+#: ../../lib/preferences.php:236
 msgid "Music Player Daemon"
 msgstr ""
 
-#: ../../lib/preferences.php:238
+#: ../../lib/preferences.php:239
 msgid "SlimServer"
 msgstr ""
 
-#: ../../lib/preferences.php:247
+#: ../../lib/preferences.php:248
 msgid "M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:248
+#: ../../lib/preferences.php:249
 msgid "Simple M3U"
 msgstr ""
 
-#: ../../lib/preferences.php:249
+#: ../../lib/preferences.php:250
 msgid "PLS"
 msgstr ""
 
-#: ../../lib/preferences.php:250
+#: ../../lib/preferences.php:251
 msgid "Asx"
 msgstr ""
 
-#: ../../lib/preferences.php:257
+#: ../../lib/preferences.php:258
 msgid "English"
 msgstr "英文"
 
-#: ../../lib/preferences.php:258
+#: ../../lib/preferences.php:259
+#, fuzzy
+msgid "British English"
+msgstr "英文"
+
+#: ../../lib/preferences.php:260
 msgid "German"
 msgstr "德文"
 
-#: ../../lib/preferences.php:259
+#: ../../lib/preferences.php:261
 msgid "French"
 msgstr "法文"
 
-#: ../../lib/preferences.php:260
+#: ../../lib/preferences.php:262
 msgid "Turkish"
 msgstr "土耳其语"
 
-#: ../../localplay.php:79
-msgid "Unknown action requested"
-msgstr "未知操作"
-
-#: ../../play/index.php:46
-msgid "Session Expired: please log in again at"
-msgstr "会话过期：请重新登录"
-
-#: ../../admin/song.php:70
-msgid "Songs Disabled"
-msgstr "歌曲被禁止播放"
-
-#: ../../admin/song.php:70
-msgid "The requested song(s) have been disabled"
-msgstr "请求的歌曲被禁止播放"
-
-#: ../../admin/song.php:80
-msgid "Songs Enabled"
-msgstr "歌曲被允许播放"
-
-#: ../../admin/song.php:80
-msgid "The requested song(s) have been enabled"
-msgstr "请求的歌曲被允许播放"
-
-#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
-msgid "Add to Catalog(s)"
-msgstr "添加到曲库"
-
-#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
-msgid "Add to all Catalogs"
-msgstr "添加所有到曲库"
-
-#: ../../admin/catalog.php:76 ../../templates/catalog.inc:73
-msgid "Update Catalog(s)"
-msgstr "更新曲库"
-
-#: ../../admin/catalog.php:87 ../../templates/catalog.inc:74
-msgid "Update All Catalogs"
-msgstr "更新所有曲库"
-
-#: ../../admin/catalog.php:119 ../../templates/catalog.inc:80
-msgid "Clean Catalog(s)"
-msgstr "清除曲库"
-
-#: ../../admin/catalog.php:149 ../../templates/catalog.inc:81
-msgid "Clean All Catalogs"
-msgstr "清除所有曲库"
-
-#: ../../admin/catalog.php:198
-msgid "Now Playing Cleared"
-msgstr "正在播放被取消"
-
-#: ../../admin/catalog.php:198
-msgid "All now playing data has been cleared"
-msgstr "所有正在播放的数据被取消"
-
-#: ../../admin/catalog.php:203
-msgid "Do you really want to clear your catalog?"
-msgstr "真的要清除曲库吗？"
-
-#: ../../admin/catalog.php:210
-msgid "Do you really want to clear the statistics for this catalog?"
-msgstr "真的要清除这个曲库的统计信息吗？"
-
-#: ../../admin/catalog.php:228
-msgid "Do you really want to delete this catalog?"
-msgstr "真的要删除曲库吗？"
-
-#: ../../admin/catalog.php:251 ../../modules/class/catalog.php:723
-#: ../../modules/class/catalog.php:869
-msgid "Starting Album Art Search"
-msgstr "开始搜索歌曲歌手"
-
-#: ../../admin/catalog.php:259
-msgid "Album Art Search Finished"
-msgstr "歌曲歌手搜索结束"
-
-#: ../../admin/mail.php:98
-msgid "Mail to"
-msgstr "发电子邮件给"
-
-#: ../../admin/mail.php:109
-msgid "Subject"
-msgstr "标题"
-
-#: ../../admin/mail.php:116
-msgid "Message"
-msgstr "正文"
-
-#: ../../admin/mail.php:126
-msgid "Send Mail"
-msgstr "发送"
-
-#: ../../admin/access.php:43
-msgid "Do you really want to delete this Access Record?"
-msgstr "真的要删除这个访问许可吗？"
-
-#: ../../admin/access.php:51
-msgid "Entry Deleted"
-msgstr "数据被删除"
-
-#: ../../admin/access.php:51
-msgid "Your Access List Entry has been removed"
-msgstr "访问许可被删除"
-
-#: ../../admin/access.php:61
-msgid "Entry Added"
-msgstr "记录被添加"
-
-#: ../../admin/access.php:61
-msgid "Your new Access List Entry has been created"
-msgstr "新访问许可被添加"
-
-#: ../../admin/users.php:77 ../../admin/users.php:124
-msgid "Error Username Required"
-msgstr "错误：请输入用户名"
-
-#: ../../admin/users.php:80 ../../admin/users.php:121
-msgid "Error Passwords don't match"
-msgstr "错误：密码不匹配"
-
-#: ../../admin/users.php:138
-msgid "Are you sure you want to permanently delete"
-msgstr "确定要永久删除？"
-
-#: ../../admin/users.php:145 ../../templates/show_confirm_action.inc.php:29
-msgid "No"
-msgstr "否"
-
-#: ../../admin/users.php:147
-msgid "User Deleted"
-msgstr "用户已删除"
-
-#: ../../admin/users.php:150
-msgid "Delete Error"
-msgstr "删除错误"
+#: ../../lib/preferences.php:263
+msgid "Spanish"
+msgstr ""
 
-#: ../../admin/users.php:150
-msgid "Unable to delete last Admin User"
-msgstr "不能删除唯一的管理员"
+#: ../../lib/preferences.php:264
+msgid "Norwegian"
+msgstr ""
 
-#: ../../amp-mpd.php:41
-msgid "Error Connecting"
-msgstr "连接错误"
+#: ../../lib/preferences.php:265
+msgid "Simplified Chinese"
+msgstr ""
 
-#: ../../albums.php:43
-msgid "Album Art Cleared"
-msgstr "歌曲歌手被删除"
+#: ../../lib/duplicates.php:80
+msgid "Find Duplicates"
+msgstr "查找重复文件"
 
-#: ../../albums.php:43
-msgid "Album Art information has been removed form the database"
-msgstr "歌曲歌手信息被从数据库消除"
+#: ../../lib/duplicates.php:83 ../../templates/show_search.inc:74
+msgid "Search Type"
+msgstr "搜索方式"
 
-#: ../../albums.php:77
-msgid "Album Art Located"
-msgstr "找到歌曲歌手信息"
+#: ../../lib/duplicates.php:91 ../../lib/class/song.class.php:275
+msgid "Title"
+msgstr "歌名"
 
-#: ../../albums.php:77
-msgid ""
-"Album Art information has been located in Amazon. If incorrect, click "
-"\"Reset Album Art\" below to remove the artwork."
-msgstr ""
-"在Amazon找到歌曲歌手信息。如果正确，请按下面的"
-"\"重置歌曲歌手\""
+#: ../../lib/duplicates.php:97
+msgid "Artist and Title"
+msgstr "歌手和歌名"
 
-#: ../../albums.php:85 ../../albums.php:95
-msgid "Get Art"
-msgstr "获取歌手信息"
+#: ../../lib/duplicates.php:102
+msgid "Artist, Album and Title"
+msgstr "歌手，歌名和专辑"
 
-#: ../../albums.php:89
-msgid "Album Art Not Located"
-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 "搜索"
 
-#: ../../albums.php:89
-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."
+#: ../../lib/general.lib.php:640
+msgid "Not Enough Data"
 msgstr ""
-"现在无法找到歌曲歌手信息。"
 
-#: ../../albums.php:105 ../../artists.php:56
-msgid "Starting Update from Tags"
-msgstr "开始从文件标记获取信息"
-
-#: ../../albums.php:110 ../../artists.php:61
-msgid "Update From Tags Complete"
-msgstr "从标记信息更新结束"
-
-#: ../../albums.php:111 ../../modules/class/catalog.php:642
-#: ../../artists.php:62
-msgid "Return"
-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 "没有找到"
 
-#: ../../albums.php:126 ../../albums.php:132
-msgid "<u>S</u>how all albums"
-msgstr "<u>S</u>显示所有专辑"
+#: ../../lib/class/genre.class.php:278
+#, fuzzy
+msgid "Show Genres starting with"
+msgstr "<u>S</u>显示歌手名字前几位字符是"
 
-#: ../../albums.php:139 ../../albums.php:146 ../../albums.php:151
-msgid "<u>S</u>how only albums starting with"
-msgstr "<u>S</u>只显示如下开头的专辑："
+#: ../../lib/class/album.class.php:126
+msgid "Various"
+msgstr "群星"
 
-#: ../../albums.php:145
-msgid "Select a starting letter or Show all"
-msgstr "选择首字符或者显示所有的"
+#: ../../lib/class/album.class.php:241 ../../lib/class/catalog.class.php:275
+#: ../../lib/class/catalog.class.php:560
+msgid "Error: Unable to open"
+msgstr "错误：无法打开"
 
-#: ../../modules/class/song.php:253 ../../modules/class/song.php:257
-#: ../../modules/class/song.php:261 ../../modules/class/song.php:265
-#: ../../modules/class/song.php:269 ../../modules/class/song.php:273
-#: ../../modules/class/song.php:277 ../../modules/class/song.php:282
-#: ../../modules/class/song.php:287 ../../modules/class/song.php:291
-#: ../../modules/class/song.php:295 ../../modules/class/song.php:300
+#: ../../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 "更新"
 
-#: ../../modules/class/song.php:257 ../../upload.php:235
-#: ../../templates/show_songs.inc:39
+#: ../../lib/class/song.class.php:279 ../../templates/show_songs.inc:39
+#: ../../templates/show_uploads.inc:39
 msgid "Bitrate"
 msgstr "码率"
 
-#: ../../modules/class/song.php:261
+#: ../../lib/class/song.class.php:283
 msgid "Rate"
 msgstr "级别"
 
-#: ../../modules/class/song.php:265
+#: ../../lib/class/song.class.php:287
 msgid "Mode"
 msgstr "模式"
 
-#: ../../modules/class/song.php:269 ../../upload.php:234
-#: ../../templates/show_songs.inc:37
+#: ../../lib/class/song.class.php:291 ../../templates/show_songs.inc:37
+#: ../../templates/show_mpdpl.inc:66 ../../templates/show_uploads.inc:38
 msgid "Time"
 msgstr "时间"
 
-#: ../../modules/class/song.php:273 ../../templates/show_songs.inc:32
-#: ../../templates/show_songs.inc:36
+#: ../../lib/class/song.class.php:295 ../../templates/show_songs.inc:32
+#: ../../templates/show_songs.inc:36 ../../templates/show_mpdpl.inc:65
 msgid "Track"
 msgstr "音轨"
 
-#: ../../modules/class/song.php:277
+#: ../../lib/class/song.class.php:299
 msgid "Filesize"
 msgstr "文件大小"
 
-#: ../../modules/class/song.php:282 ../../upload.php:231
-#: ../../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
+#: ../../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 "歌手"
 
-#: ../../modules/class/song.php:287 ../../upload.php:232
-#: ../../templates/show_songs.inc:35 ../../templates/show_albums.inc:38
-#: ../../templates/show_albums.inc:68
+#: ../../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 "专辑"
 
-#: ../../modules/class/song.php:291 ../../templates/show_albums.inc:43
+#: ../../lib/class/song.class.php:313 ../../templates/show_albums.inc:43
 #: ../../templates/show_albums.inc:73
 msgid "Year"
 msgstr "年代"
 
-#: ../../modules/class/song.php:295 ../../templates/list_flagged.inc:46
+#: ../../lib/class/song.class.php:317 ../../templates/list_flagged.inc:46
 #: ../../templates/flag.inc:66
 msgid "Comment"
 msgstr "说明"
 
-#: ../../modules/class/song.php:300 ../../upload.php:233
-#: ../../templates/show_songs.inc:40
+#: ../../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 "类别"
 
-#: ../../modules/class/catalog.php:267 ../../modules/class/catalog.php:552
-#: ../../modules/class/album.php:241
-msgid "Error: Unable to open"
-msgstr "错误：无法打开"
+#: ../../lib/class/stream.class.php:198
+#, fuzzy
+msgid "Opened for writing"
+msgstr "准备写入"
 
-#: ../../modules/class/catalog.php:290
+#: ../../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
 msgid "Error: Unable to change to directory"
 msgstr "错误：无法操作目录"
 
-#: ../../modules/class/catalog.php:313
+#: ../../lib/class/catalog.class.php:321
 msgid "Error: Unable to get filesize for"
 msgstr "错误：无法获得文件大小"
 
-#: ../../modules/class/catalog.php:332
+#: ../../lib/class/catalog.class.php:340
 msgid "Added Playlist From"
 msgstr "添加自定义歌曲列表"
 
-#: ../../modules/class/catalog.php:351
+#: ../../lib/class/catalog.class.php:359
 msgid "Added"
 msgstr "已添加"
 
-#: ../../modules/class/catalog.php:363
+#: ../../lib/class/catalog.class.php:371
 msgid "is not readable by ampache"
 msgstr "无法读取"
 
-#: ../../modules/class/catalog.php:427
+#: ../../lib/class/catalog.class.php:435
 msgid "Found in ID3"
 msgstr "在ID3中找到"
 
-#: ../../modules/class/catalog.php:431
+#: ../../lib/class/catalog.class.php:439
 msgid "Found on Amazon"
 msgstr "在Amazon找到"
 
-#: ../../modules/class/catalog.php:435
+#: ../../lib/class/catalog.class.php:443
 msgid "Found in Folder"
 msgstr "在目录里找到"
 
-#: ../../modules/class/catalog.php:439
+#: ../../lib/class/catalog.class.php:447
 msgid "Found"
 msgstr "找到"
 
-#: ../../modules/class/catalog.php:442
+#: ../../lib/class/catalog.class.php:450
 msgid "Not Found"
 msgstr "没有找到"
 
-#: ../../modules/class/catalog.php:450
+#: ../../lib/class/catalog.class.php:458
 msgid "Searched"
 msgstr "已搜索"
 
-#: ../../modules/class/catalog.php:605
+#: ../../lib/class/catalog.class.php:613
 msgid "Starting Dump Album Art"
 msgstr "开始导出歌曲歌手"
 
-#: ../../modules/class/catalog.php:625
+#: ../../lib/class/catalog.class.php:633
 msgid "Written"
 msgstr "已写入"
 
-#: ../../modules/class/catalog.php:634
+#: ../../lib/class/catalog.class.php:642
 msgid "Error unable to open file for writting"
 msgstr "错误：无法写入文件"
 
-#: ../../modules/class/catalog.php:641
+#: ../../lib/class/catalog.class.php:649
 msgid "Album Art Dump Complete"
 msgstr "歌曲歌手导出结束"
 
-#: ../../modules/class/catalog.php:708
+#: ../../lib/class/catalog.class.php:650 ../../artists.php:63
+#: ../../albums.php:112
+msgid "Return"
+msgstr "返回"
+
+#: ../../lib/class/catalog.class.php:719
 msgid "Starting Catalog Build"
 msgstr "开始重建曲库"
 
-#: ../../modules/class/catalog.php:713
+#: ../../lib/class/catalog.class.php:724
 msgid "Running Remote Sync"
 msgstr "运行远程同步"
 
-#: ../../modules/class/catalog.php:733
+#: ../../lib/class/catalog.class.php:734 ../../lib/class/catalog.class.php:880
+#: ../../admin/catalog.php:264
+msgid "Starting Album Art Search"
+msgstr "开始搜索歌曲歌手"
+
+#: ../../lib/class/catalog.class.php:744
 msgid "Catalog Finished"
 msgstr "曲库建立结束"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:899
 msgid "Total Time"
 msgstr "总时间"
 
-#: ../../modules/class/catalog.php:733 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:744 ../../lib/class/catalog.class.php:900
 msgid "Total Songs"
 msgstr "全部歌曲"
 
-#: ../../modules/class/catalog.php:734 ../../modules/class/catalog.php:889
+#: ../../lib/class/catalog.class.php:745 ../../lib/class/catalog.class.php:900
 msgid "Songs Per Seconds"
 msgstr "首歌／秒"
 
-#: ../../modules/class/catalog.php:768 ../../modules/class/catalog.php:1379
+#: ../../lib/class/catalog.class.php:779
+#: ../../lib/class/catalog.class.php:1476
 msgid "Updated"
 msgstr "已更新"
 
-#: ../../modules/class/catalog.php:775
+#: ../../lib/class/catalog.class.php:786
 msgid "No Update Needed"
 msgstr "不用更新"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "Starting New Song Search on"
 msgstr "开始搜索新歌曲"
 
-#: ../../modules/class/catalog.php:849
+#: ../../lib/class/catalog.class.php:860
 msgid "catalog"
 msgstr "曲库"
 
-#: ../../modules/class/catalog.php:853
+#: ../../lib/class/catalog.class.php:864
 msgid "Running Remote Update"
 msgstr "运行远程更新"
 
-#: ../../modules/class/catalog.php:888
+#: ../../lib/class/catalog.class.php:899
 msgid "Catalog Update Finished"
 msgstr "曲库更新结束"
 
-#: ../../modules/class/catalog.php:902
+#: ../../lib/class/catalog.class.php:919 ../../lib/mpd.php:40
+#: ../../lib/mpd.php:49
+msgid "Error"
+msgstr "错误"
+
+#: ../../lib/class/catalog.class.php:919
 msgid "Unable to load XMLRPC library, make sure XML-RPC is enabled"
 msgstr "无法载入XMLRPC库，请确认是否允许XML-RPC"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Error connecting to"
 msgstr "错误：连接"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Code"
 msgstr "代码"
 
-#: ../../modules/class/catalog.php:934 ../../modules/class/catalog.php:949
+#: ../../lib/class/catalog.class.php:958
+#: ../../lib/class/catalog.class.php:1009
 msgid "Reason"
 msgstr "原因"
 
-#: ../../modules/class/catalog.php:954
+#: ../../lib/class/catalog.class.php:974
 msgid "Completed updating remote catalog(s)"
 msgstr "远程曲库更新结束"
 
-#: ../../modules/class/catalog.php:1042
+#: ../../lib/class/catalog.class.php:1105
 msgid "Checking"
 msgstr "检查"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "Catalog Clean Done"
 msgstr "曲库被清空"
 
-#: ../../modules/class/catalog.php:1099
+#: ../../lib/class/catalog.class.php:1163
 msgid "files removed"
 msgstr "文件被删除"
 
-#: ../../modules/class/catalog.php:1339
+#: ../../lib/class/catalog.class.php:1436
 msgid "Updating the"
 msgstr "更新"
 
-#: ../../modules/class/catalog.php:1339
-#: ../../templates/show_admin_index.inc:31 ../../templates/admin_menu.inc:35
+#: ../../lib/class/catalog.class.php:1436 ../../templates/admin_menu.inc:35
 msgid "Catalog"
 msgstr "曲库"
 
-#: ../../modules/class/catalog.php:1340
+#: ../../lib/class/catalog.class.php:1437
 msgid "songs found checking tag information."
 msgstr "找到歌曲检查标记信息"
 
-#: ../../modules/class/catalog.php:1387
+#: ../../lib/class/catalog.class.php:1484
 msgid " FOUND"
 msgstr "找到"
 
-#: ../../modules/class/catalog.php:1388
+#: ../../lib/class/catalog.class.php:1485
 msgid "Searching for new Album Art"
 msgstr "查找新歌曲歌手"
 
-#: ../../modules/class/catalog.php:1392
+#: ../../lib/class/catalog.class.php:1489
 msgid "Album Art Already Found"
 msgstr "已找到歌曲歌手"
 
-#: ../../modules/class/stream.php:198
-msgid "Opened for writting"
-msgstr "准备写入"
+#: ../../lib/mpd.php:40 ../../lib/mpd.php:49
+msgid "Could not add"
+msgstr "无法添加"
 
-#: ../../modules/class/stream.php:203
-msgid "Error, cannot write"
-msgstr "错误：无法写入"
+#: ../../lib/Browser.php:867
+msgid "file"
+msgstr "文件"
 
-#: ../../modules/class/stream.php:214
-msgid "Error, cannot write song in file"
-msgstr "错误：无法写入文件"
+#: ../../lib/Browser.php:871
+msgid "File uploads not supported."
+msgstr "不支持文件上传"
 
-#: ../../modules/class/stream.php:220
-msgid "Closed after write"
-msgstr "关闭"
+#: ../../lib/Browser.php:889
+msgid "No file uploaded"
+msgstr "没有上传文件"
 
-#: ../../modules/class/album.php:126
-msgid "Various"
-msgstr "群星"
+#: ../../lib/Browser.php:896
+#, php-format
+msgid "There was a problem with the file upload: No %s was uploaded."
+msgstr "文件上传错误：没有上传 %s"
 
-#: ../../modules/lib.php:53
-msgid "day"
-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 字节）"
 
-#: ../../modules/lib.php:53
-msgid "days"
-msgstr "天"
+#: ../../lib/Browser.php:903
+#, php-format
+msgid ""
+"There was a problem with the file upload: The %s was only partially uploaded."
+msgstr "文件上传错误：%s 只上传了部分文件"
 
-#: ../../modules/lib.php:55
-msgid "hour"
-msgstr "小时"
+#: ../../lib/ui.lib.php:199
+msgid "Playlist Actions"
+msgstr "自选歌曲列表操作"
 
-#: ../../modules/lib.php:55
-msgid "hours"
-msgstr "小时"
+#: ../../lib/ui.lib.php:199
+msgid "New"
+msgstr "新建"
 
-#: ../../modules/lib.php:70
-msgid "Catalog Statistics"
-msgstr "曲库统计信息"
+#: ../../lib/ui.lib.php:200
+msgid "View All"
+msgstr "全部显示"
 
-#: ../../modules/lib.php:73
-msgid "Total Users"
-msgstr "用户总数"
+#: ../../lib/ui.lib.php:201
+msgid "Import"
+msgstr "导入"
 
-#: ../../modules/lib.php:77
-msgid "Connected Users"
-msgstr "在线用户"
+#: ../../lib/ui.lib.php:301 ../../templates/menu.inc:35
+msgid "Browse"
+msgstr "浏览"
 
-#: ../../modules/lib.php:81 ../../templates/menu.inc:35
-#: ../../templates/show_artists.inc:42 ../../templates/show_artists.inc:65
-msgid "Albums"
-msgstr "专辑"
+#: ../../lib/ui.lib.php:303
+msgid "Show w/o art"
+msgstr "不显示歌手"
 
-#: ../../modules/lib.php:85 ../../templates/menu.inc:36
-msgid "Artists"
-msgstr "歌手"
+#: ../../lib/ui.lib.php:306
+msgid "Show all"
+msgstr "全部显示"
 
-#: ../../modules/lib.php:89 ../../templates/show_artists.inc:41
-#: ../../templates/show_artists.inc:64 ../../templates/show_albums.inc:41
-#: ../../templates/show_albums.inc:71
-msgid "Songs"
-msgstr "歌曲"
+#: ../../lib/ui.lib.php:446
+msgid "No songs in this playlist."
+msgstr "此自选列表没有歌曲"
 
-#: ../../modules/lib.php:93
-msgid "Catalog Size"
-msgstr "曲库大小"
+#: ../../lib/ui.lib.php:592
+#, fuzzy
+msgid "No Catalogs Found!"
+msgstr "没有找到"
 
-#: ../../modules/lib.php:97
-msgid "Catalog Time"
-msgstr "曲库时间"
+#: ../../lib/ui.lib.php:593 ../../templates/add_catalog.inc:28
+msgid "Add a Catalog"
+msgstr "添加曲库"
 
-#: ../../modules/lib.php:151
-msgid "Play Random Selection"
-msgstr "随机播放"
+#: ../../lib/ui.lib.php:594 ../../templates/show_local_catalog_info.inc.php:7
+msgid "Catalog Statistics"
+msgstr "曲库统计信息"
 
-#: ../../modules/lib.php:158
-msgid "Item count"
-msgstr "数量"
+#: ../../lib/ui.lib.php:630
+msgid "day"
+msgstr "天"
 
-#: ../../modules/lib.php:170 ../../templates/show_artists.inc:55
-#: ../../templates/show_albums.inc:58
-msgid "All"
-msgstr "全部"
+#: ../../lib/ui.lib.php:630
+msgid "days"
+msgstr "天"
 
-#: ../../modules/lib.php:172
-msgid "From genre"
-msgstr "类型"
+#: ../../lib/ui.lib.php:632
+msgid "hour"
+msgstr "小时"
 
-#: ../../modules/lib.php:182
-msgid "Favor Unplayed"
-msgstr "没播放过的优先"
+#: ../../lib/ui.lib.php:632
+msgid "hours"
+msgstr "小时"
 
-#: ../../modules/lib.php:183
-msgid "Full Albums"
-msgstr "全部专辑"
+#: ../../lib/upload.php:225
+#, fuzzy
+msgid "The file uploaded successfully"
+msgstr "没有上传文件"
 
-#: ../../modules/lib.php:184
-msgid "Full Artist"
-msgstr "全部歌手"
+#: ../../lib/upload.php:226
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr "上传文件大小超过php.ini里面max_filesize的限制"
 
-#: ../../modules/lib.php:193
-msgid "from catalog"
-msgstr "曲库"
+#: ../../lib/upload.php:227
+#, fuzzy
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form"
+msgstr "上传文件大小超过HTML表单里面MAX_FILE_SIZE的限制"
 
-#: ../../modules/lib.php:204
-msgid "Play Random Songs"
-msgstr "随机播放"
+#: ../../lib/upload.php:228
+#, fuzzy
+msgid "The uploaded file was only partially uploaded"
+msgstr "只上传了文件的部分内容"
 
-#: ../../modules/lib.php:912
+#: ../../lib/upload.php:229
+#, fuzzy
+msgid "No file was uploaded"
+msgstr "文件没有上传"
+
+#: ../../lib/upload.php:230
+msgid "Missing a temporary folder"
+msgstr ""
+
+#: ../../modules/lib.php:708
 msgid "Public"
 msgstr "公开"
 
-#: ../../modules/lib.php:913
+#: ../../modules/lib.php:709
 msgid "Your Private"
 msgstr "私人"
 
-#: ../../modules/lib.php:914
+#: ../../modules/lib.php:710
 msgid "Other Private"
 msgstr "其他"
 
-#: ../../modules/lib.php:995 ../../templates/show_play_selected.inc.php:61
+#: ../../modules/lib.php:791 ../../templates/show_play_selected.inc.php:72
 msgid "View"
 msgstr "显示"
 
-#: ../../modules/lib.php:998 ../../templates/show_play_selected.inc.php:62
+#: ../../modules/lib.php:794 ../../templates/show_play_selected.inc.php:73
 #: ../../templates/show_users.inc:52 ../../templates/show_users.inc:86
 msgid "Edit"
 msgstr "编辑"
 
-#: ../../modules/lib.php:999 ../../upload.php:290
-#: ../../templates/show_users.inc:61 ../../templates/catalog.inc:60
+#: ../../modules/lib.php:795 ../../templates/catalog.inc:60
+#: ../../templates/show_users.inc:61 ../../templates/show_uploads.inc:50
 msgid "Delete"
 msgstr "删除"
 
-#: ../../modules/lib.php:1007 ../../templates/show_localplay.inc:41
-#: ../../templates/show_artists.inc:54 ../../templates/show_artist.inc:79
-#: ../../templates/show_mpdplay.inc:45 ../../templates/show_albums.inc:57
+#: ../../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 "播放"
 
-#: ../../modules/lib.php:1008 ../../templates/show_artists.inc:56
-#: ../../templates/show_mpdplay.inc:67 ../../templates/show_albums.inc:59
+#: ../../modules/lib.php:804 ../../templates/show_artists.inc:56
+#: ../../templates/show_albums.inc:59 ../../templates/show_mpdplay.inc:85
 msgid "Random"
 msgstr "随机"
 
-#: ../../modules/lib.php:1014 ../../templates/show_artist.inc:81
-#: ../../templates/show_songs.inc:110 ../../templates/show_albums.inc:61
-#: ../../templates/show_album.inc:61
+#: ../../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 "下载"
 
-#: ../../modules/lib.php:1025
+#: ../../modules/lib.php:821
 msgid "There are no playlists of this type"
 msgstr "没有自定义播放列表"
 
-#: ../../modules/lib.php:1060
+#: ../../modules/lib.php:856
 msgid "Create a new playlist"
 msgstr "新建自定义播放列表"
 
@@ -786,240 +598,172 @@ msgstr "新建自定义播放列表"
 msgid "Manage Users"
 msgstr "管理用户"
 
-#: ../../modules/admin.php:48
+#: ../../modules/admin.php:48 ../../templates/show_admin_index.inc:34
 msgid "Add a new user"
 msgstr "添加新用户"
 
-#: ../../index.php:38
-msgid "Welcome to"
-msgstr "欢迎来到"
-
-#: ../../index.php:40
-msgid "you are currently logged in as"
-msgstr "你登录为用户"
-
-#: ../../index.php:65
-msgid "Most Popular Albums"
-msgstr "最流行的专辑"
+#: ../../admin/catalog.php:55 ../../templates/catalog.inc:66
+msgid "Add to Catalog(s)"
+msgstr "添加到曲库"
 
-#: ../../index.php:75
-msgid "Most Popular Artists"
-msgstr "最流行的歌手"
+#: ../../admin/catalog.php:66 ../../templates/catalog.inc:67
+msgid "Add to all Catalogs"
+msgstr "添加所有到曲库"
 
-#: ../../index.php:82
-msgid "Most Popular Songs"
-msgstr "最流行的歌曲"
+#: ../../admin/catalog.php:75
+msgid "Error Connecting"
+msgstr "连接错误"
 
-#: ../../index.php:92
-msgid "Newest Artist Additions"
-msgstr "最新添加的歌手"
+#: ../../admin/catalog.php:89 ../../templates/catalog.inc:73
+msgid "Update Catalog(s)"
+msgstr "更新曲库"
 
-#: ../../index.php:99
-msgid "Newest Album Additions"
-msgstr "最新添加的专辑"
+#: ../../admin/catalog.php:100 ../../templates/catalog.inc:74
+msgid "Update All Catalogs"
+msgstr "更新所有曲库"
 
-#: ../../upload.php:124
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr "上传文件大小超过php.ini里面max_filesize的限制"
+#: ../../admin/catalog.php:132 ../../templates/catalog.inc:80
+msgid "Clean Catalog(s)"
+msgstr "清除曲库"
 
-#: ../../upload.php:127
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr ""
-"上传文件大小超过HTML表单里面MAX_FILE_SIZE的限制"
+#: ../../admin/catalog.php:162 ../../templates/catalog.inc:81
+msgid "Clean All Catalogs"
+msgstr "清除所有曲库"
 
-#: ../../upload.php:130
-msgid "The uploaded file was only partially uploaded."
-msgstr "只上传了文件的部分内容"
+#: ../../admin/catalog.php:211
+msgid "Now Playing Cleared"
+msgstr "正在播放被取消"
 
-#: ../../upload.php:133
-msgid "No file was uploaded."
-msgstr "文件没有上传"
+#: ../../admin/catalog.php:211
+msgid "All now playing data has been cleared"
+msgstr "所有正在播放的数据被取消"
 
-#: ../../upload.php:136
-msgid "An Unknown Error has occured."
-msgstr "发生未知错误"
+#: ../../admin/catalog.php:216
+msgid "Do you really want to clear your catalog?"
+msgstr "真的要清除曲库吗？"
 
-#: ../../upload.php:157
-msgid "Successfully-Quarantined"
-msgstr "成功－等待批准"
+#: ../../admin/catalog.php:223
+msgid "Do you really want to clear the statistics for this catalog?"
+msgstr "真的要清除这个曲库的统计信息吗？"
 
-#: ../../upload.php:167
-msgid "Successfully-Cataloged"
-msgstr "成功－加入曲库"
+#: ../../admin/catalog.php:241
+msgid "Do you really want to delete this catalog?"
+msgstr "真的要删除曲库吗？"
 
-#: ../../upload.php:229 ../../templates/show_access_list.inc:51
-#: ../../templates/show_artists.inc:43 ../../templates/show_artists.inc:67
-#: ../../templates/show_artist.inc:56 ../../templates/show_songs.inc:42
-#: ../../templates/show_albums.inc:45 ../../templates/show_albums.inc:75
-msgid "Action"
-msgstr "操作"
+#: ../../admin/catalog.php:272
+msgid "Album Art Search Finished"
+msgstr "歌曲歌手搜索结束"
 
-#: ../../upload.php:230 ../../templates/list_flagged.inc:41
-#: ../../templates/flag.inc:58
-msgid "Song"
-msgstr "歌曲"
+#: ../../admin/users.php:76 ../../admin/users.php:122
+msgid "Error Username Required"
+msgstr "错误：请输入用户名"
 
-#: ../../upload.php:236 ../../templates/show_songs.inc:38
-msgid "Size"
-msgstr "大小"
+#: ../../admin/users.php:79 ../../admin/users.php:119
+msgid "Error Passwords don't match"
+msgstr "错误：密码不匹配"
 
-#: ../../upload.php:237 ../../templates/show_import_playlist.inc.php:29
-msgid "Filename"
-msgstr "文件名"
+#: ../../admin/users.php:136
+msgid "Are you sure you want to permanently delete"
+msgstr "确定要永久删除？"
 
-#: ../../upload.php:238
-msgid "User"
-msgstr "用户"
+#: ../../admin/users.php:143 ../../templates/show_confirm_action.inc.php:29
+msgid "No"
+msgstr "否"
 
-#: ../../upload.php:239
-msgid "Date"
-msgstr "日期"
+#: ../../admin/users.php:145
+msgid "User Deleted"
+msgstr "用户已删除"
 
-#: ../../upload.php:267
-msgid "Unknown"
-msgstr "未知"
+#: ../../admin/users.php:148
+msgid "Delete Error"
+msgstr "删除错误"
 
-#: ../../upload.php:289
-msgid "Add"
-msgstr "添加"
+#: ../../admin/users.php:148
+msgid "Unable to delete last Admin User"
+msgstr "不能删除唯一的管理员"
 
-#: ../../upload.php:294
-msgid "Quarantined"
-msgstr "隔离"
+#: ../../admin/access.php:43
+msgid "Do you really want to delete this Access Record?"
+msgstr "真的要删除这个访问许可吗？"
 
-#: ../../flag.php:35
-msgid "Flagging song completed."
-msgstr "标记完成"
+#: ../../admin/access.php:51
+msgid "Entry Deleted"
+msgstr "数据被删除"
 
-#: ../../playlist.php:77 ../../templates/show_play_selected.inc.php:44
-msgid "Flag Selected"
-msgstr "标记选择"
+#: ../../admin/access.php:51
+msgid "Your Access List Entry has been removed"
+msgstr "访问许可被删除"
 
-#: ../../playlist.php:83 ../../templates/show_play_selected.inc.php:45
-msgid "Edit Selected"
-msgstr "编辑选择"
+#: ../../admin/access.php:61
+msgid "Entry Added"
+msgstr "记录被添加"
 
-#: ../../playlist.php:115
-msgid "owned by"
-msgstr "所有者 "
+#: ../../admin/access.php:61
+msgid "Your new Access List Entry has been created"
+msgstr "新访问许可被添加"
 
-#: ../../playlist.php:118
-msgid "Edit Playlist"
-msgstr "编辑自定义播放列表"
+#: ../../admin/mail.php:98
+msgid "Mail to"
+msgstr "发电子邮件给"
 
-#: ../../playlist.php:121
-msgid "Play Full Playlist"
-msgstr "播放自定义列表"
+#: ../../admin/mail.php:109
+msgid "Subject"
+msgstr "标题"
 
-#: ../../playlist.php:122
-msgid "Play Random"
-msgstr "随机播放"
+#: ../../admin/mail.php:116
+msgid "Message"
+msgstr "正文"
 
-#: ../../playlist.php:135
-msgid "New Playlist"
-msgstr "新建自定义播放列表"
+#: ../../admin/mail.php:126
+msgid "Send Mail"
+msgstr "发送"
 
-#: ../../playlist.php:192
-msgid "Playlist updated."
-msgstr "自定义播放列表已更新"
+#: ../../admin/song.php:68
+msgid "Songs Disabled"
+msgstr "歌曲被禁止播放"
 
-#: ../../user.php:45
-msgid "Error: Password Does Not Match or Empty"
-msgstr "错误：无效或空密码"
+#: ../../admin/song.php:68
+msgid "The requested song(s) have been disabled"
+msgstr "请求的歌曲被禁止播放"
 
-#: ../../user.php:51 ../../user.php:62
-msgid "Error: Insufficient Rights"
-msgstr "错误：没有足够权限"
+#: ../../admin/song.php:78
+msgid "Songs Enabled"
+msgstr "歌曲被允许播放"
 
-#: ../../artists.php:47
-msgid "All songs by"
-msgstr "全部歌曲"
+#: ../../admin/song.php:78
+msgid "The requested song(s) have been enabled"
+msgstr "请求的歌曲被允许播放"
 
-#: ../../artists.php:73 ../../artists.php:82 ../../artists.php:94
-#: ../../artists.php:111
-msgid "<u>S</u>how artists starting with"
-msgstr "<u>S</u>显示歌手名字前几位字符是"
+#: ../../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.inc.php:31
-#: ../../templates/show_access_list.inc:47
-#: ../../templates/customize_catalog.inc:29
-#: ../../templates/show_add_access.inc:40
-msgid "Name"
-msgstr "名字"
+#: ../../templates/show_user_registration.inc.php:36
+#: ../../templates/userform.inc:48
+msgid "Full Name"
+msgstr "全名"
 
-#: ../../templates/show_user.inc.php:40
 #: ../../templates/show_user_registration.inc.php:44
-#: ../../templates/userform.inc:56
+#: ../../templates/show_user.inc.php:40 ../../templates/userform.inc:55
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: ../../templates/show_user.inc.php:48
-msgid "View Limit"
-msgstr "显示限制"
-
-#: ../../templates/show_user.inc.php:56
-msgid "Update Profile"
-msgstr "更改信息"
-
-#: ../../templates/show_user.inc.php:67
-msgid "Enter password"
-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.inc.php:75
 #: ../../templates/show_user_registration.inc.php:60
-#: ../../templates/userform.inc:73
+#: ../../templates/show_user.inc.php:75 ../../templates/userform.inc:72
 msgid "Confirm Password"
 msgstr "确认密码"
 
-#: ../../templates/show_user.inc.php:83
-msgid "Change Password"
-msgstr "更改密码"
-
-#: ../../templates/show_user.inc.php:91
-msgid "Clear Stats"
-msgstr "清除状态"
-
-#: ../../templates/show_import_playlist.inc.php:26
-msgid "Importing a Playlist from a File"
-msgstr "从文件导入自定义播放列表"
-
-#: ../../templates/show_import_playlist.inc.php:36
-msgid "Playlist Type"
-msgstr "自定义播放列表类型"
-
-#: ../../templates/show_import_playlist.inc.php:49
-msgid "Import Playlist"
-msgstr "导入播放列表"
-
-#: ../../templates/show_confirm_action.inc.php:28
-msgid "Yes"
-msgstr "是"
-
-#: ../../templates/show_confirmation.inc.php:30
-msgid "Continue"
-msgstr "继续"
-
-#: ../../templates/show_play_selected.inc.php:43
-msgid "Play Selected"
-msgstr "播放选择的歌曲"
-
-#: ../../templates/show_play_selected.inc.php:52
-msgid "Set Track Numbers"
-msgstr "设置音轨号"
-
-#: ../../templates/show_play_selected.inc.php:53
-msgid "Remove Selected Tracks"
-msgstr "清除音轨号"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Playlist"
-msgstr "播放列表"
-
-#: ../../templates/show_play_selected.inc.php:59
-msgid "Add to"
-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
@@ -1030,28 +774,29 @@ msgstr "Ampache 安装"
 #: ../../templates/show_install_account.inc.php:37
 #: ../../templates/show_install_config.inc:37
 #: ../../templates/show_install.inc:36
+#, fuzzy
 msgid ""
-"This Page handles the installation of the ampache database and the creation "
+"This Page handles the installation of the Ampache database and the creation "
 "of the ampache.cfg.php file. Before you continue please make sure that you "
-"have the following pre-requisits"
+"have the following pre-requisites"
 msgstr ""
-"本页负责ampache数据库的安装和ampache.cfg.php配置文件的建立。"
-"在继续下一步以前，请确认你满足以下先决条件"
+"本页负责ampache数据库的安装和ampache.cfg.php配置文件的建立。在继续下一步以"
+"前，请确认你满足以下先决条件"
 
 #: ../../templates/show_install_account.inc.php:40
 #: ../../templates/show_install_config.inc:40
 #: ../../templates/show_install.inc:39
 msgid ""
 "A MySQL Server with a username and password that can create/modify databases"
-msgstr ""
-"已安装MySQL数据库，有能创建和更改数据库的用户帐号"
+msgstr "已安装MySQL数据库，有能创建和更改数据库的用户帐号"
 
 #: ../../templates/show_install_account.inc.php:41
 msgid ""
 "Your webserver has read access to the /sql/ampache.sql file and the /config/"
 "ampache.cfg.dist.php file"
 msgstr ""
-"你的WWW服务器能用只读方式访问/sql/ampache.sql文件，以及/config/ampache.cfg.dist.php文件"
+"你的WWW服务器能用只读方式访问/sql/ampache.sql文件，以及/config/ampache.cfg."
+"dist.php文件"
 
 #: ../../templates/show_install_account.inc.php:43
 #: ../../templates/show_install_config.inc:43
@@ -1062,8 +807,8 @@ msgid ""
 "values. If you would like to make changes to your ampache install at a later "
 "date simply edit /config/ampache.cfg.php"
 msgstr ""
-"如果你确信满足以上要求，请填写以下信息。以下只是必须的配置。更详细的设置"
-"可以通过直接修改 /config/ampache.cfg.php 来实现"
+"如果你确信满足以上要求，请填写以下信息。以下只是必须的配置。更详细的设置可以"
+"通过直接修改 /config/ampache.cfg.php 来实现"
 
 #: ../../templates/show_install_account.inc.php:48
 #: ../../templates/show_install_config.inc:48
@@ -1085,374 +830,454 @@ msgstr "第三步 - 初始化帐号"
 msgid ""
 "This step creates your initial Ampache admin account. Once your admin "
 "account has been created you will be directed to the login page"
-msgstr ""
-"这一步创建初始管理员帐号。帐号创建完毕会转到登录页"
-
-#: ../../templates/show_install_account.inc.php:59
-#: ../../templates/show_user_registration.inc.php:28
-#: ../../templates/show_users.inc:40 ../../templates/userform.inc:41
-msgid "Username"
-msgstr "用户名"
-
-#: ../../templates/show_install_account.inc.php:63
-#: ../../templates/show_user_registration.inc.php:52
-#: ../../templates/show_login_form.inc:53 ../../templates/userform.inc:64
-msgid "Password"
-msgstr "密码"
+msgstr "这一步创建初始管理员帐号。帐号创建完毕会转到登录页"
 
 #: ../../templates/show_install_account.inc.php:68
 msgid "Create Account"
 msgstr "新建帐号"
 
-#: ../../templates/show_user_registration.inc.php:36
-#: ../../templates/userform.inc:49
-msgid "Full Name"
-msgstr "全名"
+#: ../../templates/show_confirm_action.inc.php:28
+msgid "Yes"
+msgstr "是"
 
-#: ../../templates/show_user_registration.inc.php:69
-msgid "Register User"
-msgstr "注册用户"
+#: ../../templates/show_import_playlist.inc.php:26
+msgid "Importing a Playlist from a File"
+msgstr "从文件导入自定义播放列表"
 
-#: ../../templates/menu.inc:29
-msgid "Home"
-msgstr "首页"
+#: ../../templates/show_import_playlist.inc.php:29
+#: ../../templates/show_uploads.inc:41
+msgid "Filename"
+msgstr "文件名"
 
-#: ../../templates/menu.inc:32
-msgid "Local Play"
-msgstr "本地播放"
+#: ../../templates/show_import_playlist.inc.php:36
+msgid "Playlist Type"
+msgstr "自定义播放列表类型"
 
-#: ../../templates/menu.inc:37
-msgid "Playlists"
-msgstr "自定义文件列表"
+#: ../../templates/show_import_playlist.inc.php:49
+msgid "Import Playlist"
+msgstr "导入播放列表"
 
-#: ../../templates/menu.inc:39
-msgid "Preferences"
-msgstr "设置"
+#: ../../templates/show_user.inc.php:26
+msgid "Changing User Information for"
+msgstr ""
 
-#: ../../templates/menu.inc:42 ../../templates/show_upload.inc:59
-msgid "Upload"
-msgstr "上传"
+#: ../../templates/show_user.inc.php:31
+#: ../../templates/customize_catalog.inc:29
+#: ../../templates/show_add_access.inc:40
+#: ../../templates/show_access_list.inc:47
+msgid "Name"
+msgstr "名字"
 
-#: ../../templates/menu.inc:62 ../../templates/menu.inc:65
-msgid "Admin"
-msgstr "管理"
+#: ../../templates/show_user.inc.php:48
+msgid "Results Per Page"
+msgstr ""
 
-#: ../../templates/menu.inc:72 ../../templates/menu.inc:78
-msgid "Account"
-msgstr "帐号"
+#: ../../templates/show_user.inc.php:56
+msgid "Update Profile"
+msgstr "更改信息"
 
-#: ../../templates/menu.inc:73 ../../templates/menu.inc:79
-msgid "Stats"
-msgstr "状态"
+#: ../../templates/show_user.inc.php:67
+msgid "Enter password"
+msgstr "输入密码"
 
-#: ../../templates/menu.inc:74 ../../templates/menu.inc:80
-#: ../../templates/menu.inc:84
-msgid "Logout"
-msgstr "退出"
+#: ../../templates/show_user.inc.php:83
+msgid "Change Password"
+msgstr "更改密码"
 
-#: ../../templates/show_access_list.inc:34
-msgid "Host Access to Your Catalog"
-msgstr "曲库访问权限"
+#: ../../templates/show_user.inc.php:89
+msgid "Delete Your Personal Statistics"
+msgstr ""
 
-#: ../../templates/show_access_list.inc:43
-msgid "Add Entry"
-msgstr "添加"
+#: ../../templates/show_user.inc.php:91
+msgid "Clear Stats"
+msgstr "清除状态"
 
-#: ../../templates/show_access_list.inc:48
-msgid "Start Address"
-msgstr "开始地址"
+#: ../../templates/show_confirmation.inc.php:30
+msgid "Continue"
+msgstr "继续"
 
-#: ../../templates/show_access_list.inc:49
-msgid "End Address"
-msgstr "结束地址"
+#: ../../templates/show_play_selected.inc.php:49
+msgid "Play Selected"
+msgstr "播放选择的歌曲"
 
-#: ../../templates/show_access_list.inc:50
-#: ../../templates/show_add_access.inc:58
-msgid "Level"
-msgstr "等级"
+#: ../../templates/show_play_selected.inc.php:52
+#, fuzzy
+msgid "Download Selected"
+msgstr "播放选择的歌曲"
 
-#: ../../templates/show_access_list.inc:65
-msgid "Revoke"
-msgstr "收回"
+#: ../../templates/show_play_selected.inc.php:55 ../../playlist.php:77
+msgid "Flag Selected"
+msgstr "标记选择"
 
-#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
-msgid "Flag"
-msgstr "标记"
+#: ../../templates/show_play_selected.inc.php:56 ../../playlist.php:83
+msgid "Edit Selected"
+msgstr "编辑选择"
 
-#: ../../templates/list_flagged.inc:43
-msgid "New Flag"
-msgstr "新标记"
+#: ../../templates/show_play_selected.inc.php:63
+msgid "Set Track Numbers"
+msgstr "设置音轨号"
 
-#: ../../templates/list_flagged.inc:44
-msgid "Flagged by"
-msgstr "标记为"
+#: ../../templates/show_play_selected.inc.php:64
+msgid "Remove Selected Tracks"
+msgstr "清除音轨号"
 
-#: ../../templates/list_flagged.inc:45
-msgid "ID3 Update"
-msgstr "ID3 更新"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Playlist"
+msgstr "播放列表"
 
-#: ../../templates/list_flagged.inc:69
-msgid "Accept"
-msgstr "接受"
+#: ../../templates/show_play_selected.inc.php:70
+msgid "Add to"
+msgstr "添加到"
 
-#: ../../templates/list_flagged.inc:70
-msgid "Reject"
-msgstr "拒绝"
+#: ../../templates/show_all_popular.inc.php:27 ../../index.php:98
+msgid "Most Popular Artists"
+msgstr "最流行的歌手"
 
-#: ../../templates/show_localplay.inc:30
-msgid "Local Play Control"
-msgstr "本地播放控制"
+#: ../../templates/show_all_popular.inc.php:30 ../../index.php:71
+msgid "Most Popular Albums"
+msgstr "最流行的专辑"
 
-#: ../../templates/show_localplay.inc:35
-msgid "Playback"
-msgstr "播放"
+#: ../../templates/show_all_popular.inc.php:37
+#, fuzzy
+msgid "Most Popular Genres"
+msgstr "最流行的歌曲"
 
-#: ../../templates/show_localplay.inc:39 ../../templates/show_mpdplay.inc:43
-#: ../../templates/list_header.inc:71
-msgid "Prev"
-msgstr "后退"
+#: ../../templates/show_all_popular.inc.php:40 ../../index.php:105
+msgid "Most Popular Songs"
+msgstr "最流行的歌曲"
 
-#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:44
-msgid "Stop"
-msgstr "停止"
+#: ../../templates/show_local_catalog_info.inc.php:10
+msgid "Total Users"
+msgstr "用户总数"
 
-#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:46
-msgid "Pause"
-msgstr "暂停"
+#: ../../templates/show_local_catalog_info.inc.php:14
+msgid "Connected Users"
+msgstr "在线用户"
 
-#: ../../templates/show_localplay.inc:43 ../../templates/show_mpdplay.inc:47
-#: ../../templates/list_header.inc:94
-msgid "Next"
-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"
+msgstr "专辑"
 
-#: ../../templates/show_localplay.inc:49
-msgid "Volume"
-msgstr "音量"
+#: ../../templates/show_local_catalog_info.inc.php:22
+#: ../../templates/show_genre.inc.php:41
+#: ../../templates/show_browse_menu.inc:35
+msgid "Artists"
+msgstr "歌手"
 
-#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
-msgid "Increase Volume"
-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_localplay.inc:55 ../../templates/show_localplay.inc:56
-msgid "Decrease Volume"
-msgstr "减少音量"
+#: ../../templates/show_local_catalog_info.inc.php:30
+msgid "Catalog Size"
+msgstr "曲库大小"
 
-#: ../../templates/show_localplay.inc:62
-msgid "Clear queue"
-msgstr "清除队列"
+#: ../../templates/show_local_catalog_info.inc.php:34
+msgid "Catalog Time"
+msgstr "曲库时间"
 
-#: ../../templates/show_install_config.inc:41
-#: ../../templates/show_install.inc:40
-msgid ""
-"Your webserver has read access to the /sql/ampache.sql file and the /config/"
-"ampache.cfg.php.dist file"
-msgstr ""
-"你的WWW服务器能读取/sql/ampache.sql文件，以及/config/ampache.cfg.php.dist文件"
+#: ../../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"
+msgstr "操作"
 
-#: ../../templates/show_install_config.inc:49
-#: ../../templates/show_install.inc:50
-msgid "Step 2 - Creating the Ampache.cfg.php file"
-msgstr "第二步 - 创建ampache.cfg.php配置文件"
+#: ../../templates/show_genre.inc.php:32
+#, fuzzy
+msgid "Viewing"
+msgstr "显示"
 
-#: ../../templates/show_install_config.inc:51
-msgid ""
-"This steps takes the basic config values, and first attempts to write them "
-"out directly to your webserver. If access is denied it will prompt you to "
-"download the config file. Please put the downloaded config file in /config"
-msgstr ""
-"这一步创建基本配置信息。会首先尝试直接写到你的WWW服务器上。"
-"如果访问拒绝，会提示你下载这个配置文件保存到/config目录去。"
+#: ../../templates/show_all_recent.inc.php:27 ../../index.php:115
+msgid "Newest Artist Additions"
+msgstr "最新添加的歌手"
 
-#: ../../templates/show_install_config.inc:59
-msgid "Web Path"
-msgstr "网页路径"
+#: ../../templates/show_all_recent.inc.php:30 ../../index.php:122
+msgid "Newest Album Additions"
+msgstr "最新添加的专辑"
 
-#: ../../templates/show_install_config.inc:63
-#: ../../templates/show_install.inc:57
-msgid "Desired Database Name"
-msgstr "数据库名"
+#: ../../localplay.php:79
+msgid "Unknown action requested"
+msgstr "未知操作"
 
-#: ../../templates/show_install_config.inc:67
-#: ../../templates/show_install.inc:61
-msgid "MySQL Hostname"
-msgstr "MySQL主机"
+#: ../../artists.php:48
+msgid "All songs by"
+msgstr "全部歌曲"
 
-#: ../../templates/show_install_config.inc:71
-msgid "MySQL Username"
-msgstr "MySQL用户"
+#: ../../artists.php:57 ../../albums.php:106
+msgid "Starting Update from Tags"
+msgstr "开始从文件标记获取信息"
 
-#: ../../templates/show_install_config.inc:75
-msgid "MySQL Password"
-msgstr "MySQL密码"
+#: ../../artists.php:62 ../../albums.php:111
+msgid "Update From Tags Complete"
+msgstr "从标记信息更新结束"
 
-#: ../../templates/show_install_config.inc:80
-msgid "Write Config"
-msgstr "写入配置"
+#: ../../artists.php:72 ../../artists.php:76 ../../artists.php:82
+#: ../../artists.php:95
+#, fuzzy
+msgid "Show Artists starting with"
+msgstr "<u>S</u>显示歌手名字前几位字符是"
 
-#: ../../templates/show_install_config.inc:87
-#: ../../templates/show_test.inc:116
-msgid "Ampache.cfg.php Exists"
-msgstr "Ampache.cfg.php已存在"
+#: ../../amp-mpd.php:176 ../../playlist.php:135
+msgid "New Playlist"
+msgstr "新建自定义播放列表"
 
-#: ../../templates/show_install_config.inc:104
-#: ../../templates/show_test.inc:137
-msgid "Ampache.cfg.php Configured?"
-msgstr "Ampache.cfg.php已配置？"
+#: ../../playlist.php:115
+msgid "owned by"
+msgstr "所有者 "
 
-#: ../../templates/show_install_config.inc:124
-msgid "Check for Config"
-msgstr "检查配置"
+#: ../../playlist.php:118
+msgid "Edit Playlist"
+msgstr "编辑自定义播放列表"
 
-#: ../../templates/show_admin_index.inc:27
-msgid "Admin Section"
-msgstr "管理区"
+#: ../../playlist.php:121
+msgid "Play Full Playlist"
+msgstr "播放自定义列表"
 
-#: ../../templates/show_admin_index.inc:29 ../../templates/admin_menu.inc:33
-msgid "Users"
-msgstr "用户"
+#: ../../playlist.php:122
+msgid "Play Random"
+msgstr "随机播放"
 
-#: ../../templates/show_admin_index.inc:29
-msgid "Create/Modify User Accounts for Ampache"
-msgstr "创建／修改用户帐号"
+#: ../../playlist.php:192
+msgid "Playlist updated."
+msgstr "自定义播放列表已更新"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail"
-msgstr "邮件"
+#: ../../index.php:41
+msgid "Welcome to"
+msgstr "欢迎来到"
 
-#: ../../templates/show_admin_index.inc:30
-msgid "Mail your users to notfiy them of changes"
-msgstr "给你的用户发邮件提醒"
+#: ../../index.php:43
+msgid "you are currently logged in as"
+msgstr "你登录为用户"
 
-#: ../../templates/show_admin_index.inc:31
-msgid "Create/Update/Clean your catalog here"
-msgstr "添加／更新／清除曲库"
+#: ../../user.php:45
+msgid "Error: Password Does Not Match or Empty"
+msgstr "错误：无效或空密码"
 
-#: ../../templates/show_admin_index.inc:32 ../../templates/admin_menu.inc:36
-msgid "Admin Preferences"
-msgstr "管理员设置"
+#: ../../user.php:51 ../../user.php:62
+msgid "Error: Insufficient Rights"
+msgstr "错误：没有足够权限"
 
-#: ../../templates/show_admin_index.inc:32
-msgid "Modify Site-wide preferences"
-msgstr "全站设置修改"
+#: ../../flag.php:35
+msgid "Flagging song completed."
+msgstr "标记完成"
 
-#: ../../templates/show_admin_index.inc:33 ../../templates/catalog.inc:98
-#: ../../templates/admin_menu.inc:37
-msgid "Access Lists"
-msgstr "访问控制列表"
+#: ../../albums.php:44
+msgid "Album Art Cleared"
+msgstr "歌曲歌手被删除"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Modify Access List Permissions"
-msgstr "修改访问权限列表"
+#: ../../albums.php:44
+msgid "Album Art information has been removed form the database"
+msgstr "歌曲歌手信息被从数据库消除"
 
-#: ../../templates/show_admin_index.inc:33
-msgid "Must have access_control=true in ampache.cfg"
-msgstr "必须在ampache.cfg里有access_control=true"
+#: ../../albums.php:78
+msgid "Album Art Located"
+msgstr "找到歌曲歌手信息"
 
-#: ../../templates/show_users.inc:43
-msgid "Fullname"
-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找到歌曲歌手信息。如果正确，请按下面的\"重置歌曲歌手\""
 
-#: ../../templates/show_users.inc:48
-msgid "Last Seen"
-msgstr "最后一次"
+#: ../../albums.php:86 ../../albums.php:96
+msgid "Get Art"
+msgstr "获取歌手信息"
 
-#: ../../templates/show_users.inc:55 ../../templates/show_users.inc:91
-msgid "Prefs"
-msgstr "设置"
+#: ../../albums.php:90
+msgid "Album Art Not Located"
+msgstr "找不到歌曲歌手信息"
 
-#: ../../templates/show_users.inc:58
-msgid "Access"
-msgstr "权限"
+#: ../../albums.php:90
+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 "现在无法找到歌曲歌手信息。"
 
-#: ../../templates/show_users.inc:64
-msgid "On-line"
-msgstr "在线"
+#: ../../albums.php:127 ../../albums.php:133 ../../albums.php:140
+#: ../../albums.php:145 ../../albums.php:150
+#, fuzzy
+msgid "Show Albums starting with"
+msgstr "<u>S</u>只显示如下开头的专辑："
 
-#: ../../templates/show_users.inc:105
-msgid "delete"
+#: ../../bin/quarantine_migration.php.inc:49
+#, fuzzy
+msgid "Error: Unable to write to"
+msgstr "错误：无法打开"
+
+#: ../../bin/quarantine_migration.php.inc:56
+msgid "Error: Upload directory not inside a catalog"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:74
+#, fuzzy
+msgid "Moved"
+msgstr "模式"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "Adding"
+msgstr "管理"
+
+#: ../../bin/quarantine_migration.php.inc:78
+#, fuzzy
+msgid "to database"
+msgstr "添加数据库"
+
+#: ../../bin/quarantine_migration.php.inc:86
+msgid "Move Failed"
+msgstr ""
+
+#: ../../bin/quarantine_migration.php.inc:97
+#, fuzzy
+msgid "Deleted"
 msgstr "删除"
 
-#: ../../templates/catalog.inc:33
+#: ../../bin/quarantine_migration.php.inc:113
 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"
+"\n"
+"\t\n"
+"************* WARNING *************\n"
+"This script will move, and \n"
+"potentially delete uploaded files.\n"
+"************* WARNING *************\n"
+"\n"
+"All files marked for add will be moved to the upload directory. All files \n"
+"marked for deletion will be deleted. This script must be run as a user with\n"
+"sufficient rights to perform the above two functions. \n"
+"\n"
+"\t\n"
 msgstr ""
 
-#: ../../templates/catalog.inc:42
-msgid "Update Catalogs"
-msgstr "更新曲库"
+#: ../../bin/quarantine_migration.php.inc:127
+#, fuzzy
+msgid "Continue?  (Y/N):"
+msgstr "继续"
 
-#: ../../templates/catalog.inc:68
-msgid "Fast Add"
-msgstr "快速添加"
+#: ../../bin/quarantine_migration.php.inc:151
+#, fuzzy
+msgid "Error:  "
+msgstr "错误"
 
-#: ../../templates/catalog.inc:75
-msgid "Fast Update"
-msgstr "快速更新"
+#: ../../bin/quarantine_migration.php.inc:152
+msgid "!\n"
+msgstr ""
 
-#: ../../templates/catalog.inc:88
-msgid "You don't have any catalogs."
-msgstr "你没有任何曲库"
+#: ../../templates/customize_catalog.inc:24
+msgid "Settings for catalog in"
+msgstr "曲库设置在"
 
-#: ../../templates/catalog.inc:97
-msgid "Add a catalog"
-msgstr "添加曲库"
+#: ../../templates/customize_catalog.inc:32 ../../templates/add_catalog.inc:39
+msgid "Auto-inserted Fields"
+msgstr "自动添加的字段"
 
-#: ../../templates/catalog.inc:99
-msgid "Show Duplicate Songs"
-msgstr "显示重复的歌曲"
+#: ../../templates/customize_catalog.inc:33 ../../templates/add_catalog.inc:40
+msgid "album name"
+msgstr "专辑名"
 
-#: ../../templates/catalog.inc:100
-msgid "Show Disabled Songs"
-msgstr "显示被禁止的歌曲"
+#: ../../templates/customize_catalog.inc:34 ../../templates/add_catalog.inc:41
+msgid "artist name"
+msgstr "歌手名"
 
-#: ../../templates/catalog.inc:101
-msgid "Clear Catalog Stats"
-msgstr "清除曲库统计信息"
+#: ../../templates/customize_catalog.inc:35
+msgid "catalog path"
+msgstr "曲库路径"
 
-#: ../../templates/catalog.inc:102
-msgid "Clear Now Playing"
-msgstr "清除正在播放信息"
+#: ../../templates/customize_catalog.inc:36 ../../templates/add_catalog.inc:42
+msgid "id3 comment"
+msgstr "id3 说明"
 
-#: ../../templates/catalog.inc:103
-msgid "Dump Album Art"
-msgstr "删除歌曲歌手"
+#: ../../templates/customize_catalog.inc:37 ../../templates/add_catalog.inc:43
+msgid "genre"
+msgstr "类型"
 
-#: ../../templates/catalog.inc:104 ../../templates/add_catalog.inc:78
-msgid "Gather Album Art"
-msgstr "搜集歌曲歌手"
+#: ../../templates/customize_catalog.inc:38 ../../templates/add_catalog.inc:44
+msgid "track number (padded with leading 0)"
+msgstr "音轨号（前面用0补足）"
 
-#: ../../templates/catalog.inc:105
-msgid "View flagged songs"
-msgstr "显示已标记的歌曲"
+#: ../../templates/customize_catalog.inc:39 ../../templates/add_catalog.inc:45
+msgid "song title"
+msgstr "歌曲名"
 
-#: ../../templates/catalog.inc:106
-msgid "Catalog Tools"
-msgstr "曲库工具"
+#: ../../templates/customize_catalog.inc:40 ../../templates/add_catalog.inc:46
+msgid "year"
+msgstr "年代"
 
-#: ../../templates/show_upload.inc:27
-msgid "Please Ensure All Files Are Tagged Correctly"
-msgstr "请确定所有文件都正确标记了"
+#: ../../templates/customize_catalog.inc:41 ../../templates/add_catalog.inc:47
+msgid "other"
+msgstr "其他"
 
-#: ../../templates/show_upload.inc:30
-msgid ""
-"Ampache relies on id3 tags to sort data.  If your file is not tagged it may "
-"be deleted."
-msgstr ""
-"系统利用id3信息来索引文件，如果你的文件没有标记，可能会被删除。"
+#: ../../templates/customize_catalog.inc:45
+msgid "ID3 set command"
+msgstr "ID3 设置命令"
 
-#: ../../templates/show_upload.inc:34
-msgid "max_upload_size"
+#: ../../templates/customize_catalog.inc:51
+msgid "Filename pattern"
+msgstr "文件模板"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "Folder Pattern"
+msgstr "目录模板"
+
+#: ../../templates/customize_catalog.inc:58 ../../templates/add_catalog.inc:74
+msgid "(no leading or ending '/')"
+msgstr "(开头和结束不要带'/')"
+
+#: ../../templates/customize_catalog.inc:69
+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_search.inc:34
-msgid "Search Ampache"
-msgstr "搜索"
+#: ../../templates/show_admin_index.inc:29
+#, fuzzy
+msgid "Catalog Managment"
+msgstr "曲库名"
 
-#: ../../templates/show_search.inc:41
-msgid "Object Type"
-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"
@@ -1516,6 +1341,11 @@ msgid ""
 "support is not required for Ampache, but it is highly recommended"
 msgstr ""
 
+#: ../../templates/show_test.inc:116
+#: ../../templates/show_install_config.inc:87
+msgid "Ampache.cfg.php Exists"
+msgstr "Ampache.cfg.php已存在"
+
 #: ../../templates/show_test.inc:131
 msgid ""
 "This attempts to read /config/ampache.cfg.php If this fails either the "
@@ -1523,11 +1353,16 @@ msgid ""
 "\tit is not currently readable by your webserver."
 msgstr ""
 
+#: ../../templates/show_test.inc:137
+#: ../../templates/show_install_config.inc:104
+msgid "Ampache.cfg.php Configured?"
+msgstr "Ampache.cfg.php已配置？"
+
 #: ../../templates/show_test.inc:154
 msgid ""
-"This test makes sure that you have set all of the required config variables "
-"and that we are able to \n"
-"\tcompleatly parse your config file"
+"This test makes sure that you have set all of the required configuration "
+"variables and that we are able to \n"
+"\tcompletely parse your config file"
 msgstr ""
 
 #: ../../templates/show_test.inc:160
@@ -1556,57 +1391,59 @@ msgid ""
 "cfg.php"
 msgstr ""
 
-#: ../../templates/add_catalog.inc:28
-msgid "Add a Catalog"
-msgstr "添加曲库"
+#: ../../templates/show_localplay.inc:30
+msgid "Local Play Control"
+msgstr "本地播放控制"
 
-#: ../../templates/add_catalog.inc:30
-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)"
-msgstr ""
-"请在如下表单里面填入本地路径（例如 /data/music），或者"
-"指向远程Ampache的一个URL（例如 http://theotherampache.com）"
+#: ../../templates/show_localplay.inc:35
+msgid "Playback"
+msgstr "播放"
 
-#: ../../templates/add_catalog.inc:36
-msgid "Catalog Name"
-msgstr "曲库名"
+#: ../../templates/show_localplay.inc:39 ../../templates/list_header.inc:71
+#: ../../templates/show_mpdplay.inc:48
+msgid "Prev"
+msgstr "后退"
 
-#: ../../templates/add_catalog.inc:39 ../../templates/customize_catalog.inc:32
-msgid "Auto-inserted Fields"
-msgstr "自动添加的字段"
+#: ../../templates/show_localplay.inc:40 ../../templates/show_mpdplay.inc:49
+msgid "Stop"
+msgstr "停止"
 
-#: ../../templates/add_catalog.inc:40 ../../templates/customize_catalog.inc:33
-msgid "album name"
-msgstr "专辑名"
+#: ../../templates/show_localplay.inc:42 ../../templates/show_mpdplay.inc:51
+msgid "Pause"
+msgstr "暂停"
 
-#: ../../templates/add_catalog.inc:41 ../../templates/customize_catalog.inc:34
-msgid "artist name"
-msgstr "歌手名"
+#: ../../templates/show_localplay.inc:43 ../../templates/list_header.inc:94
+#: ../../templates/show_mpdplay.inc:52
+msgid "Next"
+msgstr "前进"
 
-#: ../../templates/add_catalog.inc:42 ../../templates/customize_catalog.inc:36
-msgid "id3 comment"
-msgstr "id3 说明"
+#: ../../templates/show_localplay.inc:49
+msgid "Volume"
+msgstr "音量"
 
-#: ../../templates/add_catalog.inc:43 ../../templates/customize_catalog.inc:37
-msgid "genre"
-msgstr "类型"
+#: ../../templates/show_localplay.inc:53 ../../templates/show_localplay.inc:54
+msgid "Increase Volume"
+msgstr "增加音量"
 
-#: ../../templates/add_catalog.inc:44 ../../templates/customize_catalog.inc:38
-msgid "track number (padded with leading 0)"
-msgstr "音轨号（前面用0补足）"
+#: ../../templates/show_localplay.inc:55 ../../templates/show_localplay.inc:56
+msgid "Decrease Volume"
+msgstr "减少音量"
 
-#: ../../templates/add_catalog.inc:45 ../../templates/customize_catalog.inc:39
-msgid "song title"
-msgstr "歌曲名"
+#: ../../templates/show_localplay.inc:62
+msgid "Clear queue"
+msgstr "清除队列"
 
-#: ../../templates/add_catalog.inc:46 ../../templates/customize_catalog.inc:40
-msgid "year"
-msgstr "年代"
+#: ../../templates/add_catalog.inc:30
+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)"
+msgstr ""
+"请在如下表单里面填入本地路径（例如 /data/music），或者指向远程Ampache的一个"
+"URL（例如 http://theotherampache.com）"
 
-#: ../../templates/add_catalog.inc:47 ../../templates/customize_catalog.inc:41
-msgid "other"
-msgstr "其他"
+#: ../../templates/add_catalog.inc:36
+msgid "Catalog Name"
+msgstr "曲库名"
 
 #: ../../templates/add_catalog.inc:53
 msgid "Path"
@@ -1628,13 +1465,9 @@ msgstr "ID3 设置命令"
 msgid "Filename Pattern"
 msgstr "文件模板"
 
-#: ../../templates/add_catalog.inc:74 ../../templates/customize_catalog.inc:58
-msgid "Folder Pattern"
-msgstr "目录模板"
-
-#: ../../templates/add_catalog.inc:74 ../../templates/customize_catalog.inc:58
-msgid "(no leading or ending '/')"
-msgstr "(开头和结束不要带'/')"
+#: ../../templates/add_catalog.inc:78 ../../templates/catalog.inc:104
+msgid "Gather Album Art"
+msgstr "搜集歌曲歌手"
 
 #: ../../templates/add_catalog.inc:82
 msgid "ID3V2 Tags"
@@ -1656,74 +1489,163 @@ msgstr "从m3u文件建立自定义播放列表"
 msgid "Add Catalog"
 msgstr "添加曲库"
 
-#: ../../templates/show_login_form.inc:49
-#: ../../templates/show_login_form.inc:63
-msgid "Login"
-msgstr "登录"
+#: ../../templates/list_flagged.inc:41 ../../templates/flag.inc:58
+#: ../../templates/show_uploads.inc:34
+msgid "Song"
+msgstr "歌曲"
 
-#: ../../templates/show_login_form.inc:59
-msgid "Remember Me"
-msgstr "登录保留直到关闭"
+#: ../../templates/list_flagged.inc:42 ../../templates/show_songs.inc:41
+msgid "Flag"
+msgstr "标记"
 
-#: ../../templates/customize_catalog.inc:24
-msgid "Settings for catalog in"
-msgstr "曲库设置在"
+#: ../../templates/list_flagged.inc:43
+msgid "New Flag"
+msgstr "新标记"
 
-#: ../../templates/customize_catalog.inc:35
-msgid "catalog path"
-msgstr "曲库路径"
+#: ../../templates/list_flagged.inc:44
+msgid "Flagged by"
+msgstr "标记为"
 
-#: ../../templates/customize_catalog.inc:45
-msgid "ID3 set command"
-msgstr "ID3 设置命令"
+#: ../../templates/list_flagged.inc:45
+msgid "ID3 Update"
+msgstr "ID3 更新"
 
-#: ../../templates/customize_catalog.inc:51
-msgid "Filename pattern"
-msgstr "文件模板"
+#: ../../templates/list_flagged.inc:69
+msgid "Accept"
+msgstr "接受"
 
-#: ../../templates/customize_catalog.inc:69
-msgid "Save Catalog Settings"
-msgstr "保存曲库设置信息"
+#: ../../templates/list_flagged.inc:70
+msgid "Reject"
+msgstr "拒绝"
 
-#: ../../templates/show_artist.inc:31
-msgid "Albums by"
-msgstr "专辑"
+#: ../../templates/show_artists.inc:55 ../../templates/show_albums.inc:58
+#: ../../templates/show_random_play.inc:46
+msgid "All"
+msgstr "全部"
 
-#: ../../templates/show_artist.inc:33
-msgid "Show All Songs By"
-msgstr "显示所有歌曲"
+#: ../../templates/show_songs.inc:33 ../../templates/show_mpdpl.inc:62
+msgid "Song title"
+msgstr "歌曲名"
 
-#: ../../templates/show_artist.inc:34
-msgid "Play All Songs By"
-msgstr "播放所有歌曲"
+#: ../../templates/show_songs.inc:38 ../../templates/show_uploads.inc:40
+msgid "Size"
+msgstr "大小"
 
-#: ../../templates/show_artist.inc:35
-msgid "Play Random Songs By"
-msgstr "随机播放歌曲"
+#: ../../templates/show_songs.inc:113
+msgid "Direct Link"
+msgstr "直接下载"
+
+#: ../../templates/show_songs.inc:131
+msgid "Total"
+msgstr "总共"
+
+#: ../../templates/show_install_config.inc:41
+#: ../../templates/show_install.inc:40
+msgid ""
+"Your webserver has read access to the /sql/ampache.sql file and the /config/"
+"ampache.cfg.php.dist file"
+msgstr ""
+"你的WWW服务器能读取/sql/ampache.sql文件，以及/config/ampache.cfg.php.dist文件"
+
+#: ../../templates/show_install_config.inc:49
+#: ../../templates/show_install.inc:50
+msgid "Step 2 - Creating the Ampache.cfg.php file"
+msgstr "第二步 - 创建ampache.cfg.php配置文件"
+
+#: ../../templates/show_install_config.inc:51
+msgid ""
+"This steps takes the basic config values, and first attempts to write them "
+"out directly to your webserver. If access is denied it will prompt you to "
+"download the config file. Please put the downloaded config file in /config"
+msgstr ""
+"这一步创建基本配置信息。会首先尝试直接写到你的WWW服务器上。如果访问拒绝，会提"
+"示你下载这个配置文件保存到/config目录去。"
+
+#: ../../templates/show_install_config.inc:59
+msgid "Web Path"
+msgstr "网页路径"
 
-#: ../../templates/show_artist.inc:37 ../../templates/show_album.inc:58
+#: ../../templates/show_install_config.inc:63
+#: ../../templates/show_install.inc:57
+msgid "Desired Database Name"
+msgstr "数据库名"
+
+#: ../../templates/show_install_config.inc:67
+#: ../../templates/show_install.inc:61
+msgid "MySQL Hostname"
+msgstr "MySQL主机"
+
+#: ../../templates/show_install_config.inc:71
+msgid "MySQL Username"
+msgstr "MySQL用户"
+
+#: ../../templates/show_install_config.inc:75
+msgid "MySQL Password"
+msgstr "MySQL密码"
+
+#: ../../templates/show_install_config.inc:80
+msgid "Write Config"
+msgstr "写入配置"
+
+#: ../../templates/show_install_config.inc:124
+msgid "Check for Config"
+msgstr "检查配置"
+
+#: ../../templates/show_album.inc:53
+msgid "Play Album"
+msgstr "播放专辑"
+
+#: ../../templates/show_album.inc:54
+msgid "Play Random from Album"
+msgstr "随机从专辑播放"
+
+#: ../../templates/show_album.inc:55
+msgid "Reset Album Art"
+msgstr "重置歌曲歌手"
+
+#: ../../templates/show_album.inc:56
+msgid "Find Album Art"
+msgstr "查找歌曲歌手"
+
+#: ../../templates/show_album.inc:58 ../../templates/show_artist.inc:37
 msgid "Update from tags"
 msgstr "从标记更新"
 
-#: ../../templates/show_artist.inc:50
-msgid "Select"
-msgstr "选择"
+#: ../../templates/show_preferences.inc:31
+msgid "Editing"
+msgstr "编辑中"
 
-#: ../../templates/show_artist.inc:52
-msgid "Cover"
-msgstr "封面"
+#: ../../templates/show_preferences.inc:31
+msgid "preferences"
+msgstr "设置"
 
-#: ../../templates/show_artist.inc:53
-msgid "Album Name"
-msgstr "专辑名"
+#: ../../templates/show_preferences.inc:33
+msgid "Rebuild Preferences"
+msgstr "重建设置"
 
-#: ../../templates/show_artist.inc:54
-msgid "Album Year"
-msgstr "专辑年代"
+#: ../../templates/show_preferences.inc:39
+msgid "Preference"
+msgstr "设置"
 
-#: ../../templates/show_artist.inc:55
-msgid "Total Tracks"
-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
+msgid "Update Preferences"
+msgstr "更新设置"
+
+#: ../../templates/show_preferences.inc:87
+msgid "Cancel"
+msgstr "取消"
 
 #: ../../templates/userform.inc:25
 msgid "Adding a New User"
@@ -1733,18 +1655,39 @@ msgstr "添加新用户"
 msgid "Editing existing User"
 msgstr "编辑已有用户"
 
-#: ../../templates/userform.inc:81
+#: ../../templates/userform.inc:80
 msgid "User Access Level"
 msgstr "用户访问控制级别"
 
-#: ../../templates/userform.inc:97
+#: ../../templates/userform.inc:96
 msgid "Add User"
 msgstr "添加用户"
 
-#: ../../templates/userform.inc:102
+#: ../../templates/userform.inc:101
 msgid "Update User"
 msgstr "更新用户"
 
+#: ../../templates/show_install.inc:48
+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 "
+"depending upon the speed of your computer"
+msgstr ""
+"这一步创建Ampache数据库并初始化数据。请提供一个有建立数据库权限的MySQL帐号。"
+"这一步可能会需要比较长一段时间，就看你机器快不快了"
+
+#: ../../templates/show_install.inc:65
+msgid "MySQL Administrative Username"
+msgstr "MySQL管理用户名"
+
+#: ../../templates/show_install.inc:69
+msgid "MySQL Administrative Password"
+msgstr "MySQL管理用户密码"
+
+#: ../../templates/show_install.inc:74
+msgid "Insert Database"
+msgstr "添加数据库"
+
 #: ../../templates/flag.inc:43
 msgid "Flag song"
 msgstr "标记歌曲"
@@ -1753,8 +1696,7 @@ msgstr "标记歌曲"
 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 ""
-"把下面的歌曲标记成某个如下列表显示的问题之一，以便管理员采取相应动作。"
+msgstr "把下面的歌曲标记成某个如下列表显示的问题之一，以便管理员采取相应动作。"
 
 #: ../../templates/flag.inc:62
 msgid "Reason to flag"
@@ -1764,162 +1706,401 @@ msgstr "标记原因"
 msgid "Flag Song"
 msgstr "标记歌曲"
 
-#: ../../templates/show_songs.inc:33
-msgid "Song title"
-msgstr "歌曲名"
+#: ../../templates/show_add_access.inc:31
+msgid "Add Access for a Host"
+msgstr "添加访问控制"
 
-#: ../../templates/show_songs.inc:113
-msgid "Direct Link"
-msgstr "直接下载"
+#: ../../templates/show_add_access.inc:33
+msgid ""
+"Use the form below to add a host that you want to have access to your "
+"Ampache catalog."
+msgstr "用下面的表单添加你需要允许访问曲库的机器地址"
 
-#: ../../templates/show_songs.inc:131
-msgid "Total"
-msgstr "总共"
+#: ../../templates/show_add_access.inc:46
+msgid "Start IP Address"
+msgstr "起始IP地址"
+
+#: ../../templates/show_add_access.inc:52
+msgid "End IP Address"
+msgstr "结束IP地址"
+
+#: ../../templates/show_add_access.inc:58
+#: ../../templates/show_access_list.inc:50
+msgid "Level"
+msgstr "等级"
+
+#: ../../templates/show_add_access.inc:72
+msgid "Add Host"
+msgstr "添加主机"
+
+#: ../../templates/catalog.inc:33
+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
+msgid "Update Catalogs"
+msgstr "更新曲库"
+
+#: ../../templates/catalog.inc:68
+msgid "Fast Add"
+msgstr "快速添加"
+
+#: ../../templates/catalog.inc:75
+msgid "Fast Update"
+msgstr "快速更新"
+
+#: ../../templates/catalog.inc:88
+msgid "You don't have any catalogs."
+msgstr "你没有任何曲库"
+
+#: ../../templates/catalog.inc:99
+msgid "Show Duplicate Songs"
+msgstr "显示重复的歌曲"
+
+#: ../../templates/catalog.inc:100
+msgid "Show Disabled Songs"
+msgstr "显示被禁止的歌曲"
+
+#: ../../templates/catalog.inc:101
+msgid "Clear Catalog Stats"
+msgstr "清除曲库统计信息"
+
+#: ../../templates/catalog.inc:103
+msgid "Dump Album Art"
+msgstr "删除歌曲歌手"
+
+#: ../../templates/catalog.inc:105
+msgid "View flagged songs"
+msgstr "显示已标记的歌曲"
+
+#: ../../templates/catalog.inc:106
+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
+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 ""
+
+#: ../../templates/show_upload.inc:32
+msgid "The following Audio file formats are supported"
+msgstr ""
+
+#: ../../templates/show_upload.inc:72
+msgid "max_upload_size"
+msgstr ""
+
+#: ../../templates/show_now_playing.inc:31
+msgid "Now Playing"
+msgstr "正在播放"
+
+#: ../../templates/show_login_form.inc:49
+#: ../../templates/show_login_form.inc:63
+msgid "Login"
+msgstr "登录"
+
+#: ../../templates/show_login_form.inc:59
+msgid "Remember Me"
+msgstr "登录保留直到关闭"
+
+#: ../../templates/show_access_list.inc:34
+msgid "Host Access to Your Catalog"
+msgstr "曲库访问权限"
+
+#: ../../templates/show_access_list.inc:43
+msgid "Add Entry"
+msgstr "添加"
+
+#: ../../templates/show_access_list.inc:48
+msgid "Start Address"
+msgstr "开始地址"
+
+#: ../../templates/show_access_list.inc:49
+msgid "End Address"
+msgstr "结束地址"
+
+#: ../../templates/show_access_list.inc:65
+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_users.inc:105
+msgid "delete"
+msgstr "删除"
+
+#: ../../templates/show_search.inc:34 ../../templates/show_search_bar.inc:36
+msgid "Search Ampache"
+msgstr "搜索"
+
+#: ../../templates/show_search.inc:41
+msgid "Object Type"
+msgstr "目标类型"
+
+#: ../../templates/show_artist.inc:31
+msgid "Albums by"
+msgstr "专辑"
+
+#: ../../templates/show_artist.inc:33
+msgid "Show All Songs By"
+msgstr "显示所有歌曲"
+
+#: ../../templates/show_artist.inc:34
+msgid "Play All Songs By"
+msgstr "播放所有歌曲"
+
+#: ../../templates/show_artist.inc:35
+msgid "Play Random Songs By"
+msgstr "随机播放歌曲"
+
+#: ../../templates/show_artist.inc:49
+msgid "Select"
+msgstr "选择"
 
-#: ../../templates/show_mpdplay.inc:33
+#: ../../templates/show_artist.inc:51
+msgid "Cover"
+msgstr "封面"
+
+#: ../../templates/show_artist.inc:52
+msgid "Album Name"
+msgstr "专辑名"
+
+#: ../../templates/show_artist.inc:53
+msgid "Album Year"
+msgstr "专辑年代"
+
+#: ../../templates/show_artist.inc:54
+msgid "Total Tracks"
+msgstr "总音轨数"
+
+#: ../../templates/show_mpdplay.inc:38
 msgid "MPD Play Control"
 msgstr "MPD播放控制"
 
-#: ../../templates/show_mpdplay.inc:53
+#: ../../templates/show_mpdplay.inc:71
 msgid "Loop"
 msgstr "循环"
 
-#: ../../templates/show_mpdplay.inc:60 ../../templates/show_mpdplay.inc:73
+#: ../../templates/show_mpdplay.inc:78 ../../templates/show_mpdplay.inc:91
 msgid "On"
 msgstr "开"
 
-#: ../../templates/show_mpdplay.inc:61 ../../templates/show_mpdplay.inc:74
+#: ../../templates/show_mpdplay.inc:79 ../../templates/show_mpdplay.inc:92
 msgid "Off"
 msgstr "关"
 
-#: ../../templates/show_mpdplay.inc:90 ../../templates/show_now_playing.inc:31
-msgid "Now Playing"
+#: ../../templates/show_mpdplay.inc:114
+#, fuzzy
+msgid "Now Playing :"
 msgstr "正在播放"
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "Refresh the Playlist Window"
-msgstr "刷新列表窗口"
+#: ../../templates/show_mpdplay.inc:138
+msgid "On Deck "
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:103
-msgid "refresh now"
-msgstr "立即刷新"
+#: ../../templates/show_mpdplay.inc:138
+msgid "(in "
+msgstr ""
 
-#: ../../templates/show_mpdplay.inc:111
-msgid "Server Playlist"
+#: ../../templates/show_mpdpl.inc:45
+#, fuzzy
+msgid "MPD Server Playlist"
 msgstr "服务器播放列表"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:46 ../../templates/show_mpdpl.inc:184
+msgid "Refresh the Playlist Window"
+msgstr "刷新列表窗口"
+
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "Click to shuffle (randomize) the playlist"
 msgstr "点击随机（乱序）播放列表"
 
-#: ../../templates/show_mpdplay.inc:146
+#: ../../templates/show_mpdpl.inc:48 ../../templates/show_mpdpl.inc:189
 msgid "shuffle"
 msgstr "乱序"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "Click the clear the playlist"
+#: ../../templates/show_mpdpl.inc:49 ../../templates/show_mpdpl.inc:190
+#, fuzzy
+msgid "Click to the clear the playlist"
 msgstr "点击清除播放列表"
 
-#: ../../templates/show_mpdplay.inc:147
-msgid "clear"
-msgstr "清除"
-
-#: ../../templates/show_install.inc:48
-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 "
-"depending upon the speed of your computer"
+#: ../../templates/show_mpdpl.inc:53 ../../templates/show_mpdpl.inc:194
+msgid "Click to the remove all except the Now Playing"
 msgstr ""
-"这一步创建Ampache数据库并初始化数据。请提供一个有建立数据库权限的MySQL帐号。"
-"这一步可能会需要比较长一段时间，就看你机器快不快了"
 
-#: ../../templates/show_install.inc:65
-msgid "MySQL Administrative Username"
-msgstr "MySQL管理用户名"
+#: ../../templates/show_uploads.inc:33
+#, fuzzy
+msgid "Status"
+msgstr "状态"
 
-#: ../../templates/show_install.inc:69
-msgid "MySQL Administrative Password"
-msgstr "MySQL管理用户密码"
+#: ../../templates/show_uploads.inc:42
+msgid "User"
+msgstr "用户"
 
-#: ../../templates/show_install.inc:74
-msgid "Insert Database"
-msgstr "添加数据库"
+#: ../../templates/show_uploads.inc:43
+msgid "Date"
+msgstr "日期"
 
-#: ../../templates/show_add_access.inc:31
-msgid "Add Access for a Host"
-msgstr "添加访问控制"
+#: ../../templates/show_uploads.inc:49
+msgid "Add"
+msgstr "添加"
 
-#: ../../templates/show_add_access.inc:33
-msgid ""
-"Use the form below to add a host that you want to have access to your "
-"Ampache catalog."
+#: ../../templates/show_random_play.inc:28
+msgid "Play Random Selection"
+msgstr "随机播放"
+
+#: ../../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_add_access.inc:46
-msgid "Start IP Address"
-msgstr "起始IP地址"
+#: ../../templates/show_random_play.inc:59
+msgid "Favor Unplayed"
+msgstr "没播放过的优先"
 
-#: ../../templates/show_add_access.inc:52
-msgid "End IP Address"
-msgstr "结束IP地址"
+#: ../../templates/show_random_play.inc:60
+msgid "Full Albums"
+msgstr "全部专辑"
 
-#: ../../templates/show_add_access.inc:72
-msgid "Add Host"
-msgstr "添加主机"
+#: ../../templates/show_random_play.inc:61
+msgid "Full Artist"
+msgstr "全部歌手"
 
-#: ../../templates/show_preferences.inc:31
-msgid "Editing"
-msgstr "编辑中"
+#: ../../templates/show_random_play.inc:66
+msgid "from catalog"
+msgstr "曲库"
 
-#: ../../templates/show_preferences.inc:31
-msgid "preferences"
-msgstr "设置"
+#: ../../templates/show_random_play.inc:75
+msgid "Play Random Songs"
+msgstr "随机播放"
 
-#: ../../templates/show_preferences.inc:33
-msgid "Rebuild Preferences"
-msgstr "重建设置"
+#~ msgid "<u>S</u>how all albums"
+#~ msgstr "<u>S</u>显示所有专辑"
 
-#: ../../templates/show_preferences.inc:39
-msgid "Preference"
-msgstr "设置"
+#~ msgid "Select a starting letter or Show all"
+#~ msgstr "选择首字符或者显示所有的"
 
-#: ../../templates/show_preferences.inc:40
-msgid "Value"
-msgstr "值"
+#~ msgid "An Unknown Error has occured."
+#~ msgstr "发生未知错误"
 
-#: ../../templates/show_preferences.inc:42
-msgid "Type"
-msgstr "类型"
+#~ msgid "Successfully-Quarantined"
+#~ msgstr "成功－等待批准"
 
-#: ../../templates/show_preferences.inc:43
-msgid "Apply to All"
-msgstr "全部应用"
+#~ msgid "Successfully-Cataloged"
+#~ msgstr "成功－加入曲库"
 
-#: ../../templates/show_preferences.inc:83
-msgid "Update Preferences"
-msgstr "更新设置"
+#~ msgid "Unknown"
+#~ msgstr "未知"
 
-#: ../../templates/show_preferences.inc:87
-msgid "Cancel"
-msgstr "取消"
+#~ msgid "Quarantined"
+#~ msgstr "隔离"
 
-#: ../../templates/admin_menu.inc:34
-msgid "Mail Users"
-msgstr "向用户发送邮件"
+#~ msgid "View Limit"
+#~ msgstr "显示限制"
 
-#: ../../templates/show_album.inc:53
-msgid "Play Album"
-msgstr "播放专辑"
+#~ msgid "Create/Modify User Accounts for Ampache"
+#~ msgstr "创建／修改用户帐号"
 
-#: ../../templates/show_album.inc:54
-msgid "Play Random from Album"
-msgstr "随机从专辑播放"
+#~ msgid "Mail"
+#~ msgstr "邮件"
 
-#: ../../templates/show_album.inc:55
-msgid "Reset Album Art"
-msgstr "重置歌曲歌手"
+#~ msgid "Mail your users to notfiy them of changes"
+#~ msgstr "给你的用户发邮件提醒"
 
-#: ../../templates/show_album.inc:56
-msgid "Find Album Art"
-msgstr "查找歌曲歌手"
+#~ msgid "Create/Update/Clean your catalog here"
+#~ msgstr "添加／更新／清除曲库"
+
+#~ msgid "Modify Site-wide preferences"
+#~ msgstr "全站设置修改"
+
+#~ msgid "Modify Access List Permissions"
+#~ msgstr "修改访问权限列表"
+
+#~ msgid "Must have access_control=true in ampache.cfg"
+#~ msgstr "必须在ampache.cfg里有access_control=true"
+
+#~ msgid "Please Ensure All Files Are Tagged Correctly"
+#~ msgstr "请确定所有文件都正确标记了"
+
+#~ msgid ""
+#~ "Ampache relies on id3 tags to sort data.  If your file is not tagged it "
+#~ "may be deleted."
+#~ msgstr "系统利用id3信息来索引文件，如果你的文件没有标记，可能会被删除。"
+
+#~ msgid "refresh now"
+#~ msgstr "立即刷新"
+
+#~ msgid "clear"
+#~ msgstr "清除"