add zh_TW translate

Signed-off-by: Shen-Ta Hsieh <ibmibmibm.tw@gmail.com>

libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_zh_TW.properties

@@ -1,44 +1,71 @@
 #
-# Taiwan  localization.
+# Traditional Chinese (Taiwan) localization.
 # Author: Cheng Jen Li
 # chengjen.li@gmail.com
+# Author: Shen-Ta Hsieh
+# ibmibmibm.tw@gmail.com
 #
 
 common.home = \u9996\u9801
-common.back = \u56DE\u5FA9
+common.back = \u4E0A\u4E00\u9801
-common.help = \u5354\u52A9
+common.help = \u8AAA\u660E
 common.play = \u64AD\u653E
 common.add = \u65B0\u589E
 common.download = \u4E0B\u8F09
 common.close = \u95DC\u9589
-common.refresh = \u5237\u65B0
+common.refresh = \u91CD\u65B0\u6574\u7406
-common.next = \u4E0B\u9801
+common.next = \u4E0B\u4E00\u9801
-common.previous = \u4E0A\u9801
+common.previous = \u4E0A\u4E00\u9801
 common.more = \u66F4\u591A
 common.ok = \u78BA\u5B9A
 common.cancel = \u53D6\u6D88
 common.save = \u5132\u5B58
 common.create = \u5EFA\u7ACB
 common.delete = \u522A\u9664
+common.edit = \u7DE8\u8F2F
+common.confirm = \u8ACB\u78BA\u8A8D
 common.unknown = (\u672A\u77E5)
 common.default = (\u9810\u8A2D\u503C)
+common.settingssaved = \u8A2D\u5B9A\u5DF2\u5132\u5B58\u3002
+common.trialexpired = \u8A66\u7528\u7248\u5C07\u65BC {0} \u5230\u671F\u3002\u53D6\u5F97<b><a href="premiumSettings.view?">Subsonic Premium</a></b>\u4F86\u4F7F\u7528\u9019\u500B\u529F\u80FD\u3002
+common.trialnotexpired = \u9019\u500B\u529F\u80FD\u5728 {0} \u4E4B\u524D\u90FD\u53EF\u4F7F\u7528\u3002\u4E4B\u5F8C\u60A8\u5FC5\u9808\u53D6\u5F97<b><a href="premiumSettings.view?">Subsonic Premium</a></b>\u624D\u80FD\u4F7F\u7528\u3002
 
 # login.jsp
 login.username = \u5E33\u865F
 login.password = \u5BC6\u78BC
 login.login = \u767B\u5165
 login.remember = \u8A18\u5F97\u6211
-login.logout = \u60A8\u5DF2\u7D93\u767B\u51FA.
+login.logout = \u60A8\u5DF2\u7D93\u767B\u51FA\u3002
-login.error = \u5E33\u865F\u6216\u662F\u5BC6\u78BC\u932F\u8AA4.
+login.error = \u5E33\u865F\u6216\u662F\u5BC6\u78BC\u932F\u8AA4\u3002
-login.insecure = {0} \u672A\u53D7\u4FDD\u8B77. \u8ACB\u5148\u4EE5\u4F7F\u7528\u8005\u53CA\u5BC6\u78BC "admin"\u767B\u5165, \u6216\u9EDE\u64CA <a href="login.view?user=admin&amp;password=admin">\u9019\u88E1</a>. \u4E26\u4E14\u7ACB\u523B\u8B8A\u66F4\u60A8\u7684\u5BC6\u78BC.
+login.insecure = {0} \u672A\u53D7\u4FDD\u8B77\u3002\u8ACB\u5148\u4EE5\u4F7F\u7528\u8005\u53CA\u5BC6\u78BC "admin"\u767B\u5165\uFF0C\u6216\u9EDE\u9078 <a href="login.view?user=admin&amp;password=admin">\u9019\u88E1</a>\uFF0C\u4E26\u4E14\u7ACB\u523B\u8B8A\u66F4\u60A8\u7684\u5BC6\u78BC\u3002
+login.recover = \u5FD8\u8A18\u5BC6\u78BC\uFF1F
+
+# recover.jsp
+recover.title = \u5FD8\u8A18\u5BC6\u78BC\uFF1F
+recover.text = \u8981\u91CD\u8A2D\u5BC6\u78BC\uFF0C\u8ACB\u5728\u4E0B\u65B9\u8F38\u5165\u60A8\u7684<b>\u5E33\u865F</b>\u6216\u662F<b>Email\u4F4D\u5740</b>\u3002
+recover.username = \u5E33\u865F\u6216Email\u4F4D\u5740
+recover.send = \u91CD\u8A2D\u5BC6\u78BC\u4E26\u5BC4\u7D66\u6211
+recover.success = \u60A8\u7684\u5BC6\u78BC\u5DF2\u91CD\u8A2D\u4E26\u5BC4\u5230\u4E86 {0} \u3002
+recover.error.usernotfound = \u62B1\u6B49\uFF0C\u672A\u627E\u5230\u4F7F\u7528\u8005\u3002
+recover.error.noemail = \u62B1\u6B49\uFF0C\u8A72\u4F7F\u7528\u8005\u672A\u8A3B\u518A\u4FE1\u7BB1\u3002
+recover.error.sendfailed = Email\u5BC4\u9001\u5931\u6557\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66\u3002
+recover.error.invalidcaptcha = \u62B1\u6B49\uFF0C\u8F38\u5165\u7684CAPTCHA\u6587\u5B57\u6709\u8AA4\uFF0C\u8ACB\u518D\u8A66\u4E00\u6B21\u3002
 
 # accessDenied.jsp
 accessDenied.title = \u62D2\u7D55\u5B58\u53D6
-accessDenied.text = \u62B1\u6B49\uFF0C\u60A8\u7121\u6B0A\u57F7\u884C\u6240\u8ACB\u6C42\u7684\u64CD\u4F5C.
+accessDenied.text = \u62B1\u6B49\uFF0C\u60A8\u7121\u6B0A\u57F7\u884C\u6240\u8ACB\u6C42\u7684\u64CD\u4F5C\u3002
+
+# notFound.jsp
+notFound.title = \u627E\u4E0D\u5230
+notFound.text = <p>Sorry, we could not find what you were looking for.</p><p>Try reloading the web page. If that doesn't help, \
+  try scanning the media folders again.</p>
+notFound.reload = \u91CD\u65B0\u6574\u7406\u9801\u9762
+notFound.scan = Media folders settings
 
 # top.jsp
 top.home = \u9996\u9801
 top.now_playing = \u64AD\u653E
+top.starred = Starred
 top.settings = \u8A2D\u5B9A
 top.status = \u72C0\u614B
 top.podcast = \u64AD\u5BA2
@@ -46,32 +73,40 @@ top.more = \u5176\u4ED6
 top.help = \u95DC\u65BC
 top.search = \u641C\u5C0B
 top.upgrade = \u6709\u65B0\u7248\u672C\u63D0\u4F9B. \u4E0B\u8F09 {0} {1} \
-          <a href\="\#" onclick\="window.open(''http\://libresonic.org/'')">\u9019\u88E1</a>.
+          <a href\="\#" onclick\="window.open(''http\://libresonic.org/'')">\u9019\u88E1</a>\u3002
-top.missing = \u627E\u4E0D\u5230\u97F3\u6A02\u593E\uFF0C\u8ACB\u91CD\u65B0\u8A2D\u5B9A.
+top.missing = \u627E\u4E0D\u5230\u97F3\u6A02\u8CC7\u6599\u593E\uFF0C\u8ACB\u91CD\u65B0\u8A2D\u5B9A\u3002
 top.logout =\u767B\u51FA{0}
+top.getpremium = \u53D6\u5F97 Subsonic Premium
+top.gotpremium = Subsonic Premium
+top.trialdaysleft = \u5269\u4E0B {0} \u5929\u9AD4\u9A57\u6642\u9593
 
 # left.jsp
-left.statistics = \u97F3\u6A02\u76D2\u6709 \
+left.scanning = \u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E\u4E2D\u2026
-                  {0}&nbsp;\u4F4D\u6B4C\u624B<br>\
+left.statistics = {0}&nbsp;\u4F4D\u6B4C\u624B<br>\
                   {1}&nbsp;\u5F35\u5C08\u8F2F<br>\
                   {2}&nbsp;\u9996\u6B4C\u66F2<br>\
-                  {3} (\u7D04 {4} \u5C0F\u6642)
+                  {3}<br>\
+                  {4}&nbsp;\u5C0F\u6642
 left.shortcut = \u6377\u5F91
+left.playlists = \u64AD\u653E\u6E05\u55AE
 left.radio = \u7DDA\u4E0A\u96FB\u8996/\u6536\u97F3\u6A5F
 left.allfolders = \u5168\u90E8
+left.showallplaylists = \u986F\u793A\u5168\u90E8
+left.createplaylist = \u5EFA\u7ACB\u65B0\u7684\u64AD\u653E\u6E05\u55AE
+left.importplaylist = \u532F\u5165\u64AD\u653E\u6E05\u55AE
 
-# playlist.jsp
+# playQueue.jsp
 playlist.stop = \u505C\u6B62
 playlist.start = \u64AD\u653E
-playlist.confirmclear = \u78BA\u5B9A\u522A\u9664\u9EDE\u64AD\u6E05\u55AE?
+playlist.confirmclear = \u78BA\u5B9A\u522A\u9664\u64AD\u653E\u6E05\u55AE?
 playlist.clear = \u6E05\u9664
 playlist.shuffle = \u96A8\u8208\u64AD\u653E
 playlist.repeat_on = \u91CD\u64AD
 playlist.repeat_off = \u4E0D\u91CD\u64AD
 playlist.undo = \u53D6\u6D88
 playlist.settings = \u8A2D\u5B9A
-playlist.more = \u5176\u4ED6...
+playlist.more = \u5176\u4ED6\u2026
-playlist.more.playlist = \u9EDE\u64AD\u6E05\u55AE
+playlist.more.playlist = \u64AD\u653E\u6E05\u55AE
 playlist.more.sortbytrack = \u97F3\u8ECC\u6392\u5E8F
 playlist.more.sortbyartist = \u6B4C\u624B\u6392\u5E8F
 playlist.more.sortbyalbum = \u5C08\u8F2F\u6392\u5E8F
@@ -79,12 +114,32 @@ playlist.more.selection = \u9078\u6B4C
 playlist.more.selectall = \u5168\u9078
 playlist.more.selectnone = \u5168\u4E0D\u9078
 playlist.getflash = \u53D6\u5F97Flash\u64A5\u653E\u5668
+playlist.saveplayqueue = \u5132\u5B58\u64AD\u653E\u4F47\u5217
+playlist.loadplayqueue = \u8F09\u5165\u64AD\u653E\u4F47\u5217
 playlist.save = \u5132\u5B58
 playlist.append = \u52A0\u5165\u6E05\u55AE
 playlist.remove = \u79FB\u9664
 playlist.up = \u4E0A
 playlist.down = \u4E0B
-playlist.empty = \u7A7A\u7684\u9EDE\u64AD\u6E05\u55AE
+playlist.empty = \u7A7A\u7684\u64AD\u653E\u6E05\u55AE
+playlist.toast.appendtoplaylist = \u64AD\u653E\u6E05\u55AE\u5DF2\u66F4\u65B0\u3002
+playlist.toast.saveasplaylist = \u64AD\u653E\u6E05\u55AE\u5DF2\u5132\u5B58\u3002
+playlist.toast.saveplayqueue = \u64AD\u653E\u4F47\u5217\u5DF2\u5132\u5B58\u3002
+playlist.missing = \u907A\u5931
+
+# playlist.jsp
+playlist2.noplaylists = \u60A8\u9084\u672A\u5EFA\u7ACB\u4EFB\u4F55\u6E05\u55AE\u3002
+playlist2.created = \u7531 {0} \u5EFA\u7ACB\u7684 {1}
+playlist2.songs = \u6B4C\u66F2
+playlist2.shared = \u5176\u4ED6\u4EBA\u4E5F\u53EF\u770B\u898B
+playlist2.notshared = \u5176\u4ED6\u4EBA\u7121\u6CD5\u770B\u898B
+playlist2.name = \u64AD\u653E\u6E05\u55AE\u540D\u7A31
+playlist2.comment = \u64AD\u653E\u6E05\u55AE\u8A3B\u89E3
+playlist2.public = \u4F7F\u6B64\u64AD\u653E\u6E05\u55AE\u53EF\u88AB\u5176\u4ED6\u4EBA\u4F7F\u7528\u3002
+playlist2.confirmdelete = \u60A8\u78BA\u5B9A\u8981\u522A\u9664\u6B64\u64AD\u653E\u6E05\u55AE\u55CE\uFF1F
+playlist2.empty = \u64AD\u653E\u6E05\u55AE\u70BA\u7A7A
+playlist2.export = \u532F\u51FA
+
 
 # status.jsp
 status.title = \u72C0\u614B
@@ -100,44 +155,61 @@ status.bitrate = Bitrate (Kbps)
 
 # search.jsp
 search.title = \u641C\u5C0B
