release 1.3.2

2 files changed, 171 insertions, 188 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index dc0c9d4a5..2cf4755bc 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 7a19f41e3..77a647ed4 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-03-21 23:14+0300\n"
+"POT-Creation-Date: 2009-02-20 15:55+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:122 tt-rss.php:247 modules/pref-prefs.php:315
+#: backend.php:122 tt-rss.php:248 modules/pref-prefs.php:315
 msgid "Default"
 msgstr "默认"
 
@@ -107,16 +107,12 @@ msgid "Unknown error"
 msgstr "未知错误"
 
 #: errors.php:5
-msgid ""
-"This program requires XmlHttpRequest to function properly. Your browser "
-"doesn't seem to support it."
-msgstr ""
+msgid "This program requires XmlHttpRequest "
+msgstr "本程序需要xmlhttprequest支持"
 
 #: errors.php:8
-msgid ""
-"This program requires cookies to function properly. Your browser doesn't "
-"seem to support them."
-msgstr ""
+msgid "This program requires cookies "
+msgstr "本程序需要开启cookies"
 
 #: errors.php:11
 msgid "Backend sanity check failed"
@@ -166,252 +162,238 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:2846 modules/popup-dialog.php:175
+#: functions.php:2841 modules/popup-dialog.php:175
 #: modules/pref-filters.php:413 mobile/functions.php:744
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2875 functions.php:2914 functions.php:3325 functions.php:4292
-#: functions.php:4322 modules/backend-rpc.php:635 modules/pref-feeds.php:1254
+#: functions.php:2870 functions.php:2909 functions.php:3320 functions.php:4275
+#: functions.php:4305 modules/backend-rpc.php:616 modules/pref-feeds.php:1247
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:2904 functions.php:3531 modules/backend-rpc.php:640
+#: functions.php:2899 functions.php:3514 modules/backend-rpc.php:621
 #: mobile/functions.php:33
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2906 functions.php:3354 functions.php:3533 prefs.php:129
-#: modules/backend-rpc.php:645 help/4.php:12 mobile/functions.php:83
+#: functions.php:2901 functions.php:3349 functions.php:3516 prefs.php:129
+#: modules/backend-rpc.php:626 help/4.php:12 mobile/functions.php:83
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:2924 functions.php:3347 functions.php:4144
+#: functions.php:2919 functions.php:3342 functions.php:4127
 #: localized_js.php:153 help/3.php:59 mobile/functions.php:61 offline.js:494
 #: offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:2926 functions.php:3351 functions.php:4151
-#: modules/pref-feeds.php:1432 help/3.php:60 mobile/functions.php:70
+#: functions.php:2921 functions.php:3346 functions.php:4134
+#: modules/pref-feeds.php:1423 help/3.php:60 mobile/functions.php:70
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:2928 functions.php:3357 functions.php:4129 help/3.php:58
+#: functions.php:2923 functions.php:3352 functions.php:4112 help/3.php:58
 #: mobile/functions.php:52
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:2930 functions.php:3360 functions.php:4122
+#: functions.php:2925 functions.php:3355 functions.php:4105
 #: localized_js.php:40 help/3.php:57 mobile/functions.php:43 offline.js:489
 #: offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3311 functions.php:3313
+#: functions.php:3306 functions.php:3308
 msgid "Search results"
 msgstr "搜索结果"
 
-#: functions.php:3329 functions.php:3342 functions.php:3348 functions.php:3352
-#: functions.php:3358 functions.php:3361 functions.php:3369
+#: functions.php:3324 functions.php:3337 functions.php:3343 functions.php:3347
+#: functions.php:3353 functions.php:3356 functions.php:3364
 msgid "Searched for"
 msgstr "搜索"
 
