update translations

1 files changed, 589 insertions, 489 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 45b444002..4a21e6f5b 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-12-24 15:59+0300\n"
+"POT-Creation-Date: 2010-01-13 13:50+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -77,7 +77,7 @@ msgstr "每天"
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:126 tt-rss.php:241 modules/pref-prefs.php:315
+#: backend.php:126 tt-rss.php:222 modules/pref-prefs.php:290
 msgid "Default"
 msgstr "默认"
 
@@ -166,256 +166,270 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1871
+#: functions.php:1874
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:1931
+#: functions.php:1934
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2864 modules/popup-dialog.php:175
-#: modules/pref-filters.php:424
+#: functions.php:2889 modules/popup-dialog.php:234
+#: modules/pref-filters.php:416
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2896 functions.php:2935 functions.php:3373 functions.php:4348
-#: functions.php:4378 modules/backend-rpc.php:637 modules/pref-feeds.php:1305
+#: functions.php:2921 functions.php:2960 functions.php:4323 functions.php:4351
+#: modules/backend-rpc.php:766 modules/pref-feeds.php:1266
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2925 functions.php:3581 modules/backend-rpc.php:642
-#: mobile/functions.php:168
+#: functions.php:2950 functions.php:3565 modules/backend-rpc.php:771
+#: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2927 functions.php:3402 functions.php:3583 prefs.php:116
-#: modules/backend-rpc.php:647 help/4.php:12 mobile/functions.php:195
+#: functions.php:2952 functions.php:3567 prefs.php:116
+#: modules/backend-rpc.php:776 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2965 functions.php:3395 functions.php:4204
-#: localized_js.php:155 help/3.php:59 offline.js:494 offline.js:1425
+#: functions.php:2997 localized_js.php:155 help/3.php:59 offline.js:494
+#: offline.js:1427
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2967 functions.php:3399 functions.php:4211
-#: modules/pref-feeds.php:1494 help/3.php:60
+#: functions.php:2999 modules/pref-feeds.php:1410 help/3.php:60
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2969 functions.php:3405 functions.php:4189 help/3.php:58
+#: functions.php:3001 help/3.php:58
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2971 functions.php:3408 functions.php:4182
-#: localized_js.php:40 help/3.php:57 offline.js:489 offline.js:1427
+#: functions.php:3003 localized_js.php:40 help/3.php:57 offline.js:489
+#: offline.js:1429
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3359 functions.php:3361
-msgid "Search results"
-msgstr "搜索结果"
-
-#: functions.php:3377 functions.php:3390 functions.php:3396 functions.php:3400
-#: functions.php:3406 functions.php:3409 functions.php:3417
-msgid "Searched for"
-msgstr "搜索"
+#: functions.php:3005
+#, fuzzy
+msgid "Archived articles"
+msgstr "星级文章"
 
-#: functions.php:4065
+#: functions.php:4076
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4070 functions.php:5403 localized_js.php:150
-#: modules/pref-feeds.php:1073 modules/pref-feeds.php:1267
-#: modules/pref-filters.php:377 modules/pref-labels.php:177
-#: modules/pref-users.php:411 offline.js:409
+#: functions.php:4081 functions.php:5406 localized_js.php:150
+#: modules/pref-feeds.php:1017 modules/pref-feeds.php:1230
+#: modules/pref-filters.php:369 modules/pref-labels.php:183
+#: modules/pref-users.php:419 offline.js:409
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4071 localized_js.php:39 tt-rss.php:250
-#: modules/pref-feeds.php:1074 modules/pref-feeds.php:1268
-#: modules/pref-filters.php:378 modules/pref-labels.php:178
-#: modules/pref-users.php:412
+#: functions.php:4082 localized_js.php:39 modules/pref-feeds.php:1018
+#: modules/pref-feeds.php:1231 modules/pref-filters.php:370
+#: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4072 functions.php:4089 localized_js.php:173 tt-rss.php:233
+#: functions.php:4083 functions.php:4100 localized_js.php:173 tt-rss.php:215
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4073 localized_js.php:74
+#: functions.php:4084 localized_js.php:74
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4074 localized_js.php:100 modules/pref-feeds.php:1075
-#: modules/pref-feeds.php:1269 modules/pref-filters.php:379
-#: modules/pref-labels.php:179 modules/pref-users.php:413
+#: functions.php:4085 localized_js.php:100 modules/pref-feeds.php:1019
+#: modules/pref-feeds.php:1232 modules/pref-filters.php:371
+#: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "无"
 
-#: functions.php:4082 localized_js.php:35 tt-rss.php:183
-#: modules/pref-feeds.php:1429 offline.js:185
+#: functions.php:4093 localized_js.php:35 tt-rss.php:179 offline.js:185
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4088 localized_js.php:152
+#: functions.php:4099 localized_js.php:152
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4090 localized_js.php:154 tt-rss.php:232
+#: functions.php:4101 localized_js.php:154 tt-rss.php:214
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4091
+#: functions.php:4102
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4093 localized_js.php:85
-msgid "Mark as read:"
-msgstr "标记为已读："
-
-#: functions.php:4094 localized_js.php:151
-msgid "Selection"
+#: functions.php:4103
+#, fuzzy
+msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4096 localized_js.php:65
-msgid "Entire feed"
-msgstr "输入feed"
+#: functions.php:4104 localized_schema.php:16 tt-rss.php:189 tt-rss.php:232
+msgid "Mark as read"
+msgstr "标记为已读"
 
-#: functions.php:4100
+#: functions.php:4110
+msgid "Archive"
+msgstr ""
+
+#: functions.php:4112
+msgid "Move back"
+msgstr ""
+
+#: functions.php:4113
+#, fuzzy
+msgid "Delete"
+msgstr "默认"
+
+#: functions.php:4118
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4141 localized_js.php:56
+#: functions.php:4159 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4396
+#: functions.php:4369
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4413
+#: functions.php:4386
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4563
+#: functions.php:4531
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4694
+#: functions.php:4657
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4718 functions.php:5431
+#: functions.php:4681 functions.php:5434
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4726
+#: functions.php:4689
 #, fuzzy
 msgid "Display original article content"
 msgstr "显示最近文章时间"
 
-#: functions.php:4733 functions.php:5413
+#: functions.php:4696 functions.php:5416
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4740 functions.php:5420
+#: functions.php:4703 functions.php:5423
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4783 functions.php:5339
+#: functions.php:4720 functions.php:5297
+msgid "Originally from:"
+msgstr ""
+
+#: functions.php:4733 functions.php:5310
+#, fuzzy
+msgid "Feed URL"
+msgstr "Feed"
+
+#: functions.php:4768 functions.php:5340
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4818 functions.php:5377
+#: functions.php:4805 functions.php:5380
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4820 functions.php:5379
+#: functions.php:4807 functions.php:5382
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4840 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1124
+#: functions.php:4827 prefs.php:144 tt-rss.php:103 modules/help.php:21
+#: modules/popup-dialog.php:26 modules/popup-dialog.php:79
+#: modules/popup-dialog.php:478 modules/pref-feeds.php:1070
+#: modules/pref-users.php:96
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4896
+#: functions.php:4883
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4965
+#: functions.php:4952
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5131 functions.php:5218
+#: functions.php:5110 functions.php:5197
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5299 functions.php:5306
+#: functions.php:5273 functions.php:5280
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5438
+#: functions.php:5441
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5457
+#: functions.php:5460
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5460
+#: functions.php:5463
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5463
+#: functions.php:5466
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5467
+#: functions.php:5470
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5469 localized_js.php:93 offline.js:444
+#: functions.php:5472 localized_js.php:93 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6171 tt-rss.php:198
+#: functions.php:6180 tt-rss.php:194
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6184
+#: functions.php:6193
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6234
+#: functions.php:6243
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6263
+#: functions.php:6272
 msgid "edit note"
 msgstr ""
 