+search.query = \u6B4C\u624B\u3001\u5C08\u8F2F\u6216\u6B4C\u66F2\u6A19\u984C\u3002
 search.search = \u641C\u5C0B
-search.index = \u6B63\u5728\u5EFA\u7ACB\u7D22\u5F15\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66!
+search.index = \u6B63\u5728\u5EFA\u7ACB\u7D22\u5F15\uFF0C\u8ACB\u7A0D\u5F8C\u518D\u8A66\uFF01
-search.hits.none = \u627E\u4E0D\u5230.
+search.hits.none = \u627E\u4E0D\u5230\u3002
+search.hits.more = \u66F4\u591A
+search.hits.artists = \u6B4C\u624B
+search.hits.albums = \u5C08\u8F2F
+search.hits.songs = \u6B4C\u66F2
+search.hits.videos = \u5F71\u50CF
 
 # gettingStarted.jsp
 gettingStarted.title = \u521D\u6B21\u4F7F\u7528
-gettingStarted.text = <p>\u6B61\u8FCE\u4F7F\u7528Libresonic!<br>\u8ACB\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9A5F\u8A2D\u5B9A.<br> \
+gettingStarted.text = <p>\u6B61\u8FCE\u4F7F\u7528Libresonic\uFF01<br>\u8ACB\u4F9D\u7167\u4E0B\u9762\u7684\u6B65\u9A5F\u8A2D\u5B9A\u3002<br> \
-                      \u9EDE\u64CA\u5DE5\u5177\u5217\u4E0A\u7684"\u9996\u9801"\uFF0C\u5C31\u80FD\u96A8\u6642\u56DE\u4F86\u9019\u88E1\uFF01.</p> \
+                      \u9EDE\u64CA\u5DE5\u5177\u5217\u4E0A\u7684"\u9996\u9801"\uFF0C\u5C31\u80FD\u96A8\u6642\u56DE\u4F86\u9019\u88E1\u3002</p> \
                       <p>\u9700\u8981\u66F4\u591A\u8A0A\u606F\u8ACB\u53C3\u8003<a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u5165\u9580\u6307\u5357</b></a></p>
-gettingStarted.step1.title = \u8B8A\u66F4\u7BA1\u7406\u54E1\u7684\u5BC6\u78BC.
+gettingStarted.root = \u8B66\u544A\uFF01Libresonic\u7A0B\u5F0F\u6B63\u4EE5 root \u4F7F\u7528\u8005\u57F7\u884C\u3002\u8ACB\u8003\u616E \
+                      <a href="http://libresonic.org/pages/installation.jsp" target="_blank">\u5225\u7684\u65B9\u5F0F</a>\u3002
+gettingStarted.step1.title = \u8B8A\u66F4\u7BA1\u7406\u54E1\u7684\u5BC6\u78BC\u3002
 gettingStarted.step1.text = \u8ACB\u4FEE\u6539\u9810\u8A2D\u7684\u7BA1\u7406\u54E1\u5BC6\u78BC\uFF0C\u4EE5\u78BA\u4FDD\u4F3A\u670D\u5668\u7684\u5B89\u5168\u3002\
-                            \u4E5F\u53EF\u4EE5\u5EFA\u7ACB\u65B0\u7684\u4F7F\u7528\u8005\u4E26\u7D66\u4E88\u4E0D\u540C\u7684\u6B0A\u9650
+                            \u4E5F\u53EF\u4EE5\u5EFA\u7ACB\u65B0\u7684\u4F7F\u7528\u8005\u4E26\u7D66\u4E88\u4E0D\u540C\u7684\u6B0A\u9650\u3002
-gettingStarted.step2.title = \u8A2D\u5B9A\u97F3\u6A02\u593E.
+gettingStarted.step2.title = \u8A2D\u5B9A\u97F3\u6A02\u8CC7\u6599\u593E\u3002
 gettingStarted.step2.text = \u8A2D\u5B9A\u60A8\u97F3\u6A02\u6240\u653E\u7F6E\u7684\u8CC7\u6599\u593E\u3002
-gettingStarted.step3.title = \u914D\u7F6E\u7DB2\u8DEF\u8A2D\u5B9A.
+gettingStarted.step3.title = \u914D\u7F6E\u7DB2\u8DEF\u8A2D\u5B9A\u3002
 gettingStarted.step3.text = \u5982\u679C\u60A8\u8981\u900F\u904E\u7DB2\u969B\u7DB2\u8DEF\u6216\u662F\u8207\u60A8\u7684\u670B\u53CB\u3001\u5BB6\u4EBA\u5206\u4EAB\u3002\
-                            \u4E26\u53D6\u5F97\u60A8\u7684\u5C08\u5C6C\u7DB2\u5740\u50CF\u662F<em>yourname</em>.libresonic.org.
+                            \u4E26\u53D6\u5F97\u60A8\u7684\u5C08\u5C6C\u7DB2\u5740\u50CF\u662F<em>yourname</em>.libresonic.org\u3002
 gettingStarted.hide = \u4E0B\u6B21\u4E0D\u986F\u793A\u672C\u9801\uFF01
-gettingStarted.hidealert = \u5982\u679C\u4E0B\u6B21\u9084\u9700\u8981\u986F\u793A\u63D0\u793A,\u8ACB\u5F9E \u8A2D\u5B9A->\u4E00\u822C \u4E2D\u52FE\u9078.
+gettingStarted.hidealert = \u5982\u679C\u4E0B\u6B21\u9084\u9700\u8981\u986F\u793A\u63D0\u793A\uFF0C\u8ACB\u5F9E \u8A2D\u5B9A\u2192\u4E00\u822C \u4E2D\u52FE\u9078\u3002
 
 # home.jsp
 home.random.title = \u96A8\u8208\u64AD\u653E
+home.alphabetical.title = \u5168\u90E8
 home.newest.title = \u6700\u65B0\u97F3\u6A02
+home.starred.title = \u661F\u865F\u6A19\u8A18
 home.highest.title = \u559C\u597D\u7A0B\u5EA6
 home.frequent.title = \u9EDE\u64AD\u7387
 home.recent.title = \u6700\u8FD1\u64AD\u653E
+home.decade.title = \u7531\u5E74\u4EFD
+home.genre.title = \u7531\u66F2\u98A8
 home.users.title = \u4F7F\u7528\u8005
 home.random.text = \u96A8\u8208\u9078\u64AD\u5C08\u8F2F
+home.alphabetical.text = \u6240\u6709\u5C08\u8F2F
 home.newest.text = \u6700\u65B0\u5C08\u8F2F
+home.starred.text = \u60A8\u6A19\u8A18\u661F\u865F\u7684\u5C08\u8F2F
 home.highest.text = \u8A55\u50F9\u9AD8\u7684\u5C08\u8F2F
 home.frequent.text = \u6700\u591A\u9EDE\u64AD\u5C08\u8F2F
 home.recent.text =\u6700\u8FD1\u64AD\u653E\u5C08\u8F2F
+home.decade.text = \u5E74\u4EFD
+home.genre.text = \u66F2\u98A8
 home.users.text = \u4F7F\u7528\u8005\u7D71\u8A08
-home.scan = \u97F3\u6A02\u593E\u5DF2\u7D93\u6383\u63CF. \u6240\u6709\u529F\u80FD\u5C1A\u672A\u958B\u653E.
+home.scan = \u6B63\u5728\u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E\u3002\u90E8\u4EFD\u529F\u80FD\u5C07\u7121\u6CD5\u4F7F\u7528\u3002
 home.albums = \u5C08\u8F2F {0} - {1}
 home.playcount = \u64AD\u653E\u4E86 {0} \u9996\u6B4C
 home.lastplayed = \u64AD\u653E {0}
 home.created = \u5EFA\u7ACB {0}
+home.shuffle = \u96A8\u6A5F\u64AD\u653E
 home.chart.total = \u7E3D\u8A08 (MB)
 home.chart.stream = \u4E32\u6D41 (MB)
 home.chart.download = \u5DF2\u4E0B\u8F09(MB)
@@ -148,70 +220,83 @@ more.title = \u5176\u4ED6
 more.random.title = \u96A8\u8208\u64AD\u653E
 more.random.text = \u5EFA\u7ACB\u96A8\u8208\u6E05\u55AE
 more.random.songs = {0} \u9996
-more.random.auto = \u7576\u9EDE\u64AD\u6E05\u55AE\u64AD\u653E\u5B8C\u7562\u6642\u7E7C\u7E8C\u64AD\u653E\u66F4\u591A\u7684\u96A8\u8208\u6B4C\u66F2 .
+more.random.auto = \u7576\u64AD\u653E\u6E05\u55AE\u64AD\u653E\u5B8C\u7562\u6642\u7E7C\u7E8C\u96A8\u6A5F\u64AD\u653E\u6B4C\u66F2\u3002
 more.random.ok = \u78BA\u5B9A
 more.random.genre = \u66F2\u98A8
 more.random.anygenre = \u4EFB\u610F
 more.random.year = \u5E74\u4EFD
 more.random.anyyear = \u4EFB\u610F
-more.random.folder = \u97F3\u6A02\u593E
+more.random.folder = \u97F3\u6A02\u8CC7\u6599\u593E
 more.random.anyfolder = \u4EFB\u610F
 more.apps.title = Libresonic Apps
 more.apps.text = <p>\u652F\u63F4 <b>iPhone</b>, \
-                 <b>Android</b> \u548C <b>AIR</b>\u7684<a href="http://libresonic.org/pages/apps.jsp" target="_blank">Libresonic apps</a>.</p>
+                 <b>Android</b> \u548C <b>AIR</b>\u7684<a href="http://libresonic.org/pages/apps.jsp" target="_blank">Libresonic apps</a>\u3002</p>
+more.jamstash.title = JamStash
+more.jamstash.text = <p>Jamstash \u662F Libresonic \u7684 HTML5 \u64AD\u653E\u5668\u3002<a href="{0}" target="_blank">\u9EDE\u9078\u9019\u88E1</a> \u4F86\u555F\u52D5\u3002 \
+                    \u4E5F\u53EF\u4EE5\u5728 <a href="https://chrome.google.com/webstore/detail/jamstash/jccdpflnecheidefpofmlblgebobbloc" target="_blank">Chrome App</a> \u5167\u53D6\u5F97\u3002</p>
+more.status.title = \u7DB2\u8DEF\u72C0\u614B
+more.status.text = <a href="status.view">\u76E3\u63A7</a>\u6240\u6709\u7DB2\u8DEF\u4E32\u6D41\u7684\u5373\u6642\u72C0\u614B\u3002
 more.mobile.title = \u79FB\u52D5\u8A2D\u5099
-more.mobile.text = <p>\u53EF\u4EE5\u7531WAP\u96FB\u8A71\u6216PDA\u4F7F\u7528 {0} .<br> \
+more.mobile.text = <p>\u53EF\u4EE5\u7531 WAP \u96FB\u8A71\u6216 PDA \u4F7F\u7528 {0} \u3002<br> \
                    \u7D93\u7531\u624B\u6A5F\u8F38\u5165\u9019\u6A23\u7684\u7DB2\u5740 <b>http://yourhostname/wap</b></p> \
-                   <p>\u7576\u7136\u60A8\u624B\u6A5F\u5FC5\u9808\u8981\u6709\u4E0A\u7DB2\u529F\u80FD!.</p>
+                   <p>\u9019\u9700\u8981\u60A8\u7684\u4F3A\u670D\u5668\u53EF\u4EE5\u900F\u904E\u7DB2\u969B\u7DB2\u8DEF\u5B58\u53D6\u3002</p>
 more.podcast.title = \u64AD\u5BA2
-more.podcast.text = <p>\u5132\u5B58\u9EDE\u64AD\u6E05\u55AE\u7576\u6210\u64AD\u5BA2.<br>\
+more.podcast.text = <p>\u5132\u5B58\u64AD\u653E\u6E05\u55AE\u7576\u6210\u64AD\u5BA2\u3002<br>\
-                    \u7D93\u7531\u9019\u500B\u7DB2\u5740\u53EF\u4EE5\u6536\u807D: <b>http://yourhostname/podcast</b>, \
+                    \u7D93\u7531\u9019\u500B\u7DB2\u5740\u53EF\u4EE5\u6536\u807D\uFF1A <b>http://yourhostname/podcast</b>\uFF0C\
-                    \u6216\u662F <b><a href="podcast.view?suffix=.rss">\u9EDE\u6211</a>.</b></p>
+                    \u6216\u662F <b><a href="podcast.view?suffix=.rss">\u9EDE\u6211</a>\u3002</b></p>
 more.upload.title = \u4E0A\u50B3\u6A94\u6848
 more.upload.source = \u9078\u64C7\u6A94\u6848
 more.upload.target = \u4E0A\u50B3\u5230
 more.upload.browse = \u9078\u64C7
 more.upload.ok = \u4E0A\u50B3
