update translations

2 files changed, 402 insertions, 341 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index b53022c90..4c44a0d9a 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 f2d01285e..261940a0e 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: 2010-11-03 13:38+0300\n"
+"POT-Creation-Date: 2010-11-08 14:28+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:143 tt-rss.php:226 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:224 modules/pref-prefs.php:329
 msgid "Default"
 msgstr "默认"
 
@@ -102,7 +102,7 @@ msgstr ""
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:552 login_form.php:142 modules/backend-rpc.php:61
+#: backend.php:546 login_form.php:142 modules/backend-rpc.php:61
 #: modules/popup-dialog.php:106
 #, fuzzy
 msgid "Default profile"
@@ -116,29 +116,30 @@ msgid ""
 "\t\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: digest.php:64 prefs.php:64 prefs.php:124 tt-rss.php:66 digest.js:132
+#: digest.php:64 prefs.php:67 prefs.php:125 tt-rss.php:68 tt-rss.php:242
+#: tt-rss.php:256 digest.js:132
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
-#: digest.php:72 prefs.php:141 tt-rss.php:100
+#: digest.php:72 prefs.php:141 tt-rss.php:97
 #, fuzzy
 msgid "Fatal Exception"
 msgstr "致命错误"
 
-#: digest.php:74 functions.php:4989 prefs.php:143 tt-rss.php:102
+#: digest.php:74 functions.php:5006 prefs.php:143 tt-rss.php:99
 #: modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:154 modules/popup-dialog.php:181
-#: modules/popup-dialog.php:208 modules/popup-dialog.php:257
-#: modules/popup-dialog.php:602 modules/popup-dialog.php:661
-#: modules/pref-feeds.php:1132 modules/pref-users.php:96
+#: modules/popup-dialog.php:230 modules/popup-dialog.php:575
+#: modules/popup-dialog.php:634 modules/popup-dialog.php:779
+#: modules/pref-feeds.php:1118 modules/pref-users.php:96
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: digest.php:84 prefs.php:91 tt-rss.php:113
+#: digest.php:84 prefs.php:92 tt-rss.php:110
 msgid "Hello,"
 msgstr "你好,"
 
-#: digest.php:88 prefs.php:95 tt-rss.php:123 mobile/functions.php:60
+#: digest.php:88 prefs.php:96 tt-rss.php:120 mobile/functions.php:60
 #: mobile/functions.php:234
 msgid "Logout"
 msgstr "注销"
@@ -226,262 +227,303 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1938
+#: functions.php:1927
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2008
+#: functions.php:1997
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2991 modules/popup-dialog.php:418
+#: functions.php:2827 functions.php:2860 functions.php:2911
+msgid "total"
+msgstr ""
+
+#: functions.php:2993 modules/popup-dialog.php:391
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:3023 functions.php:3062 functions.php:4471 functions.php:4499
-#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
+#: functions.php:3025 functions.php:3066 functions.php:4470 functions.php:4498
+#: modules/backend-rpc.php:818 modules/pref-feeds.php:1309
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3052 functions.php:3712 modules/backend-rpc.php:874
+#: functions.php:3045
+#, fuzzy
+msgid "Add category..."
+msgstr "添加feed分类..."
+
+#: functions.php:3056 functions.php:3697 modules/backend-rpc.php:823
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3054 functions.php:3714 prefs.php:115
-#: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
+#: functions.php:3058 functions.php:3699 prefs.php:116
+#: modules/backend-rpc.php:828 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3099 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3103 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3101 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3105 modules/pref-feeds.php:1491 help/3.php:61
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3103 help/3.php:59
+#: functions.php:3107 help/3.php:59
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3105 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3109 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3107
+#: functions.php:3111
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4224
-msgid "Generated feed"
-msgstr "产生feed"
+#: functions.php:4174
+msgid "Visit the website"
+msgstr ""
 
-#: functions.php:4229 functions.php:5579 modules/popup-dialog.php:82
-#: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289
+#: functions.php:4217
+#, fuzzy
+msgid "View as RSS feed"
+msgstr "隐藏我的Feed列表"
+
+#: functions.php:4223 functions.php:5590 modules/popup-dialog.php:82
+#: modules/pref-feeds.php:1065 modules/pref-feeds.php:1275
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4230 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
-#: modules/pref-feeds.php:1290 modules/pref-filters.php:378
+#: functions.php:4224 modules/popup-dialog.php:83 modules/pref-feeds.php:1066
+#: modules/pref-feeds.php:1276 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4231 functions.php:4248 tt-rss.php:219
+#: functions.php:4225 functions.php:4242 tt-rss.php:217
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4232
+#: functions.php:4226
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4233 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
-#: modules/pref-feeds.php:1291 modules/pref-filters.php:379
+#: functions.php:4227 modules/popup-dialog.php:84 modules/pref-feeds.php:1067
+#: modules/pref-feeds.php:1277 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "无"
 