@@ -445,19 +459,19 @@ msgstr "星级文章"
 msgid "Assign selected articles to label?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:44 prefs.js:332
+#: localized_js.php:44 prefs.js:275
 msgid "Can't add category: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: localized_js.php:45 functions.js:1392
+#: localized_js.php:45 functions.js:1348
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
 
-#: localized_js.php:46 prefs.js:276 tt-rss.js:1455
+#: localized_js.php:46 prefs.js:217 tt-rss.js:1447
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: localized_js.php:47 prefs.js:360
+#: localized_js.php:47 prefs.js:304
 #, fuzzy
 msgid "Can't create user: no login specified."
 msgstr "添加用户失败：未登录。"
@@ -470,7 +484,7 @@ msgstr ""
 msgid "Can't open article: received invalid XML"
 msgstr ""
 
-#: localized_js.php:50 functions.js:1433
+#: localized_js.php:50 functions.js:1383
 msgid "Can't subscribe: no feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
@@ -527,25 +541,29 @@ msgstr ""
 msgid "display feeds"
 msgstr "显示Feed"
 
-#: localized_js.php:64 modules/pref-prefs.php:40
+#: localized_js.php:64 modules/pref-prefs.php:41
 msgid "Entered passwords do not match."
 msgstr "两次输入密码不通."
 
-#: localized_js.php:66 tt-rss.js:628
+#: localized_js.php:65
+msgid "Entire feed"
+msgstr "输入feed"
+
+#: localized_js.php:66 tt-rss.js:611
 #, fuzzy, php-format
 msgid "Erase all non-starred articles in %s?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:67 prefs.js:619
+#: localized_js.php:67 prefs.js:571
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:68 prefs.js:305
+#: localized_js.php:68 prefs.js:247
 msgid "Error: Invalid feed URL."
 msgstr ""
 
-#: localized_js.php:69 prefs.js:303
+#: localized_js.php:69 prefs.js:245
 #, fuzzy
 msgid "Error: No feed URL given."
 msgstr "未能订阅：无 feed URL。"
@@ -564,11 +582,11 @@ msgstr "新窗口打开文章连结"
 msgid "Failed to open window for the article"
 msgstr ""
 
-#: localized_js.php:73 prefs.js:641
+#: localized_js.php:73 prefs.js:593
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: localized_js.php:75 offline.js:1655
+#: localized_js.php:75 offline.js:1657
 msgid "Last sync: Cancelled."
 msgstr ""
 
@@ -594,31 +612,35 @@ msgstr "读取中，请等待..."
 msgid "Local data removed."
 msgstr ""
 
-#: localized_js.php:81 prefs.js:764
+#: localized_js.php:81 prefs.js:710
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
-#: localized_js.php:82 tt-rss.js:278
+#: localized_js.php:82 tt-rss.js:259
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:83 tt-rss.js:803 tt-rss.js:816
+#: localized_js.php:83 tt-rss.js:791 tt-rss.js:804
 #, fuzzy, php-format
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:84 viewfeed.js:1305
+#: localized_js.php:84 viewfeed.js:1291
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:86 viewfeed.js:1981
+#: localized_js.php:85
+msgid "Mark as read:"
+msgstr "标记为已读："
+
+#: localized_js.php:86 viewfeed.js:2056
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:87 viewfeed.js:1344
+#: localized_js.php:87 viewfeed.js:1436
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
@@ -627,109 +649,110 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Marking all feeds as read..."
 msgstr "标记所有Feed未已读..."
 
-#: localized_js.php:89 functions.js:2217
+#: localized_js.php:89 functions.js:2165
 msgid "New articles available (Click to show)"
 msgstr ""
 
-#: localized_js.php:90 modules/pref-prefs.php:35
+#: localized_js.php:90 modules/pref-prefs.php:36
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:91 viewfeed.js:1938
+#: localized_js.php:91 viewfeed.js:2013
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:92 viewfeed.js:974 viewfeed.js:1009 viewfeed.js:1049
-#: viewfeed.js:1136 viewfeed.js:1185 viewfeed.js:1337
+#: localized_js.php:92 viewfeed.js:958 viewfeed.js:994 viewfeed.js:1035
+#: viewfeed.js:1120 viewfeed.js:1170 viewfeed.js:1323 viewfeed.js:1373
+#: viewfeed.js:1429
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:94 viewfeed.js:1979
+#: localized_js.php:94 viewfeed.js:2054
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: localized_js.php:95 prefs.js:689
+#: localized_js.php:95 prefs.js:643
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: localized_js.php:96 prefs.js:598 prefs.js:628 prefs.js:659 prefs.js:926
-#: prefs.js:947 prefs.js:1260 prefs.js:1309 prefs.js:1839 tt-rss.js:1500
+#: localized_js.php:96 functions.js:2212 functions.js:2243 prefs.js:550
+#: prefs.js:580 prefs.js:612 prefs.js:873 prefs.js:893 prefs.js:1789
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: localized_js.php:97 tt-rss.php:281 tt-rss.php:294
+#: localized_js.php:97 tt-rss.php:240 tt-rss.php:253
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: localized_js.php:98 prefs.js:563 prefs.js:906
+#: localized_js.php:98 prefs.js:514 prefs.js:853
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: localized_js.php:99 prefs.js:500
+#: localized_js.php:99 prefs.js:449
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: localized_js.php:101 prefs.js:987
+#: localized_js.php:101 prefs.js:934
 msgid "No OPML file to upload."
 msgstr "无OPML文件上传."
 
-#: localized_js.php:102 prefs.js:530 prefs.js:818 prefs.js:839 prefs.js:877
+#: localized_js.php:102 prefs.js:480 prefs.js:763 prefs.js:784 prefs.js:823
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: localized_js.php:103 modules/pref-prefs.php:30
+#: localized_js.php:103 modules/pref-prefs.php:31
 msgid "Old password cannot be blank."
 msgstr "原密码不可留空."
 
-#: localized_js.php:104 viewfeed.js:2254
+#: localized_js.php:104 viewfeed.js:2328
 #, fuzzy
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:105 prefs.js:269 tt-rss.js:1450
+#: localized_js.php:105 prefs.js:210 tt-rss.js:1442
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:106 prefs.js:353
+#: localized_js.php:106 prefs.js:297
 #, fuzzy
 msgid "Please enter login:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:107 prefs.js:2034
+#: localized_js.php:107 prefs.js:1988
 #, fuzzy
 msgid "Please enter new label background color:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:108 prefs.js:2032
+#: localized_js.php:108 prefs.js:1986
 #, fuzzy
 msgid "Please enter new label foreground color:"
 msgstr "请输入标签主题"
 
-#: localized_js.php:109 prefs.js:931
+#: localized_js.php:109
 msgid "Please select one feed."
 msgstr "请只选择一个feed."
 
