use Perl instead of Java as a base language for JS files; rebase translations

2 files changed, 318 insertions, 393 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 08c89e81d..0e541987d 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index b5953689e..3465a27c2 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: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 12:07+0400\n"
+"POT-Creation-Date: 2014-09-06 15:10+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Hao Wu\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -165,26 +165,17 @@ msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 #: classes/pref/filters.php:704
 #: classes/pref/feeds.php:1367
 #: js/feedlist.js:126
-#: js/feedlist.js:450
-#: js/functions.js:446
-#: js/functions.js:784
 #: js/functions.js:1218
 #: js/functions.js:1352
 #: js/functions.js:1664
 #: js/prefs.js:653
 #: js/prefs.js:854
-#: js/prefs.js:1441
-#: js/prefs.js:1494
-#: js/prefs.js:1534
-#: js/prefs.js:1551
-#: js/prefs.js:1567
-#: js/prefs.js:1587
 #: js/prefs.js:1760
 #: js/prefs.js:1776
 #: js/prefs.js:1794
-#: js/tt-rss.js:514
-#: js/tt-rss.js:531
-#: js/viewfeed.js:859
+#: js/tt-rss.js:55
+#: js/tt-rss.js:515
+#: js/viewfeed.js:741
 #: js/viewfeed.js:1316
 #: plugins/import_export/import_export.js:17
 #: plugins/updater/updater.js:17
@@ -390,8 +381,8 @@ msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:129
-#: include/functions.php:1263
-#: include/functions.php:1927
+#: include/functions.php:1264
+#: include/functions.php:1916
 #: classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
@@ -483,10 +474,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
 
 #: include/digest.php:109
-#: include/functions.php:1272
-#: include/functions.php:1828
-#: include/functions.php:1913
-#: include/functions.php:1935
+#: include/functions.php:1273
+#: include/functions.php:1817
+#: include/functions.php:1902
+#: include/functions.php:1924
 #: classes/opml.php:421
 #: classes/pref/feeds.php:226
 msgid "Uncategorized"
@@ -585,7 +576,6 @@ msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
 #: include/functions2.php:67
-#: js/viewfeed.js:2039
 msgid "Mark below as read"
 msgstr "将下面文章标为已读"
 
@@ -725,7 +715,7 @@ msgid "Go to"
 msgstr "跳转至……"
 
 #: include/functions2.php:97
-#: include/functions.php:1986
+#: include/functions.php:1975
 msgid "All articles"
 msgstr "全部文章"
 
@@ -734,8 +724,7 @@ msgid "Fresh"
 msgstr "最新的"
 
 #: include/functions2.php:101
-#: js/tt-rss.js:460
-#: js/tt-rss.js:642
+#: js/tt-rss.js:461
 msgid "Tag cloud"
 msgstr "标签云"
 
@@ -770,14 +759,14 @@ msgid "Search results: %s"
 msgstr "搜索结果：%s"
 
 #: include/functions2.php:1263
-#: classes/feeds.php:708
+#: classes/feeds.php:714
 #, fuzzy
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论些什么？"
 
 #: include/functions2.php:1267
-#: classes/feeds.php:712
+#: classes/feeds.php:718
 #, fuzzy
 msgid "comments"
 msgstr "评论些什么？"
@@ -793,17 +782,17 @@ msgid "no tags"
 msgstr "无标签"
 
 #: include/functions2.php:1351
-#: classes/feeds.php:694
+#: classes/feeds.php:700
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
 #: include/functions2.php:1383
-#: classes/feeds.php:646
+#: classes/feeds.php:652
 msgid "Originally from:"
 msgstr "来源："
 
 #: include/functions2.php:1396
-#: classes/feeds.php:659
+#: classes/feeds.php:665
 #: classes/pref/feeds.php:569
 msgid "Feed URL"
 msgstr "信息源 URL"
@@ -844,40 +833,35 @@ msgstr "未知类型"
 msgid "Attachments"
 msgstr "附件："
 