-#: functions.php:4241 tt-rss.php:179 offline.js:184
+#: functions.php:4235 tt-rss.php:176 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4247
+#: functions.php:4241
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4249 tt-rss.php:218
+#: functions.php:4243 tt-rss.php:215
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4250
+#: functions.php:4244 tt-rss.php:216
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4251
+#: functions.php:4245
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4252 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
+#: functions.php:4246 localized_schema.php:16 tt-rss.php:185 tt-rss.php:234
 #: digest.js:365 digest.js:435 digest.js:589
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4258
+#: functions.php:4252
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4260
+#: functions.php:4254
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4261
+#: functions.php:4255
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4266
+#: functions.php:4260 functions.php:4873
+msgid "Forward by email"
+msgstr ""
+
+#: functions.php:4263
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4307
+#: functions.php:4267
+msgid "Feed:"
+msgstr "Feed:"
+
+#: functions.php:4268 modules/popup-dialog.php:755
+#, fuzzy
+msgid "View as RSS"
+msgstr "编辑标签"
+
+#: functions.php:4311
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4517
-msgid "No feeds to display."
-msgstr "无feed显示。"
+#: functions.php:4520 functions.php:4526 tt-rss.php:179
+#, fuzzy
+msgid "Subscribe to feed..."
+msgstr "订阅feed"
 
-#: functions.php:4534
+#: functions.php:4546
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4693
+#: functions.php:4705
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4819
+#: functions.php:4829
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4844 functions.php:5606
+#: functions.php:4854 functions.php:5617
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4850 functions.php:5589
+#: functions.php:4860 functions.php:5600
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4857 functions.php:5596
+#: functions.php:4867 functions.php:5607
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4891 functions.php:5476
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4887 functions.php:5478
+#: functions.php:4904 functions.php:5489
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4927 functions.php:5508
+#: functions.php:4944 functions.php:5519
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4967 functions.php:5553
+#: functions.php:4984 functions.php:5564
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4969 functions.php:5555
+#: functions.php:4986 functions.php:5566
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:5045
+#: functions.php:5063
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:5114
+#: functions.php:5130
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5278 functions.php:5365
+#: functions.php:5289 functions.php:5376
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5441 functions.php:5448 digest.js:441
+#: functions.php:5452 functions.php:5459 digest.js:441
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5613
+#: functions.php:5624
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5632
+#: functions.php:5643
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5635
+#: functions.php:5646
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5638
+#: functions.php:5649
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5642
+#: functions.php:5653
 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:5644 offline.js:443
+#: functions.php:5655 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6399 tt-rss.php:199
+#: functions.php:6406 tt-rss.php:196
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6412
+#: functions.php:6420
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6464
+#: functions.php:6472
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6493
+#: functions.php:6501
 msgid "edit note"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:228 modules/popup-dialog.php:408
-#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
+#: functions.php:6858
+msgid "No feed selected."
+msgstr "无选定feed."
+
+#: functions.php:6868
+#, php-format
+msgid "Feeds last updated at %s"
+msgstr ""
+
+#: functions.php:6878 modules/pref-feeds.php:1138
+msgid "Some feeds have update errors (click for details)"
+msgstr "有些feed更新错误(点击了解详情) "
+
+#: localized_schema.php:9 tt-rss.php:226 modules/popup-dialog.php:381
+#: modules/pref-feeds.php:1286 modules/pref-feeds.php:1337
 msgid "Title"
 msgstr "标题"
 
@@ -493,7 +535,7 @@ msgstr "标题或内容"
 msgid "Link"
 msgstr "链接"
 
-#: localized_schema.php:12 modules/popup-dialog.php:409
+#: localized_schema.php:12 modules/popup-dialog.php:382
 msgid "Content"
 msgstr "内容"
 
@@ -509,8 +551,8 @@ msgstr "过滤文章"
 msgid "Set starred"
 msgstr "设置星级"
 
-#: localized_schema.php:18 digest.js:412 digest.js:702 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 digest.js:412 digest.js:702 viewfeed.js:548
+#: viewfeed.js:662
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -779,12 +821,12 @@ msgstr ""
 msgid "Enable external API"
 msgstr ""
 
-#: login_form.php:120 modules/popup-dialog.php:298 modules/pref-feeds.php:337
+#: login_form.php:120 modules/popup-dialog.php:271 modules/pref-feeds.php:337
 #: modules/pref-feeds.php:557 mobile/login_form.php:38
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:124 modules/popup-dialog.php:300 modules/pref-feeds.php:342
+#: login_form.php:124 modules/popup-dialog.php:273 modules/pref-feeds.php:342
 #: modules/pref-feeds.php:563 mobile/login_form.php:43
 msgid "Password:"
 msgstr "密码:"
@@ -831,37 +873,37 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:71 prefs.php:127 tt-rss.php:74
+#: prefs.php:74 prefs.php:128 tt-rss.php:76
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
 "\t\tfor this application to function properly. Please check your\n"
 "\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: prefs.php:93 help/4.php:14
+#: prefs.php:94 help/4.php:14
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:103
+#: prefs.php:104
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: prefs.php:109 tt-rss.php:115 help/3.php:63 help/4.php:8
+#: prefs.php:110 tt-rss.php:112 help/3.php:63 help/4.php:8
 msgid "Preferences"
 msgstr "我的最爱"
 
-#: prefs.php:111
+#: prefs.php:112
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
-#: prefs.php:113 help/4.php:11
+#: prefs.php:114 help/4.php:11
 #, fuzzy
 msgid "Filters"
 msgstr "标题:"
 
-#: prefs.php:118 help/4.php:13
+#: prefs.php:119 help/4.php:13
 #, fuzzy
 msgid "Users"
 msgstr "用户"
@@ -926,168 +968,159 @@ msgstr ""
 msgid "New user registrations are currently closed."
 msgstr ""
 
-#: tt-rss.php:119
+#: tt-rss.php:116
 #, fuzzy
 msgid "Comments?"
 msgstr "内容"
 