-#: localized_js.php:110 prefs.js:613
+#: localized_js.php:110 prefs.js:565
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: localized_js.php:111 prefs.js:911
+#: localized_js.php:111 prefs.js:858
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: localized_js.php:112 prefs.js:823 prefs.js:844 prefs.js:882
+#: localized_js.php:112 prefs.js:768 prefs.js:789 prefs.js:828
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: localized_js.php:113 tt-rss.js:598 tt-rss.js:617 tt-rss.js:831
-#: tt-rss.js:1017
+#: localized_js.php:113 tt-rss.js:581 tt-rss.js:600 tt-rss.js:819
+#: tt-rss.js:1008
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: localized_js.php:114 viewfeed.js:644 viewfeed.js:711
+#: localized_js.php:114 viewfeed.js:607 viewfeed.js:675
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
@@ -738,8 +761,8 @@ msgstr "读取中，请等待..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:116 localized_schema.php:18 viewfeed.js:603
-#: viewfeed.js:718
+#: localized_js.php:116 localized_schema.php:18 viewfeed.js:566
+#: viewfeed.js:682
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -752,7 +775,7 @@ msgstr ""
 msgid "Purging selected feed..."
 msgstr "移除选定的过滤器..."
 
-#: localized_js.php:119 prefs.js:1864
+#: localized_js.php:119 prefs.js:1815
 #, fuzzy, php-format
 msgid "Remove filter %s?"
 msgstr "移除选定的过滤器？"
@@ -762,19 +785,19 @@ msgstr "移除选定的过滤器？"
 msgid "Remove selected articles from label?"
 msgstr "移除选定标记?"
 
-#: localized_js.php:121 prefs.js:672
+#: localized_js.php:121 prefs.js:625
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: localized_js.php:122 prefs.js:548
+#: localized_js.php:122 prefs.js:498
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: localized_js.php:123 prefs.js:485
+#: localized_js.php:123 prefs.js:433
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: localized_js.php:124 prefs.js:514
+#: localized_js.php:124 prefs.js:463
 msgid "Remove selected users?"
 msgstr "移除选定用户?"
 
@@ -808,20 +831,20 @@ msgstr "移除选定标记..."
 msgid "Removing selected users..."
 msgstr "移除选定用户..."
 
-#: localized_js.php:132 prefs.js:1708
+#: localized_js.php:132 prefs.js:1640
 msgid "Replace current publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: localized_js.php:133 prefs.js:1846
+#: localized_js.php:133 prefs.js:1796
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: localized_js.php:134 tt-rss.js:1022
+#: localized_js.php:134 tt-rss.js:1013
 #, fuzzy, php-format
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
-#: localized_js.php:135 prefs.js:1824
+#: localized_js.php:135 prefs.js:1773
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
@@ -836,17 +859,17 @@ msgstr "无选定文章。"
 msgid "Rescoring articles..."
 msgstr "星级文章"
 
-#: localized_js.php:138 tt-rss.js:678
+#: localized_js.php:138 tt-rss.js:661
 #, fuzzy
 msgid "Reset category order?"
 msgstr "移除选定分类?"
 
-#: localized_js.php:139 prefs.js:2008
+#: localized_js.php:139 prefs.js:1961
 #, fuzzy
 msgid "Reset label colors to default?"
 msgstr "重置默认项？"
 
-#: localized_js.php:140 prefs.js:848
+#: localized_js.php:140 prefs.js:793
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
@@ -854,16 +877,16 @@ msgstr "重置选定用户密码?"
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户密码..."
 
-#: localized_js.php:142 prefs.js:1268
+#: localized_js.php:142 prefs.js:1192
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: localized_js.php:143 prefs.js:1923
+#: localized_js.php:143 prefs.js:1876
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "无选定文章。"
 
-#: localized_js.php:144 prefs.js:1729
+#: localized_js.php:144 prefs.js:1677
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
@@ -890,17 +913,21 @@ msgstr "保存过滤器..."
 msgid "Saving user..."
 msgstr "保存用户..."
 
-#: localized_js.php:153 viewfeed.js:586 viewfeed.js:651
+#: localized_js.php:151
+msgid "Selection"
+msgstr "选择："
+
+#: localized_js.php:153 viewfeed.js:549 viewfeed.js:614
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: localized_js.php:156 functions.js:1437
+#: localized_js.php:156 functions.js:1387
 #, fuzzy
 msgid "Subscribing to feed..."
 msgstr "订阅feed"
 
-#: localized_js.php:157 offline.js:1195
+#: localized_js.php:157 offline.js:1197
 msgid "Switch Tiny Tiny RSS into offline mode?"
 msgstr ""
 
@@ -933,17 +960,17 @@ msgstr "保存feed中..."
 msgid "Synchronizing labels..."
 msgstr "保存标记..."
 
-#: localized_js.php:164 tt-rss.php:169 tt-rss.js:79
+#: localized_js.php:164 tt-rss.php:170 tt-rss.js:79
 msgid "tag cloud"
 msgstr "标签簇"
 
-#: localized_js.php:165 offline.js:1672
+#: localized_js.php:165 offline.js:1674
 msgid ""
 "This will remove all offline data stored by Tiny Tiny RSS on this computer. "
 "Continue?"
 msgstr ""
 
-#: localized_js.php:166 offline.js:1743
+#: localized_js.php:166 offline.js:1745
 msgid ""
 "Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
 msgstr ""
@@ -953,7 +980,7 @@ msgstr ""
 msgid "Tiny Tiny RSS is in offline mode."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: localized_js.php:168 offline.js:1223
+#: localized_js.php:168 offline.js:1225
 msgid "Tiny Tiny RSS will reload. Go online?"
 msgstr ""
 
@@ -970,22 +997,22 @@ msgstr "尝试更改e-mail..."
 msgid "Trying to change password..."
 msgstr "尝试更改密码..."
 
-#: localized_js.php:172 viewfeed.js:706
+#: localized_js.php:172 viewfeed.js:670
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:174 viewfeed.js:635
+#: localized_js.php:174 viewfeed.js:598
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: localized_js.php:175 prefs.js:1894 tt-rss.js:604 tt-rss.js:699
+#: localized_js.php:175 prefs.js:1846 tt-rss.js:587 tt-rss.js:683
 #, php-format
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
-#: localized_js.php:176 prefs.js:582
+#: localized_js.php:176 prefs.js:533
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
@@ -993,21 +1020,21 @@ msgstr "退订选定feed?"
 msgid "Unsubscribing from selected feeds..."
 msgstr "退订选定feed..."
 
-#: localized_js.php:178 tt-rss.js:622
+#: localized_js.php:178 tt-rss.js:605
 #, fuzzy
 msgid "You can't clear this type of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:179 tt-rss.js:836
+#: localized_js.php:179 tt-rss.js:824
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:180 tt-rss.js:1012
+#: localized_js.php:180 tt-rss.js:1003
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: localized_js.php:181 tt-rss.js:593
+#: localized_js.php:181 tt-rss.js:576
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
@@ -1021,8 +1048,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:243 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1280 modules/pref-feeds.php:1341
+#: localized_schema.php:9 tt-rss.php:224 modules/popup-dialog.php:224
+#: modules/pref-feeds.php:1243 modules/pref-feeds.php:1302
 msgid "Title"
 msgstr "标题"
 
@@ -1034,7 +1061,7 @@ msgstr "标题或内容"
 msgid "Link"
 msgstr "链接"
 
-#: localized_schema.php:12 modules/popup-dialog.php:166
+#: localized_schema.php:12 modules/popup-dialog.php:225
 msgid "Content"
 msgstr "内容"
 
@@ -1046,10 +1073,6 @@ msgstr ""
 msgid "Filter article"
 msgstr "过滤文章"
 