-#: include/functions2.php:2394
-#, php-format
-msgid "LibXML error %s at line %d (column %d): %s"
-msgstr ""
-
-#: include/functions.php:1261
-#: include/functions.php:1925
+#: include/functions.php:1262
+#: include/functions.php:1914
 msgid "Special"
 msgstr "特殊区域"
 
-#: include/functions.php:1776
-#: classes/feeds.php:1118
+#: include/functions.php:1765
+#: classes/feeds.php:1124
 #: classes/pref/filters.php:169
 #: classes/pref/filters.php:447
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1980
+#: include/functions.php:1969
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1982
+#: include/functions.php:1971
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1984
+#: include/functions.php:1973
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1988
+#: include/functions.php:1977
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1990
+#: include/functions.php:1979
 msgid "Recently read"
 msgstr "最近的阅读"
 
@@ -974,9 +958,9 @@ msgstr "保存"
 #: classes/article.php:205
 #: classes/handler/public.php:503
 #: classes/handler/public.php:537
-#: classes/feeds.php:1047
-#: classes/feeds.php:1097
-#: classes/feeds.php:1157
+#: classes/feeds.php:1053
+#: classes/feeds.php:1103
+#: classes/feeds.php:1163
 #: classes/pref/users.php:170
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:428
@@ -1294,7 +1278,7 @@ msgid "Feed:"
 msgstr "信息源："
 
 #: classes/feeds.php:201
-#: classes/feeds.php:843
+#: classes/feeds.php:849
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
@@ -1303,83 +1287,83 @@ msgstr "找不到信息源。"
 msgid "Never"
 msgstr "从不清理"
 
-#: classes/feeds.php:375
+#: classes/feeds.php:381
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "导入"
 
-#: classes/feeds.php:434
-#: classes/feeds.php:529
+#: classes/feeds.php:440
+#: classes/feeds.php:535
 #, fuzzy
 msgid "mark feed as read"
 msgstr "标记信息源为已读"
 
-#: classes/feeds.php:586
+#: classes/feeds.php:592
 #, fuzzy
 msgid "Collapse article"
 msgstr "折叠文章"
 
-#: classes/feeds.php:746
+#: classes/feeds.php:752
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:749
+#: classes/feeds.php:755
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:752
+#: classes/feeds.php:758
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:756
+#: classes/feeds.php:762
 #, fuzzy
 msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
 msgstr "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方动作菜单）。"
 
-#: classes/feeds.php:758
+#: classes/feeds.php:764
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:773
-#: classes/feeds.php:938
+#: classes/feeds.php:779
+#: classes/feeds.php:944
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:783
-#: classes/feeds.php:948
+#: classes/feeds.php:789
+#: classes/feeds.php:954
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:928
+#: classes/feeds.php:934
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: classes/feeds.php:985
-#: classes/feeds.php:993
+#: classes/feeds.php:991
+#: classes/feeds.php:999
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/feeds.php:999
+#: classes/feeds.php:1005
 #: classes/pref/feeds.php:590
 #: classes/pref/feeds.php:801
 #: classes/pref/feeds.php:1781
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: classes/feeds.php:1007
+#: classes/feeds.php:1013
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:1019
+#: classes/feeds.php:1025
 #: classes/pref/users.php:133
 #: classes/pref/feeds.php:620
 #: classes/pref/feeds.php:837
 msgid "Authentication"
 msgstr "登录认证"
 
-#: classes/feeds.php:1023
+#: classes/feeds.php:1029
 #: classes/pref/users.php:397
 #: classes/pref/feeds.php:626
 #: classes/pref/feeds.php:841
@@ -1387,7 +1371,7 @@ msgstr "登录认证"
 msgid "Login"
 msgstr "登陆"
 
-#: classes/feeds.php:1026
+#: classes/feeds.php:1032
 #: classes/pref/prefs.php:261
 #: classes/pref/feeds.php:639
 #: classes/pref/feeds.php:847
@@ -1395,22 +1379,22 @@ msgstr "登陆"
 msgid "Password"
 msgstr "密码"
 
