update translations; merge new stuff from Transifex

2 files changed, 308 insertions, 426 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 0b9e4fc5c..bb13639c1 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 1893ab50b..212fcdc82 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,10 +8,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-30 16:39+0400\n"
-"PO-Revision-Date: 2011-11-23 00:49+0800\n"
-"Last-Translator: lazycai <[email protected]>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2012-03-12 13:59+0400\n"
+"PO-Revision-Date: 2012-02-14 08:32+0000\n"
+"Last-Translator: Sai <[email protected]>\n"
+"Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"
+"language/zh_CN/)\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -82,7 +83,7 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:112 index.php:163 classes/pref_prefs.php:351
+#: backend.php:112 index.php:163 classes/pref_prefs.php:360
 msgid "Default"
 msgstr "默认"
 
@@ -137,7 +138,7 @@ msgstr "Tiny Tiny RSS 数据库是最新版。"
 #: db-updater.php:94 db-updater.php:161 db-updater.php:174 register.php:194
 #: register.php:239 register.php:252 register.php:267 register.php:286
 #: register.php:371 register.php:381 register.php:393 twitter.php:111
-#: twitter.php:123 classes/pref_feeds.php:1080
+#: twitter.php:123 classes/pref_feeds.php:1087
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
@@ -211,15 +212,15 @@ msgstr ""
 "\t\t\t请检查您的浏览器设置。"
 
 #: digest.php:64 index.php:87 index.php:129 index.php:213 prefs.php:68
-#: classes/backend.php:6 classes/pref_feeds.php:1367
-#: classes/pref_filters.php:602 classes/pref_labels.php:296
-#: js/viewfeed.js:1099 js/viewfeed.js:1276
+#: classes/backend.php:6 classes/pref_feeds.php:1376
+#: classes/pref_filters.php:612 classes/pref_labels.php:296
+#: js/viewfeed.js:1108 js/viewfeed.js:1285
 msgid "Loading, please wait..."
-msgstr "读取中，请稍等……"
+msgstr "读取中，请稍候……"
 
 #: digest.php:72 index.php:97
 msgid "Hello,"
-msgstr "你好，"
+msgstr "您好，"
 
 #: digest.php:75 index.php:107 mobile/mobile-functions.php:69
 #: mobile/mobile-functions.php:244
@@ -288,7 +289,7 @@ msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
 #: index.php:99 prefs.php:90 help/main.php:71 help/prefs.php:8
-#: classes/pref_prefs.php:267
+#: classes/pref_prefs.php:276
 msgid "Preferences"
 msgstr "偏好设置"
 
@@ -306,7 +307,7 @@ msgstr "新闻"
 
 #: index.php:145
 msgid "Collapse feedlist"
-msgstr "收缩信息列表"
+msgstr "收缩侧边栏"
 
 #: index.php:148
 msgid "Show articles"
@@ -344,7 +345,7 @@ msgstr "有更新的"
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:164 classes/pref_filters.php:246
+#: index.php:164 classes/pref_filters.php:256
 msgid "Date"
 msgstr "日期"
 
@@ -356,23 +357,23 @@ msgstr "标题"
 msgid "Score"
 msgstr "评分"
 
-#: index.php:171 classes/pref_feeds.php:341 classes/pref_feeds.php:584
+#: index.php:171 classes/pref_feeds.php:347 classes/pref_feeds.php:590
 msgid "Update"
 msgstr "更新列表"
 
 #: index.php:175 index.php:190 classes/feeds.php:135 classes/feeds.php:150
-#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:125
-#: js/FeedTree.js:151
+#: include/localized_schema.php:10 js/digest.js:626 js/FeedTree.js:128
+#: js/FeedTree.js:154
 msgid "Mark as read"
 msgstr "标记为已读"
 
 #: index.php:181 classes/feeds.php:125
 msgid "Actions..."
-msgstr "动作……"
+msgstr "动作"
 
 #: index.php:183
 msgid "Search..."
-msgstr "搜索……"
+msgstr "搜索"
 
 #: index.php:184
 msgid "Feed actions:"
@@ -380,17 +381,17 @@ msgstr "信息源操作："
 
 #: index.php:185
 msgid "Subscribe to feed..."
-msgstr "订阅信息源……"
+msgstr "订阅信息源"
 
 #: index.php:186
 msgid "Edit this feed..."
-msgstr "编辑信息源……"
+msgstr "编辑信息源"
 
 #: index.php:187
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:188 classes/pref_feeds.php:511 classes/pref_feeds.php:1340
+#: index.php:188 classes/pref_feeds.php:517 classes/pref_feeds.php:1349
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
@@ -408,23 +409,23 @@ msgstr "其他操作："
 
 #: index.php:193
 msgid "Switch to digest..."
-msgstr "切换至摘要……"
+msgstr "切换至摘要模式"
 
 #: index.php:194
 msgid "Show tag cloud..."
-msgstr "显示标签云……"
+msgstr "显示标签云"
 
 #: index.php:195
 msgid "Select by tags..."
-msgstr "通过自定义标签选择……"
+msgstr "通过自定义标签选择"
 
 #: index.php:196
 msgid "Create label..."
-msgstr "创建预定义标签……"
+msgstr "创建预定义标签"
 
 #: index.php:197
 msgid "Create filter..."
-msgstr "创建过滤器……"
+msgstr "创建过滤器"
 
 #: index.php:198
 msgid "Keyboard shortcuts help"
@@ -441,9 +442,9 @@ msgid "Setting preference key %s to %s"
 msgstr "将偏好按键从 %s 设置为 %s"
 
 #: opml.php:112
-#, fuzzy, php-format
+#, php-format
 msgid "Adding label %s"
-msgstr "添加预定义标签"
+msgstr ""
 
 #: opml.php:115
 #, php-format
@@ -451,14 +452,14 @@ msgid "Duplicate label: %s"
 msgstr ""
 
 #: opml.php:169
-#, fuzzy, php-format
+#, php-format
 msgid "Adding filter %s"
-msgstr "移除这个过滤器： %s ？"
+msgstr ""
 
 #: opml.php:185
-#, fuzzy, php-format
+#, php-format
 msgid "Duplicate filter %s"
-msgstr "创建过滤器"
+msgstr ""
 
 #: opml.php:230
 msgid "is already imported."
@@ -482,7 +483,7 @@ msgstr "OPML 工具"
 
 #: opml.php:492
 msgid "Importing OPML..."
-msgstr "导入 OPML ……"
+msgstr "正在导入 OPML ……"
 
 #: opml.php:496
 msgid "Return to preferences"