-#: localized_schema.php:16 tt-rss.php:193
-msgid "Mark as read"
-msgstr "标记为已读"
-
 #: localized_schema.php:17
 msgid "Set starred"
 msgstr "设置星级"
@@ -1319,13 +1342,13 @@ msgstr ""
 msgid "Enable external API"
 msgstr ""
 
-#: login_form.php:105 modules/popup-dialog.php:107 modules/pref-feeds.php:284
-#: modules/pref-feeds.php:494 mobile/login_form.php:38
+#: login_form.php:105 modules/popup-dialog.php:120 modules/pref-feeds.php:296
+#: modules/pref-feeds.php:493 mobile/login_form.php:38
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:108 modules/popup-dialog.php:111 modules/pref-feeds.php:289
-#: modules/pref-feeds.php:500 mobile/login_form.php:43
+#: login_form.php:108 modules/popup-dialog.php:122 modules/pref-feeds.php:301
+#: modules/pref-feeds.php:499 mobile/login_form.php:43
 msgid "Password:"
 msgstr "密码:"
 
@@ -1373,7 +1396,7 @@ msgid ""
 "\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: prefs.php:92 tt-rss.php:113
+#: prefs.php:92 tt-rss.php:114
 msgid "Hello,"
 msgstr "你好,"
 
@@ -1381,17 +1404,17 @@ msgstr "你好,"
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:96 tt-rss.php:123 mobile/functions.php:57
-#: mobile/functions.php:232
+#: prefs.php:96 tt-rss.php:124 mobile/functions.php:60
+#: mobile/functions.php:234
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:104 tt-rss.php:202
+#: prefs.php:104 tt-rss.php:198
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: prefs.php:110 tt-rss.php:115 help/3.php:62 help/4.php:8
+#: prefs.php:110 tt-rss.php:116 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "我的最爱"
 
@@ -1410,6 +1433,11 @@ msgstr "标题:"
 msgid "Users"
 msgstr "用户"
 
+#: prefs.php:142 tt-rss.php:101
+#, fuzzy
+msgid "Fatal Exception"
+msgstr "致命错误"
+
 #: register.php:152
 #, fuzzy
 msgid "New user registrations are administratively disabled."
@@ -1417,7 +1445,7 @@ msgstr "Feed 浏览器有限制"
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:907
+#: update.php:94 update.php:162 modules/pref-feeds.php:884
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
@@ -1470,162 +1498,150 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: tt-rss.php:119
+#: tt-rss.php:120
 #, fuzzy
 msgid "Comments?"
 msgstr "内容"
 
-#: tt-rss.php:132
+#: tt-rss.php:133
 msgid "Offline reading"
 msgstr ""
 
-#: tt-rss.php:139
+#: tt-rss.php:140
 #, fuzzy
 msgid "Cancel synchronization"
 msgstr "保存设置"
 
-#: tt-rss.php:142
+#: tt-rss.php:143
 msgid "Synchronize"
 msgstr ""
 
-#: tt-rss.php:144
+#: tt-rss.php:145
 #, fuzzy
 msgid "Remove stored data"
 msgstr "移除选定标记?"
 
-#: tt-rss.php:146
+#: tt-rss.php:147
 #, fuzzy
 msgid "Go offline"
 msgstr "无链接"
 
-#: tt-rss.php:151
+#: tt-rss.php:152
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: tt-rss.php:158
+#: tt-rss.php:159
 #, fuzzy
 msgid "Go online"
 msgstr "无链接"
 
-#: tt-rss.php:173
-#, fuzzy
-msgid "More feeds..."
-msgstr "移除feed中..."
-
-#: tt-rss.php:184
+#: tt-rss.php:180
 #, fuzzy
 msgid "Search..."
 msgstr "搜索"
 
-#: tt-rss.php:185
+#: tt-rss.php:181
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:186
+#: tt-rss.php:182
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "订阅feed"
 
-#: tt-rss.php:187
+#: tt-rss.php:183
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "输入feed"
 
-#: tt-rss.php:188
+#: tt-rss.php:184
 #, fuzzy
 msgid "Clear articles"
 msgstr "过滤文章"
 
-#: tt-rss.php:189
+#: tt-rss.php:185
 #, fuzzy
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:190 modules/pref-feeds.php:396 modules/pref-feeds.php:1441
+#: tt-rss.php:186 modules/pref-feeds.php:397 modules/pref-feeds.php:1123
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: tt-rss.php:192
+#: tt-rss.php:188
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:194 help/3.php:44
+#: tt-rss.php:190 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:196
+#: tt-rss.php:192
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:199
+#: tt-rss.php:195
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:200
+#: tt-rss.php:196
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:201
+#: tt-rss.php:197
 #, fuzzy
 msgid "Reset category order"
 msgstr "移除选定分类?"
 
-#: tt-rss.php:212
+#: tt-rss.php:207
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:214
-msgid "Toggle Feedlist"
-msgstr ""
-
-#: tt-rss.php:222
-msgid "Search:"
-msgstr "搜索:"
+#: tt-rss.php:210
+#, fuzzy
+msgid "Show articles"
+msgstr "星级文章"
 
-#: tt-rss.php:230
+#: tt-rss.php:212
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:231
+#: tt-rss.php:213
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:234
+#: tt-rss.php:216
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:235 modules/pref-feeds.php:1286 modules/pref-feeds.php:1349
+#: tt-rss.php:217 modules/pref-feeds.php:1249 modules/pref-feeds.php:1310
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:238
+#: tt-rss.php:220
 #, fuzzy
-msgid "Order:"
-msgstr "地点:"
+msgid "Sort articles"
+msgstr "星级文章"
 
-#: tt-rss.php:242 modules/popup-dialog.php:250 modules/pref-filters.php:51
-#: modules/pref-filters.php:472
+#: tt-rss.php:223 modules/popup-dialog.php:305 modules/pref-filters.php:51
+#: modules/pref-filters.php:464
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:244
+#: tt-rss.php:225
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:248
-msgid "Limit:"
-msgstr "限制:"
-
-#: tt-rss.php:273 modules/pref-feeds.php:241 modules/pref-feeds.php:457
+#: tt-rss.php:229 modules/pref-feeds.php:253 modules/pref-feeds.php:456
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:285
+#: tt-rss.php:244
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1738,10 +1754,24 @@ msgid "Error: can't find body element."
 msgstr "错误：未找到body元素"
 
 #: modules/popup-dialog.php:8
+msgid "Published Articles"
+msgstr "已发布文章"
+
+#: modules/popup-dialog.php:13
+#, fuzzy
+msgid "Your Published articles feed URL is:"
+msgstr "已发布文章"
+
+#: modules/popup-dialog.php:22
+#, fuzzy
+msgid "Generate new URL"
+msgstr "产生feed"
+
+#: modules/popup-dialog.php:35
 msgid "Notice"
 msgstr "公告"
 
-#: modules/popup-dialog.php:14
+#: modules/popup-dialog.php:41
 #, fuzzy
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
@@ -1752,11 +1782,11 @@ msgstr ""
 "\t\t\t\t\t该进程未运行, 当所有feed不能更新时，请\n"
 "\t\t\t\t\t开始更新程序或检查设置。"
 
-#: modules/popup-dialog.php:18 modules/popup-dialog.php:38
+#: modules/popup-dialog.php:45 modules/popup-dialog.php:65
 msgid "Last update:"
 msgstr ""
 
-#: modules/popup-dialog.php:26
+#: modules/popup-dialog.php:53
 #, fuzzy
 msgid ""
 "You are running the latest version of Tiny Tiny RSS. The fact that you are "