-#: classes/feeds.php:1036
+#: classes/feeds.php:1042
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/feeds.php:1041
-#: classes/feeds.php:1095
+#: classes/feeds.php:1047
+#: classes/feeds.php:1101
 #: classes/pref/feeds.php:1816
 msgid "Subscribe"
 msgstr "订阅"
 
-#: classes/feeds.php:1044
+#: classes/feeds.php:1050
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1067
-#: classes/feeds.php:1156
+#: classes/feeds.php:1073
+#: classes/feeds.php:1162
 #: classes/pref/users.php:324
 #: classes/pref/filters.php:665
 #: classes/pref/feeds.php:1298
@@ -1418,19 +1402,19 @@ msgstr "更多信息源"
 msgid "Search"
 msgstr "搜索"
 
-#: classes/feeds.php:1071
+#: classes/feeds.php:1077
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/feeds.php:1072
+#: classes/feeds.php:1078
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1075
+#: classes/feeds.php:1081
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1096
+#: classes/feeds.php:1102
 #: classes/pref/users.php:350
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:418
@@ -1440,19 +1424,19 @@ msgstr "限制："
 msgid "Remove"
 msgstr "移除"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1113
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1115
+#: classes/feeds.php:1121
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: classes/feeds.php:1131
+#: classes/feeds.php:1137
 msgid "This feed"
 msgstr "本信息源"
 
-#: classes/feeds.php:1152
+#: classes/feeds.php:1158
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜索语法"
@@ -1806,7 +1790,6 @@ msgid "Save rule"
 msgstr "保存规则"
 
 #: classes/pref/filters.php:905
-#: js/functions.js:1022
 msgid "Add rule"
 msgstr "添加规则"
 
@@ -2037,7 +2020,6 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "仅加载几个最常用的 HTML 标签"
 
 #: classes/pref/prefs.php:54
-#: js/prefs.js:1687
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2915,30 +2897,18 @@ msgstr "准备更新。"
 msgid "Start update"
 msgstr "开始更新"
 
-#: js/feedlist.js:406
-#: js/feedlist.js:434
-msgid "Mark all articles in %s as read?"
-msgstr "将 %s 中的全部文章标记为已读？"
-
-#: js/feedlist.js:425
-#, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
-msgstr "将 %s 中的一天前的全部文章标记为已读？"
-
-#: js/feedlist.js:428
-#, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
-msgstr "将 %s 中的一周前的全部文章标记为已读？"
-
-#: js/feedlist.js:431
-#, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
-msgstr "将 %s 中的两周前的全部文章标记为已读？"
-
 #: js/functions.js:62
 msgid "The error will be reported to the configured log destination."
 msgstr "error会保存在配置的目标日志中"
 
+#: js/functions.js:90
+msgid "Report to tt-rss.org"
+msgstr ""
+
+#: js/functions.js:93
+msgid "Close"
+msgstr ""
+
 #: js/functions.js:104
 #, fuzzy
 msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
@@ -2949,92 +2919,6 @@ msgstr "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览
 msgid "Click to close"
 msgstr "点击暂停"
 