-#: functions.php:4001
+#: functions.php:3984
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4006 functions.php:5292 localized_js.php:148
-#: modules/pref-feeds.php:1035 modules/pref-feeds.php:1216
+#: functions.php:3989 functions.php:5253 localized_js.php:148
+#: modules/pref-feeds.php:1028 modules/pref-feeds.php:1209
 #: modules/pref-filters.php:366 modules/pref-labels.php:163
 #: modules/pref-users.php:401 offline.js:409
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4007 localized_js.php:39 modules/pref-feeds.php:1036
-#: modules/pref-feeds.php:1217 modules/pref-filters.php:367
+#: functions.php:3990 localized_js.php:39 modules/pref-feeds.php:1029
+#: modules/pref-feeds.php:1210 modules/pref-filters.php:367
 #: modules/pref-labels.php:164 modules/pref-users.php:402
 #: mobile/functions.php:570
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4008 functions.php:4024 localized_js.php:171 tt-rss.php:239
+#: functions.php:3991 functions.php:4007 localized_js.php:171 tt-rss.php:240
 #: mobile/functions.php:458 mobile/functions.php:571
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4009 localized_js.php:74 mobile/functions.php:573
+#: functions.php:3992 localized_js.php:74 mobile/functions.php:573
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4010 localized_js.php:99 modules/pref-feeds.php:1037
-#: modules/pref-feeds.php:1218 modules/pref-filters.php:368
+#: functions.php:3993 localized_js.php:99 modules/pref-feeds.php:1030
+#: modules/pref-feeds.php:1211 modules/pref-filters.php:368
 #: modules/pref-labels.php:165 modules/pref-users.php:403
 #: mobile/functions.php:572
 msgid "None"
 msgstr "无"
 
-#: functions.php:4018 localized_js.php:35 tt-rss.php:189
-#: modules/pref-feeds.php:1378 offline.js:185
+#: functions.php:4001 localized_js.php:35 tt-rss.php:189
+#: modules/pref-feeds.php:1371 offline.js:185
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4023 localized_js.php:150
+#: functions.php:4006 localized_js.php:150
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4025 localized_js.php:152 tt-rss.php:238
+#: functions.php:4008 localized_js.php:152 tt-rss.php:239
 #: mobile/functions.php:459
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4026
+#: functions.php:4009
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4028 localized_js.php:85
+#: functions.php:4011 localized_js.php:85
 msgid "Mark as read:"
 msgstr "标记为已读："
 
-#: functions.php:4029 localized_js.php:149 mobile/functions.php:578
+#: functions.php:4012 localized_js.php:149 mobile/functions.php:578
 msgid "Selection"
 msgstr "选择："
 
-#: functions.php:4031 localized_js.php:65 mobile/functions.php:580
+#: functions.php:4014 localized_js.php:65 mobile/functions.php:580
 msgid "Entire feed"
 msgstr "输入feed"
 
-#: functions.php:4035
+#: functions.php:4018
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4076 localized_js.php:56
+#: functions.php:4059 localized_js.php:56
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4342
+#: functions.php:4325
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4359 mobile/functions.php:12
+#: functions.php:4342 mobile/functions.php:12
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4596
+#: functions.php:4578
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4620 functions.php:5320
+#: functions.php:4602 functions.php:5272
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4628
+#: functions.php:4610
 #, fuzzy
 msgid "Display original article content"
 msgstr "显示最近文章时间"
 
-#: functions.php:4635 functions.php:5302
+#: functions.php:4617 functions.php:5263
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4642 functions.php:5309
-#, fuzzy
-msgid "Publish article with a note"
-msgstr "发布文章"
-
-#: functions.php:4682 functions.php:5226
+#: functions.php:4650 functions.php:5187
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4688 functions.php:5232
+#: functions.php:4656 functions.php:5193
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4724 functions.php:5266
+#: functions.php:4692 functions.php:5227
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4726 functions.php:5268
+#: functions.php:4694 functions.php:5229
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4746 modules/help.php:22 modules/popup-dialog.php:52
-#: modules/popup-dialog.php:456 modules/pref-feeds.php:1086
+#: functions.php:4714 modules/help.php:22 modules/popup-dialog.php:52
+#: modules/popup-dialog.php:456 modules/pref-feeds.php:1079
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4802
+#: functions.php:4770
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:4871 mobile/functions.php:423
+#: functions.php:4839 mobile/functions.php:423
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5193
+#: functions.php:5161
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5327
-#, fuzzy
-msgid "toggle unread"
-msgstr "触发开关"
-
-#: functions.php:5346
+#: functions.php:5298
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5349
+#: functions.php:5301
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5352
+#: functions.php:5304
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5356
+#: functions.php:5308
 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:5358 localized_js.php:92 offline.js:444