@@ -1765,7 +1795,7 @@ msgstr ""
 "您正使用最新版本的Tiny Tiny RSS.实际上，您看到的这个对话框，可能是一个BUG，呵"
 "呵。 "
 
-#: modules/popup-dialog.php:34
+#: modules/popup-dialog.php:61
 #, fuzzy
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
@@ -1773,435 +1803,406 @@ msgid ""
 "contact instance owner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:48
+#: modules/popup-dialog.php:75
 msgid "Visit official site"
 msgstr ""
 
-#: modules/popup-dialog.php:61
+#: modules/popup-dialog.php:88
 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
-#: modules/popup-dialog.php:70 modules/pref-feeds.php:142
-#: modules/pref-feeds.php:421 modules/pref-filters.php:414
+#: modules/popup-dialog.php:97 modules/pref-feeds.php:154
+#: modules/pref-feeds.php:420 modules/pref-filters.php:406
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:73 modules/pref-feeds.php:158
-#: modules/pref-feeds.php:435
+#: modules/popup-dialog.php:100 modules/pref-feeds.php:170
+#: modules/pref-feeds.php:434
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:84 modules/pref-feeds.php:170
-#: modules/pref-feeds.php:447
+#: modules/popup-dialog.php:109 modules/pref-feeds.php:182
+#: modules/pref-feeds.php:446
 #, fuzzy
 msgid "Place in category:"
 msgstr "保存分类..."
 
-#: modules/popup-dialog.php:104 modules/pref-feeds.php:277
-#: modules/pref-feeds.php:491 modules/pref-prefs.php:262
+#: modules/popup-dialog.php:117 modules/pref-feeds.php:289
+#: modules/pref-feeds.php:490 modules/pref-prefs.php:238
 #: modules/pref-users.php:142
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/popup-dialog.php:123
+#: modules/popup-dialog.php:132
 msgid "This feed requires authentication."
 msgstr "这个feed需要认证"
 
-#: modules/popup-dialog.php:130 modules/pref-feeds.php:105
+#: modules/popup-dialog.php:138 modules/popup-dialog.php:193
 msgid "Subscribe"
 msgstr "订阅"
 
-#: modules/popup-dialog.php:133 modules/popup-dialog.php:214
-#: modules/popup-dialog.php:337 modules/popup-dialog.php:432
-#: modules/pref-feeds.php:107 modules/pref-feeds.php:401
-#: modules/pref-feeds.php:561 modules/pref-filters.php:166
-#: modules/pref-users.php:183
+#: modules/popup-dialog.php:139
+#, fuzzy
+msgid "More feeds"
+msgstr "移除feed中..."
+
+#: modules/popup-dialog.php:140 modules/popup-dialog.php:195
+#: modules/popup-dialog.php:268 modules/popup-dialog.php:386
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:400
+#: modules/pref-feeds.php:555 modules/pref-filters.php:160
+#: modules/pref-users.php:181
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:140 modules/popup-dialog.php:211
-#: modules/pref-feeds.php:80 modules/pref-feeds.php:1169
-#: modules/pref-filters.php:307 modules/pref-labels.php:132
-#: modules/pref-users.php:363
+#: modules/popup-dialog.php:147
+#, fuzzy
+msgid "Feed Browser"
+msgstr "Feed编辑"
+
+#: modules/popup-dialog.php:165 modules/popup-dialog.php:203
+#: modules/popup-dialog.php:267 modules/pref-feeds.php:1107
+#: modules/pref-filters.php:300 modules/pref-labels.php:131
+#: modules/pref-users.php:361
 msgid "Search"
 msgstr "搜索"
 
-#: modules/popup-dialog.php:152
+#: modules/popup-dialog.php:169
+#, fuzzy
+msgid "Popular feeds"
+msgstr "显示Feed"
+
+#: modules/popup-dialog.php:170
+#, fuzzy
+msgid "Feed archive"
+msgstr "Feed 操作："
+
+#: modules/popup-dialog.php:173
+#, fuzzy
+msgid "limit:"
+msgstr "限制:"
+
+#: modules/popup-dialog.php:194
+msgid "Remove from archive"
+msgstr ""
+
+#: modules/popup-dialog.php:215
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:162
+#: modules/popup-dialog.php:221
 #, fuzzy
 msgid "match on"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:167
+#: modules/popup-dialog.php:226
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:172
+#: modules/popup-dialog.php:231
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:188
+#: modules/popup-dialog.php:247
 msgid "This feed"
 msgstr "本feed"
 
-#: modules/popup-dialog.php:226
+#: modules/popup-dialog.php:281
 #, fuzzy
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:245 modules/pref-filters.php:42
-#: modules/pref-filters.php:413
+#: modules/popup-dialog.php:300 modules/pref-filters.php:42
+#: modules/pref-filters.php:405
 msgid "Match"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:253 modules/pref-filters.php:54
-#: modules/pref-filters.php:444
+#: modules/popup-dialog.php:308 modules/pref-filters.php:54
+#: modules/pref-filters.php:436
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:254 modules/pref-filters.php:55
-#: modules/pref-filters.php:445
+#: modules/popup-dialog.php:309 modules/pref-filters.php:55
+#: modules/pref-filters.php:437
 #, fuzzy
 msgid "after"
 msgstr "更新"
 
-#: modules/popup-dialog.php:268 modules/pref-filters.php:70
+#: modules/popup-dialog.php:321 modules/pref-filters.php:68
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:271 modules/pref-filters.php:73
+#: modules/popup-dialog.php:324 modules/pref-filters.php:71
 #, fuzzy
 msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:277 modules/pref-filters.php:79
+#: modules/popup-dialog.php:330 modules/pref-filters.php:77
 #, fuzzy
 msgid "in"
 msgstr "链接"
 
-#: modules/popup-dialog.php:282 modules/pref-filters.php:84
+#: modules/popup-dialog.php:335 modules/pref-filters.php:82
 #, fuzzy
 msgid "Perform Action"
 msgstr "完成更新"
 
-#: modules/popup-dialog.php:299 modules/pref-filters.php:104
+#: modules/popup-dialog.php:352 modules/pref-filters.php:102
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:312 modules/pref-feeds.php:300
-#: modules/pref-feeds.php:509 modules/pref-filters.php:123
+#: modules/popup-dialog.php:365 modules/pref-feeds.php:312
+#: modules/pref-feeds.php:508 modules/pref-filters.php:121
 #: modules/pref-users.php:164
 #, fuzzy
 msgid "Options"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:318 modules/pref-filters.php:135
+#: modules/popup-dialog.php:371 modules/pref-filters.php:133
 msgid "Enabled"
 msgstr "可用"
 
-#: modules/popup-dialog.php:321 modules/pref-filters.php:144
+#: modules/popup-dialog.php:374 modules/pref-filters.php:142
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:333
+#: modules/popup-dialog.php:384
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:348
+#: modules/popup-dialog.php:398
 msgid "Update Errors"
 msgstr "更新错误"
 
-#: modules/popup-dialog.php:351
+#: modules/popup-dialog.php:401
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:369
+#: modules/popup-dialog.php:419
 msgid "Close"
 msgstr "关闭"
 
-#: modules/popup-dialog.php:378
+#: modules/popup-dialog.php:428
 msgid "Edit Tags"
 msgstr "编辑标签"
 