-more.upload.unzip = \u81EA\u52D5\u89E3\u58D3\u7E2Ezip\u6A94.
+more.upload.unzip = \u81EA\u52D5\u89E3\u58D3\u7E2Ezip\u6A94\u3002
-more.upload.progress = % \u5B8C\u6210. \u8ACB\u7A0D\u5019...
+more.upload.progress = % \u5B8C\u6210\u3002\u8ACB\u7A0D\u5019\u2026
 
 # upload.jsp
-upload.title = \u6A94\u6848\u4E0A\u50B3\u4E2D......
+upload.title = \u6A94\u6848\u4E0A\u50B3\u4E2D
 upload.success = \u4E0A\u50B3\u6210\u529F <b>{0}</b>
-upload.empty = \u6C92\u6709\u4E0A\u50B3\u7684\u6A94\u6848\u5594.
+upload.empty = \u6C92\u6709\u53EF\u4E0A\u50B3\u7684\u6A94\u6848\u3002
-upload.failed = \u6A94\u6848\u4E0A\u50B3\u5931\u6557\u56E0\u70BA:<br><b>"{0}"</b>
+upload.failed = \u6A94\u6848\u4E0A\u50B3\u6642\u767C\u751F\u932F\u8AA4\uFF1A<br><b>"{0}"</b>
 upload.unzipped = \u89E3\u58D3\u7E2E {0}
 
 # help.jsp
 help.title = \u95DC\u65BC {0}
-help.upgrade = <b>\u6CE8\u610F!</b> \u5DF2\u7D93\u6709\u65B0\u7684\u7248\u672C\u4E86\uFF0C\u4E0B\u8F09\u65B0\u7248 {0} {1} \
+help.upgrade = <b>\u6CE8\u610F\uFF01</b> \u6709\u65B0\u7248\u672C\u53EF\u7528\u3002\u4E0B\u8F09 {0} {1} \
-               <a href="#" onclick="window.open(''http://libresonic.org/'')">\u5728\u9019</a>.
+               <a href="#" onclick="window.open(''http://libresonic.org/'')">\u8ACB\u9EDE\u9078\u9019\u88E1</a>\u3002
+help.premium.title = \u6388\u6B0A
+help.premium.expires = (\u904E\u671F {0})
+help.premium.upgrade = \u5347\u7D1A\u5230 <a href="premiumSettings.view">Subsonic Premium</a> \u4F86\u4F7F\u7528 <a href="premiumSettings.view">\u66F4\u591A\u529F\u80FD</a>\uFF01
+help.premium.expired = (\u6388\u6B0A\u904E\u671F\u65BC {0})
 help.version.title = \u7248\u672C
 help.builddate.title = \u65E5\u671F
 help.server.title = \u4F3A\u670D\u5668
 help.license.title = \u6388\u6B0A
-help.license.text = {0} \u662F\u4EE5 <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">GPL</a> \u578B\u5F0F\u767C\u4F48\u6388\u6B0A\u7684\u81EA\u7531\u8EDF\u9AD4. <br>\
+help.license.text = {0} \u662F\u4EE5 <a href="http://www.gnu.org/copyleft/gpl.html" target="_blank">GPL</a> \u578B\u5F0F\u767C\u4F48\u6388\u6B0A\u7684\u81EA\u7531\u8EDF\u9AD4\u3002<br>\
-                    {0} \u4F7F\u7528 <a href="http://libresonic.org/pages/libraries.jsp" target="_blank">\u7B2C\u4E09\u65B9\u6388\u6B0A</a>.
+                    {0} \u4F7F\u7528 <a href="http://libresonic.org/pages/libraries.jsp" target="_blank">\u7B2C\u4E09\u65B9\u6388\u6B0A</a>\u3002
 help.homepage.title = \u9996\u9801
 help.forum.title = \u8AD6\u58C7
 help.shop.title = \u5546\u54C1
 help.contact.title = \u806F\u7E6B
 help.contact.text = {0} \u7531 Sindre Mehus \u958B\u767C\u53CA\u7DAD\u8B77 \
-                    (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>). \
+                    (<a href="mailto:sindre@activeobjects.no">sindre@activeobjects.no</a>)\u3002 \
                     \u5982\u679C\u60A8\u6709\u4EFB\u4F55\u7591\u554F\uFF0C\u610F\u898B\u6216\u5EFA\u8B70\u6539\u5584\uFF0C\u8ACB\u5230 \
-                    <a href="https://www.reddit.com/r/libresonic" target="_blank">Libresonic\u8AD6\u58C7</a>.
+                    <a href="https://www.reddit.com/r/libresonic" target="_blank">Libresonic\u8AD6\u58C7</a>\u3002
 help.log = \u8A18\u9304
-help.logfile = \u5B8C\u6574\u7684\u7D00\u9304\u5B58\u653E\u5728 {0}.
+help.logfile = \u5B8C\u6574\u7684\u7D00\u9304\u5B58\u653E\u5728 {0}\u3002
 
 # settingsHeader.jsp
 settingsheader.title = \u8A2D\u5B9A
 settingsheader.general = \u4E00\u822C
 settingsheader.advanced = \u9032\u968E
 settingsheader.personal = \u500B\u4EBA\u5316
-settingsheader.musicFolder = \u97F3\u6A02\u593E
+settingsheader.musicFolder = \u97F3\u6A02\u8CC7\u6599\u593E
 settingsheader.internetRadio = \u7DDA\u4E0A\u96FB\u8996/\u6536\u97F3\u6A5F
 settingsheader.podcast = \u64AD\u5BA2
 settingsheader.player = \u64AD\u653E\u5668
+settingsheader.dlna = DLNA/UPnP
+settingsheader.sonos = Sonos
+settingsheader.premium = Subsonic Premium
+settingsheader.share = \u5206\u4EAB\u5A92\u9AD4
 settingsheader.network = \u7DB2\u8DEF
 settingsheader.transcoding = \u8F49\u6A94
 settingsheader.user = \u4F7F\u7528\u8005
@@ -220,24 +305,25 @@ settingsheader.coverArt = \u5C08\u8F2F\u5C01\u9762
 settingsheader.password = \u5BC6\u78BC
 
 # generalSettings.jsp
-generalsettings.playlistfolder = \u9EDE\u64AD\u6E05\u55AE\u8CC7\u6599\u593E
+generalsettings.playlistfolder = \u64AD\u653E\u6E05\u55AE\u8CC7\u6599\u593E
 generalsettings.musicmask = \u97F3\u6A02\u7684\u9644\u5C6C\u6A94\u540D:
 generalsettings.videomask = \u8996\u8A0A\u7684\u9644\u5C6C\u6A94\u540D:
 generalsettings.coverartmask = \u5C08\u8F2F\u5C01\u9762\u9644\u5C6C\u6A94\u540D
 generalsettings.index = \u7D22\u5F15
 generalsettings.ignoredarticles = \u5FFD\u7565\u7684\u6B4C\u624B\u540D\u7A31
 generalsettings.shortcuts = \u6377\u5F91
+generalsettings.sortalbumsbyyear = \u7531\u5E74\u4EFD\u6392\u5E8F\u5C08\u8F2F
 generalsettings.showgettingstarted = \u5728\u9996\u9801\u986F\u793A "\u521D\u6B21\u4F7F\u7528"
 generalsettings.welcometitle = \u6B61\u8FCE\u6A19\u984C
 generalsettings.welcomesubtitle = \u6B61\u8FCE\u6B21\u6A19\u984C
 generalsettings.welcomemessage = \u6B61\u8FCE\u8A0A\u606F
 generalsettings.loginmessage = \u767B\u5165\u8A0A\u606F
-generalsettings.language = Default language
+generalsettings.language = \u9810\u8A2D\u8A9E\u8A00
 generalsettings.theme = \u9810\u8A2D\u4F48\u666F\u4E3B\u984C
 
 # advancedSettings.jsp
 advancedsettings.downsamplecommand = \u964D\u983B\u6307\u4EE4
-advancedsettings.coverartlimit = \u5C01\u9762\u9650\u5236<br><div class="detail">(0 = \u4E0D\u9650)</div>
+advancedsettings.hlscommand = HTTP \u7DDA\u4E0A\u4E32\u6D41\u6307\u4EE4
 advancedsettings.downloadlimit = \u4E0B\u8F09\u9650\u5236 (Kbps)<br><div class="detail">(0 = \u4E0D\u9650)</div>
 advancedsettings.uploadlimit = \u4E0A\u50B3\u9650\u5236 (Kbps)<br><div class="detail">(0 = \u4E0D\u9650)</div>
 advancedsettings.streamport = \u975E SSL \u4E32\u6D41 Port <br><div class="detail">(0 = \u53D6\u6D88)</div>
@@ -250,27 +336,31 @@ advancedsettings.ldapautoshadowing = \u81EA\u52D5\u5728{0}\u5EFA\u7ACB\u4F7F\u75
 
 # personalSettings.jsp
 personalsettings.title =  {0}\u7684\u500B\u4EBA\u5316\u8A2D\u5B9A
-personalsettings.language = Language
+personalsettings.language = \u8A9E\u8A00
 personalsettings.theme = \u4F48\u666F\u4E3B\u984C
+personalsettings.albumlist = \u9810\u8A2D\u5C08\u8F2F\u6392\u5E8F\u65B9\u5F0F
 personalsettings.display = \u986F\u793A
 personalsettings.browse = \u700F\u89BD
-personalsettings.playlist = \u9EDE\u64AD\u6E05\u55AE
+personalsettings.playlist = \u64AD\u653E\u6E05\u55AE
 personalsettings.tracknumber = \u97F3\u8ECC #
 personalsettings.artist = \u6B4C\u624B
 personalsettings.album = \u5C08\u8F2F
-personalsettings.genre = \u66F2\u98A8\u578B\u614B
+personalsettings.genre = \u66F2\u98A8
 personalsettings.year = \u767C\u884C
 personalsettings.bitrate = Bit rate
 personalsettings.duration = \u6642\u6548
 personalsettings.format = \u683C\u5F0F
 personalsettings.filesize = \u6587\u4EF6\u5927\u5C0F
-personalsettings.captioncutoff = Caption cutoff
 personalsettings.partymode = \u5BB4\u6703\u6A21\u5F0F
+personalsettings.queuefollowingsongs = Queue following songs on play
 personalsettings.shownowplaying = \u5176\u4ED6\u4EBA\u5728\u807D\u4EC0\u9EBC
 personalsettings.nowplayingallowed = \u8B93\u5225\u4EBA\u770B\u6211\u5728\u807D\u4EC0\u9EBC
 personalsettings.showchat = \u986F\u793A\u4EA4\u8AC7\u8A0A\u606F
+personalsettings.showartistinfo = \u986F\u793A\u6B4C\u624B\u8CC7\u8A0A
+personalsettings.autohideplayqueue = \u81EA\u52D5\u96B1\u85CF\u64AD\u653E\u4F47\u5217
 personalsettings.finalversionnotification = \u63D0\u793A\u65B0\u7248\u672C
 personalsettings.betaversionnotification = \u63D0\u793A\u65B0\u7684\u6E2C\u8A66\u7248
+personalsettings.songnotification = \u958B\u59CB\u64AD\u653E\u65B0\u6B4C\u6642\u63D0\u9192\u6211 (\u4E0D\u662F\u6240\u6709\u700F\u89BD\u5668\u90FD\u652F\u63F4)
 personalsettings.lastfmenabled = \u767B\u9304\u6211\u5728 <a href="http://last.fm/" target="_blank">Last.fm</a>\u7684\u5E33\u865F
 personalsettings.lastfmusername = Last.fm \u5E33\u865F
 personalsettings.lastfmpassword = Last.fm \u5BC6\u78BC
@@ -286,28 +376,47 @@ personalsettings.avatar.courtesy = Icons courtesy of <a href="http://www.aftergl
 
 # avatarUploadResult.jsp
 avataruploadresult.title = \u8B8A\u66F4\u500B\u4EBA\u5716\u793A
-avataruploadresult.success = \u6210\u529F\u4E0A\u50B3\u500B\u4EBA\u5716\u793A "{0}".
+avataruploadresult.success = \u6210\u529F\u4E0A\u50B3\u500B\u4EBA\u5716\u793A "{0}"\u3002
-avataruploadresult.failure = \u7121\u6CD5\u4E0A\u50B3\u500B\u4EBA\u5716\u793A. \u8ACB\u53C3\u95B1 <a href="help.view?">\u8A18\u9304</a>.
+avataruploadresult.failure = \u7121\u6CD5\u4E0A\u50B3\u500B\u4EBA\u5716\u793A. \u8ACB\u53C3\u95B1 <a href="help.view?">\u8A18\u9304</a>\u3002
 
 # passwordSettings.jsp
 passwordsettings.title = \u8B8A\u66F4\u5BC6\u78BC {0}
 
 # musicFolderSettings.jsp
-musicfoldersettings.path = \u97F3\u6A02\u593E
+musicfoldersettings.path = \u97F3\u6A02\u8CC7\u6599\u593E
 musicfoldersettings.name = \u540D\u7A31
 musicfoldersettings.enabled = \u4F7F\u7528