@@ -497,11 +498,11 @@ msgid "Exit preferences"
 msgstr "退出偏好设置"
 
 #: prefs.php:93 classes/feeds.php:981 classes/pref_feeds.php:43
-#: classes/pref_feeds.php:1249 classes/pref_feeds.php:1312
+#: classes/pref_feeds.php:1256 classes/pref_feeds.php:1319
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:95
+#: prefs.php:96 help/prefs.php:11 classes/pref_filters.php:105
 msgid "Filters"
 msgstr "过滤器"
 
@@ -586,7 +587,7 @@ msgstr "无法连接 Twitter 。请刷新页面或过会儿重试。"
 msgid "Congratulations! You have successfully registered with Twitter."
 msgstr "恭喜！您已经成功通过 Twitter 注册。"
 
-#: twitter.php:118 classes/pref_prefs.php:458
+#: twitter.php:118 classes/pref_prefs.php:467
 msgid "Register"
 msgstr "注册"
 
@@ -666,7 +667,7 @@ msgstr "选择鼠标指向的文章"
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:583
+#: help/main.php:34 help/prefs.php:25 classes/pref_filters.php:593
 msgid "Create filter"
 msgstr "创建过滤器"
 
@@ -706,11 +707,11 @@ msgstr "信息源动作"
 msgid "Refresh active feed"
 msgstr "刷新活动的信息源"
 
-#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1315
+#: help/main.php:55 help/prefs.php:22 classes/pref_feeds.php:1322
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: help/main.php:56 js/FeedTree.js:131
+#: help/main.php:56 js/FeedTree.js:134
 msgid "Edit feed"
 msgstr "编辑信息源"
 
@@ -860,22 +861,21 @@ msgstr "以未读文章数量排列信息源"
 msgid "Article not found."
 msgstr "找不到文章。"
 
-#: classes/backend.php:22
+#: classes/backend.php:32
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
 #: classes/dlg.php:26
-#, fuzzy
 msgid "Prepare data"
-msgstr "保存信息"
+msgstr ""
 
 #: classes/dlg.php:30 classes/dlg.php:72 classes/dlg.php:176
 #: classes/dlg.php:199 classes/dlg.php:236 classes/dlg.php:624
 #: classes/dlg.php:682 classes/dlg.php:781 classes/dlg.php:814
 #: classes/dlg.php:845 classes/dlg.php:876 classes/dlg.php:975
-#: classes/pref_feeds.php:1240 classes/pref_filters.php:453
-#: classes/pref_filters.php:536 classes/pref_users.php:106
-#: classes/share_button.php:47 include/functions.php:3419
+#: classes/pref_feeds.php:1247 classes/pref_filters.php:463
+#: classes/pref_filters.php:546 classes/pref_users.php:106
+#: classes/share_button.php:47 include/functions.php:3449
 msgid "Close this window"
 msgstr "关闭本窗口"
 
@@ -893,7 +893,7 @@ msgstr "创建偏好文件"
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: classes/dlg.php:113 classes/public_handler.php:135 classes/rpc.php:147
+#: classes/dlg.php:113 classes/public_handler.php:139 classes/rpc.php:147
 #: include/login_form.php:151
 msgid "Default profile"
 msgstr "默认偏好设置"
@@ -944,17 +944,17 @@ msgstr ""
 "更新进程在抓取信息更新时花费了太长时间，可能已经崩溃。请检查守护进程或联系管"
 "理员。"
 
-#: classes/dlg.php:248 classes/pref_feeds.php:294 classes/pref_feeds.php:545
+#: classes/dlg.php:248 classes/pref_feeds.php:300 classes/pref_feeds.php:551
 msgid "Feed"
 msgstr "信息源"
 
-#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:313
-#: include/functions.php:3380
+#: classes/dlg.php:252 classes/feeds.php:638 classes/pref_feeds.php:319
+#: include/functions.php:3410
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:333
-#: classes/pref_feeds.php:573
+#: classes/dlg.php:258 classes/dlg.php:989 classes/pref_feeds.php:339
+#: classes/pref_feeds.php:579
 msgid "Place in category:"
 msgstr "加入到类别："
 
@@ -962,18 +962,18 @@ msgstr "加入到类别："
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/dlg.php:278 classes/pref_feeds.php:373 classes/pref_feeds.php:616
+#: classes/dlg.php:278 classes/pref_feeds.php:379 classes/pref_feeds.php:622
 #: classes/pref_users.php:155
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:379
-#: classes/pref_feeds.php:620 classes/pref_users.php:437
+#: classes/dlg.php:282 classes/dlg.php:1003 classes/pref_feeds.php:385
+#: classes/pref_feeds.php:626 classes/pref_users.php:437
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:385
-#: classes/pref_feeds.php:626
+#: classes/dlg.php:285 classes/dlg.php:1006 classes/pref_feeds.php:391
+#: classes/pref_feeds.php:632
 msgid "Password"
 msgstr "密码"
 
@@ -996,14 +996,14 @@ msgstr "更多信息源"
 #: classes/dlg.php:303 classes/dlg.php:352 classes/dlg.php:430
 #: classes/dlg.php:553 classes/dlg.php:714 classes/dlg.php:903
 #: classes/dlg.php:953 classes/dlg.php:1026 classes/mail_button.php:112
-#: classes/note_button.php:35 classes/pref_feeds.php:528
-#: classes/pref_feeds.php:685 classes/pref_filters.php:380
+#: classes/note_button.php:35 classes/pref_feeds.php:534
+#: classes/pref_feeds.php:691 classes/pref_filters.php:390
 #: classes/pref_instances.php:103 classes/pref_labels.php:81
 #: classes/pref_users.php:194
 msgid "Cancel"
 msgstr "取消"
 
-#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1299
+#: classes/dlg.php:322 classes/dlg.php:429 classes/pref_feeds.php:1306
 #: classes/pref_users.php:367 js/tt-rss.js:232
 msgid "Search"
 msgstr "搜索"
@@ -1020,8 +1020,8 @@ msgstr "信息源存档"
 msgid "limit:"
 msgstr "限制："
 
-#: classes/dlg.php:351 classes/pref_feeds.php:501 classes/pref_filters.php:370
-#: classes/pref_filters.php:589 classes/pref_instances.php:149
+#: classes/dlg.php:351 classes/pref_feeds.php:507 classes/pref_filters.php:380
+#: classes/pref_filters.php:599 classes/pref_instances.php:149
 #: classes/pref_labels.php:284 classes/pref_users.php:393
 msgid "Remove"
 msgstr "移除"