-#: modules/popup-dialog.php:383
+#: modules/popup-dialog.php:433
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:428 modules/pref-feeds.php:399
-#: modules/pref-feeds.php:559 modules/pref-filters.php:162
-#: modules/pref-users.php:180
+#: modules/popup-dialog.php:455 modules/pref-feeds.php:399
+#: modules/pref-feeds.php:553 modules/pref-filters.php:157
+#: modules/pref-users.php:179
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:441 help/3.php:61
-msgid "Tag cloud"
+#: modules/popup-dialog.php:464
+#, fuzzy
+msgid "Tag Cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:444
+#: modules/popup-dialog.php:467
 msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
-#: modules/popup-dialog.php:445
-msgid "browse more"
-msgstr "浏览更多"
+#: modules/popup-dialog.php:468
+#, fuzzy
+msgid "more tags"
+msgstr "无标签"
 
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
 
-#: modules/pref-feeds.php:44
-msgid "Subscribed to feeds:"
-msgstr "订阅feed:"
-
-#: modules/pref-feeds.php:59
-msgid "Feed browser is administratively disabled."
-msgstr "Feed 浏览器有限制"
-
-#: modules/pref-feeds.php:63
-#, fuzzy
-msgid "Feed Browser"
-msgstr "Feed编辑"
-
-#: modules/pref-feeds.php:83
-msgid "Top"
-msgstr "Top"
-
-#: modules/pref-feeds.php:92
-msgid "Show"
-msgstr "显示"
-
-#: modules/pref-feeds.php:132
+#: modules/pref-feeds.php:144
 #, fuzzy
 msgid "Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:187
+#: modules/pref-feeds.php:199
 #, fuzzy
 msgid "Link to feed:"
 msgstr "链接:"
 
-#: modules/pref-feeds.php:204
+#: modules/pref-feeds.php:216
 msgid "Not linked"
 msgstr "无链接"
 
-#: modules/pref-feeds.php:255 modules/pref-feeds.php:470
+#: modules/pref-feeds.php:267 modules/pref-feeds.php:469
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:267 modules/pref-feeds.php:482
+#: modules/pref-feeds.php:279 modules/pref-feeds.php:481
 msgid "Article purging:"
 msgstr "文章清理:"
 
-#: modules/pref-feeds.php:314 modules/pref-feeds.php:515
-msgid "Hide from \"Other Feeds\""
-msgstr "隐藏\"其他 Feed\""
+#: modules/pref-feeds.php:326 modules/pref-feeds.php:514
+#, fuzzy
+msgid "Hide from Popular feeds"
+msgstr "隐藏我的Feed列表"
 
-#: modules/pref-feeds.php:325 modules/pref-feeds.php:520
+#: modules/pref-feeds.php:337 modules/pref-feeds.php:519
 msgid "Right-to-left content"
 msgstr "由右-左阅读习惯"
 
-#: modules/pref-feeds.php:336 modules/pref-feeds.php:525
-msgid "Hide from my feed list"
-msgstr "隐藏我的Feed列表"
-
-#: modules/pref-feeds.php:348 modules/pref-feeds.php:531
+#: modules/pref-feeds.php:349 modules/pref-feeds.php:525
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:361 modules/pref-feeds.php:537
+#: modules/pref-feeds.php:362 modules/pref-feeds.php:531
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:383 modules/pref-feeds.php:545
+#: modules/pref-feeds.php:384 modules/pref-feeds.php:539
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:411
+#: modules/pref-feeds.php:410
 #, fuzzy
 msgid "Multiple Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:801 modules/pref-feeds.php:848
+#: modules/pref-feeds.php:772 modules/pref-feeds.php:819
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:878
+#: modules/pref-feeds.php:850
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:880
+#: modules/pref-feeds.php:853
+#, fuzzy, php-format
+msgid "Could not subscribe to <b>%s</b>."
+msgstr "已经订阅到 <b>%s</b>."
+
+#: modules/pref-feeds.php:856
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:902
+#: modules/pref-feeds.php:879
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:988
+#: modules/pref-feeds.php:963
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:1011
+#: modules/pref-feeds.php:986
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:1042
-msgid "Unable to delete non empty feed categories."
-msgstr "不能删除非空分类。"
-
-#: modules/pref-feeds.php:1059
+#: modules/pref-feeds.php:1007
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1119
+#: modules/pref-feeds.php:1060
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1130 modules/pref-filters.php:156
-#: modules/pref-filters.php:516 modules/pref-labels.php:239
-#: modules/pref-users.php:484
+#: modules/pref-feeds.php:1066 modules/pref-filters.php:153
+#: modules/pref-filters.php:313 modules/pref-labels.php:140
+#: modules/pref-users.php:378
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:1152
+#: modules/pref-feeds.php:1090
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:1174 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1111 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1179
+#: modules/pref-feeds.php:1114
 #, fuzzy
-msgid "More Feeds"
-msgstr "移除feed中..."
+msgid "Edit feeds"
+msgstr "输入feed"
+
+#: modules/pref-feeds.php:1119
+msgid "Edit categories"
+msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1266
+#: modules/pref-feeds.php:1229
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1283 modules/pref-feeds.php:1345
+#: modules/pref-feeds.php:1246 modules/pref-feeds.php:1306
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1370 modules/pref-filters.php:490
-#: modules/pref-users.php:459
+#: modules/pref-feeds.php:1331 modules/pref-filters.php:482
+#: modules/pref-users.php:467
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1378
-msgid "(Hidden)"
-msgstr ""
-
-#: modules/pref-feeds.php:1391
+#: modules/pref-feeds.php:1345
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1417 modules/pref-feeds.php:1430
-#, fuzzy
-msgid "Selection:"
-msgstr "选择："
-
-#: modules/pref-feeds.php:1423
-msgid "Recategorize"
-msgstr "再分类"
-
-#: modules/pref-feeds.php:1431 modules/pref-filters.php:514
-#: modules/pref-users.php:482
-msgid "Edit"
-msgstr "编辑"
-
-#: modules/pref-feeds.php:1435
-msgid "Manual purge"
-msgstr ""
-
-#: modules/pref-feeds.php:1439
-#, fuzzy
-msgid "Clear feed data"
-msgstr "所有Feed已更新。"
-
-#: modules/pref-feeds.php:1440 modules/pref-filters.php:324
-#, fuzzy
-msgid "Rescore articles"
-msgstr "星级文章"
-
-#: modules/pref-feeds.php:1447
-#, fuzzy
-msgid "Other:"
-msgstr "地点:"
-
-#: modules/pref-feeds.php:1448
-msgid "Edit categories"
-msgstr "编辑分类"
-
-#: modules/pref-feeds.php:1460
+#: modules/pref-feeds.php:1372
 #, fuzzy
 msgid "You don't have any subscribed feeds."
 msgstr "您不能从分类中取消订阅。"
 
-#: modules/pref-feeds.php:1462
+#: modules/pref-feeds.php:1374
 #, fuzzy
 msgid "No matching feeds found."
 msgstr "未找到文章。"
 
-#: modules/pref-feeds.php:1468
+#: modules/pref-feeds.php:1380
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1472
+#: modules/pref-feeds.php:1384
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1387
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1482
+#: modules/pref-feeds.php:1393
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1485
+#: modules/pref-feeds.php:1396
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1398
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1491
+#: modules/pref-feeds.php:1405
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1500
+#: modules/pref-feeds.php:1416
 #, fuzzy
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1504
+#: modules/pref-feeds.php:1419
 #, fuzzy
-msgid "Link to published articles feed."
-msgstr "已发布文章"
+msgid "Display URL"
+msgstr "显示标签"
 