+#: functions.php:5310 localized_js.php:92 offline.js:444
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6049 tt-rss.php:204
+#: functions.php:5984 tt-rss.php:206
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6062
+#: functions.php:5997
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6106
+#: functions.php:6041
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6134
-msgid "edit note"
-msgstr ""
-
 #: localized_js.php:36
 msgid "Adding feed..."
 msgstr "添加feed中..."
@@ -601,17 +583,17 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:84 viewfeed.js:1250
+#: localized_js.php:84 viewfeed.js:1212
 #, php-format
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: localized_js.php:86 viewfeed.js:1923
+#: localized_js.php:86 viewfeed.js:1885
 #, fuzzy, php-format
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: localized_js.php:87 viewfeed.js:1289
+#: localized_js.php:87 viewfeed.js:1251
 #, fuzzy, php-format
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
@@ -624,17 +606,17 @@ msgstr "标记所有Feed未已读..."
 msgid "New password cannot be blank."
 msgstr "新密码不可留空."
 
-#: localized_js.php:90 viewfeed.js:1880
+#: localized_js.php:90 viewfeed.js:1842
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:91 viewfeed.js:922 viewfeed.js:957 viewfeed.js:997
-#: viewfeed.js:1081 viewfeed.js:1130 viewfeed.js:1282
+#: localized_js.php:91 viewfeed.js:884 viewfeed.js:919 viewfeed.js:959
+#: viewfeed.js:1043 viewfeed.js:1092 viewfeed.js:1244
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: localized_js.php:93 viewfeed.js:1921
+#: localized_js.php:93 viewfeed.js:1883
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
@@ -648,7 +630,7 @@ msgstr "未选定分类。"
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: localized_js.php:96 tt-rss.php:293 tt-rss.php:306
+#: localized_js.php:96 tt-rss.php:294 tt-rss.php:307
 msgid "No feed selected."
 msgstr "无选定feed."
 
@@ -713,7 +695,7 @@ msgstr "请只选择一个用户."
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: localized_js.php:112 viewfeed.js:595 viewfeed.js:662
+#: localized_js.php:112 viewfeed.js:562 viewfeed.js:624
 #, fuzzy
 msgid "Please wait..."
 msgstr "读取中，请等待..."
@@ -722,8 +704,8 @@ msgstr "读取中，请等待..."
 msgid "Please wait until operation finishes."
 msgstr ""
 
-#: localized_js.php:114 localized_schema.php:18 viewfeed.js:554
-#: viewfeed.js:669
+#: localized_js.php:114 localized_schema.php:18 viewfeed.js:521
+#: viewfeed.js:631
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -874,7 +856,7 @@ msgstr "保存过滤器..."
 msgid "Saving user..."
 msgstr "保存用户..."
 
-#: localized_js.php:151 viewfeed.js:537 viewfeed.js:602
+#: localized_js.php:151 viewfeed.js:504 viewfeed.js:569
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
@@ -954,12 +936,12 @@ msgstr "尝试更改e-mail..."
 msgid "Trying to change password..."
 msgstr "尝试更改密码..."
 
-#: localized_js.php:170 viewfeed.js:657
+#: localized_js.php:170 viewfeed.js:618
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
 
-#: localized_js.php:172 viewfeed.js:586
+#: localized_js.php:172 viewfeed.js:553
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
@@ -1005,8 +987,8 @@ msgid ""
 "switch it into offline mode again. Go online?"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:249 modules/popup-dialog.php:165