-musicfoldersettings.add = \u65B0\u589E\u97F3\u6A02\u593E
+musicfoldersettings.add = \u65B0\u589E\u97F3\u6A02\u8CC7\u6599\u593E
-musicfoldersettings.nopath = \u5E6B\u97F3\u6A02\u593E\u547D\u540D\u5427.
+musicfoldersettings.nopath = \u8ACB\u6307\u5B9A\u8CC7\u6599\u593E\u3002
+musicfoldersettings.notfound = \u627E\u4E0D\u5230\u8CC7\u6599\u593E
+musicfoldersettings.scan = \u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E
+musicfoldersettings.interval.never = \u5F9E\u4E0D
+musicfoldersettings.interval.one = \u6BCF\u5929
+musicfoldersettings.interval.many = \u6BCF\u9694 {0} \u5929
+musicfoldersettings.hour = \u5728 {0}:00
+musicfoldersettings.nowscanning = \u6B63\u5728\u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E\u3002\u9019\u500B\u52D5\u4F5C\u5C07\u9700\u8981\u5E7E\u5206\u9418\uFF0C\u53D6\u6C7A\u65BC\u60A8\u7684\u5A92\u9AD4\u8CC7\u6599\u5EAB\u7684\u5927\u5C0F\u3002
+musicfoldersettings.scannow = \u7ACB\u5373\u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E
+musicfoldersettings.access = \u7BA1\u7406\u4F7F\u7528\u8005\u5B58\u53D6\u6B0A\u9650
+musicfoldersettings.access.description = \u8A2D\u5B9A\u54EA\u4E9B\u8CC7\u6599\u593E\u53EF\u4EE5\u88AB\u54EA\u4E9B\u4F7F\u7528\u8005\u5B58\u53D6\u3002
+musicfoldersettings.fastcache = \u5FEB\u901F\u8B80\u53D6\u6A21\u5F0F
+musicfoldersettings.fastcache.description = \u5982\u679C\u4F60\u7684\u5A92\u9AD4\u6A94\u6848\u5728\u7DB2\u8DEF\u4E0A\u7684\u78C1\u789F\uFF0C\u4F7F\u7528\u9019\u500B\u9078\u9805\u4F86\u6E1B\u5C11\u78C1\u789F\u5B58\u53D6\u3002 \
+                                       \u6CE8\u610F\uFF1A\u65B0\u589E\u6216\u66F4\u6539\u5BE6\u969B\u6A94\u6848\u5C07\u6703\u53EA\u6709\u5728\u6383\u63CF\u97F3\u6A02\u8CC7\u6599\u593E\u5F8C\u624D\u6703\u751F\u6548\u3002
+musicfoldersettings.expunge = \u6E05\u7406\u8CC7\u6599\u5EAB
+musicfoldersettings.expunge.description = Libresonic \u5132\u5B58\u4E86\u6240\u6709\u5A92\u9AD4\u6A94\u6848\u7684\u8CC7\u8A0A\u3002\u6E05\u7406\u8CC7\u6599\u5EAB\u5F8C\uFF0C\u4E0D\u5728\u60A8\u7684\u5A92\u9AD4\u8CC7\u6599\u5EAB\u5167\u7684\u6A94\u6848\uFF0C\u5176\u8CC7\u8A0A\u5C07\u6C38\u4E45\u522A\u9664\u3002
+musicfoldersettings.organizebyfolderstructure = \u4EE5\u8CC7\u6599\u593E\u7D50\u69CB\u6574\u7406
+musicfoldersettings.organizebyfolderstructure.description = \u958B\u555F\u9019\u500B\u9078\u9805\u4F7F\u60A8\u700F\u89BD\u5A92\u9AD4\u8CC7\u6599\u5EAB\u6642\u4F7F\u7528\u539F\u4F86\u7684\u8CC7\u6599\u593E\u7D50\u69CB\uFF0C\u800C\u4E0D\u662F\u4F9D\u7167 ID3 \u6A19\u7C64\u5167\u7684\u6B4C\u624B\u8207\u5C08\u8F2F\u8CC7\u8A0A\u3002
 
 # networkSettings.jsp
-networksettings.text = \u4EE5\u4E0B\u8A2D\u5B9A\u8B93\u60A8\u900F\u904E\u7DB2\u969B\u7DB2\u8DEF\u5B58\u53D6Libresonic\u4F3A\u670D\u5668.<br> \
+networksettings.text = \u4EE5\u4E0B\u8A2D\u5B9A\u8B93\u60A8\u900F\u904E\u7DB2\u969B\u7DB2\u8DEF\u5B58\u53D6Libresonic\u4F3A\u670D\u5668\u3002<br> \
-                       \u6709\u4EFB\u4F55\u554F\u984C, \u8ACB\u53C3\u8003 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u521D\u6B21\u4F7F\u7528</b></a>\u624B\u518A.
+                       \u6709\u4EFB\u4F55\u554F\u984C\uFF0C\u8ACB\u53C3\u8003 <a href="http://libresonic.org/pages/getting-started.jsp" target="_blank"><b>\u521D\u6B21\u4F7F\u7528</b></a>\u624B\u518A\u3002
-networksettings.portforwardingenabled = \u81EA\u52D5\u914D\u7F6E\u8DEF\u7531\u5668\u5B58\u53D6Libresonic\u4F3A\u670D\u5668 (UPnP port \u8F49\u767C).
+networksettings.portforwardingenabled = \u81EA\u52D5\u914D\u7F6E\u8DEF\u7531\u5668\u5B58\u53D6 Libresonic \u4F3A\u670D\u5668 (UPnP port \u8F49\u767C)\u3002
-networksettings.portforwardinghelp = \u5982\u679C\u8DEF\u7531\u7121\u6CD5\u81EA\u52D5\u914D\u7F6E\uFF0C\u8ACB\u4F7F\u7528\u624B\u52D5\u914D\u7F6E.<br> \
+networksettings.portforwardinghelp = \u5982\u679C\u8DEF\u7531\u7121\u6CD5\u81EA\u52D5\u914D\u7F6E\uFF0C\u8ACB\u4F7F\u7528\u624B\u52D5\u914D\u7F6E\u3002<br> \
            \u4F9D\u7167 <a href="http://portforward.com/" target="_blank">portforward.com</a> \u7684\u8AAA\u660E<br>\
-           \u4F60\u5FC5\u9808\u8F49\u767CPort:{0}\u5230\u96FB\u8166\u4E0A\u904B\u884C\u7684Libresonic\u4F3A\u670D\u5668.
+           \u60A8\u5FC5\u9808\u8F49\u767CPort {0}\u5230\u96FB\u8166\u4E0A\u904B\u884C\u7684Libresonic\u4F3A\u670D\u5668\u3002
-networksettings.urlredirectionenabled = \u7528\u7C21\u55AE\u597D\u8A18\u7684\u7DB2\u5740\u9023\u7DDA\u5230\u60A8\u7684\u4F3A\u670D\u5668.
+networksettings.urlredirectionenabled = \u7528\u7C21\u55AE\u597D\u8A18\u7684\u7DB2\u5740\u9023\u7DDA\u5230\u60A8\u7684\u4F3A\u670D\u5668\u3002
-networksettings.status = \u72C0\u614B:
+networksettings.status = \u72C0\u614B\uFF1A
+networksettings.normalurl = Use
+networksettings.customurl = Use custom URL (advanced)
 
 # transcodingSettings.jsp
 transcodingsettings.name = \u8F49\u6A94\u540D\u7A31
@@ -316,22 +425,23 @@ transcodingsettings.targetformat = \u8F49\u63DB\u6210
 transcodingsettings.step1 = \u6B65\u9A5F\u4E00
 transcodingsettings.step2 = \u6B65\u9A5F\u4E8C
 transcodingsettings.step3 = \u6B65\u9A5F\u4E09
-transcodingsettings.defaultactive = \u9810\u8A2D
 transcodingsettings.add = \u65B0\u589E\u8F49\u78BC\u5668
-transcodingsettings.noname = \u8ACB\u6307\u5B9A\u4E00\u500B\u540D\u7A31.
+transcodingsettings.defaultactive = \u9810\u8A2D
-transcodingsettings.nosourceformat = \u8ACB\u6307\u5B9A\u8F49\u63DB\u683C\u5F0F.
+transcodingsettings.recommended = Recommended configuration
-transcodingsettings.notargetformat = \u8ACB\u6307\u5B9A\u8F49\u63DB\u683C\u5F0F.
+transcodingsettings.noname = \u8ACB\u6307\u5B9A\u4E00\u500B\u540D\u7A31\u3002
-transcodingsettings.nostep1 = \u8ACB\u81F3\u5C11\u6307\u5B9A\u4E00\u500B\u8F49\u63DB\u6B65\u9A5F.
+transcodingsettings.nosourceformat = \u8ACB\u6307\u5B9A\u8F49\u63DB\u7684\u4F86\u6E90\u683C\u5F0F\u3002
-transcodingsettings.info = <p class="detail">(%s = \u6A94\u6848\u5C07\u88AB\u8F49\u63DB, %b = \u64A5\u653E\u5668\u7684\u6700\u5927\u50B3\u8F38\u7387)</p> \
+transcodingsettings.notargetformat = \u8ACB\u6307\u5B9A\u8F49\u63DB\u7684\u76EE\u7684\u683C\u5F0F\u3002
-  <p>\u8F49\u6A94\u904E\u7A0B\u662F\u7531\u4E00\u500B\u97F3\u6A02\u683C\u5F0F\u7BA1\u63DB\u6210\u53E6\u4E00\u7A2E\u683C\u5F0F. {1}\u7684\u8F49\u6A94 \
+transcodingsettings.nostep1 = \u8ACB\u81F3\u5C11\u6307\u5B9A\u4E00\u500B\u8F49\u63DB\u6B65\u9A5F\u3002
-  \u5F15\u64CE\u5C07\u975E\u4E32\u6D41\u683C\u5F0F\u8F49\u63DB\u6210\u4E32\u6D41. \u76F4\u63A5\u8F49\u6A94\u4E26\u4E14\u4E0D\u9700\u8981\u78C1\u789F\u904B\u4F5C<p/> \
+transcodingsettings.info = <p class="detail">(%s = \u6A94\u6848\u5C07\u88AB\u8F49\u63DB\uFF0C%b = \u64A5\u653E\u5668\u7684\u6700\u5927\u50B3\u8F38\u7387\uFF0C%t = \u6A19\u984C\uFF0C%a = \u6B4C\u624B\uFF0C%l = \u5C08\u8F2F)</p> \
-  <p>\u5BE6\u969B\u7684\u5C08\u63DB\u6771\u505A\u901A\u5E38\u662F\u900F\u904E\u7B2C\u4E09\u65B9\u8EDF\u9AD4\u4EE5\u547D\u4EE4\u5217\u65B9\u5F0F\u8F49\u63DB\uFF0C\u7A0B\u5F0F\u5B89\u88DD\u5728 {0}. </p>\
+  <p>\u8F49\u6A94\u904E\u7A0B\u662F\u7531\u4E00\u500B\u97F3\u6A02\u683C\u5F0F\u8F49\u63DB\u6210\u53E6\u4E00\u7A2E\u683C\u5F0F\u3002{1}\u7684\u8F49\u6A94 \
-  <p>\u800CWindows\u7CFB\u7D71\u7684\u8F49\u63DB\u7A0B\u5F0F\u53EF\u4EE5\u5728<a target="_blank" href="http://libresonic.org/pages/transcoding.jsp"><b>\u9019\u88E1\u627E\u5230</b></a>. \
+  \u5F15\u64CE\u5C07\u975E\u4E32\u6D41\u683C\u5F0F\u8F49\u63DB\u6210\u4E32\u6D41\u3002\u76F4\u63A5\u8F49\u6A94\u4E26\u4E14\u4E0D\u9700\u8981\u78C1\u789F\u904B\u4F5C<p/> \
+  <p>\u5BE6\u969B\u7684\u8F49\u63DB\u52D5\u4F5C\u901A\u5E38\u662F\u900F\u904E\u7B2C\u4E09\u65B9\u8EDF\u9AD4\u4EE5\u547D\u4EE4\u5217\u65B9\u5F0F\u8F49\u63DB\uFF0C\u7A0B\u5F0F\u5B89\u88DD\u5728 {0}\u3002</p>\
+  <p>\u800CWindows\u7CFB\u7D71\u7684\u8F49\u63DB\u7A0B\u5F0F\u53EF\u4EE5\u5728<a target="_blank" href="http://libresonic.org/pages/transcoding.jsp"><b>\u9019\u88E1\u627E\u5230</b></a>\u3002 \
    \u60A8\u4E5F\u80FD\u4EE5\u81EA\u5B9A\u7684\u8F49\u63DB\uFF0C\u53EA\u8981\u6EFF\u8DB3\u4E0B\u9762\u8981\u6C42\uFF1A\
   <ul> \