-#: js/functions.js:612
-msgid "Error explained"
-msgstr "Error释义 "
-
-#: js/functions.js:694
-msgid "Upload complete."
-msgstr "上传完成。"
-
-#: js/functions.js:718
-msgid "Remove stored feed icon?"
-msgstr "移除已保存的信息源图标？"
-
-#: js/functions.js:723
-#, fuzzy
-msgid "Removing feed icon..."
-msgstr "移除已保存的信息源图标？"
-
-#: js/functions.js:728
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "找不到信息源。"
-
-#: js/functions.js:750
-msgid "Please select an image file to upload."
-msgstr "请选择图片文件上传。"
-
-#: js/functions.js:752
-msgid "Upload new icon for this feed?"
-msgstr "为本信息源上传一个新的图标？"
-
-#: js/functions.js:753
-#, fuzzy
-msgid "Uploading, please wait..."
-msgstr "读取中，请稍候……"
-
-#: js/functions.js:769
-msgid "Please enter label caption:"
-msgstr "请填写预定义标签的说明："
-
-#: js/functions.js:774
-msgid "Can't create label: missing caption."
-msgstr "创建标签失败：没有标题。"
-
-#: js/functions.js:817
-msgid "Subscribe to Feed"
-msgstr "订阅信息源"
-
-#: js/functions.js:836
-msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
-msgstr "解析输出失败。 这可能由于服务器超时或网络问题。 服务器的输出已经被记录在浏览器console控制台中。"
-
-#: js/functions.js:851
-msgid "Subscribed to %s"
-msgstr "已订阅至 %s"
-
-#: js/functions.js:856
-msgid "Specified URL seems to be invalid."
-msgstr "指定的 URL 无效。"
-
-#: js/functions.js:859
-msgid "Specified URL doesn't seem to contain any feeds."
-msgstr "指定的 URL 没有包含任何信息源。"
-
-#: js/functions.js:871
-#, fuzzy
-msgid "Expand to select feed"
-msgstr "编辑选定的信息源"
-
-#: js/functions.js:883
-#, fuzzy
-msgid "Couldn't download the specified URL: %s"
-msgstr "无法下载指定的 URL 。"
-
-#: js/functions.js:887
-msgid "XML validation failed: %s"
-msgstr "XML验证失败："
-
-#: js/functions.js:892
-msgid "You are already subscribed to this feed."
-msgstr "您已经订阅过这个信息源啦。"
-
-#: js/functions.js:1022
-#, fuzzy
-msgid "Edit rule"
-msgstr "编辑过滤器"
-
 #: js/functions.js:1048
 #, fuzzy
 msgid "Edit action"
@@ -3054,7 +2938,8 @@ msgid "Subscription reset."
 msgstr "订阅信息源"
 
 #: js/functions.js:1236
-#: js/tt-rss.js:677
+#: js/tt-rss.js:678
+#, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
@@ -3071,32 +2956,9 @@ msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
 #: js/functions.js:1381
-#: js/prefs.js:1218
 msgid "Trying to change address..."
 msgstr "尝试更改地址..."
 
-#: js/functions.js:1568
-#: js/tt-rss.js:425
-#: js/tt-rss.js:658
-msgid "You can't edit this kind of feed."
-msgstr "您无法编辑这种类型的信息源。"
-
-#: js/functions.js:1583
-msgid "Edit Feed"
-msgstr "编辑信息源"
-
-#: js/functions.js:1589
-#: js/prefs.js:99
-#: js/prefs.js:211
-#: js/prefs.js:736
-#, fuzzy
-msgid "Saving data..."
-msgstr "保存信息"
-
-#: js/functions.js:1621
-msgid "More Feeds"
-msgstr "更多信息源"
-
 #: js/functions.js:1682
 #: js/functions.js:1792
 #: js/prefs.js:414
@@ -3104,8 +2966,6 @@ msgstr "更多信息源"
 #: js/prefs.js:476
 #: js/prefs.js:629
 #: js/prefs.js:649
-#: js/prefs.js:1194
-#: js/prefs.js:1339
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
@@ -3118,20 +2978,14 @@ msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
 #: js/functions.js:1774
-#: js/prefs.js:1176
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
 #: js/functions.js:1777
-#: js/prefs.js:1179
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "移除选中的信息源？"
 
-#: js/functions.js:1875
-msgid "Help"
-msgstr "帮助"
-
 #: js/PrefFeedTree.js:48
 #, fuzzy
 msgid "Edit category"
@@ -3163,6 +3017,15 @@ msgstr "创建过滤器"
 msgid "User Editor"
 msgstr "编辑用户信息"
 
+#: js/prefs.js:99
+#: js/prefs.js:211
+#: js/prefs.js:736
+#: plugins/instances/instances.js:26
+#: plugins/instances/instances.js:89
+#, fuzzy
+msgid "Saving data..."
+msgstr "保存信息"
+
 #: js/prefs.js:134
 msgid "Edit Filter"
 msgstr "编辑过滤器"