-#: tt-rss.php:132
+#: tt-rss.php:129
 msgid "Offline reading"
 msgstr ""
 
-#: tt-rss.php:139
+#: tt-rss.php:136
 #, fuzzy
 msgid "Cancel synchronization"
 msgstr "保存设置"
 
-#: tt-rss.php:142
+#: tt-rss.php:139
 msgid "Synchronize"
 msgstr ""
 
-#: tt-rss.php:144
+#: tt-rss.php:141
 #, fuzzy
 msgid "Remove stored data"
 msgstr "移除选定标记?"
 
-#: tt-rss.php:146
+#: tt-rss.php:143
 #, fuzzy
 msgid "Go offline"
 msgstr "无链接"
 
-#: tt-rss.php:152
+#: tt-rss.php:149
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr ""
 
-#: tt-rss.php:159
+#: tt-rss.php:156
 #, fuzzy
 msgid "Go online"
 msgstr "无链接"
 
-#: tt-rss.php:170 tt-rss.js:78
+#: tt-rss.php:167 tt-rss.js:77
 msgid "tag cloud"
 msgstr "标签簇"
 
-#: tt-rss.php:180
+#: tt-rss.php:177
 #, fuzzy
 msgid "Search..."
 msgstr "搜索"
 
-#: tt-rss.php:181
+#: tt-rss.php:178
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:182
-#, fuzzy
-msgid "Subscribe to feed..."
-msgstr "订阅feed"
-
-#: tt-rss.php:183
+#: tt-rss.php:180
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "输入feed"
 
-#: tt-rss.php:184
+#: tt-rss.php:181
 #, fuzzy
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:185 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
+#: tt-rss.php:182 modules/pref-feeds.php:463 modules/pref-feeds.php:1171
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: tt-rss.php:187
+#: tt-rss.php:184
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:189 help/3.php:44
+#: tt-rss.php:186 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:191
+#: tt-rss.php:188
 #, fuzzy
 msgid "Categories:"
 msgstr "分类:"
 
-#: tt-rss.php:193
+#: tt-rss.php:190
 #, fuzzy
 msgid "Toggle reordering mode"
 msgstr "移除选定分类?"
 
-#: tt-rss.php:194
+#: tt-rss.php:191
 #, fuzzy
 msgid "Reset order"
 msgstr "重置密码"
 
-#: tt-rss.php:197
+#: tt-rss.php:194
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:200
+#: tt-rss.php:197
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:201
+#: tt-rss.php:198
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:202
+#: tt-rss.php:199
 #, fuzzy
 msgid "Keyboard shortcuts help"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:211
+#: tt-rss.php:208
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:214
+#: tt-rss.php:211
 #, fuzzy
 msgid "Show articles"
 msgstr "星级文章"
 
-#: tt-rss.php:216
+#: tt-rss.php:213
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:217
+#: tt-rss.php:214
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:220
+#: tt-rss.php:218
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:221 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
+#: tt-rss.php:219 modules/pref-feeds.php:1292 modules/pref-feeds.php:1345
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:224
+#: tt-rss.php:222
 #, fuzzy
 msgid "Sort articles"
 msgstr "星级文章"
 
-#: tt-rss.php:227 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:225 modules/popup-dialog.php:462 modules/pref-filters.php:51
 #: modules/pref-filters.php:469
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:229
+#: tt-rss.php:227
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:233 modules/pref-feeds.php:296 modules/pref-feeds.php:522
+#: tt-rss.php:231 modules/pref-feeds.php:296 modules/pref-feeds.php:522
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:244 tt-rss.php:258
-msgid "No feed selected."
-msgstr "无选定feed."
-
-#: tt-rss.php:248
+#: tt-rss.php:246
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1230,8 +1263,8 @@ msgstr "创建过滤器"
 msgid "(active)"
 msgstr "自适应"
 
-#: modules/popup-dialog.php:148 modules/popup-dialog.php:377
-#: modules/pref-feeds.php:453 modules/pref-feeds.php:1128
+#: modules/popup-dialog.php:148 modules/popup-dialog.php:350
+#: modules/pref-feeds.php:453 modules/pref-feeds.php:1114
 #: modules/pref-filters.php:153 modules/pref-filters.php:321
 #: modules/pref-labels.php:140 modules/pref-users.php:378
 msgid "Remove"
@@ -1243,33 +1276,24 @@ msgid "Activate"
 msgstr "自适应"
 
 #: modules/popup-dialog.php:163
-msgid "Published Articles"
-msgstr "已发布文章"
+msgid "Public OPML URL"
+msgstr ""
 
 #: modules/popup-dialog.php:168
 #, fuzzy
-msgid "Your Published articles feed URL is:"
+msgid "Your Public OPML URL is:"
 msgstr "已发布文章"
 
-#: modules/popup-dialog.php:177 modules/popup-dialog.php:204
+#: modules/popup-dialog.php:177 modules/popup-dialog.php:775
 #, fuzzy
 msgid "Generate new URL"
 msgstr "产生feed"
 
 #: modules/popup-dialog.php:190
-msgid "Public OPML URL"
-msgstr ""
-
-#: modules/popup-dialog.php:195
-#, fuzzy
-msgid "Your Public OPML URL is:"
-msgstr "已发布文章"
-
-#: modules/popup-dialog.php:217
 msgid "Notice"
 msgstr "公告"
 
-#: modules/popup-dialog.php:223
+#: modules/popup-dialog.php:196
 #, fuzzy
 msgid ""
 "Update daemon is enabled in configuration, but daemon process is not "