-#: modules/pref-feeds.php:1229 modules/pref-feeds.php:1290
+#: localized_schema.php:9 tt-rss.php:250 modules/popup-dialog.php:165
+#: modules/pref-feeds.php:1222 modules/pref-feeds.php:1283
 #: mobile/functions.php:775
 msgid "Title"
 msgstr "标题"
@@ -1032,7 +1014,7 @@ msgstr ""
 msgid "Filter article"
 msgstr "过滤文章"
 
-#: localized_schema.php:16 tt-rss.php:199 mobile/functions.php:583
+#: localized_schema.php:16 tt-rss.php:201 mobile/functions.php:583
 msgid "Mark as read"
 msgstr "标记为已读"
 
@@ -1360,12 +1342,12 @@ msgstr "退出我的最爱"
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:117 tt-rss.php:208
+#: prefs.php:117
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: prefs.php:123 tt-rss.php:123 help/3.php:62 help/4.php:8
+#: prefs.php:123 tt-rss.php:123 tt-rss.php:191 help/3.php:62 help/4.php:8
 msgid "Preferences"
 msgstr "我的最爱"
 
@@ -1390,7 +1372,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:869
+#: update.php:94 update.php:162 modules/pref-feeds.php:865
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
@@ -1490,117 +1472,122 @@ msgstr "移除feed中..."
 msgid "Search..."
 msgstr "搜索"
 
-#: tt-rss.php:191
+#: tt-rss.php:193
 msgid "Feed actions:"
 msgstr "Feed 操作："
 
-#: tt-rss.php:192
+#: tt-rss.php:194
 #, fuzzy
 msgid "Subscribe to feed..."
 msgstr "订阅feed"
 
-#: tt-rss.php:193
+#: tt-rss.php:195
 #, fuzzy
 msgid "Edit this feed..."
 msgstr "输入feed"
 
-#: tt-rss.php:194
+#: tt-rss.php:196
 #, fuzzy
 msgid "Clear articles"
 msgstr "过滤文章"
 
-#: tt-rss.php:195
+#: tt-rss.php:197
 #, fuzzy
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:196 modules/pref-feeds.php:372 modules/pref-feeds.php:1390
+#: tt-rss.php:198 modules/pref-feeds.php:372 modules/pref-feeds.php:1384
 msgid "Unsubscribe"
 msgstr "退订"
 
-#: tt-rss.php:198
+#: tt-rss.php:200
 msgid "All feeds:"
 msgstr "所有feed:"
 
-#: tt-rss.php:200 help/3.php:44
+#: tt-rss.php:202 help/3.php:44
 #, fuzzy
 msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
-#: tt-rss.php:202
+#: tt-rss.php:204
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:205
+#: tt-rss.php:207
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:206
+#: tt-rss.php:208
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:207
+#: tt-rss.php:209
 #, fuzzy
 msgid "Reset category order"
 msgstr "移除选定分类?"
 
-#: tt-rss.php:218
+#: tt-rss.php:210
+#, fuzzy
+msgid "&nbsp;&nbsp;Keyboard shortcuts"
+msgstr "&nbsp;&nbsp;创建过滤器"
+
+#: tt-rss.php:219
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:220
+#: tt-rss.php:221
 msgid "Toggle Feedlist"
 msgstr ""
 
-#: tt-rss.php:228 mobile/functions.php:738
+#: tt-rss.php:229 mobile/functions.php:738
 msgid "Search:"
 msgstr "搜索:"
 
-#: tt-rss.php:236 mobile/functions.php:456
+#: tt-rss.php:237 mobile/functions.php:456
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:237 mobile/functions.php:457
+#: tt-rss.php:238 mobile/functions.php:457
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:240
+#: tt-rss.php:241
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:241 modules/pref-feeds.php:1235 modules/pref-feeds.php:1298
+#: tt-rss.php:242 modules/pref-feeds.php:1228 modules/pref-feeds.php:1291
 #: mobile/functions.php:501 mobile/functions.php:504
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:244
+#: tt-rss.php:245
 #, fuzzy
 msgid "Order:"
 msgstr "地点:"
 