-  <li>\u5FC5\u9808\u4EE5\u4E00\u500B\u547D\u4EE4\u884C\u6307\u4EE4\u754C\u9762.</li> \
+  <li>\u5FC5\u9808\u6709\u547D\u4EE4\u5217\u754C\u9762\u3002</li> \
-  <li>\u5FC5\u9808\u80FD\u5920\u5C07\u8F38\u51FA\u767C\u9001\u5230\u6A19\u6E96\u8F38\u51FA(Stdout).</li> \
+  <li>\u5FC5\u9808\u80FD\u5920\u5C07\u7D50\u679C\u9001\u5230\u6A19\u6E96\u8F38\u51FA(Stdout)\u3002</li> \
-  <li>\u5982\u679C\u4F7F\u7528\u6B65\u9A5F2\u62163\uFF0C\u5B83\u5FC5\u9808\u80FD\u5920\u5F9E\u6A19\u6E96\u8F38\u5165(Stdin)\u8B80\u53D6.</li> \
+  <li>\u5982\u679C\u5728\u6B65\u9A5F2\u4F7F\u7528\uFF0C\u5B83\u5FC5\u9808\u80FD\u5920\u5F9E\u6A19\u6E96\u8F38\u5165(Stdin)\u8B80\u53D6\u3002</li> \
   </ul> \
   </p> \
   <p> \u8ACB\u6CE8\u610F\uFF0C\u8F49\u63DB\u7684\u7A0B\u5E8F\u7684\u7531\u64A5\u653E\u5668\u8A2D\u5B9A\u4E2D\u52FE\u9078\u3002\u5982\u679C"\u9810\u8A2D"\u662F\u5DF2\u52FE\u9078\u7684\uFF0C\u90A3\u9EBC\u8F49\u63DB\u6703\u81EA\u52D5\u5728\u65B0\u64AD\u653E\u5668\u4E2D\u4F7F\u7528\u3002</p>
@@ -363,28 +473,22 @@ podcastsettings.interval.weekly = \u6BCF\u9031
 podcastsettings.folder = \u5132\u5B58\u64AD\u5BA2\u5728
 
 # playerSettings.jsp
-playersettings.noplayers = \u6C92\u6709\u64A5\u653E\u5668.
+playersettings.noplayers = \u6C92\u6709\u64A5\u653E\u5668\u3002
 playersettings.type = \u5F62\u614B
 playersettings.lastseen = \u4E0A\u6B21\u767B\u5165
 playersettings.title = \u9078\u64C7\u64A5\u653E\u5668
-
 playersettings.technology.web.title = \u7DB2\u9801\u64AD\u653E
 playersettings.technology.external.title = \u76F4\u63A5\u7528\u5916\u90E8\u64AD\u653E\u5668\u64AD\u653E
-playersettings.technology.external_with_playlist.title = \u4EE5\u9EDE\u64AD\u6E05\u55AE\u5728\u5916\u90E8\u64A5\u653E\u5668\u64AD\u653E
+playersettings.technology.external_with_playlist.title = \u4EE5\u64AD\u653E\u6E05\u55AE\u5728\u5916\u90E8\u64A5\u653E\u5668\u64AD\u653E
 playersettings.technology.jukebox.title = \u9EDE\u64AD\u6A5F\u6A21\u5F0F
 playersettings.technology.web.text = \u76F4\u63A5\u5728\u7DB2\u9801\u4E2D\u7684Flash\u64AD\u653E\u5668\u64AD\u653E.
 playersettings.technology.external.text = \u5728\u60A8\u5E38\u7528\u7684\u64A5\u653E\u5668\u4E2D\u64AD\u653E\uFF0C\u4F8B\u5982:WinAmp\u3001Windows Media Player\u3001iTunes.
-playersettings.technology.external_with_playlist.text = \u5982\u540C\u4E0A\u9762\u7684\u9078\u9805\uFF0C\u4F46\u662F\u9EDE\u64AD\u6E05\u55AE\u7531\u5BA2\u6236\u7AEF\u7BA1\u7406\uFF0C\u800C\u4E0D\u662F\u4F3A\u670D\u5668<br>\
+playersettings.technology.external_with_playlist.text = \u5982\u540C\u4E0A\u9762\u7684\u9078\u9805\uFF0C\u4F46\u662F\u64AD\u653E\u6E05\u55AE\u7531\u5BA2\u6236\u7AEF\u7BA1\u7406\uFF0C\u800C\u4E0D\u662F \
-							\u56E0\u6B64\u53EF\u80FD\u7684\u60C5\u6CC1\u4E0B\u53EF\u4EE5\u76F4\u63A5\u8DF3\u807D\u4E0B\u4E00\u9996\u6B4C\u66F2\u3002
+  \u4F3A\u670D\u5668<br>\uFF0C\u56E0\u6B64\u53EF\u4EE5\u8DF3\u8457\u64AD\u653E\u3002
-playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Libresonic\u4F3A\u670D\u5668\u4E2D\u64AD\u653E. (\u9650\u5DF2\u6388\u6B0A\u7684\u7528\u6236).
+playersettings.technology.jukebox.text = \u76F4\u63A5\u5728Libresonic\u4F3A\u670D\u5668\u4E2D\u64AD\u653E\u3002(\u9650\u5DF2\u6388\u6B0A\u7684\u7528\u6236\u3002)
 playersettings.name = \u64A5\u653E\u5668\u540D\u7A31
-playersettings.coverartsize = \u5C08\u8F2F\u5C01\u9762\u5927\u5C0F
 playersettings.maxbitrate = \u6700\u5927\u50B3\u8F38\u7387
-playersettings.coverart.off = \u4E0D\u986F\u793A
+playersettings.notranscoder = <em>\u6CE8\u610F:</em> \u8F49\u78BC\u5F15\u64CE\u5C1A\u672A\u5B89\u88DD\u3002<br>\u9EDE\u9078\u3010\u8AAA\u660E\u3011\u7372\u5F97\u66F4\u591A\u8CC7\u8A0A\u3002
-playersettings.coverart.small = \u5C0F
-playersettings.coverart.medium = \u4E2D
-playersettings.coverart.large = \u5927
-playersettings.notranscoder = <em>\u6CE8\u610F:</em> ffmpeg \u5C1A\u672A\u5B89\u88DD.<br>\u9EDE\u64CA\u3010\u5354\u52A9\u3011.
 playersettings.autocontrol = \u81EA\u52D5\u64AD\u653E
 playersettings.dynamicip = \u64A5\u653E\u5668\u4F7F\u7528\u52D5\u614BIP\u4F4D\u5740
 playersettings.transcodings = \u555F\u52D5\u7684\u8F49\u78BC\u7A0B\u5F0F
@@ -392,6 +496,36 @@ playersettings.ok = \u5132\u5B58
 playersettings.forget = \u522A\u9664\u64A5\u653E\u5668
 playersettings.clone = \u8907\u88FD\u64A5\u653E\u5668
 
+dlnasettings.enabled = Enable DLNA server
+dlnasettings.description = Use this option to turn on the DLNA/UPnP Media Server in Libresonic, \
+                           and stream your media to compatible DLNA players.
+dlnasettings.servername = Media Server name
+dlnasettings.servername.description = The name of the Media Server as it will appear in DLNA players.
+
+sonossettings.enabled = Enable Sonos music service
+sonossettings.description = Use this option to turn on the Sonos music service in Libresonic, \
+                           and stream your media to Sonos devices on your local network. Remember to add Libresonic \
+                           as a music service from your Sonos controller. Visit \
+                           <a href="http://sonos.libresonic.org" target="_blank">sonos.libresonic.org</a> for more info. \
+                           For trouble-shooting, please see the <a href="help.view">log</a>.
+sonossettings.servicename = Music service name
+sonossettings.servicename.description = The name of the music service as it will appear in the Sonos controller.
+
+# shareSettings.jsp
+sharesettings.name = Name
+sharesettings.owner = Shared by
+sharesettings.description = Description
+sharesettings.visits = Visits
+sharesettings.lastvisited = Last visited
+sharesettings.expires = Expires
+sharesettings.files = Shared files
+sharesettings.expirein = Expire in
+sharesettings.expirein.week = 1w
+sharesettings.expirein.month = 1m
+sharesettings.expirein.year = 1y
+sharesettings.expirein.never = never
+sharesettings.deleteexpired = Delete all expired
+
 # userSettings.jsp
 usersettings.title = \u9078\u64C7\u4F7F\u7528\u8005
 usersettings.newuser = \u65B0\u4F7F\u7528\u8005
@@ -401,39 +535,37 @@ usersettings.stream = \u53EF\u4EE5\u64AD\u653E\u6A94\u6848
 usersettings.jukebox = \u53EF\u4EE5\u7528\u9EDE\u64A5\u6A5F\u6A21\u5F0F
 usersettings.download = \u53EF\u4EE5\u4E0B\u8F09\u6A94\u6848
 usersettings.upload = \u53EF\u4EE5\u4E0A\u50B3\u6A94\u6848
+usersettings.share = User is allowed to share files with anyone
 usersettings.coverart = \u53EF\u4EE5\u66F4\u63DB\u5C08\u8F2F\u5C01\u9762\u53CA\u6A19\u7C64
 usersettings.comment= \u53EF\u4EE5\u5EFA\u7ACB\u6216\u7DE8\u8F2F\u8A55\u8AD6\u53CA\u8A55\u5206
 usersettings.podcast= \u53EF\u4EE5\u7BA1\u7406\u64AD\u5BA2
+usersettings.folderaccess = Allow access to these media folders
 usersettings.username = \u4F7F\u7528\u8005
+usersettings.email = Email
 usersettings.changepassword = \u8B8A\u66F4\u5BC6\u78BC
 usersettings.password = \u5BC6\u78BC
 usersettings.newpassword = \u65B0\u5BC6\u78BC
 usersettings.confirmpassword = \u518D\u6B21\u78BA\u8A8D\u5BC6\u78BC
 usersettings.delete = \u522A\u9664\u4F7F\u7528\u8005
 usersettings.ldap = \u5728LDAP\u9A57\u8B49\u7528\u6236
-usersettings.nousername = \u7F3A\u5C11\u4F7F\u7528\u8005\u540D\u7A31.
+usersettings.nousername = \u7F3A\u5C11\u4F7F\u7528\u8005\u540D\u7A31\u3002
-usersettings.useralreadyexists = \u4F7F\u7528\u8005\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528\u4E86\uFF01.
+usersettings.noemail= Invalid email address.
-usersettings.nopassword = \u5FC5\u9808\u8A2D\u5B9A\u5BC6\u78BC.
+usersettings.useralreadyexists = \u5E33\u865F\u540D\u7A31\u5DF2\u7D93\u88AB\u4F7F\u7528\u4E86\u3002
-usersettings.wrongpassword = \u5169\u6B21\u8F38\u5165\u5BC6\u78BC\u4E0D\u540C.
+usersettings.nopassword = \u5FC5\u9808\u8A2D\u5B9A\u5BC6\u78BC\u3002
-usersettings.ldapdisabled = LDAP\u9A57\u8B49\u6C92\u6709\u555F\u52D5. \u8ACB\u5148\u5230\u9032\u968E\u8A2D\u5B9A.
+usersettings.wrongpassword = \u5169\u6B21\u8F38\u5165\u5BC6\u78BC\u4E0D\u540C\u3002
-usersettings.passwordnotsupportedforldap = \u7121\u6CD5\u8A2D\u5B9A\u6216\u8B8A\u66F4LDAP\u9A57\u8B49\u7528\u6236\u7684\u5BC6\u78BC.
+usersettings.ldapdisabled = LDAP\u9A57\u8B49\u6C92\u6709\u555F\u52D5\u3002\u8ACB\u5230\u9032\u968E\u8A2D\u5B9A\u3002
-usersettings.ok = \u4F7F\u7528\u8005 {0}\u7684\u5BC6\u78BC\u5DF2\u7D93\u8B8A\u66F4.
+usersettings.passwordnotsupportedforldap = \u7121\u6CD5\u8A2D\u5B9A\u6216\u8B8A\u66F4 LDAP \u9A57\u8B49\u7528\u6236\u7684\u5BC6\u78BC\u3002
-
+usersettings.ok = \u4F7F\u7528\u8005 {0} \u7684\u5BC6\u78BC\u5DF2\u7D93\u8B8A\u66F4\u3002
-# musicFolderSettings.jsp
-musicfoldersettings.interval.never = \u5F9E\u4E0D
-musicfoldersettings.interval.one = \u6BCF\u5929
-musicfoldersettings.interval.many = \u6BCF\u9694 {0} \u5929
-musicfoldersettings.hour = \u5728 {0}:00
 
 # main.jsp
 main.up = \u4E0A\u4E00\u9801
 main.playall = \u5168\u90E8\u64AD\u653E
 main.playrandom = \u96A8\u8208\u64AD\u653E
-main.addall = \u5168\u90E8\u52A0\u5230\u9EDE\u64AD\u6E05\u55AE\u4E2D
+main.addall = \u5168\u90E8\u52A0\u5230\u64AD\u653E\u6E05\u55AE\u4E2D
 main.downloadall = \u5168\u90E8\u4E0B\u8F09
 main.tags = \u7DE8\u8F2F\u6A19\u7C64