@@ -1280,11 +1304,11 @@ msgstr ""
 "\t\t\t\t\t该进程未运行, 当所有feed不能更新时，请\n"
 "\t\t\t\t\t开始更新程序或检查设置。"
 
-#: modules/popup-dialog.php:227 modules/popup-dialog.php:247
+#: modules/popup-dialog.php:200 modules/popup-dialog.php:220
 msgid "Last update:"
 msgstr ""
 
-#: modules/popup-dialog.php:235
+#: modules/popup-dialog.php:208
 #, fuzzy
 msgid ""
 "You are running the latest version of Tiny Tiny RSS. The fact that you are "
@@ -1293,7 +1317,7 @@ msgstr ""
 "您正使用最新版本的Tiny Tiny RSS.实际上，您看到的这个对话框，可能是一个BUG，呵"
 "呵。 "
 
-#: modules/popup-dialog.php:243
+#: modules/popup-dialog.php:216
 #, fuzzy
 msgid ""
 "Update daemon is taking too long to perform a feed update. This could "
@@ -1301,202 +1325,238 @@ msgid ""
 "contact instance owner."
 msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
-#: modules/popup-dialog.php:266
+#: modules/popup-dialog.php:239
 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
-#: modules/popup-dialog.php:275 modules/pref-feeds.php:197
+#: modules/popup-dialog.php:248 modules/pref-feeds.php:197
 #: modules/pref-feeds.php:486 modules/pref-filters.php:407
 msgid "Feed"
 msgstr "Feed"
 
-#: modules/popup-dialog.php:278 modules/pref-feeds.php:213
+#: modules/popup-dialog.php:251 modules/pref-feeds.php:213
 #: modules/pref-feeds.php:500
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
-#: modules/popup-dialog.php:287 modules/pref-feeds.php:225
+#: modules/popup-dialog.php:260 modules/pref-feeds.php:225
 #: modules/pref-feeds.php:512
 #, fuzzy
 msgid "Place in category:"
 msgstr "保存分类..."
 
-#: modules/popup-dialog.php:295 modules/pref-feeds.php:330
+#: modules/popup-dialog.php:268 modules/pref-feeds.php:330
 #: modules/pref-feeds.php:554 modules/pref-prefs.php:235
 #: modules/pref-users.php:142
 msgid "Authentication"
 msgstr "认证"
 
-#: modules/popup-dialog.php:310
+#: modules/popup-dialog.php:283
 msgid "This feed requires authentication."
 msgstr "这个feed需要认证"
 
-#: modules/popup-dialog.php:316 modules/popup-dialog.php:376
+#: modules/popup-dialog.php:289 modules/popup-dialog.php:349
 msgid "Subscribe"
 msgstr "订阅"
 
-#: modules/popup-dialog.php:317
+#: modules/popup-dialog.php:290
 #, fuzzy
 msgid "More feeds"
 msgstr "移除feed中..."
 
-#: modules/popup-dialog.php:318 modules/popup-dialog.php:378
-#: modules/popup-dialog.php:452 modules/popup-dialog.php:570
-#: modules/popup-dialog.php:639 modules/pref-feeds.php:466
-#: modules/pref-feeds.php:619 modules/pref-filters.php:160
-#: modules/pref-users.php:181
+#: modules/popup-dialog.php:291 modules/popup-dialog.php:351
+#: modules/popup-dialog.php:425 modules/popup-dialog.php:543
+#: modules/popup-dialog.php:612 modules/popup-dialog.php:746
+#: modules/pref-feeds.php:466 modules/pref-feeds.php:619
+#: modules/pref-filters.php:160 modules/pref-users.php:181
 msgid "Cancel"
 msgstr "取消"
 
-#: modules/popup-dialog.php:325
+#: modules/popup-dialog.php:298
 #, fuzzy
 msgid "Feed Browser"
 msgstr "Feed编辑"
 
-#: modules/popup-dialog.php:344 modules/popup-dialog.php:386
-#: modules/popup-dialog.php:451 modules/pref-feeds.php:1169
+#: modules/popup-dialog.php:317 modules/popup-dialog.php:359
+#: modules/popup-dialog.php:424 modules/pref-feeds.php:1155
 #: modules/pref-filters.php:308 modules/pref-labels.php:131
 #: modules/pref-users.php:361
 msgid "Search"
 msgstr "搜索"
 
-#: modules/popup-dialog.php:348
+#: modules/popup-dialog.php:321
 #, fuzzy
 msgid "Popular feeds"
 msgstr "显示Feed"
 
-#: modules/popup-dialog.php:349
+#: modules/popup-dialog.php:322
 #, fuzzy
 msgid "Feed archive"
 msgstr "Feed 操作："
 
-#: modules/popup-dialog.php:352
+#: modules/popup-dialog.php:325
 #, fuzzy
 msgid "limit:"
 msgstr "限制:"
 
-#: modules/popup-dialog.php:398
+#: modules/popup-dialog.php:371
 msgid "Look for"
 msgstr ""
 
-#: modules/popup-dialog.php:405
+#: modules/popup-dialog.php:378
 #, fuzzy
 msgid "match on"
 msgstr "匹配:"
 
-#: modules/popup-dialog.php:410
+#: modules/popup-dialog.php:383
 msgid "Title or content"
 msgstr "标题或内容"
 
-#: modules/popup-dialog.php:415
+#: modules/popup-dialog.php:388
 msgid "Limit search to:"
 msgstr ""
 