-#: modules/pref-feeds.php:1507
-#, fuzzy
-msgid "Generate another link"
-msgstr "生成另一个地址"
+#: modules/pref-feeds.php:1518
+#, fuzzy, php-format
+msgid "%d archived articles"
+msgstr "星级文章"
 
-#: modules/pref-feeds.php:1573
+#: modules/pref-feeds.php:1542
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2211,43 +2212,52 @@ msgstr "无feed可订阅。"
 msgid "Filter Editor"
 msgstr "过滤器编辑"
 
-#: modules/pref-filters.php:214
+#: modules/pref-filters.php:208
 #, php-format
 msgid "Saved filter <b>%s</b>"
 msgstr "保存过滤器<b>%s</b>"
 
-#: modules/pref-filters.php:264
+#: modules/pref-filters.php:258
 #, php-format
 msgid "Created filter <b>%s</b>"
 msgstr "创建过滤器 <b>%s</b>"
 
-#: modules/pref-filters.php:317 help/3.php:31 help/4.php:25
+#: modules/pref-filters.php:307 help/3.php:31 help/4.php:25
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: modules/pref-filters.php:415
+#: modules/pref-filters.php:310 modules/pref-users.php:376
+msgid "Edit"
+msgstr "编辑"
+
+#: modules/pref-filters.php:316
+#, fuzzy
+msgid "Rescore articles"
+msgstr "星级文章"
+
+#: modules/pref-filters.php:407
 #, fuzzy
 msgid "Field"
 msgstr "Feed"
 
-#: modules/pref-filters.php:416
+#: modules/pref-filters.php:408
 #, fuzzy
 msgid "Params"
 msgstr "参数:"
 
-#: modules/pref-filters.php:479
+#: modules/pref-filters.php:471
 msgid "(Disabled)"
 msgstr "(不可用)"
 
-#: modules/pref-filters.php:495
+#: modules/pref-filters.php:487
 msgid "(Inverse)"
 msgstr "(逆)"
 
-#: modules/pref-filters.php:524
+#: modules/pref-filters.php:507
 msgid "No filters defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-filters.php:526
+#: modules/pref-filters.php:509
 #, fuzzy
 msgid "No matching filters found."
 msgstr "未找到文章。"
@@ -2257,132 +2267,132 @@ msgstr "未找到文章。"
 msgid "Created label <b>%s</b>"
 msgstr "创建标记 <b>%s</b>"
 
-#: modules/pref-labels.php:140 help/3.php:30 help/4.php:26
+#: modules/pref-labels.php:137 help/3.php:30 help/4.php:26
 msgid "Create label"
 msgstr "创建标记"
 
-#: modules/pref-labels.php:217
-#, fuzzy
-msgid "Click to change color"
-msgstr "星级文章"
-
-#: modules/pref-labels.php:247
+#: modules/pref-labels.php:143
 #, fuzzy
 msgid "Clear colors"
 msgstr "过滤文章"
 
-#: modules/pref-labels.php:254
+#: modules/pref-labels.php:223
+#, fuzzy
+msgid "Click to change color"
+msgstr "星级文章"
+
+#: modules/pref-labels.php:246
 msgid "No labels defined."
 msgstr "未定义标记."
 
-#: modules/pref-labels.php:256
+#: modules/pref-labels.php:248
 #, fuzzy
 msgid "No matching labels found."
 msgstr "未找到文章。"
 
-#: modules/pref-labels.php:314
+#: modules/pref-labels.php:306
 msgid "custom color:"
 msgstr ""
 
-#: modules/pref-labels.php:315
+#: modules/pref-labels.php:307
 msgid "foreground"
 msgstr ""
 
-#: modules/pref-labels.php:316
+#: modules/pref-labels.php:308
 msgid "background"
 msgstr ""
 
-#: modules/pref-prefs.php:65
+#: modules/pref-prefs.php:66
 msgid "Password has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:67
+#: modules/pref-prefs.php:68
 msgid "Old password is incorrect."
 msgstr "原密码错误."
 
-#: modules/pref-prefs.php:117
+#: modules/pref-prefs.php:93
 msgid "The configuration was saved."
 msgstr "设置已保存."
 
-#: modules/pref-prefs.php:132
+#: modules/pref-prefs.php:108
 #, php-format
 msgid "Unknown option: %s"
 msgstr ""
 
-#: modules/pref-prefs.php:143
+#: modules/pref-prefs.php:119
 #, fuzzy
 msgid "E-mail has been changed."
 msgstr "密码已更改."
 
-#: modules/pref-prefs.php:155 modules/pref-prefs.php:213
+#: modules/pref-prefs.php:131 modules/pref-prefs.php:189
 msgid "The configuration was reset to defaults."
 msgstr "设置重置为默认"
 
-#: modules/pref-prefs.php:198
+#: modules/pref-prefs.php:174
 msgid ""
 "Your password is at default value, \n"
 "\t\t\t\t\t\tplease change it."
 msgstr "您的密码是默认的，请修改。"
 
-#: modules/pref-prefs.php:225
+#: modules/pref-prefs.php:201
 msgid "Personal data"
 msgstr "个人数据"
 
-#: modules/pref-prefs.php:232
+#: modules/pref-prefs.php:208
 #, fuzzy
 msgid "E-mail"
 msgstr "E-mail:"
 
-#: modules/pref-prefs.php:243
+#: modules/pref-prefs.php:219
 #, fuzzy
 msgid "Access level"
 msgstr "等级:"
 
-#: modules/pref-prefs.php:256
+#: modules/pref-prefs.php:232
 msgid "Change e-mail"
 msgstr "更改 e-mail"
 
-#: modules/pref-prefs.php:264
+#: modules/pref-prefs.php:240
 msgid "Old password"
 msgstr "原密码"
 
-#: modules/pref-prefs.php:271
+#: modules/pref-prefs.php:247
 msgid "New password"
 msgstr "新密码"
 
-#: modules/pref-prefs.php:279
+#: modules/pref-prefs.php:255
 msgid "Confirm password"
 msgstr "验证密码"
 
-#: modules/pref-prefs.php:296
+#: modules/pref-prefs.php:271
 msgid "Change password"
 msgstr "更改密码"
 
-#: modules/pref-prefs.php:312
+#: modules/pref-prefs.php:287
 msgid "Themes"
 msgstr "模板"
 
-#: modules/pref-prefs.php:313
+#: modules/pref-prefs.php:288
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:331
+#: modules/pref-prefs.php:305
 msgid "Change theme"
 msgstr "更改模板"
 
-#: modules/pref-prefs.php:400 modules/pref-prefs.php:405
+#: modules/pref-prefs.php:374 modules/pref-prefs.php:379
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:402 modules/pref-prefs.php:405
+#: modules/pref-prefs.php:376 modules/pref-prefs.php:379
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:427
+#: modules/pref-prefs.php:400
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:431
+#: modules/pref-prefs.php:403
 msgid "Reset to defaults"
 msgstr "恢复到默认？"
 
@@ -2391,7 +2401,7 @@ msgstr "恢复到默认？"
 msgid "Your access level is insufficient to open this tab."
 msgstr "权限不足。"
 
-#: modules/pref-users.php:17 modules/pref-users.php:480
+#: modules/pref-users.php:17
 msgid "User details"
 msgstr "用户详细"
 
@@ -2400,7 +2410,7 @@ msgstr "用户详细"
 msgid "User not found"
 msgstr "未找到Feed."
 
-#: modules/pref-users.php:50 modules/pref-users.php:420
+#: modules/pref-users.php:50 modules/pref-users.php:428
 msgid "Registered"
 msgstr ""
 