-#: tt-rss.php:248 modules/popup-dialog.php:250 modules/pref-filters.php:51
+#: tt-rss.php:249 modules/popup-dialog.php:250 modules/pref-filters.php:51
 #: modules/pref-filters.php:461
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:250
+#: tt-rss.php:251
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:254
+#: tt-rss.php:255
 msgid "Limit:"
 msgstr "限制:"
 
-#: tt-rss.php:279 modules/pref-feeds.php:236 modules/pref-feeds.php:433
+#: tt-rss.php:280 modules/pref-feeds.php:236 modules/pref-feeds.php:433
 #: mobile/functions.php:436
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:297
+#: tt-rss.php:298
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1798,7 +1785,7 @@ msgstr "取消"
 
 #: modules/popup-dialog.php:140 modules/popup-dialog.php:152
 #: modules/popup-dialog.php:211 modules/pref-feeds.php:78
-#: modules/pref-feeds.php:1131 modules/pref-filters.php:307
+#: modules/pref-feeds.php:1124 modules/pref-filters.php:307
 #: modules/pref-labels.php:130 modules/pref-users.php:363
 #: mobile/functions.php:19 mobile/functions.php:435 mobile/functions.php:729
 #: mobile/functions.php:783
@@ -1827,6 +1814,11 @@ msgstr "本feed"
 msgid "Create Filter"
 msgstr "创建过滤器"
 
+#: modules/popup-dialog.php:242 modules/popup-dialog.php:293
+#: modules/pref-filters.php:39 modules/pref-filters.php:96
+msgid "description"
+msgstr "描述"
+
 #: modules/popup-dialog.php:245 modules/pref-filters.php:42
 #: modules/pref-filters.php:402
 msgid "Match"
@@ -1995,172 +1987,172 @@ msgstr ""
 msgid "Multiple Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:763 modules/pref-feeds.php:810
+#: modules/pref-feeds.php:759 modules/pref-feeds.php:806
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:840
+#: modules/pref-feeds.php:836
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:842
+#: modules/pref-feeds.php:838
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:864
+#: modules/pref-feeds.php:860
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:950
+#: modules/pref-feeds.php:946
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:973
+#: modules/pref-feeds.php:969
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:1004
+#: modules/pref-feeds.php:997
 msgid "Unable to delete non empty feed categories."
 msgstr "不能删除非空分类。"
 
-#: modules/pref-feeds.php:1021
+#: modules/pref-feeds.php:1014
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1074
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1092 modules/pref-filters.php:156
+#: modules/pref-feeds.php:1085 modules/pref-filters.php:156
 #: modules/pref-filters.php:505 modules/pref-labels.php:225
 #: modules/pref-users.php:474
 msgid "Remove"
 msgstr "移除"
 
-#: modules/pref-feeds.php:1114
+#: modules/pref-feeds.php:1107
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:1136 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1129 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1141
+#: modules/pref-feeds.php:1134
 #, fuzzy
 msgid "More Feeds"
 msgstr "移除feed中..."
 
-#: modules/pref-feeds.php:1215
+#: modules/pref-feeds.php:1208
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1232 modules/pref-feeds.php:1294
+#: modules/pref-feeds.php:1225 modules/pref-feeds.php:1287
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1319 modules/pref-filters.php:479
+#: modules/pref-feeds.php:1312 modules/pref-filters.php:479
 #: modules/pref-users.php:449
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1327
+#: modules/pref-feeds.php:1320
 msgid "(Hidden)"
 msgstr ""
 
-#: modules/pref-feeds.php:1340
+#: modules/pref-feeds.php:1333
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1366 modules/pref-feeds.php:1379
+#: modules/pref-feeds.php:1359 modules/pref-feeds.php:1373
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: modules/pref-feeds.php:1372
+#: modules/pref-feeds.php:1365
 msgid "Recategorize"
 msgstr "再分类"
 