-#: modules/popup-dialog.php:431
+#: modules/popup-dialog.php:404
 msgid "This feed"
 msgstr "本feed"
 
-#: modules/popup-dialog.php:465
+#: modules/popup-dialog.php:438
 #, fuzzy
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: modules/popup-dialog.php:484 modules/pref-filters.php:42
+#: modules/popup-dialog.php:457 modules/pref-filters.php:42
 #: modules/pref-filters.php:406
 msgid "Match"
 msgstr "匹配"
 
-#: modules/popup-dialog.php:492 modules/pref-filters.php:54
+#: modules/popup-dialog.php:465 modules/pref-filters.php:54
 #: modules/pref-filters.php:441
 msgid "before"
 msgstr ""
 
-#: modules/popup-dialog.php:493 modules/pref-filters.php:55
+#: modules/popup-dialog.php:466 modules/pref-filters.php:55
 #: modules/pref-filters.php:442
 #, fuzzy
 msgid "after"
 msgstr "更新"
 
-#: modules/popup-dialog.php:505 modules/pref-filters.php:68
+#: modules/popup-dialog.php:478 modules/pref-filters.php:68
 msgid "Check it"
 msgstr ""
 
-#: modules/popup-dialog.php:508 modules/pref-filters.php:71
+#: modules/popup-dialog.php:481 modules/pref-filters.php:71
 #, fuzzy
 msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:514 modules/pref-filters.php:77 digest.js:392
+#: modules/popup-dialog.php:487 modules/pref-filters.php:77 digest.js:392
 #, fuzzy
 msgid "in"
 msgstr "链接"
 
-#: modules/popup-dialog.php:519 modules/pref-filters.php:82
+#: modules/popup-dialog.php:492 modules/pref-filters.php:82
 #, fuzzy
 msgid "Perform Action"
 msgstr "完成更新"
 
-#: modules/popup-dialog.php:536 modules/pref-filters.php:102
+#: modules/popup-dialog.php:509 modules/pref-filters.php:102
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:549 modules/pref-feeds.php:353
+#: modules/popup-dialog.php:522 modules/pref-feeds.php:353
 #: modules/pref-feeds.php:572 modules/pref-filters.php:121
 #: modules/pref-users.php:164
 #, fuzzy
 msgid "Options"
 msgstr "选项:"
 
-#: modules/popup-dialog.php:555 modules/pref-filters.php:133
+#: modules/popup-dialog.php:528 modules/pref-filters.php:133
 msgid "Enabled"
 msgstr "可用"
 
-#: modules/popup-dialog.php:558 modules/pref-filters.php:142
+#: modules/popup-dialog.php:531 modules/pref-filters.php:142
 msgid "Inverse match"
 msgstr "逆匹配"
 
-#: modules/popup-dialog.php:568
+#: modules/popup-dialog.php:541
 msgid "Create"
 msgstr "创建"
 
-#: modules/popup-dialog.php:582
+#: modules/popup-dialog.php:555
 msgid "Update Errors"
 msgstr "更新错误"
 
-#: modules/popup-dialog.php:585
+#: modules/popup-dialog.php:558
 msgid "These feeds have not been updated because of errors:"
 msgstr "这些feed更新错误:"
 
-#: modules/popup-dialog.php:611
+#: modules/popup-dialog.php:584
 msgid "Edit Tags"
 msgstr "编辑标签"
 
-#: modules/popup-dialog.php:616
+#: modules/popup-dialog.php:589
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:638 modules/pref-feeds.php:465
+#: modules/popup-dialog.php:611 modules/pref-feeds.php:465
 #: modules/pref-feeds.php:617 modules/pref-filters.php:157
 #: modules/pref-users.php:179
 msgid "Save"
 msgstr "保存"
 
-#: modules/popup-dialog.php:647
+#: modules/popup-dialog.php:620
 #, fuzzy
 msgid "Tag Cloud"
 msgstr "标签簇"
 
-#: modules/popup-dialog.php:650
+#: modules/popup-dialog.php:623
 msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
-#: modules/popup-dialog.php:651
+#: modules/popup-dialog.php:624
 #, fuzzy
 msgid "more tags"
 msgstr "无标签"
 
+#: modules/popup-dialog.php:644
+msgid "Forward article by email"
+msgstr ""
+
+#: modules/popup-dialog.php:684 modules/popup-dialog.php:690
+msgid "[Forwarded]"
+msgstr ""
+
+#: modules/popup-dialog.php:684
+#, fuzzy
+msgid "Multiple articles"
+msgstr "所有文章"
+
+#: modules/popup-dialog.php:705
+msgid "From:"
+msgstr ""
+
+#: modules/popup-dialog.php:715
+#, fuzzy
+msgid "To:"
+msgstr "Top"
+
+#: modules/popup-dialog.php:728
+#, fuzzy
+msgid "Subject:"
+msgstr "选择："
+
+#: modules/popup-dialog.php:745
+#, fuzzy
+msgid "Send e-mail"
+msgstr "更改 e-mail"
+
+#: modules/popup-dialog.php:766
+msgid "You can view this feed as RSS using the following URL:"
+msgstr ""
+
 #: modules/pref-feeds.php:4
 msgid "Check to enable field"
 msgstr ""