@@ -3187,7 +3050,6 @@ msgid "Removing selected labels..."
 msgstr "移除选中的预定义标签？"
 
 #: js/prefs.js:312
-#: js/prefs.js:1380
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
@@ -3313,123 +3175,6 @@ msgstr "读取中，请稍候……"
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1083
-msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
-
-#: js/prefs.js:1089
-#, fuzzy
-msgid "Removing category..."
-msgstr "创建类别"
-
-#: js/prefs.js:1110
-msgid "Remove selected categories?"
-msgstr "移除选中的类别？"
-
-#: js/prefs.js:1113
-#, fuzzy
-msgid "Removing selected categories..."
-msgstr "移除选定的类别"
-
-#: js/prefs.js:1126
-msgid "No categories are selected."
-msgstr "没有选中任何类别。"
-
-#: js/prefs.js:1134
-#, fuzzy
-msgid "Category title:"
-msgstr "类别"
-
-#: js/prefs.js:1138
-#, fuzzy
-msgid "Creating category..."
-msgstr "创建过滤器"
-
-#: js/prefs.js:1165
-msgid "Feeds without recent updates"
-msgstr "最近没更新的信息源"
-
-#: js/prefs.js:1214
-msgid "Replace current OPML publishing address with a new one?"
-msgstr "将当前的 OPML 发布地址更改替换为新地址？"
-
-#: js/prefs.js:1303
-#, fuzzy
-msgid "Clearing feed..."
-msgstr "清空信息源数据"
-
-#: js/prefs.js:1323
-msgid "Rescore articles in selected feeds?"
-msgstr "为选中信息源中的文章重置评分？"
-
-#: js/prefs.js:1326
-#, fuzzy
-msgid "Rescoring selected feeds..."
-msgstr "为选中信息源中的文章重置评分？"
-
-#: js/prefs.js:1346
-msgid "Rescore all articles? This operation may take a lot of time."
-msgstr "重置所有文章的评分？这可能将花费很长时间。"
-
-#: js/prefs.js:1349
-#, fuzzy
-msgid "Rescoring feeds..."
-msgstr "为信息源重新评分"
-
-#: js/prefs.js:1366
-msgid "Reset selected labels to default colors?"
-msgstr "将选中的可选标签重置为默认颜色？"
-
-#: js/prefs.js:1403
-msgid "Settings Profiles"
-msgstr "偏好文件的设置"
-
-#: js/prefs.js:1412
-msgid "Remove selected profiles? Active and default profiles will not be removed."
-msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
-
-#: js/prefs.js:1415
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "移除选中的偏好文件"
-
-#: js/prefs.js:1430
-msgid "No profiles are selected."
-msgstr "未选择偏好文件。"
-
-#: js/prefs.js:1438
-#: js/prefs.js:1491
-msgid "Activate selected profile?"
-msgstr "启用选中的偏好文件？"
-
-#: js/prefs.js:1454
-#: js/prefs.js:1507
-msgid "Please choose a profile to activate."
-msgstr "请选择希望启用的偏好文件。"
-
-#: js/prefs.js:1459
-#, fuzzy
-msgid "Creating profile..."
-msgstr "创建偏好文件"
-
-#: js/prefs.js:1515
-msgid "This will invalidate all previously generated feed URLs. Continue?"
-msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
-
-#: js/prefs.js:1518
-#: plugins/share/share_prefs.js:6
-msgid "Clearing URLs..."
-msgstr "清理 URLs..."
-
-#: js/prefs.js:1525
-#, fuzzy
-msgid "Generated URLs cleared."
-msgstr "生成一个新的 URL"
-
-#: js/prefs.js:1616
-msgid "Label Editor"
-msgstr "编辑预定义标签"
-
 #: js/prefs.js:1738
 msgid "Subscribing to feeds..."
 msgstr "订阅至信息源.."