-#: modules/pref-feeds.php:1380 modules/pref-filters.php:503
+#: modules/pref-feeds.php:1374 modules/pref-filters.php:503
 #: modules/pref-users.php:472
 msgid "Edit"
 msgstr "编辑"
 
-#: modules/pref-feeds.php:1384
+#: modules/pref-feeds.php:1378
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1388
+#: modules/pref-feeds.php:1382
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1389 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1383 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1396
+#: modules/pref-feeds.php:1389
 #, fuzzy
 msgid "Other:"
 msgstr "地点:"
 
-#: modules/pref-feeds.php:1397
+#: modules/pref-feeds.php:1390
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1406
+#: modules/pref-feeds.php:1397
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1410
+#: modules/pref-feeds.php:1401
 #, fuzzy
 msgid "File:"
 msgstr "标题:"
 
-#: modules/pref-feeds.php:1413
+#: modules/pref-feeds.php:1404
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1420
+#: modules/pref-feeds.php:1411
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1423
+#: modules/pref-feeds.php:1414
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1425
+#: modules/pref-feeds.php:1416
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1429
+#: modules/pref-feeds.php:1420
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1438
+#: modules/pref-feeds.php:1429
 #, 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:1442
+#: modules/pref-feeds.php:1433
 #, fuzzy
 msgid "Link to published articles feed."
 msgstr "已发布文章"
 
-#: modules/pref-feeds.php:1445
+#: modules/pref-feeds.php:1436
 #, fuzzy
 msgid "Generate another link"
 msgstr "生成另一个地址"
 
-#: modules/pref-feeds.php:1511
+#: modules/pref-feeds.php:1502
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2184,6 +2176,15 @@ msgstr "创建过滤器 <b>%s</b>"
 msgid "Create filter"
 msgstr "创建过滤器"
 
+#: modules/pref-filters.php:392
+msgid "filter_type_descr"
+msgstr ""
+
+#: modules/pref-filters.php:393
+#, fuzzy
+msgid "action_description"
+msgstr "描述"
+
 #: modules/pref-filters.php:404
 #, fuzzy
 msgid "Field"
@@ -2329,6 +2330,10 @@ msgstr "选择模板"
 msgid "Change theme"
 msgstr "更改模板"
 
+#: modules/pref-prefs.php:388
+msgid "short_desc"
+msgstr "short_desc"
+
 #: modules/pref-prefs.php:400 modules/pref-prefs.php:405
 msgid "Yes"
 msgstr "是"
@@ -2721,31 +2726,6 @@ msgstr "匹配:"
 msgid "Internal error: Function not implemented"
 msgstr ""
 
-#: viewfeed.js:2193
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "请输入标签主题"
-
-#~ msgid "This program requires XmlHttpRequest "
-#~ msgstr "本程序需要xmlhttprequest支持"
-
-#~ msgid "This program requires cookies "
-#~ msgstr "本程序需要开启cookies"
-
-#, fuzzy
-#~ msgid "&nbsp;&nbsp;Keyboard shortcuts"
-#~ msgstr "&nbsp;&nbsp;创建过滤器"
-
-#~ msgid "description"
-#~ msgstr "描述"
-
-#, fuzzy
-#~ msgid "action_description"
-#~ msgstr "描述"
-
-#~ msgid "short_desc"
-#~ msgstr "short_desc"
-
 #~ msgid "display tags"
 #~ msgstr "显示标签"
 
@@ -2770,6 +2750,9 @@ msgstr "请输入标签主题"
 #~ msgid "Address changed."
 #~ msgstr "地址已经变更"
 
+#~ msgid "Please enter label title:"
+#~ msgstr "请输入标签主题"
+
 #, fuzzy
 #~ msgid "Rescoring feeds..."
 #~ msgstr "移除feed中..."