@@ -1054,58 +1054,57 @@ msgstr "全部信息源"
 msgid "This feed"
 msgstr "本信息源"
 
-#: classes/dlg.php:452 classes/pref_filters.php:237
+#: classes/dlg.php:452 classes/pref_filters.php:247
 msgid "Match"
 msgstr "匹配"
 
-#: classes/dlg.php:459 classes/pref_filters.php:249
+#: classes/dlg.php:459 classes/pref_filters.php:259
 msgid "before"
 msgstr "之前"
 
-#: classes/dlg.php:460 classes/pref_filters.php:250
+#: classes/dlg.php:460 classes/pref_filters.php:260
 msgid "after"
 msgstr "之后"
 
-#: classes/dlg.php:475 classes/pref_filters.php:263
+#: classes/dlg.php:475 classes/pref_filters.php:273
 msgid "Check it"
 msgstr "检查一下"
 
-#: classes/dlg.php:478 classes/pref_filters.php:266
+#: classes/dlg.php:478 classes/pref_filters.php:276
 msgid "on field"
 msgstr "on field"
 
-#: classes/dlg.php:484 classes/pref_filters.php:272 js/digest.js:239
+#: classes/dlg.php:484 classes/pref_filters.php:282 js/digest.js:239
 #: js/PrefFilterTree.js:29
 msgid "in"
 msgstr "在"
 
-#: classes/dlg.php:498 classes/pref_filters.php:291
+#: classes/dlg.php:498 classes/pref_filters.php:301
 msgid "Perform Action"
 msgstr "执行动作"
 
-#: classes/dlg.php:515 classes/pref_filters.php:311
+#: classes/dlg.php:515 classes/pref_filters.php:321
 msgid "with parameters:"
 msgstr "指定参数："
 
-#: classes/dlg.php:529 classes/pref_feeds.php:393 classes/pref_feeds.php:632
-#: classes/pref_filters.php:331 classes/pref_users.php:177
+#: classes/dlg.php:529 classes/pref_feeds.php:399 classes/pref_feeds.php:638
+#: classes/pref_filters.php:341 classes/pref_users.php:177
 msgid "Options"
 msgstr "选项"
 
-#: classes/dlg.php:533 classes/pref_filters.php:343
+#: classes/dlg.php:533 classes/pref_filters.php:353
 msgid "Enabled"
 msgstr "已启用"
 
-#: classes/dlg.php:536 classes/pref_filters.php:352
+#: classes/dlg.php:536 classes/pref_filters.php:362
 msgid "Inverse match"
 msgstr "反向匹配"
 
-#: classes/dlg.php:539 classes/pref_filters.php:361
-#, fuzzy
+#: classes/dlg.php:539 classes/pref_filters.php:371
 msgid "Apply to category"
-msgstr "加入到类别："
+msgstr ""
 
-#: classes/dlg.php:547 classes/pref_filters.php:374
+#: classes/dlg.php:547 classes/pref_filters.php:384
 msgid "Test"
 msgstr "测试"
 
@@ -1136,8 +1135,8 @@ msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
 #: classes/dlg.php:712 classes/dlg.php:901 classes/note_button.php:33
-#: classes/pref_feeds.php:527 classes/pref_feeds.php:682
-#: classes/pref_filters.php:377 classes/pref_instances.php:100
+#: classes/pref_feeds.php:533 classes/pref_feeds.php:688
+#: classes/pref_filters.php:387 classes/pref_instances.php:100
 #: classes/pref_labels.php:79 classes/pref_users.php:192
 msgid "Save"
 msgstr "保存"
@@ -1197,7 +1196,7 @@ msgstr ""
 msgid "Instance"
 msgstr "实例"
 
-#: classes/dlg.php:918 classes/pref_feeds.php:311 classes/pref_feeds.php:560
+#: classes/dlg.php:918 classes/pref_feeds.php:317 classes/pref_feeds.php:566
 #: classes/pref_instances.php:67
 msgid "URL:"
 msgstr "URL："
@@ -1244,11 +1243,10 @@ msgid "Feeds to subscribe, One per line"
 msgstr ""
 
 #: classes/dlg.php:1018
-#, fuzzy
 msgid "Feeds require authentication."
-msgstr "这个信息源需要认证"
+msgstr ""
 
-#: classes/feeds.php:94 include/functions.php:3395
+#: classes/feeds.php:94 include/functions.php:3425
 msgid "Visit the website"
 msgstr "访问网站"
 
@@ -1260,8 +1258,8 @@ msgstr "以RSS信息源方式阅读"
 msgid "Select:"
 msgstr "选择："
 
-#: classes/feeds.php:116 classes/pref_feeds.php:1306
-#: classes/pref_filters.php:577 classes/pref_instances.php:142
+#: classes/feeds.php:116 classes/pref_feeds.php:1313
+#: classes/pref_filters.php:587 classes/pref_instances.php:142
 #: classes/pref_labels.php:275 classes/pref_users.php:380
 msgid "All"
 msgstr "全部"
@@ -1270,8 +1268,8 @@ msgstr "全部"
 msgid "Invert"
 msgstr "反选"
 
-#: classes/feeds.php:119 classes/pref_feeds.php:1308
-#: classes/pref_filters.php:579 classes/pref_instances.php:144
+#: classes/feeds.php:119 classes/pref_feeds.php:1315
+#: classes/pref_filters.php:589 classes/pref_instances.php:144
 #: classes/pref_labels.php:277 classes/pref_users.php:382
 msgid "None"
 msgstr "无"
@@ -1312,22 +1310,21 @@ msgstr "找不到信息源。"
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:625 include/functions.php:3367
+#: classes/feeds.php:625 include/functions.php:3397
 msgid "Originally from:"
 msgstr "来源："
 
-#: classes/feeds.php:685 include/functions.php:3324
+#: classes/feeds.php:685 include/functions.php:3354
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: classes/feeds.php:712 include/functions.php:3334
+#: classes/feeds.php:712 include/functions.php:3364
 msgid "Open article in new tab"
 msgstr "在新标签页中打开文章"
 
-#: classes/feeds.php:723 include/functions.php:3350
-#, fuzzy
+#: classes/feeds.php:723 include/functions.php:3380
 msgid "Close article"
-msgstr "删除文章"
+msgstr ""
 
 #: classes/feeds.php:744
 msgid "No unread articles found to display."