@@ -1585,169 +1645,165 @@ msgstr ""
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:1049
+#: modules/pref-feeds.php:1037
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:1069
+#: modules/pref-feeds.php:1055
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1122
+#: modules/pref-feeds.php:1108
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1152
-msgid "Some feeds have update errors (click for details)"
-msgstr "有些feed更新错误(点击了解详情) "
-
-#: modules/pref-feeds.php:1173 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1159 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1176
+#: modules/pref-feeds.php:1162
 #, fuzzy
 msgid "Edit feeds"
 msgstr "输入feed"
 
-#: modules/pref-feeds.php:1181
+#: modules/pref-feeds.php:1167
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1190
+#: modules/pref-feeds.php:1176
 #, fuzzy
 msgid "More actions..."
 msgstr "激活..."
 
-#: modules/pref-feeds.php:1194
+#: modules/pref-feeds.php:1180
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1198
+#: modules/pref-feeds.php:1184
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1199 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1185 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1288
+#: modules/pref-feeds.php:1274
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1305 modules/pref-feeds.php:1365
+#: modules/pref-feeds.php:1289 modules/pref-feeds.php:1341
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1390 modules/pref-filters.php:487
-#: modules/pref-users.php:467
+#: modules/pref-feeds.php:1366 modules/pref-filters.php:487
+#: modules/pref-users.php:457
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1404
+#: modules/pref-feeds.php:1378
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1431
+#: modules/pref-feeds.php:1405
 #, fuzzy
 msgid "You don't have any subscribed feeds."
 msgstr "您不能从分类中取消订阅。"
 
-#: modules/pref-feeds.php:1433
+#: modules/pref-feeds.php:1407
 #, fuzzy
 msgid "No matching feeds found."
 msgstr "未找到文章。"
 
-#: modules/pref-feeds.php:1439
+#: modules/pref-feeds.php:1413
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1451
+#: modules/pref-feeds.php:1425
 msgid ""
 "Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
 msgstr ""
 
-#: modules/pref-feeds.php:1453
+#: modules/pref-feeds.php:1427
 msgid "Note: Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: modules/pref-feeds.php:1468
+#: modules/pref-feeds.php:1442
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1473
+#: modules/pref-feeds.php:1447
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1479
+#: modules/pref-feeds.php:1454
 #, fuzzy
 msgid ""
 "Your OPML can be published publicly and can be subscribed by anyone who "
 "knows the URL below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1481
+#: modules/pref-feeds.php:1456
 msgid ""
 "Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
 "that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525
+#: modules/pref-feeds.php:1459 modules/pref-feeds.php:1499
 #, fuzzy
 msgid "Display URL"
 msgstr "显示标签"
 
-#: modules/pref-feeds.php:1489
+#: modules/pref-feeds.php:1464
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1491
+#: modules/pref-feeds.php:1466
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1498
+#: modules/pref-feeds.php:1473
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1504
+#: modules/pref-feeds.php:1479
 msgid "Subscribing via bookmarklet"
 msgstr ""
 
-#: modules/pref-feeds.php:1506
+#: modules/pref-feeds.php:1481
 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."
 msgstr ""
 
-#: modules/pref-feeds.php:1510
+#: modules/pref-feeds.php:1485
 #, fuzzy, php-format
 msgid "Subscribe to %s in Tiny Tiny RSS?"
 msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1514
+#: modules/pref-feeds.php:1489
 #, fuzzy
 msgid "Subscribe in Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1522
+#: modules/pref-feeds.php:1493
 #, 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:1630
+#: modules/pref-feeds.php:1604
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1659
+#: modules/pref-feeds.php:1633
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -1920,23 +1976,23 @@ msgstr "更改密码"
 msgid "Select theme"
 msgstr "选择模板"
 
-#: modules/pref-prefs.php:383 modules/pref-prefs.php:388
+#: modules/pref-prefs.php:389 modules/pref-prefs.php:394
 msgid "Yes"
 msgstr "是"
 
-#: modules/pref-prefs.php:385 modules/pref-prefs.php:388
+#: modules/pref-prefs.php:391 modules/pref-prefs.php:394
 msgid "No"
 msgstr "否"
 
-#: modules/pref-prefs.php:409
+#: modules/pref-prefs.php:415
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: modules/pref-prefs.php:412
+#: modules/pref-prefs.php:418
 msgid "Manage profiles"
 msgstr ""
 
-#: modules/pref-prefs.php:415
+#: modules/pref-prefs.php:421
 msgid "Reset to defaults"
 msgstr "恢复到默认？"
 
@@ -2056,12 +2112,12 @@ msgstr "等级:"
 msgid "Last login"
 msgstr "最后登陆"
 
-#: modules/pref-users.php:487
+#: modules/pref-users.php:477
 #, fuzzy
 msgid "No users defined."
 msgstr "未定义过滤器。"
 
-#: modules/pref-users.php:489
+#: modules/pref-users.php:479
 #, fuzzy
 msgid "No matching users found."
 msgstr "未找到文章。"
@@ -2320,7 +2376,7 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
-#: digest.js:27 tt-rss.js:670 tt-rss.js:683
+#: digest.js:27 tt-rss.js:645 tt-rss.js:658
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
@@ -2335,17 +2391,17 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Error: unable to load article."
 msgstr "错误：请上传OPML文件。"
 
-#: digest.js:405 digest.js:653 viewfeed.js:577
+#: digest.js:405 digest.js:653 viewfeed.js:580
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: digest.js:407 digest.js:660 viewfeed.js:528 viewfeed.js:592
+#: digest.js:407 digest.js:660 viewfeed.js:531 viewfeed.js:595
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: digest.js:410 digest.js:694 viewfeed.js:648
+#: digest.js:410 digest.js:694 viewfeed.js:651
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
@@ -2364,86 +2420,95 @@ msgstr ""
 msgid "Load more..."
 msgstr "读取帮助..."
 