@@ -3451,58 +3196,44 @@ msgstr "将所有文章标记为已读？"
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:385
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:496
+#: js/tt-rss.js:426
+#: js/tt-rss.js:659
+msgid "You can't edit this kind of feed."
+msgstr "您无法编辑这种类型的信息源。"
+
+#: js/tt-rss.js:497
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:645
-msgid "Select item(s) by tags"
-msgstr "通过自定义标签选择"
-
-#: js/tt-rss.js:666
+#: js/tt-rss.js:667
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/tt-rss.js:671
-#: js/tt-rss.js:824
+#: js/tt-rss.js:672
+#: js/tt-rss.js:825
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:819
+#: js/tt-rss.js:820
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:829
+#: js/tt-rss.js:830
+#, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:832
+#: js/tt-rss.js:833
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "为文章重新评分"
 
-#: js/tt-rss.js:973
-msgid "New version available!"
-msgstr "有可用的新版本啦！"
-
-#: js/viewfeed.js:113
-#: js/viewfeed.js:184
-#: js/viewfeed.js:1326
-#, fuzzy
-msgid "Click to open next unread feed."
-msgstr "点击以编辑信息源"
-
-#: js/viewfeed.js:117
-#, fuzzy
-msgid "Cancel search"
-msgstr "取消"
-
 #: js/viewfeed.js:476
 msgid "Unstar article"
 msgstr "取消星标"
@@ -3520,16 +3251,13 @@ msgid "Publish article"
 msgstr "发布文章"
 
 #: js/viewfeed.js:690
-#, fuzzy
+#, fuzzy, perl-format
 msgid "%d article selected"
 msgid_plural "%d articles selected"
 msgstr[0] "未选中任何文章。"
 
 #: js/viewfeed.js:762
 #: js/viewfeed.js:790
-#: js/viewfeed.js:817
-#: js/viewfeed.js:882
-#: js/viewfeed.js:916
 #: js/viewfeed.js:1038
 #: js/viewfeed.js:1081
 #: js/viewfeed.js:1134
@@ -3540,25 +3268,25 @@ msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
 #: js/viewfeed.js:1046
-#, fuzzy
+#, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "删除 %s 中选择的 %d 篇文章？"
 
 #: js/viewfeed.js:1048
-#, fuzzy
+#, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "删除选中的 %d 篇文章？"
 
 #: js/viewfeed.js:1090
-#, fuzzy
+#, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "将 %s 中的 %d 篇选中的文章存档？"
 
 #: js/viewfeed.js:1093
-#, fuzzy
+#, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "将存档的 %d 篇文章移回原处？"
@@ -3568,7 +3296,7 @@ msgid "Please note that unstarred articles might get purged on next feed update.
 msgstr ""
 
 #: js/viewfeed.js:1140
-#, fuzzy
+#, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "将 %s 中选中的 %d 篇文章标记为已读？"
@@ -3582,29 +3310,15 @@ msgstr "编辑文章的自定义标签"
 msgid "Saving article tags..."
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1438
-msgid "No article is selected."
-msgstr "未选中任何文章。"
-
-#: js/viewfeed.js:1473
-msgid "No articles found to mark"
-msgstr "未找到需要标记的文章"
-
-#: js/viewfeed.js:1475
+#: js/viewfeed.js:1326
 #, fuzzy
-msgid "Mark %d article as read?"
-msgid_plural "Mark %d articles as read?"
-msgstr[0] "将 %d 篇文章标记为已读？"
+msgid "Click to open next unread feed."
+msgstr "点击以编辑信息源"
 
 #: js/viewfeed.js:1984
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1990
-#, fuzzy
-msgid "Display article URL"
-msgstr "显示 URL"
-
 #: js/viewfeed.js:2090
 msgid "Assign label"
 msgstr "添加预定义标签"
@@ -3656,6 +3370,7 @@ msgid "Export Data"
 msgstr "导出数据"
 
 #: plugins/import_export/import_export.js:40
+#, perl-format
 msgid "Finished, exported %d article. You can download the data <a class='visibleLink' href='%u'>here</a>."
 msgid_plural "Finished, exported %d articles. You can download the data <a class='visibleLink' href='%u'>here</a>."
 msgstr[0] ""