@@ -1347,24 +1344,24 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
-"活动菜单）。"
+"动作菜单）。"
 
 #: classes/feeds.php:756
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:771 include/functions.php:4524
+#: classes/feeds.php:771 include/functions.php:4557
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:781 include/functions.php:4534
+#: classes/feeds.php:781 include/functions.php:4567
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:94
-#: classes/pref_filters.php:181 include/functions.php:1966
-#: include/functions.php:2009
+#: classes/feeds.php:922 classes/feeds.php:931 classes/pref_feeds.php:95
+#: classes/pref_filters.php:191 include/functions.php:1966
+#: include/functions.php:2009 include/functions.php:2856
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -1400,25 +1397,25 @@ msgstr "编辑文章注记"
 msgid "Check to enable field"
 msgstr "勾选以启用"
 
-#: classes/pref_feeds.php:81 classes/pref_feeds.php:119
-#: classes/pref_feeds.php:125 classes/pref_feeds.php:148
+#: classes/pref_feeds.php:82 classes/pref_feeds.php:120
+#: classes/pref_feeds.php:126 classes/pref_feeds.php:149
 #, php-format
 msgid "(%d feeds)"
 msgstr "(%d 个信息源)"
 
-#: classes/pref_feeds.php:300
+#: classes/pref_feeds.php:306
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref_feeds.php:356 classes/pref_feeds.php:596
+#: classes/pref_feeds.php:362 classes/pref_feeds.php:602
 msgid "using"
 msgstr "使用"
 
-#: classes/pref_feeds.php:366 classes/pref_feeds.php:607
+#: classes/pref_feeds.php:372 classes/pref_feeds.php:613
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref_feeds.php:389
+#: classes/pref_feeds.php:395
 msgid ""
 "<b>Hint:</b> you need to fill in your login information if your feed "
 "requires authentication, except for Twitter feeds."
@@ -1426,256 +1423,255 @@ msgstr ""
 "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除"
 "外。"
 
-#: classes/pref_feeds.php:405 classes/pref_feeds.php:636
+#: classes/pref_feeds.php:411 classes/pref_feeds.php:642
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref_feeds.php:416 classes/pref_feeds.php:641
+#: classes/pref_feeds.php:422 classes/pref_feeds.php:647
 msgid "Right-to-left content"
 msgstr "右至左的内容"
 
-#: classes/pref_feeds.php:428 classes/pref_feeds.php:647
+#: classes/pref_feeds.php:434 classes/pref_feeds.php:653
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref_feeds.php:441 classes/pref_feeds.php:653
+#: classes/pref_feeds.php:447 classes/pref_feeds.php:659
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref_feeds.php:455 classes/pref_feeds.php:661
+#: classes/pref_feeds.php:461 classes/pref_feeds.php:667
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref_feeds.php:467 classes/pref_feeds.php:667
+#: classes/pref_feeds.php:473 classes/pref_feeds.php:673
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref_feeds.php:479 classes/pref_feeds.php:673
+#: classes/pref_feeds.php:485 classes/pref_feeds.php:679
 msgid "Mark posts as updated on content change"
 msgstr "将内容更改过的文章标记为已更新状态"
 
-#: classes/pref_feeds.php:485
+#: classes/pref_feeds.php:491
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref_feeds.php:499
+#: classes/pref_feeds.php:505
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref_feeds.php:518
+#: classes/pref_feeds.php:524
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref_feeds.php:525
+#: classes/pref_feeds.php:531
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref_feeds.php:927 classes/pref_feeds.php:980
+#: classes/pref_feeds.php:933 classes/pref_feeds.php:986
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref_feeds.php:1011
+#: classes/pref_feeds.php:1018
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: classes/pref_feeds.php:1014
+#: classes/pref_feeds.php:1021
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅 <b>%s</b>。"
 
-#: classes/pref_feeds.php:1017
+#: classes/pref_feeds.php:1024
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: classes/pref_feeds.php:1020
+#: classes/pref_feeds.php:1027
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: classes/pref_feeds.php:1028
+#: classes/pref_feeds.php:1030
+#, fuzzy
+msgid "Multiple feed URLs found."
+msgstr "未找到信息源。"
+
+#: classes/pref_feeds.php:1035
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: classes/pref_feeds.php:1050
+#: classes/pref_feeds.php:1057
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: classes/pref_feeds.php:1075
+#: classes/pref_feeds.php:1082
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: classes/pref_feeds.php:1154
+#: classes/pref_feeds.php:1161
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "数据库中已经有 <b>$%s</b> 这个类别。"
 
-#: classes/pref_feeds.php:1170
+#: classes/pref_feeds.php:1177
 msgid "Create category"
 msgstr "创建类别"
 
-#: classes/pref_feeds.php:1230
+#: classes/pref_feeds.php:1237
 msgid "No feed categories defined."
 msgstr "没有定义过的信息源类别。"
 
-#: classes/pref_feeds.php:1236
+#: classes/pref_feeds.php:1243
 msgid "Remove selected categories"
 msgstr "移除选定的类别"
 
-#: classes/pref_feeds.php:1260
+#: classes/pref_feeds.php:1267
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref_feeds.php:1280
+#: classes/pref_feeds.php:1287
 msgid "Inactive feeds"
 msgstr "很久不活跃的信息源"
 
-#: classes/pref_feeds.php:1303 classes/pref_filters.php:574
+#: classes/pref_feeds.php:1310 classes/pref_filters.php:584
 #: classes/pref_instances.php:139 classes/pref_labels.php:272
 #: classes/pref_users.php:377
 msgid "Select"
 msgstr "选择"
 
-#: classes/pref_feeds.php:1317
+#: classes/pref_feeds.php:1324
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref_feeds.php:1319 classes/pref_feeds.php:1331
+#: classes/pref_feeds.php:1326 classes/pref_feeds.php:1340
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: classes/pref_feeds.php:1321 js/prefs.js:2085
-#, fuzzy
+#: classes/pref_feeds.php:1328 js/prefs.js:2100
 msgid "Batch subscribe"
-msgstr "取消订阅"
+msgstr ""
 
-#: classes/pref_feeds.php:1326
+#: classes/pref_feeds.php:1333
 msgid "Categories"
 msgstr "类别"
 
-#: classes/pref_feeds.php:1329
+#: classes/pref_feeds.php:1336
 msgid "Edit categories"
 msgstr "编辑类别"
 
-#: classes/pref_feeds.php:1345
+#: classes/pref_feeds.php:1338
+#, fuzzy
+msgid "(Un)hide empty categories"
+msgstr "编辑类别"
+
+#: classes/pref_feeds.php:1354
 msgid "More actions..."