-#: digest.js:656 digest.js:698 viewfeed.js:585 viewfeed.js:652
+#: digest.js:656 digest.js:698 viewfeed.js:588 viewfeed.js:655
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
 
-#: functions.js:1252
+#: functions.js:1251
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
 
-#: functions.js:1287
+#: functions.js:1286
 msgid "Can't subscribe: no feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: functions.js:1291
+#: functions.js:1290
 #, fuzzy
 msgid "Subscribing to feed..."
 msgstr "订阅feed"
 
-#: functions.js:1314
+#: functions.js:1313
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "订阅feed:"
 
-#: functions.js:1323
+#: functions.js:1322
 #, fuzzy
 msgid "Can't subscribe to the specified URL."
 msgstr "未能订阅：无 feed URL。"
 
-#: functions.js:1326
+#: functions.js:1325
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "您不能从分类中取消订阅。"
 
-#: functions.js:1887
+#: functions.js:1824
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: functions.js:1924
+#: functions.js:1861
 #, fuzzy
 msgid "Subscribed to %d feed(s)."
 msgstr "订阅feed:"
 
-#: functions.js:1934 functions.js:1965 prefs.js:559 prefs.js:589 prefs.js:621
-#: prefs.js:910 prefs.js:930 prefs.js:1778
+#: functions.js:1871 functions.js:1902 prefs.js:562 prefs.js:592 prefs.js:624
+#: prefs.js:913 prefs.js:933 prefs.js:1728
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: functions.js:1949
+#: functions.js:1886
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: functions.js:2001
+#: functions.js:1938
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "移除选定标记?"
 
-#: functions.js:2033
+#: functions.js:1970
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "请只选择一个feed."
 
-#: functions.js:2035
+#: functions.js:1972
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: functions.js:2052
+#: functions.js:1989
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "请输入标签主题"
 
-#: functions.js:2057
+#: functions.js:1994
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: functions.js:2097 tt-rss.js:499
+#: functions.js:2034 tt-rss.js:474
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
+#: functions.js:2165
+#, fuzzy
+msgid "Please enter category title:"
+msgstr "请输入标签主题"
+
+#: functions.js:2193
+msgid "Generate new syndication address for this feed?"
+msgstr ""
+
 #: offline.js:636
 msgid "Data for offline browsing has not been downloaded yet."
 msgstr ""
@@ -2508,265 +2573,278 @@ msgid ""
 "Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
 msgstr ""
 
-#: prefs.js:235
+#: prefs.js:236
 #, fuzzy
 msgid "Error: No feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: prefs.js:237
+#: prefs.js:238
 msgid "Error: Invalid feed URL."
 msgstr ""
 
-#: prefs.js:265
+#: prefs.js:266
 #, fuzzy
 msgid "Can't add profile: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: prefs.js:287
+#: prefs.js:288
 msgid "Can't add category: no name specified."
 msgstr "添加分类失败：未指定分类名"
 
-#: prefs.js:309
+#: prefs.js:310
 #, fuzzy
 msgid "Please enter login:"
 msgstr "请输入标签主题"
 
-#: prefs.js:316
+#: prefs.js:317
 #, fuzzy
 msgid "Can't create user: no login specified."
 msgstr "添加用户失败：未登录。"
 
-#: prefs.js:440
+#: prefs.js:443
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: prefs.js:456
+#: prefs.js:459
 msgid "No labels are selected."
 msgstr "未选定标记."
 
-#: prefs.js:470
+#: prefs.js:473
 msgid ""
 "Remove selected users? Neither default admin nor your account will be "
 "removed."
 msgstr ""
 
-#: prefs.js:487 prefs.js:800 prefs.js:821 prefs.js:860
+#: prefs.js:490 prefs.js:803 prefs.js:824 prefs.js:863
 msgid "No users are selected."
 msgstr "未选定用户."
 
-#: prefs.js:505
+#: prefs.js:508
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:521 prefs.js:890
+#: prefs.js:524 prefs.js:893
 msgid "No filters are selected."
 msgstr "未选定过滤器。"
 
-#: prefs.js:540
+#: prefs.js:543
 msgid "Unsubscribe from selected feeds?"
 msgstr "退订选定feed?"
 
-#: prefs.js:574
+#: prefs.js:577
 msgid "Please select only one feed."
 msgstr "请只选择一个feed."
 
-#: prefs.js:580
+#: prefs.js:583
 #, fuzzy
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: prefs.js:602
+#: prefs.js:605
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: prefs.js:634
+#: prefs.js:637
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
 
-#: prefs.js:650
+#: prefs.js:653
 #, fuzzy
 msgid "No profiles selected."
 msgstr "无选定文章。"
 
-#: prefs.js:662
+#: prefs.js:665
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: prefs.js:680
+#: prefs.js:683
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: prefs.js:747
+#: prefs.js:750
 msgid "Login field cannot be blank."
 msgstr "登陆框不能留空。"
 
-#: prefs.js:805 prefs.js:826 prefs.js:865
+#: prefs.js:808 prefs.js:829 prefs.js:868
 msgid "Please select only one user."
 msgstr "请只选择一个用户."
 
-#: prefs.js:830
+#: prefs.js:833
 msgid "Reset password of selected user?"
 msgstr "重置选定用户密码?"
 