@@ -2439,27 +2449,27 @@ msgstr "更改密码"
 msgid "E-mail: "
 msgstr "E-mail:"
 
-#: modules/pref-users.php:203
+#: modules/pref-users.php:201
 #, php-format
 msgid "Changed password of user <b>%s</b>."
 msgstr "更改用<b>%s</b>密码"
 
-#: modules/pref-users.php:251
+#: modules/pref-users.php:249
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "添加用 <b>%s</b> ，密码为<b>%s</b>"
 
-#: modules/pref-users.php:258
+#: modules/pref-users.php:256
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "创建用户 <b>%s</b> 失败"
 
-#: modules/pref-users.php:262
+#: modules/pref-users.php:260
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: modules/pref-users.php:282
+#: modules/pref-users.php:280
 #, php-format
 msgid ""
 "Changed password of user <b>%s</b>\n"
@@ -2468,41 +2478,46 @@ msgstr ""
 "更改用户 <b>%s</b>\n"
 "\t\t\t\t\t 的密码为 <b>%s</b>"
 
-#: modules/pref-users.php:286
+#: modules/pref-users.php:284
 #, fuzzy, php-format
 msgid "Notifying <b>%s</b>."
 msgstr "添加分类 <b>%s</b>."
 
-#: modules/pref-users.php:323
+#: modules/pref-users.php:321
 msgid "[tt-rss] Password change notification"
 msgstr ""
 
-#: modules/pref-users.php:374 help/4.php:27
+#: modules/pref-users.php:370 help/4.php:27
 msgid "Create user"
 msgstr "创建用户"
 
-#: modules/pref-users.php:418
+#: modules/pref-users.php:374
+#, fuzzy
+msgid "Details"
+msgstr "每天"
+
+#: modules/pref-users.php:380
+msgid "Reset password"
+msgstr "重置密码"
+
+#: modules/pref-users.php:426
 msgid "Login"
 msgstr "登陆"
 
-#: modules/pref-users.php:419
+#: modules/pref-users.php:427
 msgid "Access Level"
 msgstr "等级:"
 
-#: modules/pref-users.php:421
+#: modules/pref-users.php:429
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:486
-msgid "Reset password"
-msgstr "重置密码"
-
-#: modules/pref-users.php:491
+#: modules/pref-users.php:487
 #, fuzzy
 msgid "No users defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-users.php:493
+#: modules/pref-users.php:489
 #, fuzzy
 msgid "No matching users found."
 msgstr "未找到文章。"
@@ -2675,6 +2690,10 @@ msgstr ""
 msgid "Go to..."
 msgstr ""
 
+#: help/3.php:61
+msgid "Tag cloud"
+msgstr "标签簇"
+
 #: help/3.php:68 help/4.php:41
 #, fuzzy
 msgid "Press any key to close this window."
@@ -2713,13 +2732,13 @@ msgid ""
 "configuration and your access level."
 msgstr ""
 
-#: mobile/functions.php:56 mobile/functions.php:134 mobile/functions.php:170
-#: mobile/functions.php:197 mobile/functions.php:231 mobile/functions.php:355
+#: mobile/functions.php:59 mobile/functions.php:136 mobile/functions.php:172
+#: mobile/functions.php:199 mobile/functions.php:233 mobile/functions.php:356
 #: mobile/prefs.php:25
 msgid "Home"
 msgstr ""
 
-#: mobile/functions.php:391
+#: mobile/functions.php:392
 msgid "Nothing found (click to reload feed)."
 msgstr ""
 
@@ -2752,6 +2771,100 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
+#: functions.js:1410
+#, fuzzy
+msgid "Subscribed to %s"
+msgstr "订阅feed:"
+
+#: functions.js:1419
+#, fuzzy
+msgid "Can't subscribe to the specified URL."
+msgstr "未能订阅：无 feed URL。"
+
+#: functions.js:1422
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "您不能从分类中取消订阅。"
+
+#: functions.js:2202
+#, fuzzy
+msgid "Subscribed to %d feed(s)."
+msgstr "订阅feed:"
+
+#: functions.js:2227
+#, fuzzy
+msgid "Remove selected feeds from archive?"
+msgstr "移除选定标记?"
+
+#: viewfeed.js:1333
+#, fuzzy
+msgid "Delete %d selected articles in %s?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:1335
+#, fuzzy
+msgid "Delete %d selected articles?"
+msgstr "移除选定标记?"
+
+#: viewfeed.js:1383
+#, fuzzy
+msgid "Archive %d selected articles in %s?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:1386
+msgid "Move %d archived articles back?"
+msgstr ""
+
+#~ msgid "Search results"
+#~ msgstr "搜索结果"
+
+#~ msgid "Searched for"
+#~ msgstr "搜索"
+
+#, fuzzy
+#~ msgid "More feeds..."
+#~ msgstr "移除feed中..."
+
+#~ msgid "Search:"
+#~ msgstr "搜索:"
+
+#, fuzzy
+#~ msgid "Order:"
+#~ msgstr "地点:"
+
+#~ msgid "browse more"
+#~ msgstr "浏览更多"
+
+#~ msgid "Feed browser is administratively disabled."
+#~ msgstr "Feed 浏览器有限制"
+
+#~ msgid "Top"
+#~ msgstr "Top"
+
+#~ msgid "Show"
+#~ msgstr "显示"
+
+#~ msgid "Hide from \"Other Feeds\""
+#~ msgstr "隐藏\"其他 Feed\""
+
+#~ msgid "Unable to delete non empty feed categories."
+#~ msgstr "不能删除非空分类。"
+
+#~ msgid "Recategorize"
+#~ msgstr "再分类"
+
+#, fuzzy
+#~ msgid "Clear feed data"
+#~ msgstr "所有Feed已更新。"
+
+#, fuzzy
+#~ msgid "Other:"
+#~ msgstr "地点:"
+
+#, fuzzy
+#~ msgid "Generate another link"
+#~ msgstr "生成另一个地址"
+
 #, fuzzy
 #~ msgid "View feeds"
 #~ msgstr "隐藏我的Feed列表"
@@ -2809,9 +2922,6 @@ msgstr "以未读文章数量排序feed源"
 #~ msgid "short_desc"
 #~ msgstr "short_desc"
 
-#~ msgid "display tags"
-#~ msgstr "显示标签"
-
 #~ msgid "Can't add user: no login specified."
 #~ msgstr "添加用户失败：未登录。"
 
@@ -2902,15 +3012,9 @@ msgstr "以未读文章数量排序feed源"
 #~ msgid "config: DATABASE_BACKED_SESSIONS are currently broken with MySQL"
 #~ msgstr "设置: DATABASE_BACKED_SESSIONS 受到 MySQL 影响"
 
-#~ msgid "Fatal Error"
-#~ msgstr "致命错误"
-
 #~ msgid "Unknown Error"
 #~ msgstr "未知错误"
 
-#~ msgid "Published Articles"
-#~ msgstr "已发布文章"
-
 #~ msgid "Feed information:"
 #~ msgstr "Feed 信息："
 
@@ -2986,10 +3090,6 @@ msgstr "以未读文章数量排序feed源"
 #~ msgstr "本控制面板显示系统其他用户订阅的feed，如果您感兴趣。"
 
 #, fuzzy
-#~ msgid "Stored articles"
-#~ msgstr "星级文章"
-
-#, fuzzy
 #~ msgid "Match "
 #~ msgstr "匹配"