-msgstr "更多动作……"
+msgstr "更多动作"
 
-#: classes/pref_feeds.php:1349
+#: classes/pref_feeds.php:1358
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref_feeds.php:1353
+#: classes/pref_feeds.php:1362
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref_feeds.php:1354 classes/pref_filters.php:593
+#: classes/pref_feeds.php:1363 classes/pref_filters.php:603
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
-#: classes/pref_feeds.php:1396
+#: classes/pref_feeds.php:1405
 msgid "<b>Hint:</b> you can drag feeds and categories around."
 msgstr "<b>提示：</b> 您可以拖拽信息源和类别。"
 
-#: classes/pref_feeds.php:1404
+#: classes/pref_feeds.php:1413
 msgid "Import and export"
 msgstr ""
 
-#: classes/pref_feeds.php:1406
+#: classes/pref_feeds.php:1415
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref_feeds.php:1408
-#, fuzzy
+#: classes/pref_feeds.php:1417
 msgid ""
 "Using OPML you can export and import your feeds, filters, labels and Tiny "
 "Tiny RSS settings."
-msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
+msgstr ""
 
-#: classes/pref_feeds.php:1410
-#, fuzzy
+#: classes/pref_feeds.php:1419
 msgid "Only main settings profile can be migrated using OPML."
-msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
+msgstr ""
 
-#: classes/pref_feeds.php:1423
-#, fuzzy
+#: classes/pref_feeds.php:1432
 msgid "Import my OPML"
-msgstr "导入 OPML ……"
+msgstr ""
 
-#: classes/pref_feeds.php:1427
+#: classes/pref_feeds.php:1436
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref_feeds.php:1429
+#: classes/pref_feeds.php:1438
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref_feeds.php:1433
-#, fuzzy
+#: classes/pref_feeds.php:1442
 msgid "Export OPML"
-msgstr "导出"
+msgstr ""
 
-#: classes/pref_feeds.php:1437
+#: classes/pref_feeds.php:1446
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref_feeds.php:1439
-#, fuzzy
+#: classes/pref_feeds.php:1448
 msgid ""
 "Published OPML does not include your Tiny Tiny RSS settings, feeds that "
 "require authentication or feeds hidden from Popular feeds."
 msgstr ""
-"提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获取的"
-"信息源、以及从最受欢迎的信息源中隐藏的信息源。"
 
-#: classes/pref_feeds.php:1442
-#, fuzzy
+#: classes/pref_feeds.php:1451
 msgid "Display published OPML URL"
-msgstr "公开的 OPML URL"
+msgstr ""
 
-#: classes/pref_feeds.php:1445
-#, fuzzy
+#: classes/pref_feeds.php:1454
 msgid "Article archive"
-msgstr "文章发布时间"
+msgstr ""
 
-#: classes/pref_feeds.php:1447
+#: classes/pref_feeds.php:1456
 msgid ""
 "You can export and import your Starred and Archived articles for safekeeping "
 "or when migrating between tt-rss instances."
 msgstr ""
 
-#: classes/pref_feeds.php:1450
-#, fuzzy
+#: classes/pref_feeds.php:1459
 msgid "Export my data"
-msgstr "导出"
+msgstr ""
 
-#: classes/pref_feeds.php:1465
+#: classes/pref_feeds.php:1474
 msgid "Import"
 msgstr "导入"
 
-#: classes/pref_feeds.php:1472
+#: classes/pref_feeds.php:1481
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref_feeds.php:1474
+#: classes/pref_feeds.php:1483
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: classes/pref_feeds.php:1481
+#: classes/pref_feeds.php:1490
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref_feeds.php:1489
+#: classes/pref_feeds.php:1498
 msgid "Subscribing using bookmarklet"
 msgstr "通过书签订阅"
 
-#: classes/pref_feeds.php:1491
+#: classes/pref_feeds.php:1500
 msgid ""
 "Drag the link below to your browser toolbar, open the feed you're interested "
 "in in your browser and click on the link to subscribe to it."
@@ -1683,25 +1679,24 @@ msgstr ""
 "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接"
 "以订阅。"
 
-#: classes/pref_feeds.php:1495
+#: classes/pref_feeds.php:1504
 #, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
 
-#: classes/pref_feeds.php:1499
+#: classes/pref_feeds.php:1508
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中订阅"
 
-#: classes/pref_feeds.php:1503
-#, fuzzy
+#: classes/pref_feeds.php:1512
 msgid "Published & shared articles / Generated feeds"
-msgstr "已发布、已分享的文章和生成的信息源"
+msgstr ""
 
-#: classes/pref_feeds.php:1505
+#: classes/pref_feeds.php:1514
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref_feeds.php:1507
+#: classes/pref_feeds.php:1516
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
@@ -1709,31 +1704,31 @@ msgstr ""
 "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订"
 "阅。"
 
-#: classes/pref_feeds.php:1513
+#: classes/pref_feeds.php:1522
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref_feeds.php:1516
+#: classes/pref_feeds.php:1525
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref_feeds.php:1518
+#: classes/pref_feeds.php:1527
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: classes/pref_feeds.php:1520
+#: classes/pref_feeds.php:1529
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: classes/pref_feeds.php:1523
+#: classes/pref_feeds.php:1532
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: classes/pref_feeds.php:1529
+#: classes/pref_feeds.php:1538
 msgid "Twitter"
 msgstr "Twitter"
 
-#: classes/pref_feeds.php:1538
+#: classes/pref_feeds.php:1547
 msgid ""
 "Before you can update your Twitter feeds, you must register this instance of "
 "Tiny Tiny RSS with Twitter.com."
@@ -1741,34 +1736,38 @@ msgstr ""
 "更新 Twitter 信息源之前，您必须在 Twitter.com 上注册这个 Tiny Tiny RSS 的实"
 "例。"
 
-#: classes/pref_feeds.php:1540
+#: classes/pref_feeds.php:1549
 msgid ""
 "You have been successfully registered with Twitter.com and should be able to "
 "access your Twitter feeds."
 msgstr "您已经成功在 Twitter.com 上注册并获取您的 Twitter 信息源的访问权。"
 
-#: classes/pref_feeds.php:1544
+#: classes/pref_feeds.php:1553
 msgid "Register with Twitter.com"
 msgstr "在 Twitter.com 上注册"
 