-#: prefs.js:895
+#: prefs.js:898
 msgid "Please select only one filter."
 msgstr "请只选择一个过滤器."
 
-#: prefs.js:971
+#: prefs.js:974
 msgid "No OPML file to upload."
 msgstr "无OPML文件上传."
 
-#: prefs.js:1175
+#: prefs.js:1172
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: prefs.js:1588
-msgid "Replace current publishing address with a new one?"
-msgstr "使用新地址替换当前地址？"
-
-#: prefs.js:1625
+#: prefs.js:1575
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: prefs.js:1661
+#: prefs.js:1611
 #, fuzzy
 msgid "Save current configuration?"
 msgstr "保存设置"
 
-#: prefs.js:1762
+#: prefs.js:1712
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1785
+#: prefs.js:1735
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1804
+#: prefs.js:1754
 #, fuzzy
 msgid "Remove filter %s?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:1865
+#: prefs.js:1815
 #, fuzzy
 msgid "Save changes to selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1945
+#: prefs.js:1895
 #, fuzzy
 msgid "Reset label colors to default?"
 msgstr "重置默认项？"
 
-#: prefs.js:1970
+#: prefs.js:1920
 #, fuzzy
 msgid "Please enter new label foreground color:"
 msgstr "请输入标签主题"
 
-#: prefs.js:1972
+#: prefs.js:1922
 #, fuzzy
 msgid "Please enter new label background color:"
 msgstr "请输入标签主题"
 
-#: prefs.js:2104
+#: prefs.js:2054
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:2120
+#: prefs.js:2070
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: tt-rss.js:73
+#: tt-rss.js:72
 msgid "display feeds"
 msgstr "显示Feed"
 
-#: tt-rss.js:178
+#: tt-rss.js:156
 #, fuzzy
 msgid "Mark all articles as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: tt-rss.js:488
+#: tt-rss.js:463
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: tt-rss.js:493 tt-rss.js:698 tt-rss.js:873
+#: tt-rss.js:468 tt-rss.js:673 tt-rss.js:848
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: tt-rss.js:561
+#: tt-rss.js:536
 #, fuzzy
 msgid "Reset category order?"
 msgstr "移除选定分类?"
 
-#: tt-rss.js:703
+#: tt-rss.js:678
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:868
+#: tt-rss.js:843
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:878
+#: tt-rss.js:853
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
-#: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
-#: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
+#: viewfeed.js:938 viewfeed.js:974 viewfeed.js:1009 viewfeed.js:1088
+#: viewfeed.js:1126 viewfeed.js:1267 viewfeed.js:1310 viewfeed.js:1359
+#: viewfeed.js:2297
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: viewfeed.js:1256
+#: viewfeed.js:1241
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: viewfeed.js:1298
+#: viewfeed.js:1276
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1300
+#: viewfeed.js:1278
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "移除选定标记?"
 
-#: viewfeed.js:1348
+#: viewfeed.js:1319
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1351
+#: viewfeed.js:1322
 msgid "Move %d archived articles back?"
 msgstr ""
 
-#: viewfeed.js:1401
+#: viewfeed.js:1365
 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1977
+#: viewfeed.js:2002
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: viewfeed.js:2018
+#: viewfeed.js:2043
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: viewfeed.js:2020
+#: viewfeed.js:2045
 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:2255
+#: viewfeed.js:2280
 #, fuzzy
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
+#~ msgid "Generated feed"
+#~ msgstr "产生feed"
+
+#~ msgid "No feeds to display."
+#~ msgstr "无feed显示。"
+
+#~ msgid "Published Articles"
+#~ msgstr "已发布文章"
+
+#, fuzzy
+#~ msgid "Your Published articles feed URL is:"
+#~ msgstr "已发布文章"
+
+#~ msgid "Replace current publishing address with a new one?"
+#~ msgstr "使用新地址替换当前地址？"
+
 #, fuzzy
 #~ msgid "Reset category order"
 #~ msgstr "移除选定分类?"
@@ -2777,9 +2855,6 @@ msgstr "请输入标签主题"
 #~ msgid "Adding feed..."
 #~ msgstr "添加feed中..."
 
-#~ msgid "Adding feed category..."
-#~ msgstr "添加feed分类..."
-
 #, fuzzy
 #~ msgid "Adding profile..."
 #~ msgstr "添加feed中..."
@@ -3020,9 +3095,6 @@ msgstr "请输入标签主题"
 #~ msgid "Feed browser is administratively disabled."
 #~ msgstr "Feed 浏览器有限制"
 
-#~ msgid "Top"
-#~ msgstr "Top"
-
 #~ msgid "Show"
 #~ msgstr "显示"
 
@@ -3043,14 +3115,6 @@ msgstr "请输入标签主题"
 #~ msgid "Generate another link"
 #~ msgstr "生成另一个地址"
 
-#, fuzzy
-#~ msgid "View feeds"
-#~ msgstr "隐藏我的Feed列表"
-
-#, fuzzy
-#~ msgid "View tags"
-#~ msgstr "编辑标签"
-
 #~ msgid "View:"
 #~ msgstr "浏览:"
 
@@ -3335,9 +3399,6 @@ msgstr "请输入标签主题"
 #~ msgid "Match:"
 #~ msgstr "匹配："
 
-#~ msgid "Feed:"
-#~ msgstr "Feed:"
-
 #~ msgid "Action:"
 #~ msgstr "操作:"