-main.playcount = \u9EDE\u64AD {0} \u6B21.
+main.playcount = \u64AD\u653E {0} \u6B21\u3002
-main.lastplayed =\u4E0A\u6B21\u9EDE\u64AD\u5728 {0}.
+main.lastplayed =\u4E0A\u6B21\u64AD\u653E\u5728 {0} \u3002
 main.comment = \u8A55\u8AD6
 main.wiki = <table class="detail">\
             <tr><td style="padding-right:1em">__text__</td><td>Bold text           </td><td style="padding-left:3em;padding-right:1em">\\\\                     </td><td>Line break</td></tr>\
@@ -441,12 +573,29 @@ main.wiki = <table class="detail">\
             <tr><td style="padding-right:1em">* text  </td><td>List item           </td><td style="padding-left:3em;padding-right:1em">http://foo.com/          </td><td>Link</td></tr>\
             <tr><td style="padding-right:1em">1. text </td><td>Enumerated list item</td><td style="padding-left:3em;padding-right:1em">{link:Foo|http://foo.com}</td><td>Named link</td></tr>\
             </table>
+main.sharealbum = Share
+main.more = More actions...
+main.more.selection = Selected songs...
+main.more.share = Share
+main.premium = <a href="{0}" style="text-decoration:underline">Get Subsonic Premium</a><br>(and remove this ad)
 main.nowplaying =\u76EE\u524D\u64A5\u653E
 main.lyrics = \u6B4C\u8A5E
 main.minutesago = \u5206\u9418\u524D
 main.chat = \u4EA4\u8AC7
+main.scanning = Scanning files:
 main.message = \u5BEB\u5728\u9019\u88E1
 main.clearchat = \u6E05\u9664
+main.addtoplaylist.title = Add to playlist
+main.addtoplaylist.text = Add selected songs to this playlist:
+main.addnext = Play next
+main.addlast = Play last
+main.addnext.toast = Song will be played next
+main.addlast.toast = Song will be played last
+main.similarartists = Similar artists
+main.startradio = Start radio
+main.playtopsongs = Play top songs
+main.showall = Show all albums
+main.topsongs = Top songs
 
 # rating.jsp
 rating.rating = \u7B49\u7D1A
@@ -457,17 +606,18 @@ coverart.change = \u8B8A\u66F4
 coverart.zoom = \u653E\u5927
 
 # allmusic.jsp
-allmusic.text = \u5728 allmusic.com \u641C\u5C0B\u5C08\u8F2F <em>{0}</em> - \u8ACB\u7A0D\u5019.
+allmusic.text = \u5728 allmusic.com \u641C\u5C0B\u5C08\u8F2F <em>{0}</em> - \u8ACB\u7A0D\u5019\u3002
 
 # changeCoverArt.jsp
 changecoverart.title = \u8B8A\u66F4\u5C08\u8F2F\u5C01\u9762
 changecoverart.address = \u6216\u662F\u8F38\u5165\u5716\u5F62\u7684\u4F4D\u5740
 changecoverart.artist = \u6B4C\u624B
 changecoverart.album = \u5C08\u8F2F
-changecoverart.wait = \u8ACB\u7A0D\u5019...
+changecoverart.search = Google Image Search
-changecoverart.success = \u5716\u5F62\u4E0B\u8F09\u6210\u529F.
+changecoverart.wait = \u8ACB\u7A0D\u5019\u2026
-changecoverart.error = \u7121\u6CD5\u4E0B\u8F09\u5716\u5F62.
+changecoverart.success = \u5716\u7247\u4E0B\u8F09\u6210\u529F\u3002
-changecoverart.noimagesfound = \u627E\u4E0D\u5230\u5716\u5F62\u6A94.
+changecoverart.error = \u7121\u6CD5\u4E0B\u8F09\u5716\u7247\u3002
+changecoverart.noimagesfound = \u627E\u4E0D\u5230\u5716\u7247\u3002
 
 # changeCoverArtConfirm.jsp
 changeCoverArtConfirm.failed = \u7121\u6CD5\u4FEE\u6539\u5C08\u8F2F\u5C01\u9762:<br><b>"{0}"</b>
@@ -492,8 +642,48 @@ edittags.updated = Updated
 edittags.skipped = \u7565\u904E
 edittags.error = \u932F\u8AA4
 
+# share.jsp
+share.title = Share
+share.warning = <h2>IMPORTANT NOTICE!</h2><p>Play fair &ndash; Don't share copyrighted material in any manner that violates the law.</p>
+share.facebook = Share on Facebook
+share.twitter = Share on Twitter
+share.googleplus = Share on Google+
+share.link = Or share this with someone by sending them this link: <a href="{0}" target="_blank">{0}</a>
+share.disabled = To share your music with someone you must first register your own <em>libresonic.org</em> address.<br> \
+                 Please go to <a href="networkSettings.view"><b>Settings &gt; Network</b></a> (administrative rights required).
+share.manage = Manage my shared media
+
+# premium.jsp
+premium.title = Subsonic Premium
+premium.invalidlicense = Invalid license key.
+premium.text = <p>Upgrade to <a href="http://premium.libresonic.org/" target="_blank">Subsonic Premium</a> to enjoy these extra features:</p> \
+                    <ul> \
+                    <li><a href="http://libresonic.org/pages/apps.jsp" target="_blank">Apps</a> for Android, iPhone, Windows Phone, Mac, Chrome and more*.</li> \
+                    <li>Video streaming.</li> \
+                    <li>Stream to your Chromecast and Sonos devices.</li> \
+                    <li>Podcast receiver.</li> \
+                    <li>Your personal server address: <em>yourname</em>.libresonic.org (see <a href="networkSettings.view">Settings &gt; Network</a>).</li> \
+                    <li>Play your media on compatible DLNA/UPnP devices.</li> \
+                    <li>Share your media on Facebook, Twitter, Google+.</li> \
+                    <li>No ads in the web interface.</li> \
+                    <li>Other features to be released later.</li> \
+                    </ul> \
+                    <p style="font-size:10px;">* Some apps must be purchased separately.</p>
+premium.getpremium = Get Subsonic Premium
+premium.licensed = You have a valid Subsonic Premium license!
+premium.licensedexpires = Your Subsonic Premium license is valid until {0}
+premium.licensedexpired = Your Subsonic Premium license expired {0}
+premium.licensedto = The license is registered to {0}.
+premium.forcechange = Register a different license key
+premium.register = When upgrading to Subsonic Premium you receive a license key by email. Please register it below.
+premium.resend = Lost the license key? <a href="http://libresonic.org/backend/requestLicense.view" target="_blank">Send it again</a>.
+premium.register.email = Email
+premium.register.license = License&nbsp;key
+
 # podcastReceiver.jsp
 podcastreceiver.title = \u64AD\u5BA2\u63A5\u6536\u5668
+podcastreceiver.empty = You haven't subscribed to any podcasts yet.
+podcastreceiver.episodes = {0} episodes
 podcastreceiver.expandall = \u986F\u793A\u6536\u85CF\u96C6
 podcastreceiver.collapseall = \u96B1\u85CF\u6536\u85CF\u96C6
 podcastreceiver.status.new = \u65B0\u7684
@@ -509,78 +699,86 @@ podcastreceiver.check = \u6838\u5C0D\u65B0\u7684\u6536\u85CF\u96C6
 podcastreceiver.refresh = \u5237\u65B0\u672C\u9801
 podcastreceiver.settings = \u64AD\u5BA2\u8A2D\u5B9A
 podcastreceiver.subscribe = \u8A02\u95B1\u64AD\u5BA2
+podcastreceiver.newestepisodes = Newest episodes
 
 # lyrics.jsp
 lyrics.title = \u6B4C\u8A5E
 lyrics.artist = \u6B4C\u624B
 lyrics.song = \u6B4C\u66F2
 lyrics.search = \u641C\u5C0B
-lyrics.wait = \u641C\u5C0B\u6B4C\u8A5E\u4E2D, \u8ACB\u7A0D\u5019...
+lyrics.wait = \u641C\u5C0B\u6B4C\u8A5E\u4E2D\uFF0C\u8ACB\u7A0D\u5019\u2026
 lyrics.courtesy = (\u6B4C\u8A5E\u7531<a href="http://www.chartlyrics.com/" target="_blank">chartlyrics.com</a>\u63D0\u4F9B)
-lyrics.nolyricsfound = \u627E\u4E0D\u5230\u6B4C\u8A5E.
+lyrics.nolyricsfound = \u627E\u4E0D\u5230\u6B4C\u8A5E\u3002
+lyrics.trylater = Sorry, the lyrics search engine allows just one search every 20 seconds. Try again later.
 
 # helpPopup.jsp
 helppopup.title = {0} \u5354\u52A9
-helppopup.cover.title = \u5C08\u8F2F\u5C01\u9762\u5927\u5C0F
-helppopup.cover.text = <p>\u7531\u60A8\u6307\u5B9A\u986F\u793A\u5C08\u8F2F\u5C01\u9762\u7684\u5927\u5C0F\uFF0C\u4E5F\u53EF\u4EE5\u5B8C\u5168\u95DC\u9589.</p>
 helppopup.transcode.title = \u6700\u5927\u50B3\u8F38\u7387
-helppopup.transcode.text = <p>\u5982\u679C\u60A8\u7684\u64AD\u653E\u983B\u5BEC\u6709\u9650\uFF0C\u53EF\u4EE5\u904E\u8A2D\u5B9A\u6700\u5927\u50B3\u8F38\u7387\u4F86\u6539\u5584. \
+helppopup.transcode.text = <p>\u5982\u679C\u60A8\u7684\u64AD\u653E\u983B\u5BEC\u6709\u9650\uFF0C\u53EF\u4EE5\u904E\u8A2D\u5B9A\u6700\u5927\u50B3\u8F38\u7387\u4F86\u6539\u5584\u3002 \
-                           \u4F8B\u5982,\u5982\u679Cmp3\u539F\u672C\u7684\u58D3\u7E2E\u6BD4\u4F8B\u70BA256Kbps(kilobits per second), \u5982\u679C\u8A2D\u5B9A\u6700\u5927\u50B3\u8F38\u7387\u70BA128\
+                           \u4F8B\u5982\uFF0C\u5982\u679C\u60A8\u539F\u672C\u7684 mp3 \u6A94\u6848\u7684\u7DE8\u78BC\u7387\u70BA 256Kbps(\u6BCF\u79D2\u5343\u4F4D\u5143)\uFF0C\u5982\u679C\u8A2D\u5B9A\u6700\u5927\u50B3\u8F38\u7387\u70BA128\
-                           \u6703\u4F7F{0}\u81EA\u52D5\u5C07\u539F\u672C 256Kbps\u7684\u97F3\u6A02\u8ABF\u964D\u6210 128 Kbps.</p>
+                           \u6703\u4F7F {0} \u81EA\u52D5\u5C07\u539F\u672C 256Kbps \u7684\u97F3\u6A02\u7DE8\u78BC\u70BA\u6210 128 Kbps\u3002</p>
-helppopup.playlistfolder.title = \u9EDE\u64AD\u6E05\u55AE\u8CC7\u6599\u593E
+helppopup.playlistfolder.title = \u64AD\u653E\u6E05\u55AE\u8CC7\u6599\u593E
-helppopup.playlistfolder.text = <p>\u5B58\u653E\u9EDE\u64AD\u6E05\u55AE\u7684\u8CC7\u6599\u593E.</p>
+helppopup.playlistfolder.text = <p>\u5B58\u653E\u64AD\u653E\u6E05\u55AE\u7684\u8CC7\u6599\u593E\u3002</p>
 helppopup.musicmask.title = \u97F3\u6A02\u7684\u9644\u5C6C\u6A94\u540D
 helppopup.musicmask.text = <p>\u6307\u5B9A\u97F3\u6A02\u6A94\u6848\u7684\u9644\u5C6C\u6A94\u540D</p>
 helppopup.videomask.title = \u8996\u8A0A\u6A94\u7684\u9644\u5C6C\u6A94\u540D
 helppopup.videomask.text = <p>\u6307\u5B9A\u8996\u8A0A\u6A94\u6848\u7684\u8CA0\u6578\u6A94\u540D</p>
 helppopup.coverartmask.title = \u5C08\u8F2F\u5C01\u9762\u9644\u5C6C\u6A94\u540D
-helppopup.coverartmask.text = <p>\u8207\u97F3\u6A02\u593E\u653E\u5728\u4E00\u8D77\u7684\u5C08\u8F2F\u5C01\u9762\uFF0C\u5148\u6307\u5B9A\u5C08\u8F2F\u5C01\u9762\u6A94\u6848\u7684\u9644\u5C6C\u6A94\u540D.</p>
+helppopup.coverartmask.text = <p>\u8207\u97F3\u6A02\u8CC7\u6599\u593E\u653E\u5728\u4E00\u8D77\u7684\u5C08\u8F2F\u5C01\u9762\uFF0C\u5148\u6307\u5B9A\u5C08\u8F2F\u5C01\u9762\u6A94\u6848\u7684\u9644\u5C6C\u6A94\u540D\u3002</p>
 helppopup.downsamplecommand.title = \u964D\u983B\u6307\u4EE4
-helppopup.downsamplecommand.text = <p>\u8B93\u60A8\u8A2D\u5B9A\u8ABF\u964D\u64AD\u653E\u97F3\u6A02\u6642\u964D\u4F4E\u53D6\u6A23\u983B\u7387\u7684\u6307\u4EE4.</p>\
+helppopup.downsamplecommand.text = <p>\u8B93\u60A8\u8A2D\u5B9A\u8ABF\u964D\u64AD\u653E\u97F3\u6A02\u6642\u964D\u4F4E\u53D6\u6A23\u983B\u7387\u7684\u6307\u4EE4\u3002</p>\
-                                   <p>(%s = \u8981\u964D\u983B\u7684\u6A94\u6848, %b = \u64A5\u653E\u5668\u7684\u6700\u5927\u50B3\u8F38\u7387)</p>
+                                   <p>(%s = \u8981\u964D\u983B\u7684\u6A94\u6848\uFF0C%b = \u64A5\u653E\u5668\u7684\u6700\u5927\u50B3\u8F38\u7387\uFF0C%t = \u6A19\u984C\uFF0C%a = \u6B4C\u624B\uFF0C%l = \u5C08\u8F2F)</p>
+helppopup.hlscommand.title = HTTP Live Streaming command
+helppopup.hlscommand.text = <p>The command used to create video segments for Apple''s HLS (HTTP Live Streaming) protocol.</p>
 helppopup.index.title = \u5206\u985E\u6AA2\u7D22
-helppopup.index.text = <p>\u8A2D\u5B9A\u97F3\u6A02\u6AA2\u7D22\u7684\u65B9\u5F0F\uFF0C\uFF08\u5C31\u5982\u540C\u73FE\u5728\u5728\u87A2\u5E55\u5DE6\u4E0A\u65B9\u7684\u5206\u985E\uFF09. \u5728\u97F3\u6A02\u593E\u88E1\u7684\u6A94\u6848\u5F88\u5BB9\u6613\u5206\u985E\u6AA2\u7D22</p> \
+helppopup.index.text = <p>\u8A2D\u5B9A\u97F3\u6A02\u7D22\u5F15(\u5728\u87A2\u5E55\u5DE6\u65B9)\u6B78\u985E\u7684\u65B9\u5F0F\u3002\u5728\u97F3\u6A02\u8CC7\u6599\u593E\u88E1\u7684 \
-                       <p>\u901A\u5E38\u4EE5\u7A7A\u767D\u4F86\u5206\u9694\u6AA2\u7D22\u9805\u76EE. \u4E00\u822C\u4F86\u8AAA\uFF0C\u4E00\u500B\u5B57\u6BCD\uFF08\u570B\u5B57\uFF09\u70BA\u4E00\u500B\u9805\u76EE, \
+                       \u6A94\u6848\u5F88\u5BB9\u6613\u900F\u904E\u7D22\u5F15\u5B58\u53D6\u3002</p> \
-                       \u4F46\u4E5F\u53EF\u4EE5\u591A\u500B\u5B57\u6BCD\uFF08\u570B\u5B57\uFF09\u653E\u5728\u540C\u4E00\u5206\u985E\u9805\u76EE\u4E2D. \u4F8B\u5982\uFF1A\u3105(\u5305\u9B91),\u53EF\u4EE5\u5C07 <em>\u5305\u9B91</em>\u8996\u70BA\u540C\u4E00\u5206\u985E\
+                       <p>\u5B9A\u7FA9\u65B9\u5F0F\u662F\u4EE5\u7A7A\u767D\u5206\u9694\u7684\u7D22\u5F15\u9805\u76EE\u3002\u4E00\u822C\u4F86\u8AAA\uFF0C\u9805\u76EE\u662F\u55AE\u4E00\u5B57\u6BCD\uFF0C \
-                       <p>\u800C\u7121\u6CD5\u6B78\u985E\u7684\u6A94\u6848\uFF0C\u5C07\u5168\u90E8\u6B78\u65BC "#"\u9805\u76EE\u4E2D.</p>
+                       \u4F46\u60A8\u4E5F\u53EF\u4EE5\u6307\u5B9A\u591A\u500B\u5B57\u6BCD\u3002\u4F8B\u5982\uFF1A\u9805\u76EE The \u6703\u9023\u7D50\u5230\u6240\u6709 \
+                       \u958B\u982D\u70BA "The" \u7684\u8CC7\u6599\u593E\u8207\u6A94\u6848\u3002</p> \
+                       <p>\u60A8\u4E5F\u53EF\u4EE5\u7528\u62EC\u5F27\u4F86\u5305\u542B\u591A\u500B\u7D22\u5F15\u5B57\u5143\u3002\u4F8B\u5982\uFF1A \
+                       <em>A-E(ABCDE)</em> \u6703\u986F\u793A\u70BA <em>A-E</em> \u4E26\u9023\u7D50\u5230\u6240\u6709\u958B\u982D\u70BA \
+                       A\u3001B\u3001C\u3001D\u6216E\u7684\u8CC7\u6599\u593E\u8207\u6A94\u6848\u3002\u9019\u5C0D\u65BC\u6536\u7D0D\u5C11\u898B\u7684\u5B57\u5143(\u50CF\u662FX\u3001Y\u8207Z)\u5F88\u6709\u5E6B\u52A9\uFF0C\u6216 \
+                       \u6B78\u985E\u91CD\u97F3\u5B57\u5143(\u5982A\u3001\u00C0\u8207\u00C1)</p> \
+                       <p>\u7121\u6CD5\u6B78\u985E\u7684\u8CC7\u6599\u593E\u8207\u6A94\u6848\uFF0C\u5C07\u5168\u90E8\u6B78\u65BC "#" \u9805\u76EE\u4E2D\u3002</p>
 helppopup.ignoredarticles.title = \u5FFD\u7565\u5B57\u9996
-helppopup.ignoredarticles.text = <p>\u6709\u4E9B\u5B57\u9996(\u4F8B\u5982"The") \u901A\u5E38\u5728\u66F2\u76EE\u6B78\u985E\u4E2D\u61C9\u8A72\u5FFD\u7565\uFF0C\u8ACB\u5728\u6B64\u8655\u8A2D\u5B9A.</p>
+helppopup.ignoredarticles.text = <p>\u6709\u4E9B\u5B57\u9996(\u4F8B\u5982"The") \u901A\u5E38\u5728\u66F2\u76EE\u6B78\u985E\u4E2D\u61C9\u8A72\u5FFD\u7565\uFF0C\u8ACB\u5728\u6B64\u8655\u8A2D\u5B9A\u3002</p>
 helppopup.shortcuts.title = \u6377\u5F91
-helppopup.shortcuts.text = <p>\u4EE5\u7A7A\u767D\u4F86\u5206\u9694\u5728\u6700\u4E0A\u5C64\u76EE\u9304\u4E2D\u5EFA\u7ACB\u6377\u5F91\u6AA2\u7D22. \u7528\u5F15\u865F\u4F86\u5206\u7D44\u5B57\u5143, \u4F8B\u5982:</p> \
+helppopup.shortcuts.text = <p>\u4EE5\u7A7A\u767D\u4F86\u5206\u9694\u5728\u6700\u4E0A\u5C64\u76EE\u9304\u4E2D\u5EFA\u7ACB\u6377\u5F91\u6AA2\u7D22\u3002\u7528\u5F15\u865F\u4F86\u5206\u7D44\u5B57\u5143\uFF0C\u4F8B\u5982\uFF1A</p> \
                            <p><em>New Incoming "Sound tracks"</em></p>
 helppopup.language.title = Language
-helppopup.language.text = <p>\u5728\u9019\u88E1\u9078\u64C7\u6240\u63D0\u4F9B\u7684\u986F\u793A\u8A9E\u8A00.</p>
+helppopup.language.text = <p>\u5728\u9019\u88E1\u9078\u64C7\u6240\u63D0\u4F9B\u7684\u986F\u793A\u8A9E\u8A00\u3002</p>
 helppopup.visibility.title = \u986F\u793A\u9805\u76EE
-helppopup.visibility.text = <p>\u9078\u64C7\u5728\u700F\u89BD\u6216\u662F\u5728\u9EDE\u64AD\u6E05\u55AE\u4E2D\uFF0C\u986F\u793A\u97F3\u6A02\u7684\u5404\u7A2E\u8A73\u7D30\u8CC7\u8A0A</p>
+helppopup.visibility.text = <p>\u9078\u64C7\u5728\u700F\u89BD\u6216\u662F\u5728\u64AD\u653E\u6E05\u55AE\u4E2D\uFF0C\u986F\u793A\u97F3\u6A02\u7684\u5404\u7A2E\u8A73\u7D30\u8CC7\u8A0A</p>
 helppopup.partymode.title = \u5BB4\u6703\u6A21\u5F0F
 helppopup.partymode.text = <p>\u4F7F\u7528\u5BB4\u6703\u6A21\u5F0F\u7C21\u5316\u4F7F\u7528\u8005\u754C\u9762\uFF0C\u63D0\u4F9B\u7D66\u7121\u7D93\u9A57\u7684\u4F7F\u7528\u8005\u64CD\u4F5C\
-                           \u4E5F\u53EF\u4EE5\u907F\u514D\u56E0\u70BA\u610F\u5916\u64CD\u4F5C\u800C\u5F04\u4E82\u4E86\u9EDE\u64AD\u6E05\u55AE.</p>
+                           \u4E5F\u53EF\u4EE5\u907F\u514D\u56E0\u70BA\u610F\u5916\u64CD\u4F5C\u800C\u5F04\u4E82\u4E86\u64AD\u653E\u6E05\u55AE\u3002</p>
 helppopup.theme.title = \u4F48\u666F\u4E3B\u984C
-helppopup.theme.text = <p>\u8B93\u60A8\u53EF\u4EE5\u9078\u64C7\u4E0D\u540C\u7684\u4F48\u666F\u4E3B\u984C. \u4F48\u666F\u4E3B\u984C\u900F\u904E\u4E0D\u540C\u7684\u984F\u8272\u3001\u5B57\u9AD4\u3001\u5716\u50CF\u7B49\uFF0C\u5E36\u7D66\u60A8\u4E0D\u540C\u7684{0}\u611F\u53D7.</p>
+helppopup.theme.text = <p>\u8B93\u60A8\u53EF\u4EE5\u9078\u64C7\u4E0D\u540C\u7684\u4F48\u666F\u4E3B\u984C\u3002\u4F48\u666F\u4E3B\u984C\u900F\u904E\u4E0D\u540C\u7684\u984F\u8272\u3001\u5B57\u9AD4\u3001\u5716\u50CF\u7B49\uFF0C\u5E36\u7D66\u60A8\u4E0D\u540C\u7684{0}\u611F\u53D7\u3002</p>
 helppopup.welcomemessage.title = \u6B61\u8FCE\u6A19\u984C
-helppopup.welcomemessage.text = <p>\u5728\u9996\u9801\u4E2D\u986F\u793A\u7684\u6A19\u984C.</p>
+helppopup.welcomemessage.text = <p>\u5728\u9996\u9801\u4E2D\u986F\u793A\u7684\u6A19\u984C\u3002</p>
 helppopup.loginmessage.title = \u767B\u5165\u8A0A\u606F
-helppopup.loginmessage.text = <p>\u5728\u767B\u5165\u756B\u9762\u986F\u793A\u7684\u63D0\u793A\u8A0A\u606F.</p>
+helppopup.loginmessage.text = <p>\u5728\u767B\u5165\u756B\u9762\u986F\u793A\u7684\u63D0\u793A\u8A0A\u606F\u3002</p>
 helppopup.coverartlimit.title = \u5C08\u8F2F\u5C01\u9762\u9650\u5236
-helppopup.coverartlimit.text = <p>\u5728\u4E00\u9801\u756B\u9762\u4E2D\u986F\u793A\u5C08\u8F2F\u5C01\u9762\u7684\u6700\u5927\u6578\u91CF.</p>
+helppopup.coverartlimit.text = <p>\u5728\u4E00\u9801\u756B\u9762\u4E2D\u986F\u793A\u5C08\u8F2F\u5C01\u9762\u7684\u6700\u5927\u6578\u91CF\u3002</p>
 helppopup.downloadlimit.title = \u4E0B\u8F09\u9650\u5236
-helppopup.downloadlimit.text = <p>\u4E0B\u8F09\u6A94\u6848\u6642\u7684\u983B\u5BEC\u9650\u5236.</p>
+helppopup.downloadlimit.text = <p>\u4E0B\u8F09\u6A94\u6848\u6642\u7684\u983B\u5BEC\u9650\u5236\u3002</p>
 helppopup.uploadlimit.title = \u4E0A\u50B3\u9650\u5236
-helppopup.uploadlimit.text = <p>\u4E0A\u50B3\u6A94\u6848\u6642\u7684\u983B\u5BEC\u9650\u5236.</p>
+helppopup.uploadlimit.text = <p>\u4E0A\u50B3\u6A94\u6848\u6642\u7684\u983B\u5BEC\u9650\u5236\u3002</p>
-helppopup.streamport.title = \u975E-SSL \u4E32\u6D41 Port
+helppopup.streamport.title = \u975ESSL \u4E32\u6D41 Port
-helppopup.streamport.text = <p>\u672C\u9078\u9805\u53EA\u662F\u7528\u65BC\u5728\u4F3A\u670D\u5668\u4E0A\u7684 {0} \u4F7F\u7528 SSL (HTTPS)\u50B3\u8F38\u5354\u5B9A.</p><p>\u6709\u4E9B\u64AD\u653E\u5668 \
+helppopup.streamport.text = <p>\u672C\u9078\u9805\u53EA\u662F\u7528\u65BC\u5728\u4F3A\u670D\u5668\u4E0A\u7684 {0} \u4F7F\u7528 SSL (HTTPS)\u50B3\u8F38\u5354\u5B9A\u3002</p><p>\u6709\u4E9B\u64AD\u653E\u5668 \
-                            (\u4F8B\u5982 Winamp) \u4E26\u672A\u652F\u63F4\u7D93\u7531SSL\u7684\u4E32\u6D41\u5354\u5B9A. \u5982\u679C\u60A8\u4E0D\u7D93\u7531SSL\u50B3\u9001\u4E32\u6D41\uFF0C\u8ACB\u6307\u5B9A\u901A\u8A0APORT(\u901A\u5E38\u662F80\u62164040)\
+                            (\u4F8B\u5982 Winamp) \u4E0D\u652F\u63F4\u7D93\u7531SSL\u7684\u4E32\u6D41\u5354\u5B9A\u3002\u5982\u679C\u60A8\u4E0D\u7D93\u7531SSL\u50B3\u9001\u4E32\u6D41\uFF0C\u8ACB\u6307\u5B9A\u901A\u8A0APORT(\u901A\u5E38\u662F80\u62164040)\
-                             \u8ACB\u6CE8\u610F\uFF0C\u4E32\u6D41\u97F3\u6A02\u4E26\u4E0D\u6703\u88AB\u52A0\u5BC6.</p>
+                             \u8ACB\u6CE8\u610F\uFF0C\u4E32\u6D41\u97F3\u6A02\u4E26\u4E0D\u6703\u88AB\u52A0\u5BC6\u3002</p>
 helppopup.ldap.title = LDAP \u9A57\u8B49
-helppopup.ldap.text = <p>\u4F7F\u7528\u8005\u53EF\u4EE5\u7D93\u7531\u5916\u90E8\u7684LDAP\u4F3A\u670D\u5668\u9A57\u8B49 (\u5305\u62ECWindows Active Directory). \
+helppopup.ldap.text = <p>\u4F7F\u7528\u8005\u53EF\u4EE5\u7D93\u7531\u5916\u90E8\u7684LDAP\u4F3A\u670D\u5668\u9A57\u8B49 (\u5305\u62ECWindows Active Directory)\u3002\
-                      \u7576\u8A2D\u5B9A\u4F7F\u7528LDAP\u4F7F\u7528\u8005\u767B\u5165 {0}, \u5E33\u865F\u53CA\u5BC6\u78BC\u5C31\u7531\u5916\u90E8\u4F3A\u670D\u5668\u9A57\u8B49, \u800C\u4E0D\u662F\u7531{0}\u4F86\u9A57\u8B49.</p>
+                      \u7576\u8A2D\u5B9A\u4F7F\u7528LDAP\u4F7F\u7528\u8005\u767B\u5165 {0}\uFF0C\u5E33\u865F\u53CA\u5BC6\u78BC\u5C31\u7531\u5916\u90E8\u4F3A\u670D\u5668\u9A57\u8B49\uFF0C\u800C\u4E0D\u662F\u7531{0}\u4F86\u9A57\u8B49\u3002</p>
 helppopup.ldapurl.title = LDAP \u4F4D\u5740
-helppopup.ldapurl.text = <p>\u8A2D\u5B9A LDAP \u4F3A\u670D\u5668\u7684\u4F4D\u5740. \u5354\u5B9A\u61C9\u8A72\u662F <em>ldap://</em> \u6216 <em>ldaps://</em> \
+helppopup.ldapurl.text = <p>\u8A2D\u5B9A LDAP \u4F3A\u670D\u5668\u7684\u4F4D\u5740\u3002\u5354\u5B9A\u61C9\u8A72\u662F <em>ldap://</em> \u6216 <em>ldaps://</em> \
-                         (\u7D93\u7531SSL\u7684LDAP\u5354\u5B9A). \u8ACB\u53C3\u8003<a href="http://java.sun.com/products/jndi/tutorial/ldap/misc/url.html" target="_blank">\u9019\u88E1</a> \
+                         (\u7D93\u7531SSL\u7684LDAP\u5354\u5B9A)\u3002\u8ACB\u53C3\u8003<a href="http://java.sun.com/products/jndi/tutorial/ldap/misc/url.html" target="_blank">\u9019\u88E1</a> \
-                         \u6709\u66F4\u591A\u8A73\u7D30\u8AAA\u660E.</p>
+                         \u6709\u66F4\u591A\u8A73\u7D30\u8AAA\u660E\u3002</p>
 helppopup.ldapsearchfilter.title = LDAP \u641C\u5C0B\u904E\u6FFE
 helppopup.ldapsearchfilter.text = <p>\u8490\u5C0BLDAP\u7528\u6236\u6642\uFF0C\u5728\u9019\u88E1\u8A2D\u5B9A\u904E\u6FFE\u8868\u793A\u5F0F \
-                                  (\u5B9A\u7FA9\u5728<a href="http://www.ietf.org/rfc/rfc2254.txt" target="_blank">RFC 2254</a>). \
+                                  (\u5B9A\u7FA9\u5728<a href="http://www.ietf.org/rfc/rfc2254.txt" target="_blank">RFC 2254</a>)\u3002 \
                                   The pattern "'{0'}" is replaced by the username, \u4F8B\u5982: \
                                   <ul>\
                                     <li>(uid='{0'}) - this would search for a username match on the uid attribute.</li> \