-#: classes/pref_feeds.php:1550
+#: classes/pref_feeds.php:1559
 msgid "Clear stored credentials"
 msgstr "清空保存的个人信息"
 
-#: classes/pref_filters.php:47
+#: classes/pref_filters.php:39
 msgid "Articles matching this filter:"
 msgstr "符合本过滤器条件的文章："
 
-#: classes/pref_filters.php:84
+#: classes/pref_filters.php:89
 msgid "No articles matching this filter has been found."
 msgstr "本过滤器下没有匹配到文章。"
 
-#: classes/pref_filters.php:523
+#: classes/pref_filters.php:93
+msgid "Invalid regular expression."
+msgstr ""
+
+#: classes/pref_filters.php:533
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: classes/pref_filters.php:586 classes/pref_instances.php:148
+#: classes/pref_filters.php:596 classes/pref_instances.php:148
 #: classes/pref_users.php:391
 msgid "Edit"
 msgstr "编辑"
@@ -1846,95 +1845,94 @@ msgstr "密码更改成功。"
 msgid "Old password is incorrect."
 msgstr "原密码输入错误。"
 
-#: classes/pref_prefs.php:88
+#: classes/pref_prefs.php:97
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: classes/pref_prefs.php:103
+#: classes/pref_prefs.php:112
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: classes/pref_prefs.php:117
+#: classes/pref_prefs.php:126
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: classes/pref_prefs.php:159
-#, fuzzy
+#: classes/pref_prefs.php:168
 msgid "Personal data / Authentication"
-msgstr "登录密码"
+msgstr ""
 
-#: classes/pref_prefs.php:186
+#: classes/pref_prefs.php:195
 msgid "Full name"
 msgstr "姓名"
 
-#: classes/pref_prefs.php:190
+#: classes/pref_prefs.php:199
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: classes/pref_prefs.php:195
+#: classes/pref_prefs.php:204
 msgid "Access level"
 msgstr "访问级别"
 
-#: classes/pref_prefs.php:205
+#: classes/pref_prefs.php:214
 msgid "Save data"
 msgstr "保存信息"
 
-#: classes/pref_prefs.php:214
+#: classes/pref_prefs.php:223
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref_prefs.php:242
+#: classes/pref_prefs.php:251
 msgid "Old password"
 msgstr "原密码"
 
-#: classes/pref_prefs.php:245
+#: classes/pref_prefs.php:254
 msgid "New password"
 msgstr "新密码"
 
-#: classes/pref_prefs.php:250
+#: classes/pref_prefs.php:259
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: classes/pref_prefs.php:260
+#: classes/pref_prefs.php:269
 msgid "Change password"
 msgstr "更改密码"
 
-#: classes/pref_prefs.php:345
+#: classes/pref_prefs.php:354
 msgid "Select theme"
 msgstr "选择主题"
 
-#: classes/pref_prefs.php:397
+#: classes/pref_prefs.php:406
 msgid "Customize"
 msgstr "自定义"
 
-#: classes/pref_prefs.php:416 classes/pref_prefs.php:423
-#: classes/pref_prefs.php:428
+#: classes/pref_prefs.php:425 classes/pref_prefs.php:432
+#: classes/pref_prefs.php:437
 msgid "Yes"
 msgstr "是"
 
-#: classes/pref_prefs.php:418 classes/pref_prefs.php:428
+#: classes/pref_prefs.php:427 classes/pref_prefs.php:437
 msgid "No"
 msgstr "否"
 
-#: classes/pref_prefs.php:462
+#: classes/pref_prefs.php:471
 msgid "Clear"
 msgstr "清空"
 
-#: classes/pref_prefs.php:468
+#: classes/pref_prefs.php:477
 #, php-format
-msgid "Current server time: %s"
+msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref_prefs.php:493
+#: classes/pref_prefs.php:502
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: classes/pref_prefs.php:496
+#: classes/pref_prefs.php:505
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: classes/pref_prefs.php:499
+#: classes/pref_prefs.php:508
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
@@ -1994,13 +1992,11 @@ msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
 #: classes/pref_users.php:291
-#, fuzzy, php-format
+#, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
 "\t\t\t\t to <b>%s</b>"
 msgstr ""
-"更改用户 <b>%s</b>\n"
-"\t\t\t\t\t 的密码为 <b>%s</b>"
 
 #: classes/pref_users.php:298
 #, php-format
@@ -2031,27 +2027,23 @@ msgstr "没有定义用户。"
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
-#: classes/readitlater_button.php:7
-msgid "Read it later"
-msgstr ""
-
-#: classes/rpc.php:427 include/functions.php:3314 include/functions.php:4079
+#: classes/rpc.php:426 include/functions.php:3344 include/functions.php:4109
 msgid "no tags"
 msgstr "无标签"
 
-#: classes/rpc.php:742
+#: classes/rpc.php:741
 msgid "Your request could not be completed."
 msgstr "您的请求无法完成。"
 
-#: classes/rpc.php:746
+#: classes/rpc.php:745
 msgid "Feed update has been scheduled."
 msgstr "信息源更新的任务计划已制定。"
 
-#: classes/rpc.php:754
+#: classes/rpc.php:753
 msgid "Category update has been scheduled."
 msgstr "分类更新已列入任务计划。"
 
-#: classes/rpc.php:767
+#: classes/rpc.php:766
 msgid "Can't update this kind of feed."
 msgstr "无法更新这种类型的信息源。"
 
@@ -2079,62 +2071,61 @@ msgstr "用户名或密码错误"
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:3158 js/viewfeed.js:1945
+#: include/functions.php:3188 js/viewfeed.js:1954
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:3159 js/viewfeed.js:1944
+#: include/functions.php:3189 js/viewfeed.js:1953
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3285
+#: include/functions.php:3315
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:4104
+#: include/functions.php:4134
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:4514
+#: include/functions.php:4547
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: include/functions.php:4698
+#: include/functions.php:4731
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:4738
+#: include/functions.php:4771
 msgid "Attachment:"
 msgstr "附件："
 
-#: include/functions.php:4740
+#: include/functions.php:4773
 msgid "Attachments:"
 msgstr "附件："
 
-#: include/functions.php:5171
+#: include/functions.php:5217
 #, php-format
 msgid "%d archived articles"
 msgstr "%d 个存档的文章"
 
-#: include/functions.php:5195
+#: include/functions.php:5241
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:5241
-#, fuzzy
+#: include/functions.php:5287
 msgid "Could not import: incorrect schema version."
-msgstr "无法找到必要的表结构文件，需要版本："
+msgstr ""
 