@@ -3668,6 +3383,15 @@ msgstr "导入数据"
 msgid "Please choose the file first."
 msgstr "请先选择文件。"
 
+#: plugins/mail/mail.js:36
+msgid "Error sending email:"
+msgstr ""
+
+#: plugins/mail/mail.js:38
+#, fuzzy
+msgid "Your message has been sent."
+msgstr "您的个人数据已保存。"
+
 #: plugins/note/note.js:17
 #, fuzzy
 msgid "Saving article note..."
@@ -3717,6 +3441,10 @@ msgstr "请仅选择一个实例。"
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
+#: plugins/share/share_prefs.js:6
+msgid "Clearing URLs..."
+msgstr "清理 URLs..."
+
 #: plugins/share/share_prefs.js:13
 msgid "Shared URLs cleared."
 msgstr "分享的URL已被清除。"
@@ -3747,6 +3475,203 @@ msgstr "尝试取消分享..."
 msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 msgstr "请先备份你的tt-rss目录。 敲击'yes'来继续下一步。"
 
+#~ msgid "Mark all articles in %s as read?"
+#~ msgstr "将 %s 中的全部文章标记为已读？"
+
+#, fuzzy
+#~ msgid "Mark all articles in %s older than 1 day as read?"
+#~ msgstr "将 %s 中的一天前的全部文章标记为已读？"
+
+#, fuzzy
+#~ msgid "Mark all articles in %s older than 1 week as read?"
+#~ msgstr "将 %s 中的一周前的全部文章标记为已读？"
+
+#, fuzzy
+#~ msgid "Mark all articles in %s older than 2 weeks as read?"
+#~ msgstr "将 %s 中的两周前的全部文章标记为已读？"
+
+#~ msgid "Error explained"
+#~ msgstr "Error释义 "
+
+#~ msgid "Upload complete."
+#~ msgstr "上传完成。"
+
+#~ msgid "Remove stored feed icon?"
+#~ msgstr "移除已保存的信息源图标？"
+
+#, fuzzy
+#~ msgid "Removing feed icon..."
+#~ msgstr "移除已保存的信息源图标？"
+
+#, fuzzy
+#~ msgid "Feed icon removed."
+#~ msgstr "找不到信息源。"
+
+#~ msgid "Please select an image file to upload."
+#~ msgstr "请选择图片文件上传。"
+
+#~ msgid "Upload new icon for this feed?"
+#~ msgstr "为本信息源上传一个新的图标？"
+
+#, fuzzy
+#~ msgid "Uploading, please wait..."
+#~ msgstr "读取中，请稍候……"
+
+#~ msgid "Please enter label caption:"
+#~ msgstr "请填写预定义标签的说明："
+
+#~ msgid "Can't create label: missing caption."
+#~ msgstr "创建标签失败：没有标题。"
+
+#~ msgid "Subscribe to Feed"
+#~ msgstr "订阅信息源"
+
+#~ msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
+#~ msgstr "解析输出失败。 这可能由于服务器超时或网络问题。 服务器的输出已经被记录在浏览器console控制台中。"
+
+#~ msgid "Subscribed to %s"
+#~ msgstr "已订阅至 %s"
+
+#~ msgid "Specified URL seems to be invalid."
+#~ msgstr "指定的 URL 无效。"
+
+#~ msgid "Specified URL doesn't seem to contain any feeds."
+#~ msgstr "指定的 URL 没有包含任何信息源。"
+
+#, fuzzy
+#~ msgid "Expand to select feed"
+#~ msgstr "编辑选定的信息源"
+
+#, fuzzy
+#~ msgid "Couldn't download the specified URL: %s"
+#~ msgstr "无法下载指定的 URL 。"
+
+#~ msgid "XML validation failed: %s"
+#~ msgstr "XML验证失败："
+
+#~ msgid "You are already subscribed to this feed."
+#~ msgstr "您已经订阅过这个信息源啦。"
+
+#, fuzzy
+#~ msgid "Edit rule"
+#~ msgstr "编辑过滤器"
+
+#~ msgid "Edit Feed"
+#~ msgstr "编辑信息源"
+
+#~ msgid "More Feeds"
+#~ msgstr "更多信息源"
+
+#~ msgid "Help"
+#~ msgstr "帮助"
+
+#, fuzzy
+#~ msgid "Removing category..."
+#~ msgstr "创建类别"
+
+#~ msgid "Remove selected categories?"
+#~ msgstr "移除选中的类别？"
+
+#, fuzzy
+#~ msgid "Removing selected categories..."
+#~ msgstr "移除选定的类别"
+
+#~ msgid "No categories are selected."
+#~ msgstr "没有选中任何类别。"
+
+#, fuzzy
+#~ msgid "Category title:"
+#~ msgstr "类别"
+
+#, fuzzy
+#~ msgid "Creating category..."
+#~ msgstr "创建过滤器"
+
+#~ msgid "Feeds without recent updates"
+#~ msgstr "最近没更新的信息源"
+
+#~ msgid "Replace current OPML publishing address with a new one?"
+#~ msgstr "将当前的 OPML 发布地址更改替换为新地址？"
+
+#, fuzzy
+#~ msgid "Clearing feed..."
+#~ msgstr "清空信息源数据"
+
+#~ msgid "Rescore articles in selected feeds?"
+#~ msgstr "为选中信息源中的文章重置评分？"
+
+#, fuzzy
+#~ msgid "Rescoring selected feeds..."
+#~ msgstr "为选中信息源中的文章重置评分？"
+
+#~ msgid "Rescore all articles? This operation may take a lot of time."
+#~ msgstr "重置所有文章的评分？这可能将花费很长时间。"
+
+#, fuzzy
+#~ msgid "Rescoring feeds..."
+#~ msgstr "为信息源重新评分"
+
+#~ msgid "Reset selected labels to default colors?"
+#~ msgstr "将选中的可选标签重置为默认颜色？"
+
+#~ msgid "Settings Profiles"
+#~ msgstr "偏好文件的设置"
+
+#~ msgid "Remove selected profiles? Active and default profiles will not be removed."
+#~ msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
+
+#, fuzzy
+#~ msgid "Removing selected profiles..."
+#~ msgstr "移除选中的偏好文件"
+
+#~ msgid "No profiles are selected."
+#~ msgstr "未选择偏好文件。"
+
+#~ msgid "Activate selected profile?"
+#~ msgstr "启用选中的偏好文件？"
+
+#~ msgid "Please choose a profile to activate."
+#~ msgstr "请选择希望启用的偏好文件。"
+
+#, fuzzy
+#~ msgid "Creating profile..."
+#~ msgstr "创建偏好文件"
+
+#~ msgid "This will invalidate all previously generated feed URLs. Continue?"
+#~ msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
+
+#, fuzzy
+#~ msgid "Generated URLs cleared."
+#~ msgstr "生成一个新的 URL"
+
+#~ msgid "Label Editor"
+#~ msgstr "编辑预定义标签"
+
+#~ msgid "Select item(s) by tags"
+#~ msgstr "通过自定义标签选择"
+
+#~ msgid "New version available!"
+#~ msgstr "有可用的新版本啦！"
+
+#, fuzzy
+#~ msgid "Cancel search"
+#~ msgstr "取消"
+
+#~ msgid "No article is selected."
+#~ msgstr "未选中任何文章。"
+
+#~ msgid "No articles found to mark"
+#~ msgstr "未找到需要标记的文章"
+
+#, fuzzy
+#~ msgid "Mark %d article as read?"
+#~ msgid_plural "Mark %d articles as read?"
+#~ msgstr[0] "将 %d 篇文章标记为已读？"
+
+#, fuzzy
+#~ msgid "Display article URL"
+#~ msgstr "显示 URL"
+
 #~ msgid "From:"
 #~ msgstr "发信人："