@@ -588,22 +786,22 @@ helppopup.ldapsearchfilter.text = <p>\u8490\u5C0BLDAP\u7528\u6236\u6642\uFF0C\u5
                                   </ul></p>
 helppopup.ldapmanagerdn.title = LDAP \u7BA1\u7406\u8005 DN
 helppopup.ldapmanagerdn.text = <p>\u5982\u679C LDAP \u4F3A\u670D\u5668\u4E0D\u652F\u63F4\u533F\u540D\u4F7F\u7528\u8005\u9023\u7DDA\uFF0C\u60A8\u5FC5\u9808\u6307\u5B9A DN \
-                                  (<em>Distinguished Name</em>)\u53CALDAP\u4F7F\u7528\u8005\u7684\u5BC6\u78BC.</p>
+                                  (<em>Distinguished Name</em>)\u53CALDAP\u4F7F\u7528\u8005\u7684\u5BC6\u78BC\u3002</p>
 helppopup.ldapautoshadowing.title = \u5728 {0} \u81EA\u52D5\u5EFA\u7ACB LDAP \u5E33\u865F
-helppopup.ldapautoshadowing.text = <p>\u8A2D\u5B9A\u9019\u500B\u9078\u9805, \u5247LDAP \u7528\u6236\u4E0D\u5FC5\u5728\u767B\u5165\u4E4B\u524D\u624B\u52D5\u5EFA\u7ACB{0}\u7684\u5E33\u865F. </p> \
+helppopup.ldapautoshadowing.text = <p>\u8A2D\u5B9A\u9019\u500B\u9078\u9805\uFF0C\u5247LDAP \u7528\u6236\u4E0D\u5FC5\u5728\u767B\u5165\u4E4B\u524D\u624B\u52D5\u5EFA\u7ACB{0}\u7684\u5E33\u865F\u3002</p> \
-                                   <p>\u6CE8\u610F! \u9019\u610F\u5473\u6240\u6709\u5728LDAP\u4E0A\u7684\u4F7F\u7528\u8005\u90FD\u53EF\u4EE5\u767B\u5165\u60A8\u7684{0}, \
+                                   <p>\u6CE8\u610F\uFF01 \u9019\u8868\u793A\u6240\u6709\u5728LDAP\u4E0A\u7684\u4F7F\u7528\u8005\u90FD\u53EF\u4EE5\u767B\u5165\u60A8\u7684{0}\uFF0C\
-                                   \u4E5F\u8A31\u9019\u4E0D\u662F\u60A8\u60F3\u8981\u7684\u529F\u80FD.</p>
+                                   \u4E5F\u8A31\u9019\u4E0D\u662F\u60A8\u60F3\u8981\u7684\u529F\u80FD\u3002</p>
 helppopup.playername.title = \u64A5\u653E\u5668\u540D\u7A31