-#: include/functions.php:5246
+#: include/functions.php:5292
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: include/functions.php:5405
+#: include/functions.php:5451
 #, php-format
 msgid "Finished: %d articles processed, %d imported, %d feeds created."
 msgstr ""
 
-#: include/functions.php:5411
+#: include/functions.php:5457
 msgid "Could not load XML document."
 msgstr ""
 
@@ -2167,7 +2158,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "添加自定义标签"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1909
+#: include/localized_schema.php:14 js/viewfeed.js:1918
 msgid "Assign label"
 msgstr "添加预定义标签"
 
@@ -2251,7 +2242,7 @@ msgstr "在 tt-rss 处注册您的 SSL 证书"
 
 #: include/localized_schema.php:32
 #, fuzzy
-msgid "Uses server timezone"
+msgid "Uses UTC timezone"
 msgstr "用户所在时区"
 
 #: include/localized_schema.php:33
@@ -2366,7 +2357,7 @@ msgstr "用户所在时区"
 msgid "Sort headlines by feed date"
 msgstr "以信息源的日期排序"
 
-#: include/localized_schema.php:61 js/prefs.js:1765
+#: include/localized_schema.php:61 js/prefs.js:1780
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2390,7 +2381,7 @@ msgstr "偏好："
 msgid "Use less traffic"
 msgstr "使用较少流量"
 
-#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:512 js/tt-rss.js:525
+#: js/digest.js:23 js/feedlist.js:481 js/tt-rss.js:511 js/tt-rss.js:524
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
@@ -2442,7 +2433,7 @@ msgstr "加载更多……"
 msgid "New articles available in this feed (click to show)"
 msgstr "本信息源中的最新文章（点击显示）"
 
-#: js/FeedTree.js:137
+#: js/FeedTree.js:140
 msgid "Update feed"
 msgstr "更新信息源"
 
@@ -2514,64 +2505,64 @@ msgstr "您已经订阅过这个信息源啦。"
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: js/functions.js:990 js/prefs.js:168
+#: js/functions.js:1008 js/prefs.js:168
 msgid "Filter Test Results"
 msgstr "过滤器测试结果"
 
-#: js/functions.js:1048
+#: js/functions.js:1068
 msgid ""
 "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification "
 "hub again on next feed update."
 msgstr ""
 "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
 
-#: js/functions.js:1069 js/tt-rss.js:395
+#: js/functions.js:1089 js/tt-rss.js:394
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1176
+#: js/functions.js:1196
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1207
+#: js/functions.js:1227
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1391 js/tt-rss.js:374 js/tt-rss.js:885
+#: js/functions.js:1411 js/tt-rss.js:373 js/tt-rss.js:884
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/functions.js:1406
+#: js/functions.js:1426
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1444
+#: js/functions.js:1464
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1505 js/functions.js:1615 js/prefs.js:393 js/prefs.js:423
+#: js/functions.js:1525 js/functions.js:1635 js/prefs.js:393 js/prefs.js:423
 #: js/prefs.js:455 js/prefs.js:613 js/prefs.js:633 js/prefs.js:1250
 #: js/prefs.js:1395
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1547
+#: js/functions.js:1567
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1586
+#: js/functions.js:1606
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1597 js/prefs.js:1232
+#: js/functions.js:1617 js/prefs.js:1232
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
-#: js/mail_button.js:7 js/viewfeed.js:628 js/viewfeed.js:656
-#: js/viewfeed.js:683 js/viewfeed.js:745 js/viewfeed.js:777 js/viewfeed.js:893
-#: js/viewfeed.js:936 js/viewfeed.js:986
+#: js/mail_button.js:7 js/viewfeed.js:637 js/viewfeed.js:665
+#: js/viewfeed.js:692 js/viewfeed.js:754 js/viewfeed.js:786 js/viewfeed.js:902
+#: js/viewfeed.js:945 js/viewfeed.js:995
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
@@ -2674,9 +2665,8 @@ msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
 #: js/prefs.js:814
-#, fuzzy
 msgid "Please choose the file first."
-msgstr "请先选择一个 OPML 文件。"
+msgstr ""
 
 #: js/prefs.js:941
 msgid "Reset to defaults?"
@@ -2743,55 +2733,52 @@ msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续�
 msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1673
+#: js/prefs.js:1688
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/prefs.js:1736
+#: js/prefs.js:1751
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
 
-#: js/prefs.js:1807
+#: js/prefs.js:1822
 msgid "Link Instance"
 msgstr "链接实例"
 
-#: js/prefs.js:1858
+#: js/prefs.js:1873
 msgid "Edit Instance"
 msgstr "编辑实例"
 
-#: js/prefs.js:1907
+#: js/prefs.js:1922
 msgid "Remove selected instances?"
 msgstr "移除选中的实例？"
 
-#: js/prefs.js:1924 js/prefs.js:1936
+#: js/prefs.js:1939 js/prefs.js:1951
 msgid "No instances are selected."
 msgstr "未选中任何实例。"
 
-#: js/prefs.js:1941
+#: js/prefs.js:1956
 msgid "Please select only one instance."
 msgstr "请仅选择一个实例。"
 
-#: js/prefs.js:1976
-#, fuzzy
+#: js/prefs.js:1991
 msgid "Export Data"
-msgstr "导出"
+msgstr ""
 
-#: js/prefs.js:2003
+#: js/prefs.js:2018
 msgid ""
 "Finished, exported %d articles. You can download the data <a "
 "class='visibleLink' href='%u'>here</a>."
 msgstr ""
 
-#: js/prefs.js:2056
-#, fuzzy
+#: js/prefs.js:2071
 msgid "Data Import"
-msgstr "导入"
+msgstr ""
 
-#: js/prefs.js:2091
-#, fuzzy
+#: js/prefs.js:2106
 msgid "Subscribing to feeds..."
-msgstr "正在订阅信息源……"
+msgstr ""
 
 #: js/share_button.js:10
 msgid "Share article by URL"
@@ -2801,199 +2788,94 @@ msgstr "通过 URL 分享文章"
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
-#: js/tt-rss.js:384
+#: js/tt-rss.js:383
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
-#: js/tt-rss.js:389 js/tt-rss.js:597 js/tt-rss.js:1043
+#: js/tt-rss.js:388 js/tt-rss.js:596 js/tt-rss.js:1042
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:592
+#: js/tt-rss.js:591
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:602
+#: js/tt-rss.js:601
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:1083
+#: js/tt-rss.js:1082
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
-#: js/viewfeed.js:873
+#: js/viewfeed.js:882
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记 %s 中所有可见的文章为已读？"
 