-helppopup.playername.text = <p>\u8B93\u4F60\u5E6B\u64AD\u653E\u5668\u6307\u5B9A\u4E00\u500B\u5BB9\u6613\u8A18\u4F4F\u7684\u540D\u5B57\uFF0C\u5982\u201C\u5DE5\u4F5C\u5BA4\u201D\u6216\u201C\u5BA2\u5EF3\u201D</p>
+helppopup.playername.text = <p>\u8B93\u60A8\u5E6B\u64AD\u653E\u5668\u6307\u5B9A\u4E00\u500B\u5BB9\u6613\u8A18\u4F4F\u7684\u540D\u5B57\uFF0C\u5982\u201C\u5DE5\u4F5C\u5BA4\u201D\u6216\u201C\u5BA2\u5EF3\u201D</p>
 helppopup.autocontrol.title = \u63A7\u5236\u64AD\u653E\u5668\u81EA\u52D5\u64AD\u653E
-helppopup.autocontrol.text = <p>\u8A2D\u5B9A\u9019\u500B\u9078\u9805, {0} \u5728\u60A8\u958B\u59CB\u64AD\u653E\u6642\uFF0C\u6703\u81EA\u52D5\u555F\u52D5\u64AD\u653E\u5668\
+helppopup.autocontrol.text = <p>\u8A2D\u5B9A\u9019\u500B\u9078\u9805\uFF0C {0} \u5728\u60A8\u958B\u59CB\u64AD\u653E\u6642\uFF0C\u6703\u81EA\u52D5\u555F\u52D5\u64AD\u653E\u5668\
-                             \u5426\u5247\u60A8\u5FC5\u9808\u81EA\u5DF1\u555F\u52D5\u4E26\u4E14\u9023\u63A5\u60A8\u7684\u64A5\u653E\u5668.</p>
+                             \u5426\u5247\u60A8\u5FC5\u9808\u81EA\u5DF1\u555F\u52D5\u4E26\u4E14\u9023\u63A5\u60A8\u7684\u64A5\u653E\u5668\u3002</p>
 helppopup.dynamicip.title = \u52D5\u614B IP \u4F4D\u5740
-helppopup.dynamicip.text = <p>\u95DC\u9589\u6B64\u9078\u9805\uFF0C\u5982\u679C\u60A8\u4F7F\u7528\u975C\u614BIP\u4F4D\u5740.</p>
+helppopup.dynamicip.text = <p>\u95DC\u9589\u6B64\u9078\u9805\uFF0C\u5982\u679C\u60A8\u4F7F\u7528\u975C\u614BIP\u4F4D\u5740\u3002</p>
 
 # wap/index.jsp
 wap.index.missing = \u627E\u4E0D\u5230\u97F3\u6A02
-wap.index.playlist = \u9EDE\u64AD\u6E05\u55AE
+wap.index.playlist = \u64AD\u653E\u6E05\u55AE
 wap.index.search = \u641C\u5C0B
 wap.index.settings = \u8A2D\u5B9A
 
@@ -616,7 +814,7 @@ wap.browse.downloadone = \u4E0B\u8F09\u6B4C\u66F2
 wap.browse.downloadall = \u5168\u90E8\u4E0B\u8F09
 
 # wap/playlist.jsp
-wap.playlist.title =\u9EDE\u64AD\u6E05\u55AE
+wap.playlist.title = \u64AD\u653E\u6E05\u55AE
 wap.playlist.noplayer = \u9023\u63A5\u4E0D\u5230\u64AD\u653E\u5668
 wap.playlist.clear = \u6E05\u9664
 wap.playlist.load = \u8F09\u5165
@@ -627,7 +825,7 @@ wap.playlist.play = \u5728\u96FB\u8A71\u4E2D\u64AD\u9001
 wap.search.title = \u641C\u5C0B
 
 # wap/searchResult.jsp
-wap.searchresult.index = \u6B63\u5728\u5EFA\u7ACB\u641C\u5C0B\u7D22\u5F15\u3002\u8ACB\u7A0D\u5F8C\u518D\u8A66.
+wap.searchresult.index = \u6B63\u5728\u5EFA\u7ACB\u641C\u5C0B\u7D22\u5F15\u3002\u8ACB\u7A0D\u5F8C\u518D\u8A66\u3002
 
 # wap/settings.jsp
 wap.settings.selectplayer = \u9078\u64C7\u64AD\u653E\u5668