-#: js/viewfeed.js:901
+#: js/viewfeed.js:910
 msgid "Delete %d selected articles in %s?"
 msgstr "删除 %s 中选择的 %d 篇文章？"
 
-#: js/viewfeed.js:903
+#: js/viewfeed.js:912
 msgid "Delete %d selected articles?"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:945
+#: js/viewfeed.js:954
 msgid "Archive %d selected articles in %s?"
 msgstr "将 %s 中的 %d 篇选中的文章存档？"
 
-#: js/viewfeed.js:948
+#: js/viewfeed.js:957
 msgid "Move %d archived articles back?"
 msgstr "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:992
+#: js/viewfeed.js:1001
 msgid "Mark %d selected articles in %s as read?"
 msgstr "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1016
+#: js/viewfeed.js:1025
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1173
+#: js/viewfeed.js:1182
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
-#: js/viewfeed.js:1208
+#: js/viewfeed.js:1217
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
-#: js/viewfeed.js:1210
+#: js/viewfeed.js:1219
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1374
+#: js/viewfeed.js:1383
 msgid "Loading..."
 msgstr "加载中……"
 
-#: js/viewfeed.js:1848
+#: js/viewfeed.js:1857
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1854
+#: js/viewfeed.js:1863
 msgid "View in a tt-rss tab"
 msgstr "在 tt-rss 舌签中查看"
 
-#: js/viewfeed.js:1862
-#, fuzzy
+#: js/viewfeed.js:1871
 msgid "Mark above as read"
-msgstr "标记为已读"
+msgstr ""
 
-#: js/viewfeed.js:1868
-#, fuzzy
+#: js/viewfeed.js:1877
 msgid "Mark below as read"
-msgstr "标记为已读"
+msgstr ""
 
-#: js/viewfeed.js:1914
+#: js/viewfeed.js:1923
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1947
 msgid "Playing..."
 msgstr "播放中……"
 
-#: js/viewfeed.js:1939
+#: js/viewfeed.js:1948
 msgid "Click to pause"
 msgstr "点击暂停"
-
-#~ msgid "Personal data"
-#~ msgstr "个人信息"
-
-#~ msgid "About..."
-#~ msgstr "关于……"
-
-#~ msgid "Help"
-#~ msgstr "帮助"
-
-#~ msgid "Importing using DOMXML."
-#~ msgstr "通过 DOMXML 导入。"
-
-#~ msgid "Importing using DOMDocument."
-#~ msgstr "通过 DOMDocument 导入。"
-
-#~ msgid ""
-#~ "DOMXML extension is not found. It is required for PHP versions below 5."
-#~ msgstr "未检测到 DOMXML 扩展。PHP 5以下的版本需要用到本扩展。"
-
-#~ msgid "Cache images locally (SimplePie only)"
-#~ msgstr "在本地缓存图片（仅针对SimplePie）"
-
-#~ msgid ""
-#~ "Using OPML you can export and import your feeds and Tiny Tiny RSS "
-#~ "settings."
-#~ msgstr "您可以用 OPML 进行信息源和 Tiny Tiny RSS 偏好设置的导出导入。"
-
-#~ msgid "Note: Only main settings profile can be migrated using OPML."
-#~ msgstr "提醒：OPML 仅可用于默认偏好文件的迁移。"
-
-#~ msgid "Publish"
-#~ msgstr "发布"
-
-#~ msgid ""
-#~ "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
-#~ "that require authentication or feeds hidden from Popular feeds."
-#~ msgstr ""
-#~ "提醒：公开发布的 OPML 不会包含您的 Tiny Tiny RSS 配置文件、需要认证才能获"
-#~ "取的信息源、以及从最受欢迎的信息源中隐藏的信息源。"
-
-#~ msgid "Changed password of user <b>%s</b>."
-#~ msgstr "用户 <b>%s</b> 的密码已更改。"
-
-#~ msgid "Content filtering"
-#~ msgstr "内容过滤"
-
-#~ msgid ""
-#~ "Tiny Tiny RSS has support for filtering (or processing) articles. "
-#~ "Filtering is done once, when new article is imported to the database from "
-#~ "the newsfeed, specified field is matched against regular expression and "
-#~ "some action is taken. Regular expression matching is case-insensitive."
-#~ msgstr ""
-#~ "Tiny Tiny RSS 支持文章过滤。过滤在文章导入数据库的时候完成，指定的内容在与"
-#~ "正则表达式匹配后会执行指定的动作。正则表达式区分大小写。"
-
-#~ msgid ""
-#~ "Supported actions are: filter (do not import) article, mark article as "
-#~ "read, set starred, assign tag(s), and set score. Filters can be defined "
-#~ "globally and for some specific feed."
-#~ msgstr ""
-#~ "支持的动作包括：过滤文章（不导入），标记文章为已读，加注星标，加注自定义标"
-#~ "签，进行评分。过滤器可以全局设置，也可以针对指定的信息源设置。"
-
-#~ msgid ""
-#~ "Multiple and inverse matching are supported. All matching filters are "
-#~ "considered when article is being imported and all actions executed in "
-#~ "sequence. Inverse matching reverts matching result, e.g. filter matching "
-#~ "XYZZY in title with inverse flag will match all articles, except those "
-#~ "containing string XYZZY in title."
-#~ msgstr ""
-#~ "支持多项匹配和反向匹配。当文章被导入时，所有的匹配过滤器会被依次执行。反向"
-#~ "匹配会将匹配结果反转，比如反向匹配 XYZZY 这个关键字的情况将会匹配所有标题"
-#~ "中不包含 XYZZY 的文章。"
-
-#~ msgid "See also:"
-#~ msgstr "另请参考："
-
-#, fuzzy
-#~ msgid "Add category..."
-#~ msgstr "创建类别"
-
-#, fuzzy
-#~ msgid "Add label..."
-#~ msgstr "创建预定义标签……"
-
-#~ msgid "Dismiss article"
-#~ msgstr "不再显示本文章"
-
-#~ msgid "Remove:"
-#~ msgstr "移除："
-
-#~ msgid "Assign:"
-#~ msgstr "应用于："
-
-#~ msgid "Toggle category reordering mode"
-#~ msgstr "锁定类别重新排序模式"
-
-#~ msgid "Update all feeds"
-#~ msgstr "更新全部信息源"
-
-#~ msgid "Sort by name or unread count"
-#~ msgstr "通过名称或未读的数量排序"