rebase translations

[tt-rss.git] / locale / zh_CN / LC_MESSAGES / messages.po

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index dfc84c80c5df860659dbb10e83b7ff38b16528ce..47f7924fd876ebc83a07019bce79bd279956d1ab 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-03-11 15:49+0300\n"
+"POT-Creation-Date: 2017-07-04 16:29+0300\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Hao Wu\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -57,12 +57,14 @@ msgstr "禁用更新"
 
 #: backend.php:84
 #: backend.php:94
-msgid "Each 15 minutes"
+#, fuzzy
+msgid "15 minutes"
 msgstr "每15分钟"
 
 #: backend.php:85
 #: backend.php:95
-msgid "Each 30 minutes"
+#, fuzzy
+msgid "30 minutes"
 msgstr "每30分钟"
 
 #: backend.php:86
@@ -72,12 +74,14 @@ msgstr "每小时"
 
 #: backend.php:87
 #: backend.php:97
-msgid "Each 4 hours"
+#, fuzzy
+msgid "4 hours"
 msgstr "每4小时"
 
 #: backend.php:88
 #: backend.php:98
-msgid "Each 12 hours"
+#, fuzzy
+msgid "12 hours"
 msgstr "每12小时"
 
 #: backend.php:89
@@ -91,8 +95,8 @@ msgid "Weekly"
 msgstr "每周"
 
 #: backend.php:103
+#: classes/pref/users.php:42
 #: classes/pref/system.php:51
-#: classes/pref/users.php:119
 msgid "User"
 msgstr "普通用户"
 
@@ -156,257 +160,250 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
-#: index.php:133
-#: index.php:150
-#: index.php:270
-#: prefs.php:102
+#: errors.php:37
+#, fuzzy
+msgid "Method not found"
+msgstr "找不到信息源。"
+
+#: errors.php:39
+#, fuzzy
+msgid "Plugin not found"
+msgstr "未找到用户"
+
+#: index.php:149
+#: index.php:165
+#: index.php:283
+#: prefs.php:118
 #: classes/backend.php:5
-#: classes/pref/feeds.php:1367
-#: classes/pref/filters.php:704
-#: classes/pref/labels.php:296
-#: js/feedlist.js:126
-#: js/functions.js:1221
-#: js/functions.js:1355
-#: js/functions.js:1667
-#: js/prefs.js:653
-#: js/prefs.js:854
-#: js/prefs.js:1760
-#: js/prefs.js:1776
-#: js/prefs.js:1794
-#: js/tt-rss.js:55
-#: js/tt-rss.js:523
-#: js/viewfeed.js:741
-#: js/viewfeed.js:1316
+#: classes/pref/labels.php:282
+#: classes/pref/filters.php:819
+#: classes/pref/feeds.php:1376
+#: js/feedlist.js:149
+#: js/functions.js:1210
+#: js/functions.js:1457
+#: js/prefs.js:621
+#: js/prefs.js:813
+#: js/prefs.js:1644
+#: js/prefs.js:1659
+#: js/tt-rss.js:551
+#: js/viewfeed.js:1184
 #: plugins/import_export/import_export.js:17
-#: js/feedlist.js:450
-#: js/functions.js:449
-#: js/functions.js:787
-#: js/prefs.js:1441
-#: js/prefs.js:1494
-#: js/prefs.js:1534
-#: js/prefs.js:1551
-#: js/prefs.js:1567
-#: js/prefs.js:1587
-#: js/tt-rss.js:540
-#: js/viewfeed.js:859
+#: js/feedlist.js:467
+#: js/feedlist.js:515
+#: js/functions.js:372
+#: js/functions.js:630
+#: js/prefs.js:1356
+#: js/prefs.js:1409
+#: js/prefs.js:1448
+#: js/prefs.js:1461
+#: js/prefs.js:1472
+#: js/prefs.js:1487
+#: js/tt-rss.js:568
+#: js/viewfeed.js:764
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
-#: index.php:168
-msgid "Collapse feedlist"
-msgstr "收缩侧边栏"
-
-#: index.php:171
+#: index.php:187
 msgid "Show articles"
 msgstr "显示文章"
 
-#: index.php:174
+#: index.php:190
 msgid "Adaptive"
 msgstr "自动适应"
 
-#: index.php:175
+#: index.php:191
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:176
-#: include/functions2.php:102
-#: classes/feeds.php:102
+#: index.php:192
+#: include/functions.php:1181
+#: classes/feeds.php:110
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:177
-#: include/functions2.php:103
-#: classes/feeds.php:103
+#: index.php:193
+#: include/functions.php:1182
+#: classes/feeds.php:111
 msgid "Published"
 msgstr "已发布"
 
-#: index.php:178
-#: classes/feeds.php:89
-#: classes/feeds.php:101
+#: index.php:194
+#: classes/feeds.php:103
+#: classes/feeds.php:109
 msgid "Unread"
 msgstr "未读"
 
-#: index.php:179
-#, fuzzy
-msgid "Unread First"
-msgstr "未读优先"
-
-#: index.php:180
+#: index.php:195
 msgid "With Note"
 msgstr "笔记"
 
-#: index.php:181
+#: index.php:196
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
-#: index.php:184
+#: index.php:199
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:187
+#: index.php:202
 msgid "Default"
 msgstr "默认"
 
-#: index.php:188
+#: index.php:203
 msgid "Newest first"
 msgstr "最新优先"
 
-#: index.php:189
+#: index.php:204
 msgid "Oldest first"
 msgstr "最早优先"
 
-#: index.php:190
+#: index.php:205
 msgid "Title"
 msgstr "标题"
 
-#: index.php:194
-#: index.php:235
-#: include/functions2.php:92
-#: classes/feeds.php:107
-#: js/FeedTree.js:132
-#: js/FeedTree.js:160
+#: index.php:209
+#: index.php:249
+#: include/functions.php:1169
+#: classes/feeds.php:115
+#: js/FeedTree.js:138
+#: js/FeedTree.js:166
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: index.php:197
+#: index.php:212
 msgid "Older than one day"
 msgstr "一天前"
 
-#: index.php:200
+#: index.php:215
 msgid "Older than one week"
 msgstr "一周前"
 
-#: index.php:203
+#: index.php:218
 msgid "Older than two weeks"
 msgstr "两周前"
 
-#: index.php:219
+#: index.php:234
 msgid "Communication problem with server."
 msgstr "连接服务器出错."
 
-#: index.php:225
+#: index.php:239
 msgid "Actions..."
 msgstr "操作"
 
-#: index.php:227
+#: index.php:241
 #, fuzzy
 msgid "Preferences..."
 msgstr "偏好设置"
 
-#: index.php:228
+#: index.php:242
 msgid "Search..."
 msgstr "搜索"
 
-#: index.php:229
+#: index.php:243
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:230
-#: classes/handler/public.php:628
+#: index.php:244
+#: classes/handler/public.php:583
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
-#: index.php:231
+#: index.php:245
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
-#: index.php:232
+#: index.php:246
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:233
-#: classes/pref/feeds.php:757
-#: classes/pref/feeds.php:1322
-#: js/PrefFeedTree.js:74
+#: index.php:247
+#: classes/pref/feeds.php:785
+#: classes/pref/feeds.php:1331
+#: js/PrefFeedTree.js:80
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:234
+#: index.php:248
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:236
+#: index.php:250
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:237
+#: index.php:251
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:238
-#: include/functions2.php:78
+#: index.php:252
+#: include/functions.php:1155
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "切换宽屏模式"
 
-#: index.php:239
-msgid "Select by tags..."
-msgstr "通过自定义标签选择"
-
-#: index.php:240
+#: index.php:253
 msgid "Create label..."
 msgstr "创建预定义标签"
 
-#: index.php:241
+#: index.php:254
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: index.php:242
+#: index.php:255
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:251
+#: index.php:264
 msgid "Logout"
 msgstr "注销"
 
-#: index.php:257
+#: index.php:270
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:120
-#: include/functions2.php:105
-#: classes/pref/prefs.php:440
+#: prefs.php:136
+#: include/functions.php:1184
+#: classes/pref/prefs.php:435
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: prefs.php:111
+#: prefs.php:127
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:112
+#: prefs.php:128
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:123
-#: classes/pref/feeds.php:110
-#: classes/pref/feeds.php:1243
-#: classes/pref/feeds.php:1311
+#: prefs.php:139
+#: classes/pref/feeds.php:112
+#: classes/pref/feeds.php:1271
+#: classes/pref/feeds.php:1320
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:126
-#: classes/pref/filters.php:188
+#: prefs.php:142
+#: classes/pref/filters.php:273
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:129
-#: include/functions.php:1262
-#: include/functions.php:1914
+#: prefs.php:145
 #: classes/pref/labels.php:90
+#: classes/feeds.php:1718
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:133
+#: prefs.php:149
 msgid "Users"
 msgstr "用户"
 
-#: prefs.php:136
+#: prefs.php:152
 msgid "System"
 msgstr "系统"
 
 #: register.php:187
-#: include/login_form.php:245
+#: include/login_form.php:252
 msgid "Create new account"
 msgstr "创建新的帐号"
 
@@ -422,13 +419,13 @@ msgstr "新用户注册功能已被管理员禁用。"
 #: register.php:337
 #: register.php:347
 #: register.php:359
-#: classes/handler/public.php:698
-#: classes/handler/public.php:769
-#: classes/handler/public.php:867
-#: classes/handler/public.php:946
-#: classes/handler/public.php:960
-#: classes/handler/public.php:967
-#: classes/handler/public.php:992
+#: classes/handler/public.php:653
+#: classes/handler/public.php:724
+#: classes/handler/public.php:822
+#: classes/handler/public.php:901
+#: classes/handler/public.php:915
+#: classes/handler/public.php:922
+#: classes/handler/public.php:947
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回至 Tiny Tiny RSS"
 
@@ -445,12 +442,12 @@ msgid "Check availability"
 msgstr "检查可用性"
 
 #: register.php:229
-#: classes/handler/public.php:785
+#: classes/handler/public.php:740
 msgid "Email:"
 msgstr "电子邮箱："
 
 #: register.php:232
-#: classes/handler/public.php:790
+#: classes/handler/public.php:745
 msgid "How much is two plus two:"
 msgstr "二加二等于几："
 
@@ -478,1124 +475,1038 @@ msgstr "帐号创建成功。"
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: update.php:62
+#: update.php:66
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
 
-#: include/digest.php:109
-#: include/functions.php:1271
-#: include/functions.php:1815
-#: include/functions.php:1900
-#: include/functions.php:1922
-#: classes/opml.php:421
-#: classes/pref/feeds.php:226
+#: include/controls.php:83
+#: classes/pref/filters.php:242
+#: classes/pref/filters.php:253
+#: classes/pref/filters.php:544
+msgid "All feeds"
+msgstr "全部信息源"
+
+#: include/controls.php:134
+#: include/controls.php:316
+#: classes/pref/feeds.php:228
+#: classes/opml.php:486
+#: classes/feeds.php:1727
+#: classes/digest.php:113
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: include/feedbrowser.php:82
+#: include/feedbrowser.php:84
 #, fuzzy, php-format
 msgid "%d archived article"
 msgid_plural "%d archived articles"
 msgstr[0] "%d 个存档的文章"
 
-#: include/feedbrowser.php:106
+#: include/feedbrowser.php:108
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions2.php:52
+#: include/functions.php:900
+#, php-format
+msgid "%d min"
+msgstr ""
+
+#: include/functions.php:1131
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions2.php:53
+#: include/functions.php:1132
 #, fuzzy
 msgid "Open next feed"
 msgstr "显示下一个信息源"
 
-#: include/functions2.php:54
+#: include/functions.php:1133
 msgid "Open previous feed"
 msgstr "显示前一个信息源"
 
-#: include/functions2.php:55
+#: include/functions.php:1134
 #, fuzzy
 msgid "Open next article"
 msgstr "显示下一篇文章"
 
-#: include/functions2.php:56
+#: include/functions.php:1135
 #, fuzzy
 msgid "Open previous article"
 msgstr "显示前一篇文章"
 
-#: include/functions2.php:57
+#: include/functions.php:1136
 msgid "Open next article (don't scroll long articles)"
 msgstr "显示下一篇文章 (不要在长文章中滚动)"
 
-#: include/functions2.php:58
+#: include/functions.php:1137
 msgid "Open previous article (don't scroll long articles)"
 msgstr "显示前一篇文章 (不要在长文章中滚动)"
 
-#: include/functions2.php:59
+#: include/functions.php:1138
 msgid "Move to next article (don't expand or mark read)"
 msgstr "跳转至下一篇文章 (不要展开或标记为已读)"
 
-#: include/functions2.php:60
+#: include/functions.php:1139
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "跳转至前一篇文章 (不要展开或标记为已读)"
 
-#: include/functions2.php:61
+#: include/functions.php:1140
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions2.php:62
+#: include/functions.php:1141
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions2.php:63
-#: js/viewfeed.js:2009
+#: include/functions.php:1142
+#: js/viewfeed.js:1701
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions2.php:64
-#: js/viewfeed.js:2020
+#: include/functions.php:1143
+#: js/viewfeed.js:1713
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions2.php:65
-#: js/viewfeed.js:1998
+#: include/functions.php:1144
+#: js/viewfeed.js:1688
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions2.php:66
+#: include/functions.php:1145
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions2.php:67
-#, fuzzy
-msgid "Dismiss selected"
-msgstr "不再显示所选的文章"
-
-#: include/functions2.php:68
-#, fuzzy
-msgid "Dismiss read"
-msgstr "不再显示已读文章"
-
-#: include/functions2.php:69
+#: include/functions.php:1146
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions2.php:70
-#: js/viewfeed.js:2039
+#: include/functions.php:1147
+#: js/viewfeed.js:1734
 msgid "Mark below as read"
 msgstr "将下面文章标为已读"
 
-#: include/functions2.php:71
-#: js/viewfeed.js:2033
+#: include/functions.php:1148
+#: js/viewfeed.js:1727
 msgid "Mark above as read"
 msgstr "将上面文章标为已读"
 
-#: include/functions2.php:72
+#: include/functions.php:1149
 #, fuzzy
 msgid "Scroll down"
 msgstr "向下滚动"
 
-#: include/functions2.php:73
+#: include/functions.php:1150
 msgid "Scroll up"
 msgstr "向上滚动"
 
-#: include/functions2.php:74
+#: include/functions.php:1151
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions2.php:75
+#: include/functions.php:1152
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions2.php:76
+#: include/functions.php:1153
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "关闭/折叠文章"
 
-#: include/functions2.php:77
+#: include/functions.php:1154
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "切换文章展开 (连续模式)"
 
-#: include/functions2.php:79
+#: include/functions.php:1156
 #: plugins/embed_original/init.php:31
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "切换嵌入模式"
 
-#: include/functions2.php:80
+#: include/functions.php:1157
 #, fuzzy
 msgid "Article selection"
 msgstr "文章选择"
 
-#: include/functions2.php:81
+#: include/functions.php:1158
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions2.php:82
+#: include/functions.php:1159
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions2.php:83
+#: include/functions.php:1160
 #, fuzzy
 msgid "Select starred"
 msgstr "选择加星标文章"
 
-#: include/functions2.php:84
+#: include/functions.php:1161
 #, fuzzy
 msgid "Select published"
 msgstr "选择已发布文章"
 
-#: include/functions2.php:85
+#: include/functions.php:1162
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions2.php:86
+#: include/functions.php:1163
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions2.php:87
-#: classes/pref/feeds.php:550
-#: classes/pref/feeds.php:794
+#: include/functions.php:1164
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:811
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions2.php:88
+#: include/functions.php:1165
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新当前信息源"
 
-#: include/functions2.php:89
+#: include/functions.php:1166
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "显示/隐藏 已读信息"
 
-#: include/functions2.php:90
-#: classes/pref/feeds.php:1314
+#: include/functions.php:1167
+#: classes/pref/feeds.php:1323
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions2.php:91
-#: js/FeedTree.js:139
-#: js/PrefFeedTree.js:68
+#: include/functions.php:1168
+#: js/FeedTree.js:145
+#: js/PrefFeedTree.js:74
+#: js/viewfeed.js:1855
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions2.php:93
+#: include/functions.php:1170
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions2.php:94
+#: include/functions.php:1171
+msgid "Toggle headline grouping"
+msgstr ""
+
+#: include/functions.php:1172
 #, fuzzy
 msgid "Debug feed update"
 msgstr "调试信息源更新"
 
-#: include/functions2.php:95
-#: js/FeedTree.js:182
+#: include/functions.php:1173
+#, fuzzy
+msgid "Debug viewfeed()"
+msgstr "调试信息源更新"
+
+#: include/functions.php:1174
+#: js/FeedTree.js:194
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions2.php:96
+#: include/functions.php:1175
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "展开/折叠 当前分类"
 
-#: include/functions2.php:97
+#: include/functions.php:1176
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "切换连续模式"
 
-#: include/functions2.php:98
+#: include/functions.php:1177
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "切换连续模式中的自动展开功能"
 
-#: include/functions2.php:99
+#: include/functions.php:1178
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions2.php:100
-#: include/functions.php:1973
+#: include/functions.php:1179
+#: classes/feeds.php:1602
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions2.php:101
+#: include/functions.php:1180
 msgid "Fresh"
 msgstr "最新的"
 
-#: include/functions2.php:104
-#: js/tt-rss.js:467
-#: js/tt-rss.js:651
+#: include/functions.php:1183
+#: js/tt-rss.js:495
+#: js/tt-rss.js:664
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions2.php:106
+#: include/functions.php:1185
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions2.php:107
-#: classes/pref/labels.php:281
+#: include/functions.php:1186
+#: classes/pref/labels.php:267
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions2.php:108
-#: classes/pref/filters.php:678
+#: include/functions.php:1187
+#: classes/pref/filters.php:793
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions2.php:109
+#: include/functions.php:1188
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "收起侧边栏"
 
-#: include/functions2.php:110
+#: include/functions.php:1189
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示帮助对话框"
 
-#: include/functions2.php:687
-#, php-format
-msgid "Search results: %s"
-msgstr "搜索结果：%s"
-
-#: include/functions2.php:1302
-#: classes/feeds.php:714
-#, fuzzy
-msgid "comment"
-msgid_plural "comments"
-msgstr[0] "评论些什么？"
-
-#: include/functions2.php:1306
-#: classes/feeds.php:718
-#, fuzzy
-msgid "comments"
-msgstr "评论些什么？"
-
-#: include/functions2.php:1347
-msgid " - "
-msgstr " - "
-
-#: include/functions2.php:1380
-#: include/functions2.php:1628
-#: classes/article.php:280
-msgid "no tags"
-msgstr "无标签"
-
-#: include/functions2.php:1390
-#: classes/feeds.php:700
-msgid "Edit tags for this article"
-msgstr "为本文编辑自定义标签"
-
-#: include/functions2.php:1422
-#: classes/feeds.php:652
-msgid "Originally from:"
-msgstr "来源："
-
-#: include/functions2.php:1435
-#: classes/feeds.php:665
-#: classes/pref/feeds.php:569
-msgid "Feed URL"
-msgstr "信息源 URL"
+#: include/functions.php:2456
+msgid "There is no error, the file uploaded with success"
+msgstr ""
 
-#: include/functions2.php:1469
-#: classes/backend.php:105
-#: classes/pref/users.php:95
-#: classes/pref/feeds.php:1611
-#: classes/pref/feeds.php:1677
-#: classes/pref/filters.php:145
-#: classes/pref/prefs.php:1102
-#: classes/dlg.php:36
-#: classes/dlg.php:59
-#: classes/dlg.php:92
-#: classes/dlg.php:158
-#: classes/dlg.php:189
-#: classes/dlg.php:216
-#: plugins/af_psql_trgm/init.php:98
-#: plugins/googlereaderimport/init.php:194
-#: plugins/import_export/init.php:411
-#: plugins/import_export/init.php:456
-#: plugins/share/init.php:123
-msgid "Close this window"
-msgstr "关闭本窗口"
+#: include/functions.php:2457
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
+msgstr ""
 
-#: include/functions2.php:1665
-msgid "(edit note)"
-msgstr "（编辑注记）"
+#: include/functions.php:2458
+msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
+msgstr ""
 
-#: include/functions2.php:1913
-msgid "unknown type"
-msgstr "未知类型"
+#: include/functions.php:2459
+msgid "The uploaded file was only partially uploaded"
+msgstr ""
 
-#: include/functions2.php:1981
+#: include/functions.php:2460
 #, fuzzy
-msgid "Attachments"
-msgstr "附件："
-
-#: include/functions.php:1260
-#: include/functions.php:1912
-msgid "Special"
-msgstr "特殊区域"
-
-#: include/functions.php:1763
-#: classes/feeds.php:1124
-#: classes/pref/filters.php:169
-#: classes/pref/filters.php:447
-msgid "All feeds"
-msgstr "全部信息源"
-
-#: include/functions.php:1967
-msgid "Starred articles"
-msgstr "加星标文章"
-
-#: include/functions.php:1969
-msgid "Published articles"
-msgstr "已发布文章"
+msgid "No file was uploaded"
+msgstr "没有文件上传。"
 
-#: include/functions.php:1971
-msgid "Fresh articles"
-msgstr "最新更新的文章"
+#: include/functions.php:2461
+msgid "Missing a temporary folder"
+msgstr ""
 
-#: include/functions.php:1975
-msgid "Archived articles"
-msgstr "存档的文章"
+#: include/functions.php:2462
+msgid "Failed to write file to disk."
+msgstr ""
 
-#: include/functions.php:1977
-msgid "Recently read"
-msgstr "最近的阅读"
+#: include/functions.php:2463
+msgid "A PHP extension stopped the file upload."
+msgstr ""
 
-#: include/login_form.php:190
-#: classes/handler/public.php:525
-#: classes/handler/public.php:780
+#: include/login_form.php:197
+#: classes/handler/public.php:480
+#: classes/handler/public.php:735
 msgid "Login:"
 msgstr "登陆："
 
-#: include/login_form.php:200
-#: classes/handler/public.php:528
+#: include/login_form.php:207
+#: classes/handler/public.php:483
 msgid "Password:"
 msgstr "密码："
 
-#: include/login_form.php:206
+#: include/login_form.php:213
 #, fuzzy
 msgid "I forgot my password"
 msgstr "忘记密码"
 
-#: include/login_form.php:212
+#: include/login_form.php:219
 msgid "Profile:"
 msgstr "偏好："
 
-#: include/login_form.php:216
-#: classes/handler/public.php:266
+#: include/login_form.php:223
+#: classes/handler/public.php:287
+#: classes/pref/prefs.php:1035
 #: classes/rpc.php:63
-#: classes/pref/prefs.php:1040
 msgid "Default profile"
 msgstr "默认偏好设置"
 
-#: include/login_form.php:224
+#: include/login_form.php:231
 msgid "Use less traffic"
 msgstr "省流量"
 
-#: include/login_form.php:228
+#: include/login_form.php:235
 msgid "Does not display images in articles, reduces automatic refreshes."
 msgstr "不显示文章中的图片，减少自动刷新。"
 
-#: include/login_form.php:236
+#: include/login_form.php:243
 msgid "Remember me"
 msgstr "记住我"
 
-#: include/login_form.php:242
-#: classes/handler/public.php:533
+#: include/login_form.php:249
+#: classes/handler/public.php:488
 msgid "Log in"
 msgstr "登录"
 
-#: include/sessions.php:61
-msgid "Session failed to validate (incorrect IP)"
-msgstr "无法验证会话（IP 错误）"
-
-#: include/sessions.php:67
+#: include/sessions.php:44
 #, fuzzy
 msgid "Session failed to validate (schema version changed)"
 msgstr "无法验证会话（schema版本发生变化）"
 
-#: include/sessions.php:85
+#: include/sessions.php:56
 #, fuzzy
 msgid "Session failed to validate (user not found)"
 msgstr "无法验证会话（没有找到该用户）"
 
-#: include/sessions.php:94
+#: include/sessions.php:65
 #, fuzzy
 msgid "Session failed to validate (password changed)"
 msgstr "无法验证会话（密码错误）"
 
-#: classes/backend.php:33
+#: classes/backend.php:31
 msgid "Other interface tips are available in the Tiny Tiny RSS wiki."
 msgstr "在 Tiny Tiny RSS 的维基上可以找到其他界面技巧。"
 
-#: classes/backend.php:38
+#: classes/backend.php:36
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: classes/backend.php:61
+#: classes/backend.php:59
 msgid "Shift"
 msgstr "Shift"
 
-#: classes/backend.php:64
+#: classes/backend.php:62
 msgid "Ctrl"
 msgstr "Ctrl"
 
-#: classes/backend.php:99
+#: classes/backend.php:97
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
-#: classes/handler/public.php:466
+#: classes/backend.php:103
+#: classes/dlg.php:37
+#: classes/dlg.php:60
+#: classes/dlg.php:93
+#: classes/dlg.php:159
+#: classes/dlg.php:186
+#: classes/article.php:744
+#: classes/pref/filters.php:206
+#: classes/pref/prefs.php:1097
+#: classes/pref/feeds.php:1626
+#: classes/pref/feeds.php:1692
+#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:467
+#: plugins/af_psql_trgm/init.php:102
+#: plugins/share/init.php:120
+msgid "Close this window"
+msgstr "关闭本窗口"
+
+#: classes/dlg.php:17
+msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
+msgstr "如果你已经导入了预定义标签或过滤器，你可能需要重新加载来看到新的设置。"
+
+#: classes/dlg.php:48
+msgid "Your Public OPML URL is:"
+msgstr "你的公共 OPML URL 是："
+
+#: classes/dlg.php:57
+#: classes/dlg.php:183
+#: plugins/share/init.php:117
+msgid "Generate new URL"
+msgstr "生成一个新的 URL"
+
+#: classes/dlg.php:71
+msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
+msgstr "更新进程已在配置中启用，但守护进程没有运行，导致无法抓取信息。请启动守护进程，或联系管理员。"
+
+#: classes/dlg.php:75
+#: classes/dlg.php:84
+msgid "Last update:"
+msgstr "上次更新："
+
+#: classes/dlg.php:80
+msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
+msgstr "更新进程在抓取信息更新时花费了太长时间，这可能引起崩溃或假死问题。请检查守护进程或联系管理员。"
+
+#: classes/dlg.php:174
+msgid "You can view this feed as RSS using the following URL:"
+msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
+
+#: classes/article.php:25
+msgid "Article not found."
+msgstr "找不到文章。"
+
+#: classes/article.php:197
+msgid "Tags for this article (separated by commas):"
+msgstr "本文的标签，请用逗号分开："
+
+#: classes/article.php:222
+#: classes/pref/labels.php:79
+#: classes/pref/filters.php:519
+#: classes/pref/users.php:98
+#: classes/pref/prefs.php:981
+#: classes/pref/feeds.php:789
+#: classes/pref/feeds.php:931
+#: plugins/af_psql_trgm/init.php:181
+#: plugins/nsfw/init.php:85
+#: plugins/af_readability/init.php:68
+#: plugins/mail/init.php:64
+#: plugins/af_redditimgur/init.php:60
+#: plugins/note/init.php:51
+#: plugins/af_zz_imgproxy/init.php:240
+msgid "Save"
+msgstr "保存"
+
+#: classes/article.php:224
+#: classes/handler/public.php:457
+#: classes/handler/public.php:491
+#: classes/pref/labels.php:81
+#: classes/pref/filters.php:522
+#: classes/pref/filters.php:942
+#: classes/pref/filters.php:1022
+#: classes/pref/filters.php:1115
+#: classes/pref/users.php:100
+#: classes/pref/prefs.php:983
+#: classes/pref/feeds.php:790
+#: classes/pref/feeds.php:934
+#: classes/pref/feeds.php:1833
+#: classes/feeds.php:1098
+#: classes/feeds.php:1148
+#: classes/feeds.php:1185
+#: plugins/mail/init.php:173
+#: plugins/note/init.php:53
+msgid "Cancel"
+msgstr "取消"
+
+#: classes/article.php:311
+#: classes/article.php:652
+#: classes/article.php:805
+msgid "no tags"
+msgstr "无标签"
+
+#: classes/article.php:419
+msgid "unknown type"
+msgstr "未知类型"
+
+#: classes/article.php:496
+#, fuzzy
+msgid "Attachments"
+msgstr "附件："
+
+#: classes/article.php:591
+#: classes/feeds.php:741
+#, fuzzy
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] "评论些什么？"
+
+#: classes/article.php:595
+#: classes/feeds.php:745
+#, fuzzy
+msgid "comments"
+msgstr "评论些什么？"
+
+#: classes/article.php:621
+msgid " - "
+msgstr " - "
+
+#: classes/article.php:662
+#: classes/feeds.php:727
+msgid "Edit tags for this article"
+msgstr "为本文编辑自定义标签"
+
+#: classes/article.php:694
+#: classes/feeds.php:681
+msgid "Originally from:"
+msgstr "来源："
+
+#: classes/article.php:707
+#: classes/pref/feeds.php:574
+#: classes/feeds.php:694
+msgid "Feed URL"
+msgstr "信息源 URL"
+
+#: classes/article.php:843
+msgid "(edit note)"
+msgstr "（编辑注记）"
+
+#: classes/handler/public.php:421
 #: plugins/bookmarklets/init.php:40
 #, fuzzy
 msgid "Share with Tiny Tiny RSS"
 msgstr "在 Tiny Tiny RSS 中分享订阅"
 
-#: classes/handler/public.php:474
+#: classes/handler/public.php:429
 #, fuzzy
 msgid "Title:"
 msgstr "标题"
 
-#: classes/handler/public.php:476
-#: classes/pref/feeds.php:567
-#: plugins/instances/init.php:212
-#: plugins/instances/init.php:401
+#: classes/handler/public.php:431
+#: classes/pref/feeds.php:572
 msgid "URL:"
 msgstr "URL："
 
-#: classes/handler/public.php:478
+#: classes/handler/public.php:433
 #, fuzzy
 msgid "Content:"
 msgstr "内容"
 
-#: classes/handler/public.php:480
+#: classes/handler/public.php:435
 #, fuzzy
 msgid "Labels:"
 msgstr "预定义标签"
 
-#: classes/handler/public.php:499
+#: classes/handler/public.php:454
 msgid "Shared article will appear in the Published feed."
 msgstr "被分享的文章将会出现在已发布信息源中。"
 
-#: classes/handler/public.php:501
+#: classes/handler/public.php:456
 msgid "Share"
 msgstr "分享"
 
-#: classes/handler/public.php:502
-#: classes/handler/public.php:536
-#: classes/feeds.php:1053
-#: classes/feeds.php:1103
-#: classes/feeds.php:1163
-#: classes/article.php:205
-#: classes/pref/users.php:170
-#: classes/pref/feeds.php:774
-#: classes/pref/feeds.php:903
-#: classes/pref/feeds.php:1817
-#: classes/pref/filters.php:428
-#: classes/pref/filters.php:827
-#: classes/pref/filters.php:908
-#: classes/pref/filters.php:975
-#: classes/pref/labels.php:81
-#: classes/pref/prefs.php:988
-#: plugins/note/init.php:53
-#: plugins/mail/init.php:172
-#: plugins/instances/init.php:248
-#: plugins/instances/init.php:436
-msgid "Cancel"
-msgstr "取消"
-
-#: classes/handler/public.php:523
+#: classes/handler/public.php:478
 #, fuzzy
 msgid "Not logged in"
 msgstr "未登录"
 
-#: classes/handler/public.php:582
+#: classes/handler/public.php:537
 msgid "Incorrect username or password"
 msgstr "用户名或密码错误"
 
-#: classes/handler/public.php:634
+#: classes/handler/public.php:589
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:637
+#: classes/handler/public.php:592
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: classes/handler/public.php:640
+#: classes/handler/public.php:595
 #, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "无法订阅到 <b>%s</b>。"
 
-#: classes/handler/public.php:643
+#: classes/handler/public.php:598
 #, php-format
 msgid "No feeds found in <b>%s</b>."
 msgstr "在 <b>%s</b> 中没有找到信息源。"
 
-#: classes/handler/public.php:646
+#: classes/handler/public.php:601
 #, fuzzy
 msgid "Multiple feed URLs found."
 msgstr "发现了多个信息源。"
 
-#: classes/handler/public.php:650
+#: classes/handler/public.php:605
 #, php-format
 msgid "Could not subscribe to <b>%s</b>.<br>Can't download the Feed URL."
 msgstr "无法订阅 <b>%s</b>。<br>无法下载信息源的 URL。"
 
-#: classes/handler/public.php:668
+#: classes/handler/public.php:623
 msgid "Subscribe to selected feed"
 msgstr "订阅选中的信息源"
 
-#: classes/handler/public.php:693
+#: classes/handler/public.php:648
 msgid "Edit subscription options"
 msgstr "编辑订阅选项"
 
-#: classes/handler/public.php:730
+#: classes/handler/public.php:685
 #, fuzzy
 msgid "Password recovery"
 msgstr "找回密码"
 
-#: classes/handler/public.php:773
+#: classes/handler/public.php:728
 msgid "You will need to provide valid account name and email. A password reset link will be sent to your email address."
 msgstr "你需要提供合法的用户名和Email地址。密码重置链接将会发送到你的Email中。"
 
-#: classes/handler/public.php:795
-#: classes/pref/users.php:352
+#: classes/handler/public.php:750
+#: classes/pref/users.php:349
 msgid "Reset password"
 msgstr "重置密码"
 
-#: classes/handler/public.php:805
+#: classes/handler/public.php:760
 msgid "Some of the required form parameters are missing or incorrect."
 msgstr "表单中的信息不完整或不正确。"
 
-#: classes/handler/public.php:809
-#: classes/handler/public.php:875
+#: classes/handler/public.php:764
+#: classes/handler/public.php:830
 #, fuzzy
 msgid "Go back"
 msgstr "返回"
 
-#: classes/handler/public.php:846
+#: classes/handler/public.php:801
 #, fuzzy
 msgid "[tt-rss] Password reset request"
 msgstr "[tt-rss] 密码重置请求"
 
-#: classes/handler/public.php:871
+#: classes/handler/public.php:826
 msgid "Sorry, login and email combination not found."
 msgstr "对不起，没有找到用户名和Email组合。"
 
-#: classes/handler/public.php:893
+#: classes/handler/public.php:848
 msgid "Your access level is insufficient to run this script."
 msgstr "访问级别不足，无法运行脚本。"
 
-#: classes/handler/public.php:919
+#: classes/handler/public.php:874
 msgid "Database Updater"
 msgstr "数据库更新管理器"
 
-#: classes/handler/public.php:984
+#: classes/handler/public.php:939
 msgid "Perform updates"
 msgstr "执行更新"
 
-#: classes/feeds.php:51
-msgid "View as RSS feed"
-msgstr "以RSS信息源方式阅读"
+#: classes/pref/labels.php:22
+#: classes/pref/filters.php:373
+#: classes/pref/filters.php:863
+msgid "Caption"
+msgstr "标题"
 
-#: classes/feeds.php:52
-#: classes/feeds.php:132
-#: classes/pref/feeds.php:1473
-msgid "View as RSS"
-msgstr "以 RSS 形式阅读"
+#: classes/pref/labels.php:37
+msgid "Colors"
+msgstr "颜色"
 
-#: classes/feeds.php:60
-#, fuzzy, php-format
-msgid "Last updated: %s"
-msgstr "上次更新："
+#: classes/pref/labels.php:42
+msgid "Foreground:"
+msgstr "前端："
 
-#: classes/feeds.php:88
-#: classes/pref/users.php:337
-#: classes/pref/feeds.php:1305
-#: classes/pref/feeds.php:1562
-#: classes/pref/feeds.php:1626
-#: classes/pref/filters.php:302
-#: classes/pref/filters.php:350
-#: classes/pref/filters.php:672
-#: classes/pref/filters.php:760
+#: classes/pref/labels.php:42
+msgid "Background:"
+msgstr "背景："
+
+#: classes/pref/labels.php:232
+#, php-format
+msgid "Created label <b>%s</b>"
+msgstr "创建预定义标签 <b>%s</b>"
+
+#: classes/pref/labels.php:258
+#: classes/pref/filters.php:384
+#: classes/pref/filters.php:441
+#: classes/pref/filters.php:784
+#: classes/pref/filters.php:872
+#: classes/pref/filters.php:899
+#: classes/pref/users.php:333
+#: classes/pref/prefs.php:992
+#: classes/pref/feeds.php:1311
+#: classes/pref/feeds.php:1574
+#: classes/pref/feeds.php:1638
+msgid "Select"
+msgstr "选择"
+
+#: classes/pref/labels.php:261
+#: classes/pref/filters.php:387
+#: classes/pref/filters.php:444
 #: classes/pref/filters.php:787
-#: classes/pref/labels.php:275
-#: classes/pref/prefs.php:1000
-#: plugins/instances/init.php:287
+#: classes/pref/filters.php:875
+#: classes/pref/filters.php:902
+#: classes/pref/users.php:336
+#: classes/pref/prefs.php:995
+#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1577
+#: classes/pref/feeds.php:1641
+#: classes/feeds.php:102
 msgid "All"
 msgstr "全部"
 
-#: classes/feeds.php:90
-msgid "Invert"
-msgstr "反选"
-
-#: classes/feeds.php:91
-#: classes/pref/users.php:339
-#: classes/pref/feeds.php:1307
-#: classes/pref/feeds.php:1564
-#: classes/pref/feeds.php:1628
-#: classes/pref/filters.php:304
-#: classes/pref/filters.php:352
-#: classes/pref/filters.php:674
-#: classes/pref/filters.php:762
+#: classes/pref/labels.php:263
+#: classes/pref/filters.php:389
+#: classes/pref/filters.php:446
 #: classes/pref/filters.php:789
-#: classes/pref/labels.php:277
-#: classes/pref/prefs.php:1002
-#: plugins/instances/init.php:289
-msgid "None"
+#: classes/pref/filters.php:877
+#: classes/pref/filters.php:904
+#: classes/pref/users.php:338
+#: classes/pref/prefs.php:997
+#: classes/pref/feeds.php:1316
+#: classes/pref/feeds.php:1579
+#: classes/pref/feeds.php:1643
+#: classes/feeds.php:105
+msgid "None"
 msgstr "无"
 
-#: classes/feeds.php:97
-#, fuzzy
-msgid "More..."
-msgstr "更多……"
+#: classes/pref/labels.php:270
+#: classes/pref/filters.php:512
+#: classes/pref/filters.php:806
+#: classes/pref/users.php:347
+#: classes/pref/feeds.php:767
+#: classes/feeds.php:1147
+msgid "Remove"
+msgstr "移除"
 
-#: classes/feeds.php:99
-msgid "Selection toggle:"
-msgstr "锁定选择："
+#: classes/pref/labels.php:273
+msgid "Clear colors"
+msgstr "清空颜色"
 
-#: classes/feeds.php:105
-msgid "Selection:"
-msgstr "选择："
+#: classes/pref/filters.php:153
+#, fuzzy
+msgid "Preview article"
+msgstr "最新更新的文章"
 
-#: classes/feeds.php:108
+#: classes/pref/filters.php:264
+#: classes/pref/filters.php:558
 #, fuzzy
-msgid "Set score"
-msgstr "评分"
+msgid "(inverse)"
+msgstr "反选"
 
-#: classes/feeds.php:111
-msgid "Archive"
-msgstr "存档"
+#: classes/pref/filters.php:260
+#: classes/pref/filters.php:557
+#, php-format
+msgid "%s on %s in %s %s"
+msgstr ""
 
-#: classes/feeds.php:113
-msgid "Move back"
-msgstr "移回原位"
+#: classes/pref/filters.php:379
+#: classes/pref/filters.php:867
+#: classes/pref/filters.php:981
+msgid "Match"
+msgstr "匹配"
 
-#: classes/feeds.php:114
-#: classes/pref/filters.php:311
-#: classes/pref/filters.php:359
-#: classes/pref/filters.php:769
-#: classes/pref/filters.php:796
+#: classes/pref/filters.php:393
+#: classes/pref/filters.php:450
+#: classes/pref/filters.php:881
+#: classes/pref/filters.php:908
+msgid "Add"
+msgstr "添加"
+
+#: classes/pref/filters.php:396
+#: classes/pref/filters.php:453
+#: classes/pref/filters.php:884
+#: classes/pref/filters.php:911
+#: classes/feeds.php:122
 msgid "Delete"
 msgstr "删除"
 
-#: classes/feeds.php:119
-#: classes/feeds.php:124
-#: plugins/mailto/init.php:25
-#: plugins/mail/init.php:75
-msgid "Forward by email"
-msgstr "通过邮件转发"
+#: classes/pref/filters.php:436
+#: classes/pref/filters.php:894
+#, fuzzy
+msgid "Apply actions"
+msgstr "应用操作"
 
-#: classes/feeds.php:128
-msgid "Feed:"
-msgstr "信息源："
+#: classes/pref/filters.php:486
+#: classes/pref/filters.php:923
+msgid "Enabled"
+msgstr "已启用"
 
-#: classes/feeds.php:201
-#: classes/feeds.php:849
-msgid "Feed not found."
-msgstr "找不到信息源。"
+#: classes/pref/filters.php:495
+#: classes/pref/filters.php:926
+msgid "Match any rule"
+msgstr "匹配任意规则"
 
-#: classes/feeds.php:260
+#: classes/pref/filters.php:504
+#: classes/pref/filters.php:929
 #, fuzzy
-msgid "Never"
-msgstr "从不清理"
-
-#: classes/feeds.php:381
-#, fuzzy, php-format
-msgid "Imported at %s"
-msgstr "导入"
+msgid "Inverse matching"
+msgstr "反向匹配"
 
-#: classes/feeds.php:440
-#: classes/feeds.php:535
-#, fuzzy
-msgid "mark feed as read"
-msgstr "标记信息源为已读"
+#: classes/pref/filters.php:516
+#: classes/pref/filters.php:936
+msgid "Test"
+msgstr "测试"
 
-#: classes/feeds.php:592
-#, fuzzy
-msgid "Collapse article"
-msgstr "折叠文章"
+#: classes/pref/filters.php:780
+#: classes/pref/users.php:323
+#: classes/pref/feeds.php:1307
+#: classes/feeds.php:1118
+#: classes/feeds.php:1184
+#: js/tt-rss.js:165
+msgid "Search"
+msgstr "搜索"
 
-#: classes/feeds.php:752
-msgid "No unread articles found to display."
-msgstr "没有未读文章。"
+#: classes/pref/filters.php:796
+msgid "Combine"
+msgstr "连续"
 
-#: classes/feeds.php:755
-msgid "No updated articles found to display."
-msgstr "没有最新更新的文章。"
+#: classes/pref/filters.php:799
+#: classes/pref/users.php:345
+msgid "Edit"
+msgstr "编辑"
 
-#: classes/feeds.php:758
-msgid "No starred articles found to display."
-msgstr "没有加星标的文章。"
+#: classes/pref/filters.php:802
+#: classes/pref/feeds.php:1327
+#: classes/pref/feeds.php:1341
+msgid "Reset sort order"
+msgstr "重置排序"
 
-#: classes/feeds.php:762
-#, fuzzy
-msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
-msgstr "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方动作菜单）。"
+#: classes/pref/filters.php:810
+#: classes/pref/feeds.php:1363
+msgid "Rescore articles"
+msgstr "为文章重新评分"
 
-#: classes/feeds.php:764
-msgid "No articles found to display."
-msgstr "暂时没有文章。"
+#: classes/pref/filters.php:939
+msgid "Create"
+msgstr "创建"
 
-#: classes/feeds.php:779
-#: classes/feeds.php:944
-#, php-format
-msgid "Feeds last updated at %s"
-msgstr "上次信息源更新时间：%s"
+#: classes/pref/filters.php:993
+msgid "Inverse regular expression matching"
+msgstr "反选正则表达式匹配结果"
 
-#: classes/feeds.php:789
-#: classes/feeds.php:954
-msgid "Some feeds have update errors (click for details)"
-msgstr "部分信息源更新错误（点击了解详情）"
+#: classes/pref/filters.php:995
+msgid "on field"
+msgstr "on field"
 
-#: classes/feeds.php:934
-msgid "No feed selected."
-msgstr "没有选中的信息源。"
+#: classes/pref/filters.php:1001
+#: js/PrefFilterTree.js:64
+msgid "in"
+msgstr "在"
 
-#: classes/feeds.php:991
-#: classes/feeds.php:999
+#: classes/pref/filters.php:1014
 #, fuzzy
-msgid "Feed or site URL"
-msgstr "信息源 URL"
-
-#: classes/feeds.php:1005
-#: classes/pref/feeds.php:590
-#: classes/pref/feeds.php:801
-#: classes/pref/feeds.php:1781
-msgid "Place in category:"
-msgstr "加入到类别："
+msgid "Wiki: Filters"
+msgstr "过滤器"
 
-#: classes/feeds.php:1013
-msgid "Available feeds"
-msgstr "可用的信息源"
+#: classes/pref/filters.php:1019
+#, fuzzy
+msgid "Save rule"
+msgstr "保存规则"
 
-#: classes/feeds.php:1025
-#: classes/pref/users.php:133
-#: classes/pref/feeds.php:620
-#: classes/pref/feeds.php:837
-msgid "Authentication"
-msgstr "登录认证"
+#: classes/pref/filters.php:1019
+#: js/functions.js:865
+msgid "Add rule"
+msgstr "添加规则"
 
-#: classes/feeds.php:1029
-#: classes/pref/users.php:397
-#: classes/pref/feeds.php:626
-#: classes/pref/feeds.php:841
-#: classes/pref/feeds.php:1795
-msgid "Login"
-msgstr "登陆"
+#: classes/pref/filters.php:1042
+msgid "Perform Action"
+msgstr "执行动作"
 
-#: classes/feeds.php:1032
-#: classes/pref/feeds.php:639
-#: classes/pref/feeds.php:847
-#: classes/pref/feeds.php:1798
-#: classes/pref/prefs.php:260
-msgid "Password"
-msgstr "密码"
+#: classes/pref/filters.php:1093
+#, fuzzy
+msgid "No actions available"
+msgstr "有可用的新版本啦！"
 
-#: classes/feeds.php:1042
-msgid "This feed requires authentication."
-msgstr "这个信息源需要认证"
+#: classes/pref/filters.php:1112
+#, fuzzy
+msgid "Save action"
+msgstr "保存操作"
 
-#: classes/feeds.php:1047
-#: classes/feeds.php:1101
-#: classes/pref/feeds.php:1816
-msgid "Subscribe"
-msgstr "订阅"
+#: classes/pref/filters.php:1112
+#: js/functions.js:887
+#, fuzzy
+msgid "Add action"
+msgstr "添加操作"
 
-#: classes/feeds.php:1050
-msgid "More feeds"
-msgstr "更多信息源"
+#: classes/pref/filters.php:1136
+#, fuzzy
+msgid "[No caption]"
+msgstr "[无标题]"
 
-#: classes/feeds.php:1073
-#: classes/feeds.php:1162
-#: classes/pref/users.php:324
-#: classes/pref/feeds.php:1298
-#: classes/pref/filters.php:665
-#: js/tt-rss.js:174
-msgid "Search"
-msgstr "搜索"
+#: classes/pref/filters.php:1138
+#, php-format
+msgid "%s (%d rule)"
+msgid_plural "%s (%d rules)"
+msgstr[0] ""
 
-#: classes/feeds.php:1077
-msgid "Popular feeds"
-msgstr "最受欢迎的信息源"
+#: classes/pref/filters.php:1153
+#, fuzzy
+msgid "matches any rule"
+msgstr "匹配任意规则"
 
-#: classes/feeds.php:1078
-msgid "Feed archive"
-msgstr "信息源存档"
+#: classes/pref/filters.php:1156
+#, fuzzy, php-format
+msgid "%s (+%d action)"
+msgid_plural "%s (+%d actions)"
+msgstr[0] "信息源动作"
 
-#: classes/feeds.php:1081
-msgid "limit:"
-msgstr "限制："
+#: classes/pref/users.php:6
+#: classes/pref/system.php:8
+msgid "Your access level is insufficient to open this tab."
+msgstr "您的访问级别不够，无法打开这个舌签。"
 
-#: classes/feeds.php:1102
-#: classes/pref/users.php:350
-#: classes/pref/feeds.php:744
-#: classes/pref/filters.php:418
-#: classes/pref/filters.php:691
-#: classes/pref/labels.php:284
-#: plugins/instances/init.php:294
-msgid "Remove"
-msgstr "移除"
+#: classes/pref/users.php:24
+#, fuzzy
+msgid "Edit user"
+msgstr "编辑过滤器"
 
-#: classes/feeds.php:1113
-msgid "Look for"
-msgstr "查找"
+#: classes/pref/users.php:56
+#: classes/pref/feeds.php:637
+#: classes/pref/feeds.php:866
+#: classes/feeds.php:1068
+msgid "Authentication"
+msgstr "登录认证"
 
-#: classes/feeds.php:1121
-msgid "Limit search to:"
-msgstr "限制搜索条件："
+#: classes/pref/users.php:59
+msgid "Access level: "
+msgstr "访问级别："
 
-#: classes/feeds.php:1137
-msgid "This feed"
-msgstr "本信息源"
+#: classes/pref/users.php:77
+#: classes/pref/feeds.php:667
+#: classes/pref/feeds.php:884
+msgid "Options"
+msgstr "选项"
 
-#: classes/feeds.php:1158
-#, fuzzy
-msgid "Search syntax"
-msgstr "搜索语法"
+#: classes/pref/users.php:91
+#: js/prefs.js:538
+msgid "User details"
+msgstr "用户详细资料"
 
-#: classes/article.php:25
-msgid "Article not found."
-msgstr "æ\89¾ä¸\8då\88°æ\96\87ç« ã\80\82"
+#: classes/pref/users.php:118
+msgid "User not found"
+msgstr "æ\9cªæ\89¾å\88°ç\94¨æ\88·"
 
-#: classes/article.php:178
-msgid "Tags for this article (separated by commas):"
-msgstr "本文的标签，请用逗号分开："
+#: classes/pref/users.php:132
+#: classes/pref/users.php:399
+msgid "Registered"
+msgstr "注册时间"
 
-#: classes/article.php:203
-#: classes/pref/users.php:168
-#: classes/pref/feeds.php:773
-#: classes/pref/feeds.php:900
-#: classes/pref/filters.php:425
-#: classes/pref/labels.php:79
-#: classes/pref/prefs.php:986
-#: plugins/af_psql_trgm/init.php:175
-#: plugins/note/init.php:51
-#: plugins/nsfw/init.php:85
-#: plugins/mail/init.php:64
-#: plugins/instances/init.php:245
-msgid "Save"
-msgstr "保存"
+#: classes/pref/users.php:133
+msgid "Last logged in"
+msgstr "上次登录"
 
-#: classes/opml.php:28
-#: classes/opml.php:33
-msgid "OPML Utility"
-msgstr "OPML 工具"
+#: classes/pref/users.php:140
+msgid "Subscribed feeds count"
+msgstr "订阅的信息源数量"
 
-#: classes/opml.php:37
-msgid "Importing OPML..."
-msgstr "正在导入 OPML ……"
+#: classes/pref/users.php:141
+#, fuzzy
+msgid "Stored articles"
+msgstr "加星标文章"
 
-#: classes/opml.php:41
-msgid "Return to preferences"
-msgstr "返回偏好设置"
+#: classes/pref/users.php:145
+#: classes/pref/users.php:398
+msgid "Subscribed feeds"
+msgstr "订阅的信息源"
 
-#: classes/opml.php:271
+#: classes/pref/users.php:232
 #, php-format
-msgid "Adding feed: %s"
-msgstr "添加信息源: %s"
-
-#: classes/opml.php:282
-#, fuzzy, php-format
-msgid "Duplicate feed: %s"
-msgstr "重复的信息源"
+msgid "Added user <b>%s</b> with password <b>%s</b>"
+msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: classes/opml.php:296
+#: classes/pref/users.php:239
 #, php-format
-msgid "Adding label %s"
-msgstr "æ·»å\8a é¢\84å®\9aä¹\89æ \87ç­¾%s"
+msgid "Could not create user <b>%s</b>"
+msgstr "æ\97 æ³\95å\88\9b建ç\94¨æ\88· <b>%s</b> "
 
-#: classes/opml.php:299
+#: classes/pref/users.php:243
 #, php-format
-msgid "Duplicate label: %s"
-msgstr "重复预定义标签: %s"
+msgid "User <b>%s</b> already exists."
+msgstr "用户 <b>%s</b> 已存在。"
 
-#: classes/opml.php:311
-#, php-format
-msgid "Setting preference key %s to %s"
-msgstr "将偏好按键从 %s 设置为 %s"
+#: classes/pref/users.php:264
+#, fuzzy, php-format
+msgid "Changed password of user <b>%s</b> to <b>%s</b>"
+msgstr "用户 <b>%s</b> ，密码修改为<b>%s</b>"
 
-#: classes/opml.php:343
-#, fuzzy
-msgid "Adding filter..."
-msgstr "创建过滤器"
-
-#: classes/opml.php:421
-#, fuzzy, php-format
-msgid "Processing category: %s"
-msgstr "加入到类别："
-
-#: classes/opml.php:470
-#: plugins/googlereaderimport/init.php:66
-#: plugins/import_export/init.php:424
-#, php-format
-msgid "Upload failed with error code %d"
-msgstr "上传错误，错误代码：%d"
-
-#: classes/opml.php:484
-#: plugins/googlereaderimport/init.php:80
-#: plugins/import_export/init.php:438
-#, fuzzy
-msgid "Unable to move uploaded file."
-msgstr "无法移动已上传文件。"
-
-#: classes/opml.php:488
-#: plugins/googlereaderimport/init.php:84
-#: plugins/import_export/init.php:442
-msgid "Error: please upload OPML file."
-msgstr "错误：请上传 OPML 文件。"
-
-#: classes/opml.php:499
-#, fuzzy
-msgid "Error: unable to find moved OPML file."
-msgstr "错误：无法找到移动的OPML文件。"
-
-#: classes/opml.php:506
-#: plugins/googlereaderimport/init.php:187
-msgid "Error while parsing document."
-msgstr "解析文档时发生错误。"
-
-#: classes/pref/system.php:8
-#: classes/pref/users.php:6
-#: plugins/instances/init.php:154
-msgid "Your access level is insufficient to open this tab."
-msgstr "您的访问级别不够，无法打开这个舌签。"
-
-#: classes/pref/system.php:29
-msgid "Error Log"
-msgstr "错误日志"
-
-#: classes/pref/system.php:40
-msgid "Refresh"
-msgstr "刷新"
-
-#: classes/pref/system.php:43
-#, fuzzy
-msgid "Clear log"
-msgstr "清空日志"
-
-#: classes/pref/system.php:48
-msgid "Error"
-msgstr "错误"
-
-#: classes/pref/system.php:49
-#, fuzzy
-msgid "Filename"
-msgstr "文件名："
-
-#: classes/pref/system.php:50
-msgid "Message"
-msgstr "消息"
-
-#: classes/pref/system.php:52
-msgid "Date"
-msgstr "日期"
-
-#: classes/pref/users.php:34
-msgid "User not found"
-msgstr "未找到用户"
-
-#: classes/pref/users.php:53
-#: classes/pref/users.php:399
-msgid "Registered"
-msgstr "注册时间"
-
-#: classes/pref/users.php:54
-msgid "Last logged in"
-msgstr "上次登录"
-
-#: classes/pref/users.php:61
-msgid "Subscribed feeds count"
-msgstr "订阅的信息源数量"
-
-#: classes/pref/users.php:65
-msgid "Subscribed feeds"
-msgstr "订阅的信息源"
-
-#: classes/pref/users.php:136
-msgid "Access level: "
-msgstr "访问级别："
-
-#: classes/pref/users.php:154
-#: classes/pref/feeds.php:647
-#: classes/pref/feeds.php:853
-msgid "Options"
-msgstr "选项"
-
-#: classes/pref/users.php:232
-#, php-format
-msgid "Added user <b>%s</b> with password <b>%s</b>"
-msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
-
-#: classes/pref/users.php:239
-#, php-format
-msgid "Could not create user <b>%s</b>"
-msgstr "无法创建用户 <b>%s</b> "
-
-#: classes/pref/users.php:243
-#, php-format
-msgid "User <b>%s</b> already exists."
-msgstr "用户 <b>%s</b> 已存在。"
-
-#: classes/pref/users.php:265
-#, fuzzy, php-format
-msgid "Changed password of user <b>%s</b> to <b>%s</b>"
-msgstr "用户 <b>%s</b> ，密码修改为<b>%s</b>"
-
-#: classes/pref/users.php:267
+#: classes/pref/users.php:266
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "用户 <b>%s</b> ，新密码发送至<b>%s</b>"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:290
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
-#: classes/pref/users.php:334
-#: classes/pref/feeds.php:1302
-#: classes/pref/feeds.php:1559
-#: classes/pref/feeds.php:1623
-#: classes/pref/filters.php:299
-#: classes/pref/filters.php:347
-#: classes/pref/filters.php:669
-#: classes/pref/filters.php:757
-#: classes/pref/filters.php:784
-#: classes/pref/labels.php:272
-#: classes/pref/prefs.php:997
-#: plugins/instances/init.php:284
-msgid "Select"
-msgstr "选择"
-
-#: classes/pref/users.php:342
+#: classes/pref/users.php:341
 msgid "Create user"
 msgstr "创建用户"
 
-#: classes/pref/users.php:346
-msgid "Details"
-msgstr "详细"
-
-#: classes/pref/users.php:348
-#: classes/pref/filters.php:684
-#: plugins/instances/init.php:293
-msgid "Edit"
-msgstr "编辑"
+#: classes/pref/users.php:396
+#: classes/pref/feeds.php:643
+#: classes/pref/feeds.php:870
+#: classes/pref/feeds.php:1810
+#: classes/feeds.php:1072
+msgid "Login"
+msgstr "登陆"
 
-#: classes/pref/users.php:398
+#: classes/pref/users.php:397
 msgid "Access Level"
 msgstr "访问级别"
 
@@ -1604,1051 +1515,1017 @@ msgid "Last login"
 msgstr "最后登陆"
 
 #: classes/pref/users.php:419
-#: plugins/instances/init.php:334
 msgid "Click to edit"
 msgstr "点击进行编辑"
 
-#: classes/pref/users.php:439
+#: classes/pref/users.php:440
 msgid "No users defined."
 msgstr "没有定义用户。"
 
-#: classes/pref/users.php:441
+#: classes/pref/users.php:442
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
-#: classes/pref/feeds.php:13
-msgid "Check to enable field"
-msgstr "勾选以启用"
-
-#: classes/pref/feeds.php:63
-#: classes/pref/feeds.php:212
-#: classes/pref/feeds.php:256
-#: classes/pref/feeds.php:262
-#: classes/pref/feeds.php:288
-#, fuzzy, php-format
-msgid "(%d feed)"
-msgid_plural "(%d feeds)"
-msgstr[0] "(%d 个信息源)"
-
-#: classes/pref/feeds.php:556
-msgid "Feed Title"
-msgstr "信息源标题"
-
-#: classes/pref/feeds.php:598
-#: classes/pref/feeds.php:812
-msgid "Update"
-msgstr "更新列表"
-
-#: classes/pref/feeds.php:613
-#: classes/pref/feeds.php:828
-msgid "Article purging:"
-msgstr "文章清理："
+#: classes/pref/prefs.php:18
+#: classes/pref/feeds.php:537
+msgid "General"
+msgstr "通用"
 
-#: classes/pref/feeds.php:643
-msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
-msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
+#: classes/pref/prefs.php:19
+msgid "Interface"
+msgstr "界面"
 
-#: classes/pref/feeds.php:659
-#: classes/pref/feeds.php:857
-msgid "Hide from Popular feeds"
-msgstr "从最受欢迎的信息源中隐藏"
+#: classes/pref/prefs.php:20
+msgid "Advanced"
+msgstr "高级"
 
-#: classes/pref/feeds.php:671
-#: classes/pref/feeds.php:863
-msgid "Include in e-mail digest"
-msgstr "包含电子邮件摘要"
+#: classes/pref/prefs.php:21
+msgid "Digest"
+msgstr "摘要"
 
-#: classes/pref/feeds.php:684
-#: classes/pref/feeds.php:869
-msgid "Always display image attachments"
-msgstr "å§\8bç»\88æ\98¾ç¤ºå\9b¾ç\89\87é\99\84件"
+#: classes/pref/prefs.php:25
+#, fuzzy
+msgid "Allow duplicate articles"
+msgstr "å\85\81许é\87\8då¤\8dæ\96\87ç« "
 
-#: classes/pref/feeds.php:697
-#: classes/pref/feeds.php:877
-msgid "Do not embed images"
-msgstr "不要嵌入图片"
+#: classes/pref/prefs.php:26
+msgid "Blacklisted tags"
+msgstr "被列入黑名单的标签"
 
-#: classes/pref/feeds.php:710
-#: classes/pref/feeds.php:885
-msgid "Cache images locally"
-msgstr "本地缓存图片"
+#: classes/pref/prefs.php:26
+#, fuzzy
+msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
+msgstr "自动检测文章标签时，这些标签将被忽略（半角逗号隔开的列表）。"
 
-#: classes/pref/feeds.php:722
-#: classes/pref/feeds.php:891
-msgid "Mark updated articles as unread"
-msgstr "将已更新的文章标记为未读"
+#: classes/pref/prefs.php:27
+msgid "Automatically mark articles as read"
+msgstr "自动标记文章为已读"
 
-#: classes/pref/feeds.php:728
-msgid "Icon"
-msgstr "图标"
+#: classes/pref/prefs.php:27
+#, fuzzy
+msgid "This option enables marking articles as read automatically while you scroll article list."
+msgstr "在滚动页面的同时自动将文章标记为已读。"
 
-#: classes/pref/feeds.php:742
-msgid "Replace"
-msgstr "替换"
+#: classes/pref/prefs.php:28
+msgid "Automatically expand articles in combined mode"
+msgstr "在连续模式下自动展开文章"
 
-#: classes/pref/feeds.php:764
-msgid "Resubscribe to push updates"
-msgstr "重新订阅以推送更新"
+#: classes/pref/prefs.php:29
+msgid "Combined feed display"
+msgstr "合并信息源，使之连续显示"
 
-#: classes/pref/feeds.php:771
-msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
-msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
+#: classes/pref/prefs.php:29
+msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
+msgstr "将文章列表展开显示，而不是将标题和内容分别显示"
 
-#: classes/pref/feeds.php:1146
-#: classes/pref/feeds.php:1199
-msgid "All done."
-msgstr "全部完成。"
+#: classes/pref/prefs.php:30
+msgid "Confirm marking feed as read"
+msgstr "标记信息源为已读之前弹出确认"
 
-#: classes/pref/feeds.php:1254
-msgid "Feeds with errors"
-msgstr "有错误的信息源"
+#: classes/pref/prefs.php:31
+msgid "Amount of articles to display at once"
+msgstr "同时显示的文章数量"
 
-#: classes/pref/feeds.php:1279
+#: classes/pref/prefs.php:32
 #, fuzzy
-msgid "Inactive feeds"
-msgstr "刷新活动的信息源"
-
-#: classes/pref/feeds.php:1316
-msgid "Edit selected feeds"
-msgstr "编辑选定的信息源"
-
-#: classes/pref/feeds.php:1318
-#: classes/pref/feeds.php:1332
-#: classes/pref/filters.php:687
-msgid "Reset sort order"
-msgstr "重置排序"
+msgid "Default feed update interval"
+msgstr "默认更新间隔"
 
-#: classes/pref/feeds.php:1320
-#: js/prefs.js:1732
-msgid "Batch subscribe"
-msgstr "批量订阅"
+#: classes/pref/prefs.php:32
+msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
+msgstr ""
 
-#: classes/pref/feeds.php:1327
-#, fuzzy
-msgid "Categories"
-msgstr "信息源类别"
+#: classes/pref/prefs.php:33
+msgid "Mark articles in e-mail digest as read"
+msgstr "将邮件摘要中的文章标记为已读"
 
-#: classes/pref/feeds.php:1330
+#: classes/pref/prefs.php:34
 #, fuzzy
-msgid "Add category"
-msgstr "编辑类别"
+msgid "Enable e-mail digest"
+msgstr "启用电子邮件摘要"
 
-#: classes/pref/feeds.php:1334
-#, fuzzy
-msgid "Remove selected"
-msgstr "移除选中的信息源"
+#: classes/pref/prefs.php:34
+msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
+msgstr "每天将更新的和未读的文章标题通过邮件发送摘要到您设置的邮箱中"
 
-#: classes/pref/feeds.php:1345
-msgid "More actions..."
-msgstr "更多操作"
+#: classes/pref/prefs.php:35
+msgid "Try to send digests around specified time"
+msgstr "在特定时间发送摘要"
 
-#: classes/pref/feeds.php:1349
-msgid "Manual purge"
-msgstr "手动清除"
+#: classes/pref/prefs.php:35
+#, fuzzy
+msgid "Uses UTC timezone"
+msgstr "用户所在时区"
 
-#: classes/pref/feeds.php:1353
-msgid "Clear feed data"
-msgstr "æ¸\85空信æ\81¯æº\90æ\95°æ\8d®"
+#: classes/pref/prefs.php:36
+msgid "Enable API access"
+msgstr "å\90¯ç\94¨API访é\97®"
 
-#: classes/pref/feeds.php:1354
-#: classes/pref/filters.php:695
-msgid "Rescore articles"
-msgstr "为文章重新评分"
+#: classes/pref/prefs.php:36
+msgid "Allows external clients to access this account through the API"
+msgstr "允许外部客户端通过API来访问该账户"
 
-#: classes/pref/feeds.php:1404
-msgid "OPML"
-msgstr "OPML"
+#: classes/pref/prefs.php:37
+msgid "Enable feed categories"
+msgstr "启用信息源分类"
 
-#: classes/pref/feeds.php:1406
-msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
-msgstr "使ç\94¨OPMLä½ å\8f¯ä»¥å¯¼å\87ºæ\88\96导å\85¥ä¿¡æ\81¯æº\90feedså\88\97表ã\80\81è¿\87滤å\99¨ã\80\81æ \87签以å\8f\8a设置ã\80\82"
+#: classes/pref/prefs.php:38
+msgid "Sort feeds by unread articles count"
+msgstr "以æ\9cªè¯»æ\96\87ç« æ\95°é\87\8fæ\8e\92åº\8fä¿¡æ\81¯æº\90"
 
-#: classes/pref/feeds.php:1406
-msgid "Only main settings profile can be migrated using OPML."
-msgstr "只有主要设置能够通过OPML文件来进行迁移。"
+#: classes/pref/prefs.php:39
+msgid "Maximum age of fresh articles (in hours)"
+msgstr "最新更新文章的保鲜期（以小时为单位）"
 
-#: classes/pref/feeds.php:1419
+#: classes/pref/prefs.php:40
 #, fuzzy
-msgid "Import my OPML"
-msgstr "正在导入 OPML ……"
-
-#: classes/pref/feeds.php:1423
-msgid "Filename:"
-msgstr "文件名："
-
-#: classes/pref/feeds.php:1425
-msgid "Include settings"
-msgstr "包含设置"
+msgid "Hide feeds with no unread articles"
+msgstr "隐藏没有未读文章的信息源"
 
-#: classes/pref/feeds.php:1429
+#: classes/pref/prefs.php:41
 #, fuzzy
-msgid "Export OPML"
-msgstr "正在导入 OPML ……"
+msgid "Show special feeds when hiding read feeds"
+msgstr "隐藏已读信息之后显示特殊区域的内容"
 
-#: classes/pref/feeds.php:1433
-msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
-msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
+#: classes/pref/prefs.php:42
+msgid "Long date format"
+msgstr "长时间格式"
 
-#: classes/pref/feeds.php:1435
-msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
-msgstr ""
+#: classes/pref/prefs.php:42
+msgid "The syntax used is identical to the PHP <a href='http://php.net/manual/function.date.php'>date()</a> function."
+msgstr "所使用的语法与PHP <a href='http://php.net/manual/function.date.php'>date()</a> 函数相同."
 
-#: classes/pref/feeds.php:1437
-msgid "Public OPML URL"
-msgstr "公开的 OPML URL"
+#: classes/pref/prefs.php:43
+msgid "On catchup show next feed"
+msgstr "自动显示下一个信息源"
 
-#: classes/pref/feeds.php:1438
-#, fuzzy
-msgid "Display published OPML URL"
-msgstr "公开的 OPML URL"
+#: classes/pref/prefs.php:43
+msgid "Automatically open next feed with unread articles after marking one as read"
+msgstr "标记未读文章为已读后，自动显示下一个信息源的文章。"
 
-#: classes/pref/feeds.php:1447
-msgid "Firefox integration"
-msgstr "Firefox 集成"
+#: classes/pref/prefs.php:44
+#, fuzzy
+msgid "Purge articles after this number of days (0 - disables)"
+msgstr "清除多少天之前的文章？（0为不启用）"
 
-#: classes/pref/feeds.php:1449
-msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
-msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
+#: classes/pref/prefs.php:45
+msgid "Purge unread articles"
+msgstr "清除未读文章"
 
-#: classes/pref/feeds.php:1456
-msgid "Click here to register this site as a feed reader."
-msgstr "点击此处将本站注册为信息源阅读器。"
+#: classes/pref/prefs.php:46
+msgid "Reverse headline order (oldest first)"
+msgstr "反转标题列表顺序（最旧的在上面）"
 
-#: classes/pref/feeds.php:1464
-#, fuzzy
-msgid "Published & shared articles / Generated feeds"
-msgstr "已发布的文章和生成的信息源"
+#: classes/pref/prefs.php:47
+msgid "Short date format"
+msgstr "短时间格式"
 
-#: classes/pref/feeds.php:1466
-msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
-msgstr "å·²å\8f\91å¸\83ç\9a\84æ\96\87ç« å°\86ä¼\9aè¾\93å\87ºä¸ºå\85¬å¼\80ç\9a\84 RSS ä¿¡æ\81¯æº\90ï¼\8cç½\91ä¸\8aç\9a\84ä»»ä½\95人å\8f¯ä»¥é\80\9aè¿\87å¦\82ä¸\8b URL è¿\9bè¡\8c订é\98\85ã\80\82"
+#: classes/pref/prefs.php:48
+msgid "Show content preview in headlines list"
+msgstr "å\9c¨æ \87é¢\98å\88\97表中æ\98¾ç¤ºå\86\85容é¢\84è§\88"
 
-#: classes/pref/feeds.php:1474
-msgid "Display URL"
-msgstr "显示 URL"
+#: classes/pref/prefs.php:49
+msgid "Sort headlines by feed date"
+msgstr "以信息源的日期排序"
 
-#: classes/pref/feeds.php:1477
-msgid "Clear all generated URLs"
-msgstr "清空所有生成的 URL"
+#: classes/pref/prefs.php:49
+msgid "Use feed-specified date to sort headlines instead of local import date."
+msgstr "使用信息源中定义的时间，而非本地导入的时间来排序。"
 
-#: classes/pref/feeds.php:1555
-msgid "These feeds have not been updated with new content for 3 months (oldest first):"
-msgstr "以ä¸\8bä¿¡æ\81¯æº\90å·²ç»\8fæ\9c\89ä¸\89个æ\9c\88没æ\9c\89å\86\85容æ\9b´æ\96°äº\86ï¼\88æ\9c\80æ\97§ç\9a\84å\9c¨æ\9c\80ä¸\8aï¼\89ï¼\9a"
+#: classes/pref/prefs.php:50
+msgid "Login with an SSL certificate"
+msgstr "使ç\94¨ SSL è¯\81书ç\99»å½\95"
 
-#: classes/pref/feeds.php:1589
-#: classes/pref/feeds.php:1653
-msgid "Click to edit feed"
-msgstr "点击以编辑信息源"
+#: classes/pref/prefs.php:50
+msgid "Click to register your SSL client certificate with tt-rss"
+msgstr "在 tt-rss 处注册您的 SSL 证书"
 
-#: classes/pref/feeds.php:1607
-#: classes/pref/feeds.php:1673
-msgid "Unsubscribe from selected feeds"
-msgstr "取消订阅选中的信息源"
+#: classes/pref/prefs.php:51
+#, fuzzy
+msgid "Do not embed images in articles"
+msgstr "不要显示文章中的图片"
 
-#: classes/pref/feeds.php:1778
-msgid "Add one valid RSS feed per line (no feed detection is done)"
-msgstr "每行添加一条RSS源"
+#: classes/pref/prefs.php:52
+msgid "Strip unsafe tags from articles"
+msgstr "从文章中剔除不安全的标签"
 
-#: classes/pref/feeds.php:1787
-msgid "Feeds to subscribe, One per line"
-msgstr "所有将订阅的Feeds, 每行一条"
+#: classes/pref/prefs.php:52
+msgid "Strip all but most common HTML tags when reading articles."
+msgstr "仅加载几个最常用的 HTML 标签"
 
-#: classes/pref/feeds.php:1809
-msgid "Feeds require authentication."
-msgstr "Feed需要登录认证。"
+#: classes/pref/prefs.php:53
+#: js/prefs.js:1580
+msgid "Customize stylesheet"
+msgstr "自定义样式"
 
-#: classes/pref/filters.php:93
-msgid "Articles matching this filter:"
-msgstr "符合本过滤器条件的文章："
+#: classes/pref/prefs.php:53
+msgid "Customize CSS stylesheet to your liking"
+msgstr "自定义 CSS 样式"
 
-#: classes/pref/filters.php:131
+#: classes/pref/prefs.php:54
 #, fuzzy
-msgid "No recent articles matching this filter have been found."
-msgstr "本过滤器下没有匹配到文章。"
+msgid "Time zone"
+msgstr "用户所在时区"
+
+#: classes/pref/prefs.php:55
+msgid "Group headlines in virtual feeds"
+msgstr "对虚拟源中的文章按源分组"
 
-#: classes/pref/filters.php:135
-msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
-msgstr "使用复杂的表达式可能没有返回结果。"
+#: classes/pref/prefs.php:55
+msgid "Special feeds, labels, and categories are grouped by originating feeds"
+msgstr "将特殊信息源、预定义标签和分类按照信息源分组"
 
-#: classes/pref/filters.php:179
-#: classes/pref/filters.php:458
+#: classes/pref/prefs.php:56
 #, fuzzy
-msgid "(inverse)"
-msgstr "反选"
+msgid "Language"
+msgstr "语言："
 
-#: classes/pref/filters.php:175
-#: classes/pref/filters.php:457
-#, php-format
-msgid "%s on %s in %s %s"
-msgstr ""
+#: classes/pref/prefs.php:57
+msgid "Theme"
+msgstr "主题："
 
-#: classes/pref/filters.php:288
-#: classes/pref/filters.php:748
-#: classes/pref/labels.php:22
-msgid "Caption"
-msgstr "标题"
+#: classes/pref/prefs.php:57
+msgid "Select one of the available CSS themes"
+msgstr "选择一个可用的CSS主题"
 
-#: classes/pref/filters.php:294
-#: classes/pref/filters.php:752
-#: classes/pref/filters.php:867
-msgid "Match"
-msgstr "匹配"
+#: classes/pref/prefs.php:126
+msgid "The configuration was saved."
+msgstr "设置已保存。"
 
-#: classes/pref/filters.php:308
-#: classes/pref/filters.php:356
-#: classes/pref/filters.php:766
-#: classes/pref/filters.php:793
-msgid "Add"
-msgstr "添加"
+#: classes/pref/prefs.php:140
+msgid "Your personal data has been saved."
+msgstr "您的个人数据已保存。"
 
-#: classes/pref/filters.php:342
-#: classes/pref/filters.php:779
-#, fuzzy
-msgid "Apply actions"
-msgstr "应用操作"
+#: classes/pref/prefs.php:160
+msgid "Your preferences are now set to default values."
+msgstr "你的偏好设置已经重置为默认值。"
 
-#: classes/pref/filters.php:392
-#: classes/pref/filters.php:808
-msgid "Enabled"
-msgstr "已启用"
+#: classes/pref/prefs.php:183
+#, fuzzy
+msgid "Personal data / Authentication"
+msgstr "登录密码"
 
-#: classes/pref/filters.php:401
-#: classes/pref/filters.php:811
-msgid "Match any rule"
-msgstr "匹配任意规则"
+#: classes/pref/prefs.php:203
+msgid "Personal data"
+msgstr "个人数据"
 
-#: classes/pref/filters.php:410
-#: classes/pref/filters.php:814
-#, fuzzy
-msgid "Inverse matching"
-msgstr "反向匹配"
+#: classes/pref/prefs.php:213
+msgid "Full name"
+msgstr "姓名"
 
-#: classes/pref/filters.php:422
-#: classes/pref/filters.php:821
-msgid "Test"
-msgstr "测试"
+#: classes/pref/prefs.php:217
+msgid "E-mail"
+msgstr "电子邮件"
 
-#: classes/pref/filters.php:681
-msgid "Combine"
-msgstr "è¿\9eç»­"
+#: classes/pref/prefs.php:223
+msgid "Access level"
+msgstr "访é\97®çº§å\88«"
 
-#: classes/pref/filters.php:824
-msgid "Create"
-msgstr "创建"
+#: classes/pref/prefs.php:233
+msgid "Save data"
+msgstr "保存信息"
 
-#: classes/pref/filters.php:879
-msgid "Inverse regular expression matching"
-msgstr "反选正则表达式匹配结果"
+#: classes/pref/prefs.php:245
+#: classes/pref/feeds.php:658
+#: classes/pref/feeds.php:878
+#: classes/pref/feeds.php:1813
+#: classes/feeds.php:1076
+msgid "Password"
+msgstr "密码"
 
-#: classes/pref/filters.php:881
-msgid "on field"
-msgstr "on field"
+#: classes/pref/prefs.php:254
+msgid "Your password is at default value, please change it."
+msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref/filters.php:887
-#: js/PrefFilterTree.js:61
-msgid "in"
-msgstr "在"
+#: classes/pref/prefs.php:289
+msgid "Changing your current password will disable OTP."
+msgstr "更改当前密码会使OTP动态口令失效。"
 
-#: classes/pref/filters.php:900
-#, fuzzy
-msgid "Wiki: Filters"
-msgstr "过滤器"
+#: classes/pref/prefs.php:294
+msgid "Old password"
+msgstr "原密码"
 
-#: classes/pref/filters.php:905
-#, fuzzy
-msgid "Save rule"
-msgstr "保存规则"
+#: classes/pref/prefs.php:297
+msgid "New password"
+msgstr "新密码"
 
-#: classes/pref/filters.php:905
-#: js/functions.js:1025
-msgid "Add rule"
-msgstr "添加规则"
+#: classes/pref/prefs.php:302
+msgid "Confirm password"
+msgstr "确认密码"
 
-#: classes/pref/filters.php:928
-msgid "Perform Action"
-msgstr "æ\89§è¡\8cå\8a¨ä½\9c"
+#: classes/pref/prefs.php:312
+msgid "Change password"
+msgstr "æ\9b´æ\94¹å¯\86ç \81"
 
-#: classes/pref/filters.php:954
-msgid "with parameters:"
-msgstr "指定参数："
+#: classes/pref/prefs.php:318
+msgid "One time passwords / Authenticator"
+msgstr "动态口令"
 
-#: classes/pref/filters.php:972
-#, fuzzy
-msgid "Save action"
-msgstr "保存操作"
+#: classes/pref/prefs.php:322
+msgid "One time passwords are currently enabled. Enter your current password below to disable."
+msgstr "动态口令已经启用。输入你当前的密码来禁用。"
 
-#: classes/pref/filters.php:972
-#: js/functions.js:1051
+#: classes/pref/prefs.php:347
+#: classes/pref/prefs.php:398
 #, fuzzy
-msgid "Add action"
-msgstr "添加操作"
+msgid "Enter your password"
+msgstr "用户名或密码错误"
 
-#: classes/pref/filters.php:995
+#: classes/pref/prefs.php:358
 #, fuzzy
-msgid "[No caption]"
-msgstr "[无标题]"
+msgid "Disable OTP"
+msgstr "禁用OTP动态口令"
 
-#: classes/pref/filters.php:997
-#, php-format
-msgid "%s (%d rule)"
-msgid_plural "%s (%d rules)"
-msgstr[0] ""
+#: classes/pref/prefs.php:364
+msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
+msgstr "更改当前密码会自动禁用OTP动态口令。"
 
-#: classes/pref/filters.php:1012
-#, fuzzy, php-format
-msgid "%s (+%d action)"
-msgid_plural "%s (+%d actions)"
-msgstr[0] "信息源动作"
+#: classes/pref/prefs.php:366
+msgid "Scan the following code by the Authenticator application:"
+msgstr "使用认证应用扫描下面编码"
 
-#: classes/pref/labels.php:37
-msgid "Colors"
-msgstr "颜色"
+#: classes/pref/prefs.php:403
+#, fuzzy
+msgid "Enter the generated one time password"
+msgstr "请填写动态口令："
 
-#: classes/pref/labels.php:42
-msgid "Foreground:"
-msgstr "前端："
+#: classes/pref/prefs.php:417
+#, fuzzy
+msgid "Enable OTP"
+msgstr "已启用"
 
-#: classes/pref/labels.php:42
-msgid "Background:"
-msgstr "背景："
+#: classes/pref/prefs.php:423
+msgid "PHP GD functions are required for OTP support."
+msgstr ""
 
-#: classes/pref/labels.php:232
-#, php-format
-msgid "Created label <b>%s</b>"
-msgstr "创建预定义标签 <b>%s</b>"
+#: classes/pref/prefs.php:466
+msgid "Some preferences are only available in default profile."
+msgstr ""
 
-#: classes/pref/labels.php:287
-msgid "Clear colors"
-msgstr "清空颜色"
+#: classes/pref/prefs.php:564
+msgid "Customize"
+msgstr "自定义"
 
-#: classes/pref/prefs.php:18
-msgid "General"
-msgstr "通用"
+#: classes/pref/prefs.php:631
+msgid "Register"
+msgstr "注册"
 
-#: classes/pref/prefs.php:19
-msgid "Interface"
-msgstr "界面"
+#: classes/pref/prefs.php:635
+msgid "Clear"
+msgstr "清空"
 
-#: classes/pref/prefs.php:20
-msgid "Advanced"
-msgstr "高级"
+#: classes/pref/prefs.php:641
+#, php-format
+msgid "Current server time: %s (UTC)"
+msgstr "当前服务器系统时间: %s (UTC)"
 
-#: classes/pref/prefs.php:21
-msgid "Digest"
-msgstr "摘要"
+#: classes/pref/prefs.php:673
+msgid "Save configuration"
+msgstr "保存设置"
 
-#: classes/pref/prefs.php:25
+#: classes/pref/prefs.php:677
 #, fuzzy
-msgid "Allow duplicate articles"
-msgstr "允许重复文章"
-
-#: classes/pref/prefs.php:26
-msgid "Blacklisted tags"
-msgstr "被列入黑名单的标签"
+msgid "Save and exit preferences"
+msgstr "退出偏好设置"
 
-#: classes/pref/prefs.php:26
-#, fuzzy
-msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
-msgstr "自动检测文章标签时，这些标签将被忽略（半角逗号隔开的列表）。"
+#: classes/pref/prefs.php:682
+msgid "Manage profiles"
+msgstr "管理偏好文件"
 
-#: classes/pref/prefs.php:27
-msgid "Automatically mark articles as read"
-msgstr "自动标记文章为已读"
+#: classes/pref/prefs.php:685
+msgid "Reset to defaults"
+msgstr "恢复到默认"
 
-#: classes/pref/prefs.php:27
-#, fuzzy
-msgid "This option enables marking articles as read automatically while you scroll article list."
-msgstr "在滚动页面的同时自动将文章标记为已读。"
+#: classes/pref/prefs.php:698
+#: classes/pref/feeds.php:772
+msgid "Plugins"
+msgstr "插件"
 
-#: classes/pref/prefs.php:28
-msgid "Automatically expand articles in combined mode"
-msgstr "在连续模式下自动展开文章"
+#: classes/pref/prefs.php:700
+msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
+msgstr "需要刷新页面来使插件生效。"
 
-#: classes/pref/prefs.php:29
-msgid "Combined feed display"
-msgstr "合并信息源，使之连续显示"
+#: classes/pref/prefs.php:730
+msgid "System plugins"
+msgstr "系统插件"
 
-#: classes/pref/prefs.php:29
-msgid "Display expanded list of feed articles, instead of separate displays for headlines and article content"
-msgstr "将文章列表展开显示，而不是将标题和内容分别显示"
+#: classes/pref/prefs.php:731
+msgid "System plugins are enabled in <strong>config.php</strong> for all users."
+msgstr ""
 
-#: classes/pref/prefs.php:30
-msgid "Confirm marking feed as read"
-msgstr "标记信息源为已读之前弹出确认"
+#: classes/pref/prefs.php:736
+#: classes/pref/prefs.php:792
+msgid "Plugin"
+msgstr "插件"
 
-#: classes/pref/prefs.php:31
-msgid "Amount of articles to display at once"
-msgstr "同时显示的文章数量"
+#: classes/pref/prefs.php:737
+#: classes/pref/prefs.php:793
+msgid "Description"
+msgstr "描述"
 
-#: classes/pref/prefs.php:32
-#, fuzzy
-msgid "Default feed update interval"
-msgstr "默认更新间隔"
+#: classes/pref/prefs.php:738
+#: classes/pref/prefs.php:794
+msgid "Version"
+msgstr "版本"
 
-#: classes/pref/prefs.php:32
-msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
-msgstr ""
+#: classes/pref/prefs.php:739
+#: classes/pref/prefs.php:795
+msgid "Author"
+msgstr "作者"
 
-#: classes/pref/prefs.php:33
-msgid "Mark articles in e-mail digest as read"
-msgstr "将邮件摘要中的文章标记为已读"
+#: classes/pref/prefs.php:770
+#: classes/pref/prefs.php:829
+msgid "more info"
+msgstr "更多信息"
 
-#: classes/pref/prefs.php:34
+#: classes/pref/prefs.php:779
+#: classes/pref/prefs.php:838
 #, fuzzy
-msgid "Enable e-mail digest"
-msgstr "启用电子邮件摘要"
-
-#: classes/pref/prefs.php:34
-msgid "This option enables sending daily digest of new (and unread) headlines on your configured e-mail address"
-msgstr "每天将更新的和未读的文章标题通过邮件发送摘要到您设置的邮箱中"
+msgid "Clear data"
+msgstr "清空信息源数据"
 
-#: classes/pref/prefs.php:35
-msgid "Try to send digests around specified time"
-msgstr "在特定时间发送摘要"
+#: classes/pref/prefs.php:788
+msgid "User plugins"
+msgstr "用户插件"
 
-#: classes/pref/prefs.php:35
+#: classes/pref/prefs.php:853
 #, fuzzy
-msgid "Uses UTC timezone"
-msgstr "用户所在时区"
+msgid "Enable selected plugins"
+msgstr "启用信息源分类"
 
-#: classes/pref/prefs.php:36
-msgid "Enable API access"
-msgstr "启用API访问"
+#: classes/pref/prefs.php:921
+#, fuzzy
+msgid "Incorrect one time password"
+msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:36
-msgid "Allows external clients to access this account through the API"
-msgstr "允许外部客户端通过API来访问该账户"
+#: classes/pref/prefs.php:924
+#: classes/pref/prefs.php:941
+#, fuzzy
+msgid "Incorrect password"
+msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:37
-msgid "Enable feed categories"
-msgstr "启用信息源分类"
+#: classes/pref/prefs.php:966
+#, php-format
+msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
+msgstr "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">本文件</a>。"
 
-#: classes/pref/prefs.php:38
-msgid "Sort feeds by unread articles count"
-msgstr "以未读文章数量排序信息源"
+#: classes/pref/prefs.php:1006
+msgid "Create profile"
+msgstr "创建偏好文件"
 
-#: classes/pref/prefs.php:39
-msgid "Maximum age of fresh articles (in hours)"
-msgstr "最新更新文章的保鲜期（以小时为单位）"
+#: classes/pref/prefs.php:1029
+#: classes/pref/prefs.php:1057
+msgid "(active)"
+msgstr "（当前使用的）"
 
-#: classes/pref/prefs.php:40
-#, fuzzy
-msgid "Hide feeds with no unread articles"
-msgstr "隐藏没有未读文章的信息源"
+#: classes/pref/prefs.php:1091
+msgid "Remove selected profiles"
+msgstr "移除选中的偏好文件"
 
-#: classes/pref/prefs.php:41
-#, fuzzy
-msgid "Show special feeds when hiding read feeds"
-msgstr "隐藏已读信息之后显示特殊区域的内容"
+#: classes/pref/prefs.php:1093
+msgid "Activate profile"
+msgstr "启用偏好文件"
 
-#: classes/pref/prefs.php:42
-msgid "Long date format"
-msgstr "长时间格式"
+#: classes/pref/feeds.php:15
+msgid "Check to enable field"
+msgstr "勾选以启用"
 
-#: classes/pref/prefs.php:42
-msgid "The syntax used is identical to the PHP <a href='http://php.net/manual/function.date.php'>date()</a> function."
-msgstr "所使用的语法与PHP <a href='http://php.net/manual/function.date.php'>date()</a> 函数相同."
+#: classes/pref/feeds.php:65
+#: classes/pref/feeds.php:214
+#: classes/pref/feeds.php:258
+#: classes/pref/feeds.php:264
+#: classes/pref/feeds.php:290
+#, fuzzy, php-format
+msgid "(%d feed)"
+msgid_plural "(%d feeds)"
+msgstr[0] "(%d 个信息源)"
 
-#: classes/pref/prefs.php:43
-msgid "On catchup show next feed"
-msgstr "自动显示下一个信息源"
+#: classes/pref/feeds.php:561
+msgid "Feed Title"
+msgstr "信息源标题"
 
-#: classes/pref/prefs.php:43
-msgid "Automatically open next feed with unread articles after marking one as read"
-msgstr "标记未读文章为已读后，自动显示下一个信息源的文章。"
+#: classes/pref/feeds.php:595
+#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:1796
+#: classes/feeds.php:1048
+msgid "Place in category:"
+msgstr "加入到类别："
 
-#: classes/pref/prefs.php:44
+#: classes/pref/feeds.php:608
+#: classes/pref/feeds.php:832
 #, fuzzy
-msgid "Purge articles after this number of days (0 - disables)"
-msgstr "清除多少天之前的文章？（0为不启用）"
+msgid "Language:"
+msgstr "语言："
 
-#: classes/pref/prefs.php:45
-msgid "Purge unread articles"
-msgstr "清除未读文章"
+#: classes/pref/feeds.php:615
+#: classes/pref/feeds.php:841
+msgid "Update"
+msgstr "更新列表"
 
-#: classes/pref/prefs.php:46
-msgid "Reverse headline order (oldest first)"
-msgstr "反转标题列表顺序（最旧的在上面）"
+#: classes/pref/feeds.php:630
+#: classes/pref/feeds.php:857
+msgid "Article purging:"
+msgstr "文章清理："
 
-#: classes/pref/prefs.php:47
-msgid "Short date format"
-msgstr "短时间格式"
+#: classes/pref/feeds.php:662
+msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
+msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
 
-#: classes/pref/prefs.php:48
-msgid "Show content preview in headlines list"
-msgstr "在标题列表中显示内容预览"
+#: classes/pref/feeds.php:681
+#: classes/pref/feeds.php:888
+msgid "Hide from Popular feeds"
+msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/prefs.php:49
-msgid "Sort headlines by feed date"
-msgstr "以信息源的日期排序"
+#: classes/pref/feeds.php:693
+#: classes/pref/feeds.php:894
+msgid "Include in e-mail digest"
+msgstr "包含电子邮件摘要"
 
-#: classes/pref/prefs.php:49
-msgid "Use feed-specified date to sort headlines instead of local import date."
-msgstr "使用信息源中定义的时间，而非本地导入的时间来排序。"
+#: classes/pref/feeds.php:706
+#: classes/pref/feeds.php:900
+msgid "Always display image attachments"
+msgstr "始终显示图片附件"
 
-#: classes/pref/prefs.php:50
-msgid "Login with an SSL certificate"
-msgstr "使用 SSL 证书登录"
+#: classes/pref/feeds.php:719
+#: classes/pref/feeds.php:908
+msgid "Do not embed images"
+msgstr "不要嵌入图片"
 
-#: classes/pref/prefs.php:50
-msgid "Click to register your SSL client certificate with tt-rss"
-msgstr "在 tt-rss 处注册您的 SSL 证书"
+#: classes/pref/feeds.php:732
+#: classes/pref/feeds.php:916
+msgid "Cache media"
+msgstr ""
 
-#: classes/pref/prefs.php:51
-#, fuzzy
-msgid "Do not embed images in articles"
-msgstr "不要显示文章中的图片"
+#: classes/pref/feeds.php:744
+#: classes/pref/feeds.php:922
+msgid "Mark updated articles as unread"
+msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/prefs.php:52
-msgid "Strip unsafe tags from articles"
-msgstr "从文章中剔除不安全的标签"
+#: classes/pref/feeds.php:748
+msgid "Icon"
+msgstr "图标"
 
-#: classes/pref/prefs.php:52
-msgid "Strip all but most common HTML tags when reading articles."
-msgstr "仅加载几个最常用的 HTML 标签"
+#: classes/pref/feeds.php:765
+msgid "Replace"
+msgstr "替换"
 
-#: classes/pref/prefs.php:53
-#: js/prefs.js:1687
-msgid "Customize stylesheet"
-msgstr "自定义样式"
+#: classes/pref/feeds.php:1174
+#: classes/pref/feeds.php:1227
+msgid "All done."
+msgstr "全部完成。"
 
-#: classes/pref/prefs.php:53
-msgid "Customize CSS stylesheet to your liking"
-msgstr "自定义 CSS 样式"
+#: classes/pref/feeds.php:1282
+msgid "Feeds with errors"
+msgstr "有错误的信息源"
 
-#: classes/pref/prefs.php:54
+#: classes/pref/feeds.php:1289
 #, fuzzy
-msgid "Time zone"
-msgstr "用户所在时区"
+msgid "Inactive feeds"
+msgstr "刷新活动的信息源"
 
-#: classes/pref/prefs.php:55
-msgid "Group headlines in virtual feeds"
-msgstr "对虚拟源中的文章按源分组"
+#: classes/pref/feeds.php:1325
+msgid "Edit selected feeds"
+msgstr "编辑选定的信息源"
 
-#: classes/pref/prefs.php:55
-msgid "Special feeds, labels, and categories are grouped by originating feeds"
-msgstr "将特殊信息源、预定义标签和分类按照信息源分组"
+#: classes/pref/feeds.php:1329
+#: js/prefs.js:1618
+msgid "Batch subscribe"
+msgstr "批量订阅"
 
-#: classes/pref/prefs.php:56
+#: classes/pref/feeds.php:1336
 #, fuzzy
-msgid "Language"
-msgstr "语言："
+msgid "Categories"
+msgstr "信息源类别"
 
-#: classes/pref/prefs.php:57
-msgid "Theme"
-msgstr "主题："
+#: classes/pref/feeds.php:1339
+#, fuzzy
+msgid "Add category"
+msgstr "编辑类别"
 
-#: classes/pref/prefs.php:57
-msgid "Select one of the available CSS themes"
-msgstr "选择一个可用的CSS主题"
+#: classes/pref/feeds.php:1343
+#, fuzzy
+msgid "Remove selected"
+msgstr "移除选中的信息源"
+
+#: classes/pref/feeds.php:1354
+msgid "More actions..."
+msgstr "更多操作"
 
-#: classes/pref/prefs.php:68
-msgid "Old password cannot be blank."
-msgstr "请输入之前使用的密码。"
+#: classes/pref/feeds.php:1358
+msgid "Manual purge"
+msgstr "手动清除"
 
-#: classes/pref/prefs.php:73
-msgid "New password cannot be blank."
-msgstr "请输入一个新密码。"
+#: classes/pref/feeds.php:1362
+msgid "Clear feed data"
+msgstr "清空信息源数据"
 
-#: classes/pref/prefs.php:78
-msgid "Entered passwords do not match."
-msgstr "两次输入的密码不一致。"
+#: classes/pref/feeds.php:1416
+msgid "OPML"
+msgstr "OPML"
 
-#: classes/pref/prefs.php:87
-msgid "Function not supported by authentication module."
-msgstr "认证模块不支持该功能。"
+#: classes/pref/feeds.php:1418
+msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
+msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
 
-#: classes/pref/prefs.php:126
-msgid "The configuration was saved."
-msgstr "设置已保存。"
+#: classes/pref/feeds.php:1419
+msgid "Only main settings profile can be migrated using OPML."
+msgstr "只有主要设置能够通过OPML文件来进行迁移。"
 
-#: classes/pref/prefs.php:141
-#, php-format
-msgid "Unknown option: %s"
-msgstr "æ\9cªç\9f¥é\80\89项ï¼\9a %s"
+#: classes/pref/feeds.php:1432
+#, fuzzy
+msgid "Import my OPML"
+msgstr "æ­£å\9c¨å¯¼å\85¥ OPML â\80¦â\80¦"
 
-#: classes/pref/prefs.php:155
-msgid "Your personal data has been saved."
-msgstr "æ\82¨ç\9a\84个人æ\95°æ\8d®å·²ä¿\9då­\98ã\80\82"
+#: classes/pref/feeds.php:1438
+msgid "Filename:"
+msgstr "æ\96\87件å\90\8dï¼\9a"
 
-#: classes/pref/prefs.php:175
-msgid "Your preferences are now set to default values."
-msgstr "你的偏好设置已经重置为默认值。"
+#: classes/pref/feeds.php:1440
+msgid "Include settings"
+msgstr "包含设置"
 
-#: classes/pref/prefs.php:198
+#: classes/pref/feeds.php:1444
 #, fuzzy
-msgid "Personal data / Authentication"
-msgstr "登录密码"
+msgid "Export OPML"
+msgstr "正在导入 OPML ……"
 
-#: classes/pref/prefs.php:218
-msgid "Personal data"
-msgstr "个人数据"
+#: classes/pref/feeds.php:1448
+msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
+msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref/prefs.php:228
-msgid "Full name"
-msgstr "å§\93å\90\8d"
+#: classes/pref/feeds.php:1452
+msgid "Public OPML URL"
+msgstr "å\85¬å¼\80ç\9a\84 OPML URL"
 
-#: classes/pref/prefs.php:232
-msgid "E-mail"
-msgstr "电子邮件"
+#: classes/pref/feeds.php:1453
+#, fuzzy
+msgid "Display published OPML URL"
+msgstr "公开的 OPML URL"
 
-#: classes/pref/prefs.php:238
-msgid "Access level"
-msgstr "访问级别"
+#: classes/pref/feeds.php:1462
+msgid "Firefox integration"
+msgstr "Firefox 集成"
 
-#: classes/pref/prefs.php:248
-msgid "Save data"
-msgstr "保存信息"
+#: classes/pref/feeds.php:1464
+msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
+msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: classes/pref/prefs.php:267
-msgid "Your password is at default value, please change it."
-msgstr "您还在使用系统默认的密码，请修改。"
+#: classes/pref/feeds.php:1471
+msgid "Click here to register this site as a feed reader."
+msgstr "点击此处将本站注册为信息源阅读器。"
+
+#: classes/pref/feeds.php:1479
+#, fuzzy
+msgid "Published & shared articles / Generated feeds"
+msgstr "已发布的文章和生成的信息源"
+
+#: classes/pref/feeds.php:1481
+msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
+msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
 
-#: classes/pref/prefs.php:294
-msgid "Changing your current password will disable OTP."
-msgstr "更改当前密码会使OTP动态口令失效。"
+#: classes/pref/feeds.php:1488
+#: classes/feeds.php:54
+#: classes/feeds.php:140
+msgid "View as RSS"
+msgstr "以 RSS 形式阅读"
 
-#: classes/pref/prefs.php:299
-msgid "Old password"
-msgstr "原密码"
+#: classes/pref/feeds.php:1489
+msgid "Display URL"
+msgstr "显示 URL"
 
-#: classes/pref/prefs.php:302
-msgid "New password"
-msgstr "æ\96°å¯\86ç \81"
+#: classes/pref/feeds.php:1492
+msgid "Clear all generated URLs"
+msgstr "æ¸\85空æ\89\80æ\9c\89ç\94\9fæ\88\90ç\9a\84 URL"
 
-#: classes/pref/prefs.php:307
-msgid "Confirm password"
-msgstr "确认密码"
+#: classes/pref/feeds.php:1570
+msgid "These feeds have not been updated with new content for 3 months (oldest first):"
+msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/prefs.php:317
-msgid "Change password"
-msgstr "更改密码"
+#: classes/pref/feeds.php:1604
+#: classes/pref/feeds.php:1668
+msgid "Click to edit feed"
+msgstr "点击以编辑信息源"
 
-#: classes/pref/prefs.php:323
-msgid "One time passwords / Authenticator"
-msgstr "动态口令"
+#: classes/pref/feeds.php:1622
+#: classes/pref/feeds.php:1688
+msgid "Unsubscribe from selected feeds"
+msgstr "取消订阅选中的信息源"
 
-#: classes/pref/prefs.php:327
-msgid "One time passwords are currently enabled. Enter your current password below to disable."
-msgstr "动态口令已经启用。输入你当前的密码来禁用。"
+#: classes/pref/feeds.php:1793
+msgid "Add one valid RSS feed per line (no feed detection is done)"
+msgstr "每行添加一条RSS源"
 
-#: classes/pref/prefs.php:352
-#: classes/pref/prefs.php:403
-#, fuzzy
-msgid "Enter your password"
-msgstr "用户名或密码错误"
+#: classes/pref/feeds.php:1802
+msgid "Feeds to subscribe, One per line"
+msgstr "所有将订阅的Feeds, 每行一条"
 
-#: classes/pref/prefs.php:363
-#, fuzzy
-msgid "Disable OTP"
-msgstr "禁用OTP动态口令"
+#: classes/pref/feeds.php:1825
+msgid "Feeds require authentication."
+msgstr "Feed需要登录认证。"
 
-#: classes/pref/prefs.php:369
-msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
-msgstr "更改当前密码会自动禁用OTP动态口令。"
+#: classes/pref/feeds.php:1832
+#: classes/feeds.php:1092
+#: classes/feeds.php:1146
+msgid "Subscribe"
+msgstr "订阅"
 
-#: classes/pref/prefs.php:371
-msgid "Scan the following code by the Authenticator application:"
-msgstr "使用认证应用扫描下面编码"
+#: classes/pref/system.php:29
+msgid "Error Log"
+msgstr "错误日志"
+
+#: classes/pref/system.php:40
+msgid "Refresh"
+msgstr "刷新"
 
-#: classes/pref/prefs.php:408
+#: classes/pref/system.php:43
 #, fuzzy
-msgid "Enter the generated one time password"
-msgstr "请填写动态口令："
+msgid "Clear log"
+msgstr "清空日志"
+
+#: classes/pref/system.php:48
+msgid "Error"
+msgstr "错误"
 
-#: classes/pref/prefs.php:422
+#: classes/pref/system.php:49
 #, fuzzy
-msgid "Enable OTP"
-msgstr "已启用"
+msgid "Filename"
+msgstr "文件名："
 
-#: classes/pref/prefs.php:428
-msgid "PHP GD functions are required for OTP support."
-msgstr ""
+#: classes/pref/system.php:50
+msgid "Message"
+msgstr "消息"
 
-#: classes/pref/prefs.php:471
-msgid "Some preferences are only available in default profile."
-msgstr ""
+#: classes/pref/system.php:52
+msgid "Date"
+msgstr "日期"
 
-#: classes/pref/prefs.php:569
-msgid "Customize"
-msgstr "自定义"
+#: classes/opml.php:28
+#: classes/opml.php:33
+msgid "OPML Utility"
+msgstr "OPML 工具"
 
-#: classes/pref/prefs.php:630
-msgid "Register"
-msgstr "注å\86\8c"
+#: classes/opml.php:37
+msgid "Importing OPML..."
+msgstr "æ­£å\9c¨å¯¼å\85¥ OPML â\80¦â\80¦"
 
-#: classes/pref/prefs.php:634
-msgid "Clear"
-msgstr "清空"
+#: classes/opml.php:41
+msgid "Return to preferences"
+msgstr "返回偏好设置"
 
-#: classes/pref/prefs.php:640
+#: classes/opml.php:295
 #, php-format
-msgid "Current server time: %s (UTC)"
-msgstr "当前服务器系统时间: %s (UTC)"
+msgid "Adding feed: %s"
+msgstr "添加信息源: %s"
 
-#: classes/pref/prefs.php:672
-msgid "Save configuration"
-msgstr "保存设置"
+#: classes/opml.php:306
+#, fuzzy, php-format
+msgid "Duplicate feed: %s"
+msgstr "重复的信息源"
 
-#: classes/pref/prefs.php:676
-#, fuzzy
-msgid "Save and exit preferences"
-msgstr "退出偏好设置"
+#: classes/opml.php:320
+#, php-format
+msgid "Adding label %s"
+msgstr "添加预定义标签%s"
 
-#: classes/pref/prefs.php:681
-msgid "Manage profiles"
-msgstr "管理偏好文件"
+#: classes/opml.php:323
+#, php-format
+msgid "Duplicate label: %s"
+msgstr "重复预定义标签: %s"
 
-#: classes/pref/prefs.php:684
-msgid "Reset to defaults"
-msgstr "恢复到默认"
+#: classes/opml.php:335
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr "将偏好按键从 %s 设置为 %s"
 
-#: classes/pref/prefs.php:707
-msgid "Plugins"
-msgstr "插件"
+#: classes/opml.php:367
+#, fuzzy
+msgid "Adding filter..."
+msgstr "创建过滤器"
 
-#: classes/pref/prefs.php:709
-msgid "You will need to reload Tiny Tiny RSS for plugin changes to take effect."
-msgstr "需要刷新页面来使插件生效。"
+#: classes/opml.php:486
+#, fuzzy, php-format
+msgid "Processing category: %s"
+msgstr "加入到类别："
 
-#: classes/pref/prefs.php:711
-msgid "Download more plugins at tt-rss.org <a class=\"visibleLink\" target=\"_blank\" href=\"http://tt-rss.org/forum/viewforum.php?f=22\">forums</a> or <a target=\"_blank\" class=\"visibleLink\" href=\"http://tt-rss.org/wiki/Plugins\">wiki</a>."
-msgstr ""
+#: classes/opml.php:532
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr "上传错误，错误代码：%d"
 
-#: classes/pref/prefs.php:737
-msgid "System plugins"
-msgstr "系统插件"
+#: classes/opml.php:544
+#: plugins/import_export/init.php:448
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "无法移动已上传文件。"
 
-#: classes/pref/prefs.php:741
-#: classes/pref/prefs.php:797
-msgid "Plugin"
-msgstr "插件"
+#: classes/opml.php:548
+#: plugins/import_export/init.php:452
+msgid "Error: please upload OPML file."
+msgstr "错误：请上传 OPML 文件。"
 
-#: classes/pref/prefs.php:742
-#: classes/pref/prefs.php:798
-msgid "Description"
-msgstr "描述"
+#: classes/opml.php:559
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "错误：无法找到移动的OPML文件。"
 
-#: classes/pref/prefs.php:743
-#: classes/pref/prefs.php:799
-msgid "Version"
-msgstr "版本"
+#: classes/opml.php:566
+msgid "Error while parsing document."
+msgstr "解析文档时发生错误。"
 
-#: classes/pref/prefs.php:744
-#: classes/pref/prefs.php:800
-msgid "Author"
-msgstr "作者"
+#: classes/feeds.php:53
+msgid "View as RSS feed"
+msgstr "以RSS信息源方式阅读"
 
-#: classes/pref/prefs.php:775
-#: classes/pref/prefs.php:834
-msgid "more info"
-msgstr "更多信息"
+#: classes/feeds.php:62
+#, fuzzy, php-format
+msgid "Last updated: %s"
+msgstr "上次更新："
 
-#: classes/pref/prefs.php:784
-#: classes/pref/prefs.php:843
+#: classes/feeds.php:100
 #, fuzzy
-msgid "Clear data"
-msgstr "清空信息源数据"
+msgid "Select..."
+msgstr "选择"
 
-#: classes/pref/prefs.php:793
-msgid "User plugins"
-msgstr "用户插件"
+#: classes/feeds.php:104
+msgid "Invert"
+msgstr "反选"
 
-#: classes/pref/prefs.php:858
-#, fuzzy
-msgid "Enable selected plugins"
-msgstr "启用信息源分类"
+#: classes/feeds.php:107
+msgid "Selection toggle:"
+msgstr "锁定选择："
 
-#: classes/pref/prefs.php:926
-#, fuzzy
-msgid "Incorrect one time password"
-msgstr "用户名或密码错误"
+#: classes/feeds.php:113
+msgid "Selection:"
+msgstr "选择："
 
-#: classes/pref/prefs.php:929
-#: classes/pref/prefs.php:946
+#: classes/feeds.php:116
 #, fuzzy
-msgid "Incorrect password"
-msgstr "用户名或密码错误"
-
-#: classes/pref/prefs.php:971
-#, php-format
-msgid "You can override colors, fonts and layout of your currently selected theme with custom CSS declarations here. <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">This file</a> can be used as a baseline."
-msgstr "您可以通过自定义 CSS 来更改颜色，字体和版式。具体可参考 <a target=\"_blank\" class=\"visibleLink\" href=\"%s\">本文件</a>。"
+msgid "Set score"
+msgstr "评分"
 
-#: classes/pref/prefs.php:1011
-msgid "Create profile"
-msgstr "å\88\9b建å\81\8f好æ\96\87件"
+#: classes/feeds.php:119
+msgid "Archive"
+msgstr "å­\98æ¡£"
 
-#: classes/pref/prefs.php:1034
-#: classes/pref/prefs.php:1062
-msgid "(active)"
-msgstr "（当前使用的）"
+#: classes/feeds.php:121
+msgid "Move back"
+msgstr "移回原位"
 
-#: classes/pref/prefs.php:1096
-msgid "Remove selected profiles"
-msgstr "移除选中的偏好文件"
+#: classes/feeds.php:127
+#: classes/feeds.php:132
+#: plugins/mailto/init.php:25
+#: plugins/mail/init.php:75
+msgid "Forward by email"
+msgstr "通过邮件转发"
 
-#: classes/pref/prefs.php:1098
-msgid "Activate profile"
-msgstr "启用偏好文件"
+#: classes/feeds.php:136
+msgid "Feed:"
+msgstr "信息源："
 
-#: classes/dlg.php:16
-msgid "If you have imported labels and/or filters, you might need to reload preferences to see your new data."
-msgstr "如果你已经导入了预定义标签或过滤器，你可能需要重新加载来看到新的设置。"
+#: classes/feeds.php:228
+#: classes/feeds.php:885
+msgid "Feed not found."
+msgstr "找不到信息源。"
 
-#: classes/dlg.php:47
-msgid "Your Public OPML URL is:"
-msgstr "你的公共 OPML URL 是："
+#: classes/feeds.php:291
+#, fuzzy
+msgid "Never"
+msgstr "从不清理"
 
-#: classes/dlg.php:56
-#: classes/dlg.php:213
-#: plugins/share/init.php:120
-msgid "Generate new URL"
-msgstr "生成一个新的 URL"
+#: classes/feeds.php:405
+#, fuzzy, php-format
+msgid "Imported at %s"
+msgstr "导入"
 
-#: classes/dlg.php:70
-msgid "Update daemon is enabled in configuration, but daemon process is not running, which prevents all feeds from updating. Please start the daemon process or contact instance owner."
-msgstr "更新进程已在配置中启用，但守护进程没有运行，导致无法抓取信息。请启动守护进程，或联系管理员。"
+#: classes/feeds.php:464
+#: classes/feeds.php:561
+#, fuzzy
+msgid "mark feed as read"
+msgstr "标记信息源为已读"
 
-#: classes/dlg.php:74
-#: classes/dlg.php:83
-msgid "Last update:"
-msgstr "上次更新："
+#: classes/feeds.php:622
+#, fuzzy
+msgid "Collapse article"
+msgstr "折叠文章"
 
-#: classes/dlg.php:79
-msgid "Update daemon is taking too long to perform a feed update. This could indicate a problem like crash or a hang. Please check the daemon process or contact instance owner."
-msgstr "æ\9b´æ\96°è¿\9bç¨\8bå\9c¨æ\8a\93å\8f\96ä¿¡æ\81¯æ\9b´æ\96°æ\97¶è\8a±è´¹äº\86太é\95¿æ\97¶é\97´ï¼\8cè¿\99å\8f¯è\83½å¼\95èµ·å´©æº\83æ\88\96å\81\87æ­»é\97®é¢\98ã\80\82请æ£\80æ\9f¥å®\88æ\8a¤è¿\9bç¨\8bæ\88\96è\81\94系管ç\90\86å\91\98。"
+#: classes/feeds.php:784
+msgid "No unread articles found to display."
+msgstr "没æ\9c\89æ\9cªè¯»æ\96\87ç« 。"
 
-#: classes/dlg.php:165
-msgid "Match:"
-msgstr "匹配："
+#: classes/feeds.php:787
+msgid "No updated articles found to display."
+msgstr "没有最新更新的文章。"
 
-#: classes/dlg.php:167
-msgid "Any"
-msgstr "任意"
+#: classes/feeds.php:790
+msgid "No starred articles found to display."
+msgstr "没有加星标的文章。"
 
-#: classes/dlg.php:170
+#: classes/feeds.php:794
 #, fuzzy
-msgid "All tags."
-msgstr "所有自定义标签"
-
-#: classes/dlg.php:172
-msgid "Which Tags?"
-msgstr "哪些自定义标签？"
-
-#: classes/dlg.php:185
-msgid "Display entries"
-msgstr "显示条目"
+msgid "No articles found to display. You can assign articles to labels manually from article header context menu (applies to all selected articles) or use a filter."
+msgstr "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方动作菜单）。"
 
-#: classes/dlg.php:204
-msgid "You can view this feed as RSS using the following URL:"
-msgstr "æ\82¨å\8f¯ä»¥é\80\9aè¿\87å¦\82ä¸\8b URL 以 RSS æ\96¹å¼\8fæ\9f¥ç\9c\8bæ\9c¬ä¿¡æ\81¯æº\90ï¼\9a"
+#: classes/feeds.php:796
+msgid "No articles found to display."
+msgstr "æ\9a\82æ\97¶æ²¡æ\9c\89æ\96\87ç« ã\80\82"
 
-#: plugins/af_psql_trgm/init.php:26
+#: classes/feeds.php:811
+#: classes/feeds.php:985
 #, php-format
-msgid "Data saved (%s)"
-msgstr ""
+msgid "Feeds last updated at %s"
+msgstr "上次信息源更新时间：%s"
 
-#: plugins/af_psql_trgm/init.php:108
-#, fuzzy
-msgid "Show related articles"
-msgstr "加星标文章"
+#: classes/feeds.php:821
+#: classes/feeds.php:995
+msgid "Some feeds have update errors (click for details)"
+msgstr "部分信息源更新错误（点击了解详情）"
 
-#: plugins/af_psql_trgm/init.php:114
-#: plugins/af_psql_trgm/init.php:211
-#, fuzzy
-msgid "Mark similar articles as read"
-msgstr "将所有文章标记为已读？"
+#: classes/feeds.php:975
+msgid "No feed selected."
+msgstr "没有选中的信息源。"
 
-#: plugins/af_psql_trgm/init.php:157
+#: classes/feeds.php:1034
+#: classes/feeds.php:1042
 #, fuzzy
-msgid "Global settings"
-msgstr "包含设置"
-
-#: plugins/af_psql_trgm/init.php:161
-msgid "Minimum similarity:"
-msgstr ""
+msgid "Feed or site URL"
+msgstr "信息源 URL"
 
-#: plugins/af_psql_trgm/init.php:166
-msgid "Minimum title length:"
-msgstr ""
+#: classes/feeds.php:1056
+msgid "Available feeds"
+msgstr "可用的信息源"
 
-#: plugins/af_psql_trgm/init.php:183
-msgid "Currently enabled for (click to edit):"
-msgstr ""
+#: classes/feeds.php:1087
+msgid "This feed requires authentication."
+msgstr "这个信息源需要认证"
 
-#: plugins/af_psql_trgm/init.php:200
-msgid "Similarity (pg_trgm)"
-msgstr ""
+#: classes/feeds.php:1095
+msgid "More feeds"
+msgstr "更多信息源"
 
-#: plugins/af_comics/init.php:39
-msgid "Feeds supported by af_comics"
-msgstr "af_comics的feed源"
+#: classes/feeds.php:1122
+msgid "Popular feeds"
+msgstr "最受欢迎的信息源"
 
-#: plugins/af_comics/init.php:41
-msgid "The following comics are currently supported:"
-msgstr "ä¸\8bé\9d¢ç\9a\84comics已被æ\94¯æ\8c\81ï¼\9a"
+#: classes/feeds.php:1123
+msgid "Feed archive"
+msgstr "ä¿¡æ\81¯æº\90å­\98æ¡£"
 
-#: plugins/note/init.php:26
-#: plugins/note/note.js:11
-msgid "Edit article note"
-msgstr "编辑文章注记"
+#: classes/feeds.php:1126
+msgid "limit:"
+msgstr "限制："
 
-#: plugins/googlereaderimport/init.php:92
-#: plugins/import_export/init.php:450
-msgid "No file uploaded."
-msgstr "没有文件上传。"
+#: classes/feeds.php:1158
+msgid "Look for"
+msgstr "查找"
 
-#: plugins/googlereaderimport/init.php:179
+#: classes/feeds.php:1166
 #, php-format
-msgid "All done. %d out of %d articles imported."
-msgstr "完成。已成功导入%d条文章，全部%d条文章。"
+msgid "in %s"
+msgstr ""
 
-#: plugins/googlereaderimport/init.php:183
-msgid "The document has incorrect format."
-msgstr "文档格式错误。"
+#: classes/feeds.php:1171
+msgid "Used for word stemming"
+msgstr ""
 
-#: plugins/googlereaderimport/init.php:354
-msgid "Import starred or shared items from Google Reader"
-msgstr "从Google Reader中导入加星或共享条目。"
+#: classes/feeds.php:1180
+#, fuzzy
+msgid "Search syntax"
+msgstr "搜索语法"
 
-#: plugins/googlereaderimport/init.php:358
-msgid "Paste your starred.json or shared.json into the form below."
-msgstr "把你的starred.json 或 shared.json复制到下面的表格中。"
+#: classes/feeds.php:1596
+msgid "Starred articles"
+msgstr "加星标文章"
 
-#: plugins/googlereaderimport/init.php:372
-msgid "Import my Starred items"
-msgstr "导å\85¥æ\88\91ç\9a\84å\8a æ\98\9fæ\9d¡ç\9b®"
+#: classes/feeds.php:1598
+msgid "Published articles"
+msgstr "å·²å\8f\91å¸\83æ\96\87ç« "
 
-#: plugins/mailto/init.php:49
-#: plugins/mailto/init.php:55
-#: plugins/mail/init.php:112
-#: plugins/mail/init.php:118
-msgid "[Forwarded]"
-msgstr "[已转发]"
+#: classes/feeds.php:1600
+msgid "Fresh articles"
+msgstr "最新更新的文章"
 
-#: plugins/mailto/init.php:49
-#: plugins/mail/init.php:112
-msgid "Multiple articles"
-msgstr "多个文章"
+#: classes/feeds.php:1604
+msgid "Archived articles"
+msgstr "存档的文章"
 
-#: plugins/mailto/init.php:71
-msgid "Clicking the following link to invoke your mail client:"
-msgstr "点击下面链接来启动你的邮件客户端："
+#: classes/feeds.php:1606
+msgid "Recently read"
+msgstr "最近的阅读"
 
-#: plugins/mailto/init.php:75
-#, fuzzy
-msgid "Forward selected article(s) by email."
-msgstr "用邮件转发文章"
+#: classes/feeds.php:1716
+msgid "Special"
+msgstr "特殊区域"
 
-#: plugins/mailto/init.php:78
-msgid "You should be able to edit the message before sending in your mail client."
-msgstr "在邮件发送前，你能够编辑消息。"
+#: classes/feeds.php:1962
+#, php-format
+msgid "Search results: %s"
+msgstr "搜索结果：%s"
 
-#: plugins/mailto/init.php:83
+#: plugins/vf_shared/init.php:16
+#: plugins/vf_shared/init.php:60
 #, fuzzy
-msgid "Close this dialog"
-msgstr "å\85³é\97­æ\9c¬ç\95\8cé\9d¢"
+msgid "Shared articles"
+msgstr "å\8a æ\98\9fæ \87æ\96\87ç« "
 
 #: plugins/import_export/init.php:58
 msgid "Import and export"
@@ -2666,44 +2543,151 @@ msgstr "导出我的数据"
 msgid "Import"
 msgstr "导入"
 
-#: plugins/import_export/init.php:223
+#: plugins/import_export/init.php:231
 msgid "Could not import: incorrect schema version."
 msgstr "无法导入：不正确的schema版本。"
 
-#: plugins/import_export/init.php:228
+#: plugins/import_export/init.php:236
 msgid "Could not import: unrecognized document format."
 msgstr "无法导入：不可识别的文档格式。"
 
-#: plugins/import_export/init.php:387
+#: plugins/import_export/init.php:397
 msgid "Finished: "
 msgstr "已完成："
 
-#: plugins/import_export/init.php:388
+#: plugins/import_export/init.php:398
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "编辑文章注记"
 
-#: plugins/import_export/init.php:389
+#: plugins/import_export/init.php:399
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "已经导入过。"
 
-#: plugins/import_export/init.php:390
+#: plugins/import_export/init.php:400
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "没有选中的信息源。"
 
-#: plugins/import_export/init.php:395
+#: plugins/import_export/init.php:405
 msgid "Could not load XML document."
 msgstr "无法加载XML文档。"
 
-#: plugins/import_export/init.php:407
+#: plugins/import_export/init.php:417
 msgid "Prepare data"
 msgstr "准备数据"
 
+#: plugins/import_export/init.php:434
+#, fuzzy, php-format
+msgid "Upload failed with error code %d (%s)"
+msgstr "上传错误，错误代码：%d"
+
+#: plugins/import_export/init.php:460
+msgid "No file uploaded."
+msgstr "没有文件上传。"
+
+#: plugins/mailto/init.php:48
+#: plugins/mailto/init.php:54
+#: plugins/mail/init.php:112
+#: plugins/mail/init.php:118
+msgid "[Forwarded]"
+msgstr "[已转发]"
+
+#: plugins/mailto/init.php:48
+#: plugins/mail/init.php:112
+msgid "Multiple articles"
+msgstr "多个文章"
+
+#: plugins/mailto/init.php:70
+msgid "Clicking the following link to invoke your mail client:"
+msgstr "点击下面链接来启动你的邮件客户端："
+
+#: plugins/mailto/init.php:74
+#, fuzzy
+msgid "Forward selected article(s) by email."
+msgstr "用邮件转发文章"
+
+#: plugins/mailto/init.php:77
+msgid "You should be able to edit the message before sending in your mail client."
+msgstr "在邮件发送前，你能够编辑消息。"
+
+#: plugins/mailto/init.php:82
+#, fuzzy
+msgid "Close this dialog"
+msgstr "关闭本界面"
+
+#: plugins/bookmarklets/init.php:20
+msgid "Bookmarklets"
+msgstr ""
+
+#: plugins/bookmarklets/init.php:22
+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 "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接以订阅。"
+
+#: plugins/bookmarklets/init.php:26
+#, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
+
+#: plugins/bookmarklets/init.php:31
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "在 Tiny Tiny RSS 中订阅"
+
+#: plugins/bookmarklets/init.php:34
+msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:28
+#, php-format
+msgid "Data saved (%s, %d)"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:112
+#, fuzzy
+msgid "Show related articles"
+msgstr "加星标文章"
+
+#: plugins/af_psql_trgm/init.php:118
+#: plugins/af_psql_trgm/init.php:220
+#, fuzzy
+msgid "Mark similar articles as read"
+msgstr "将所有文章标记为已读？"
+
+#: plugins/af_psql_trgm/init.php:157
+msgid "PostgreSQL trigram extension returns string similarity as a floating point number (0-1). Setting it too low might produce false positives, zero disables checking."
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:160
+#, fuzzy
+msgid "Global settings"
+msgstr "包含设置"
+
+#: plugins/af_psql_trgm/init.php:164
+msgid "Minimum similarity:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:169
+msgid "Minimum title length:"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:174
+#, fuzzy
+msgid "Enable for all feeds:"
+msgstr "启用信息源分类"
+
+#: plugins/af_psql_trgm/init.php:191
+#: plugins/af_readability/init.php:78
+msgid "Currently enabled for (click to edit):"
+msgstr ""
+
+#: plugins/af_psql_trgm/init.php:209
+msgid "Similarity (pg_trgm)"
+msgstr ""
+
 #: plugins/nsfw/init.php:30
 #: plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
@@ -2722,22 +2706,36 @@ msgstr ""
 msgid "Configuration saved."
 msgstr "设置已保存。"
 
-#: plugins/auth_internal/init.php:65
+#: plugins/toggle_sidebar/init.php:23
+msgid "Collapse feedlist"
+msgstr "收缩侧边栏"
+
+#: plugins/af_readability/init.php:21
+msgid "Data saved."
+msgstr ""
+
+#: plugins/af_readability/init.php:33
 #, fuzzy
-msgid "Please enter your one time password:"
-msgstr "请填写类别名称："
+msgid "Inline content"
+msgstr "滚动文章内容"
 
-#: plugins/auth_internal/init.php:188
-msgid "Password has been changed."
-msgstr "密码更改成功。"
+#: plugins/af_readability/init.php:39
+msgid "Readability settings (af_readability)"
+msgstr ""
 
-#: plugins/auth_internal/init.php:190
-msgid "Old password is incorrect."
-msgstr "原密码输入错误。"
+#: plugins/af_readability/init.php:66
+msgid "Use Readability for pages shared via bookmarklet."
+msgstr ""
 
-#: plugins/close_button/init.php:22
-msgid "Close article"
-msgstr "关闭文章"
+#: plugins/af_readability/init.php:95
+#, fuzzy
+msgid "Readability"
+msgstr "检查可用性"
+
+#: plugins/af_readability/init.php:106
+#, fuzzy
+msgid "Inline article content"
+msgstr "滚动文章内容"
 
 #: plugins/mail/init.php:28
 msgid "Mail addresses saved."
@@ -2760,591 +2758,536 @@ msgstr "收信人："
 msgid "Subject:"
 msgstr "主题："
 
-#: plugins/mail/init.php:171
+#: plugins/mail/init.php:172
 msgid "Send e-mail"
 msgstr "发送邮件"
 
-#: plugins/instances/init.php:141
-msgid "Linked"
-msgstr "链接"
-
-#: plugins/instances/init.php:204
-#: plugins/instances/init.php:395
-msgid "Instance"
-msgstr "实例"
-
-#: plugins/instances/init.php:215
-#: plugins/instances/init.php:312
-#: plugins/instances/init.php:404
-msgid "Instance URL"
-msgstr "实例 URL："
-
-#: plugins/instances/init.php:226
-#: plugins/instances/init.php:414
-msgid "Access key:"
-msgstr "访问密钥："
-
-#: plugins/instances/init.php:229
-#: plugins/instances/init.php:313
-#: plugins/instances/init.php:417
-msgid "Access key"
-msgstr "访问密钥"
-
-#: plugins/instances/init.php:233
-#: plugins/instances/init.php:421
-msgid "Use one access key for both linked instances."
-msgstr "为两个相联的实例使用一个访问密钥。"
-
-#: plugins/instances/init.php:241
-#: plugins/instances/init.php:429
-msgid "Generate new key"
-msgstr "生成新的密钥"
-
-#: plugins/instances/init.php:292
-msgid "Link instance"
-msgstr "链接实例"
-
-#: plugins/instances/init.php:304
-msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
-msgstr "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 URL 为本实例建立链接："
-
-#: plugins/instances/init.php:314
-msgid "Last connected"
-msgstr "上次连接"
-
-#: plugins/instances/init.php:315
-msgid "Status"
-msgstr "状态"
-
-#: plugins/instances/init.php:316
-msgid "Stored feeds"
-msgstr "保存的信息源"
-
-#: plugins/instances/init.php:433
-msgid "Create link"
-msgstr "创建链接"
+#: plugins/share/init.php:39
+msgid "You can disable all articles shared by unique URLs here."
+msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: plugins/vf_shared/init.php:16
-#: plugins/vf_shared/init.php:54
+#: plugins/share/init.php:42
+msgid "Unshare all articles"
+msgstr "取消所有分享"
+
+#: plugins/share/init.php:75
+msgid "Share by URL"
+msgstr "通过 URL 分享"
+
+#: plugins/share/init.php:96
+msgid "You can share this article by the following unique URL:"
+msgstr "您可以通过以下唯一 URL 分享本文："
+
+#: plugins/share/init.php:114
 #, fuzzy
-msgid "Shared articles"
-msgstr "å\8a æ\98\9fæ \87æ\96\87ç« "
+msgid "Unshare article"
+msgstr "å\8f\96æ¶\88æ\98\9fæ \87"
 
-#: plugins/bookmarklets/init.php:20
-msgid "Bookmarklets"
+#: plugins/af_comics/init.php:48
+msgid "Feeds supported by af_comics"
+msgstr "af_comics的feed源"
+
+#: plugins/af_comics/init.php:50
+msgid "The following comics are currently supported:"
+msgstr "下面的comics已被支持："
+
+#: plugins/af_comics/init.php:68
+msgid "GoComics requires a specific URL to workaround their lack of feed support: <code>http://feeds.feedburner.com/uclick/<em>comic_name</em></code> (e.g. <code>http://www.gocomics.com/garfield</code> uses <code>http://feeds.feedburner.com/uclick/garfield</code>)."
 msgstr ""
 
-#: plugins/bookmarklets/init.php:22
-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 "将以下链接拖拽至您的浏览器工具条，在浏览器中打开您想看的信息源，然后点击链接以订阅。"
+#: plugins/af_comics/init.php:70
+msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
+msgstr ""
 
-#: plugins/bookmarklets/init.php:26
-#, php-format
-msgid "Subscribe to %s in Tiny Tiny RSS?"
-msgstr "在 Tiny Tiny RSS 中订阅 %s ？"
+#: plugins/af_redditimgur/init.php:25
+msgid "Reddit content settings (af_redditimgur)"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:31
-msgid "Subscribe in Tiny Tiny RSS"
-msgstr "在 Tiny Tiny RSS 中订阅"
+#: plugins/af_redditimgur/init.php:50
+msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
+msgstr ""
 
-#: plugins/bookmarklets/init.php:34
-msgid "Use this bookmarklet to publish arbitrary pages using Tiny Tiny RSS"
+#: plugins/af_redditimgur/init.php:54
+msgid "Extract missing content using Readability"
 msgstr ""
 
-#: plugins/share/init.php:39
-msgid "You can disable all articles shared by unique URLs here."
-msgstr "您可以取消所有通过 URL 分享的文章。"
+#: plugins/af_redditimgur/init.php:59
+msgid "Enable additional duplicate checking"
+msgstr ""
+
+#: plugins/af_redditimgur/init.php:73
+#: plugins/af_zz_imgproxy/init.php:254
+#, fuzzy
+msgid "Configuration saved"
+msgstr "设置已保存。"
+
+#: plugins/note/init.php:26
+#: plugins/note/note.js:11
+msgid "Edit article note"
+msgstr "编辑文章注记"
+
+#: plugins/close_button/init.php:25
+msgid "Close article"
+msgstr "关闭文章"
+
+#: plugins/af_zz_imgproxy/init.php:210
+msgid "Image proxy settings (af_zz_imgproxy)"
+msgstr ""
+
+#: plugins/af_zz_imgproxy/init.php:234
+#, fuzzy
+msgid "Enable proxy for all remote images."
+msgstr "启用信息源分类"
+
+#: plugins/af_zz_imgproxy/init.php:238
+#, fuzzy
+msgid "Don't cache files locally."
+msgstr "本地缓存图片"
+
+#: plugins/auth_internal/init.php:65
+#, fuzzy
+msgid "Please enter your one time password:"
+msgstr "请填写类别名称："
 
-#: plugins/share/init.php:44
-msgid "Unshare all articles"
-msgstr "å\8f\96æ¶\88æ\89\80æ\9c\89å\88\86享"
+#: plugins/auth_internal/init.php:188
+msgid "Password has been changed."
+msgstr "å¯\86ç \81æ\9b´æ\94¹æ\88\90å\8a\9fã\80\82"
 
-#: plugins/share/init.php:77
-msgid "Share by URL"
-msgstr "通过 URL 分享"
+#: plugins/auth_internal/init.php:190
+msgid "Old password is incorrect."
+msgstr "原密码输入错误。"
 
-#: plugins/share/init.php:99
-msgid "You can share this article by the following unique URL:"
-msgstr "您可以通过以下唯一 URL 分享本文："
+#: js/FeedTree.js:172
+#, fuzzy
+msgid "(Un)collapse"
+msgstr "收起侧边栏"
 
-#: plugins/share/init.php:117
+#: js/PrefFeedTree.js:54
 #, fuzzy
-msgid "Unshare article"
-msgstr "取消星标"
+msgid "Edit category"
+msgstr "编辑类别"
 
-#: js/functions.js:62
-msgid "The error will be reported to the configured log destination."
-msgstr "error会保存在配置的目标日志中"
+#: js/PrefFeedTree.js:61
+#, fuzzy
+msgid "Remove category"
+msgstr "创建类别"
 
-#: js/functions.js:90
-msgid "Report to tt-rss.org"
-msgstr ""
+#: js/PrefFilterTree.js:67
+msgid "Inverse"
+msgstr "反选"
 
-#: js/functions.js:93
+#: js/functions.js:74
 msgid "Close"
 msgstr ""
 
-#: js/functions.js:104
-#, fuzzy
-msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
-msgstr "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数据库。"
-
-#: js/functions.js:224
+#: js/functions.js:151
 #, fuzzy
 msgid "Click to close"
 msgstr "点击暂停"
 
-#: js/functions.js:1051
+#: js/functions.js:887
 #, fuzzy
 msgid "Edit action"
 msgstr "信息源动作"
 
-#: js/functions.js:1088
-msgid "Create Filter"
-msgstr "创建过滤器"
+#: js/functions.js:928
+#, perl-format
+msgid "Looking for articles (%d processed, %f found)..."
+msgstr ""
 
-#: js/functions.js:1218
-msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
-msgstr "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
+#: js/functions.js:958
+#, fuzzy, perl-format
+msgid "Found %d articles matching this filter:"
+msgstr "符合本过滤器条件的文章："
 
-#: js/functions.js:1229
-#, fuzzy
-msgid "Subscription reset."
-msgstr "订阅信息源"
+#: js/functions.js:1010
+msgid "Create Filter"
+msgstr "创建过滤器"
 
-#: js/functions.js:1239
-#: js/tt-rss.js:686
+#: js/functions.js:1128
+#: js/tt-rss.js:696
 #, perl-format
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
-#: js/functions.js:1242
+#: js/functions.js:1131
 msgid "Removing feed..."
 msgstr "删除feed..."
 
-#: js/functions.js:1349
+#: js/functions.js:1204
 msgid "Please enter category title:"
 msgstr "请填写类别名称："
 
-#: js/functions.js:1380
+#: js/functions.js:1229
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1384
-#: js/prefs.js:1218
+#: js/functions.js:1233
+#: js/prefs.js:1150
 msgid "Trying to change address..."
 msgstr "尝试更改地址..."
 
-#: js/functions.js:1685
-#: js/functions.js:1795
-#: js/prefs.js:414
-#: js/prefs.js:444
-#: js/prefs.js:476
-#: js/prefs.js:629
-#: js/prefs.js:649
-#: js/prefs.js:1194
-#: js/prefs.js:1339
+#: js/functions.js:1476
+#: js/functions.js:1585
+#: js/prefs.js:398
+#: js/prefs.js:424
+#: js/prefs.js:456
+#: js/prefs.js:599
+#: js/prefs.js:617
+#: js/prefs.js:1132
+#: js/prefs.js:1259
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
-#: js/functions.js:1727
+#: js/functions.js:1519
 msgid "Remove selected feeds from the archive? Feeds with stored articles will not be removed."
 msgstr "将选中的信息源从存档中移除？包含已保存文章的信息源不会被移除。"
 
-#: js/functions.js:1766
+#: js/functions.js:1556
 msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
-#: js/functions.js:1777
-#: js/prefs.js:1176
+#: js/functions.js:1567
+#: js/prefs.js:1113
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
-#: js/functions.js:1780
-#: js/prefs.js:1179
+#: js/functions.js:1570
+#: js/prefs.js:1116
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "移除选中的信息源？"
 
-#: js/PrefFeedTree.js:48
-#, fuzzy
-msgid "Edit category"
-msgstr "编辑类别"
-
-#: js/PrefFeedTree.js:55
-#, fuzzy
-msgid "Remove category"
-msgstr "创建类别"
-
-#: js/PrefFilterTree.js:64
-msgid "Inverse"
-msgstr "反选"
-
-#: js/prefs.js:55
+#: js/prefs.js:60
 msgid "Please enter login:"
 msgstr "请输入登录名："
 
-#: js/prefs.js:62
+#: js/prefs.js:67
 msgid "Can't create user: no login specified."
 msgstr "无法创建用户：没有指定登录名。"
 
-#: js/prefs.js:66
+#: js/prefs.js:71
 #, fuzzy
 msgid "Adding user..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:94
+#: js/prefs.js:96
 msgid "User Editor"
 msgstr "编辑用户信息"
 
-#: js/prefs.js:99
-#: js/prefs.js:211
-#: js/prefs.js:736
-#: plugins/instances/instances.js:26
-#: plugins/instances/instances.js:89
-#: js/functions.js:1592
+#: js/prefs.js:100
+#: js/prefs.js:209
+#: js/prefs.js:706
+#: js/functions.js:1387
 #, fuzzy
 msgid "Saving data..."
 msgstr "保存信息"
 
-#: js/prefs.js:134
+#: js/prefs.js:131
 msgid "Edit Filter"
 msgstr "编辑过滤器"
 
-#: js/prefs.js:181
+#: js/prefs.js:170
 #, fuzzy
 msgid "Remove filter?"
 msgstr "移除这个过滤器： %s ？"
 
-#: js/prefs.js:186
+#: js/prefs.js:175
 #, fuzzy
 msgid "Removing filter..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:296
+#: js/prefs.js:292
 msgid "Remove selected labels?"
 msgstr "移除选中的预定义标签？"
 
-#: js/prefs.js:299
+#: js/prefs.js:295
 #, fuzzy
 msgid "Removing selected labels..."
 msgstr "移除选中的预定义标签？"
 
-#: js/prefs.js:312
-#: js/prefs.js:1380
+#: js/prefs.js:308
+#: js/prefs.js:1300
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
-#: js/prefs.js:326
+#: js/prefs.js:320
 msgid "Remove selected users? Neither default admin nor your account will be removed."
 msgstr "移除选中的用户？默认管理员和您的帐户不会被移除。"
 
-#: js/prefs.js:329
+#: js/prefs.js:323
 #, fuzzy
 msgid "Removing selected users..."
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:343
-#: js/prefs.js:487
-#: js/prefs.js:508
-#: js/prefs.js:547
+#: js/prefs.js:338
+#: js/prefs.js:467
+#: js/prefs.js:486
+#: js/prefs.js:520
 msgid "No users are selected."
 msgstr "没有选中任何用户。"
 
-#: js/prefs.js:361
+#: js/prefs.js:350
 msgid "Remove selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:364
+#: js/prefs.js:353
 #, fuzzy
 msgid "Removing selected filters..."
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:376
-#: js/prefs.js:584
-#: js/prefs.js:603
+#: js/prefs.js:366
+#: js/prefs.js:554
+#: js/prefs.js:573
 msgid "No filters are selected."
 msgstr "没有选中的过滤器。"
 
-#: js/prefs.js:395
+#: js/prefs.js:378
 msgid "Unsubscribe from selected feeds?"
 msgstr "从选中的信息源取消订阅？"
 
-#: js/prefs.js:399
+#: js/prefs.js:382
 #, fuzzy
 msgid "Unsubscribing from selected feeds..."
 msgstr "取消订阅选中的信息源"
 
-#: js/prefs.js:429
+#: js/prefs.js:409
 msgid "Please select only one feed."
 msgstr "请仅选择一个信息源。"
 
-#: js/prefs.js:435
+#: js/prefs.js:415
 msgid "Erase all non-starred articles in selected feed?"
 msgstr "清空选中的信息源当中所有未加星标的文章？"
 
-#: js/prefs.js:438
+#: js/prefs.js:418
 #, fuzzy
 msgid "Clearing selected feed..."
 msgstr "编辑选定的信息源"
 
-#: js/prefs.js:457
+#: js/prefs.js:437
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr "文章保存几天？（填写0则采用默认设置）"
 
-#: js/prefs.js:460
+#: js/prefs.js:440
 #, fuzzy
 msgid "Purging selected feed..."
 msgstr "编辑选定的信息源"
 
-#: js/prefs.js:492
-#: js/prefs.js:513
-#: js/prefs.js:552
+#: js/prefs.js:472
+#: js/prefs.js:491
+#: js/prefs.js:525
 msgid "Please select only one user."
 msgstr "请仅选择一个用户。"
 
-#: js/prefs.js:517
+#: js/prefs.js:495
 msgid "Reset password of selected user?"
 msgstr "重置选定用户的密码？"
 
-#: js/prefs.js:520
+#: js/prefs.js:498
 #, fuzzy
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户的密码？"
 
-#: js/prefs.js:565
-msgid "User details"
-msgstr "用户详细资料"
-
-#: js/prefs.js:589
+#: js/prefs.js:559
 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
 
-#: js/prefs.js:607
+#: js/prefs.js:577
 #, fuzzy
 msgid "Combine selected filters?"
 msgstr "移除选定的过滤器？"
 
-#: js/prefs.js:610
+#: js/prefs.js:580
 #, fuzzy
 msgid "Joining filters..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:671
+#: js/prefs.js:639
 msgid "Edit Multiple Feeds"
 msgstr "编辑多个信息源"
 
-#: js/prefs.js:695
+#: js/prefs.js:663
 msgid "Save changes to selected feeds?"
 msgstr "保存对信息源的更改？"
 
-#: js/prefs.js:772
+#: js/prefs.js:740
 msgid "OPML Import"
 msgstr "OPML 导入"
 
-#: js/prefs.js:799
+#: js/prefs.js:759
 msgid "Please choose an OPML file first."
 msgstr "请先选择一个 OPML 文件。"
 
-#: js/prefs.js:802
-#: plugins/googlereaderimport/init.js:45
+#: js/prefs.js:762
 #: plugins/import_export/import_export.js:115
 #, fuzzy
 msgid "Importing, please wait..."
 msgstr "读取中，请稍候……"
 
-#: js/prefs.js:969
+#: js/prefs.js:924
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1738
+#: js/prefs.js:1624
 msgid "Subscribing to feeds..."
 msgstr "订阅至信息源.."
 
-#: js/prefs.js:1775
+#: js/prefs.js:1643
 msgid "Clear stored data for this plugin?"
 msgstr "清除本插件已保存的数据？"
 
-#: js/prefs.js:1792
+#: js/prefs.js:1657
 msgid "Clear all messages in the error log?"
 msgstr "清除错误日志里的所有消息"
 
-#: js/tt-rss.js:127
+#: js/tt-rss.js:118
 msgid "Mark all articles as read?"
 msgstr "将所有文章标记为已读？"
 
-#: js/tt-rss.js:133
+#: js/tt-rss.js:124
 #, fuzzy
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:391
+#: js/tt-rss.js:402
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:432
-#: js/tt-rss.js:667
-#: js/functions.js:1571
+#: js/tt-rss.js:450
+#: js/functions.js:1366
+#: js/tt-rss.js:677
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
-#: js/tt-rss.js:503
+#: js/tt-rss.js:531
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:516
-#: js/tt-rss.js:717
+#: js/tt-rss.js:544
+#: js/tt-rss.js:727
 msgid "Widescreen is not available in combined mode."
 msgstr ""
 
-#: js/tt-rss.js:675
-msgid "You can't unsubscribe from the category."
-msgstr "æ\82¨ä¸\8dè\83½å\8f\96æ¶\88订é\98\85ä¸\80个类å\88«。"
+#: js/tt-rss.js:825
+msgid "You can't rescore this kind of feed."
+msgstr "æ\97 æ³\95é\87\8dç½®æ\9c¬ç±»ä¿¡æ\81¯æº\90ç\9a\84è¯\84å\88\86。"
 
-#: js/tt-rss.js:680
-#: js/tt-rss.js:836
+#: js/tt-rss.js:830
+#: js/tt-rss.js:690
 msgid "Please select some feed first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:831
-msgid "You can't rescore this kind of feed."
-msgstr "无法重置本类信息源的评分。"
-
-#: js/tt-rss.js:841
+#: js/tt-rss.js:835
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:844
+#: js/tt-rss.js:838
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "为文章重新评分"
 
-#: js/viewfeed.js:476
-msgid "Unstar article"
-msgstr "取消星标"
-
-#: js/viewfeed.js:480
-msgid "Star article"
-msgstr "加星标"
-
-#: js/viewfeed.js:534
-msgid "Unpublish article"
-msgstr "取消发布文章"
-
-#: js/viewfeed.js:538
-msgid "Publish article"
-msgstr "发布文章"
-
-#: js/viewfeed.js:690
-#, fuzzy, perl-format
-msgid "%d article selected"
-msgid_plural "%d articles selected"
-msgstr[0] "未选中任何文章。"
-
-#: js/viewfeed.js:762
-#: js/viewfeed.js:790
-#: js/viewfeed.js:1038
-#: js/viewfeed.js:1081
-#: js/viewfeed.js:1134
-#: js/viewfeed.js:2289
+#: js/viewfeed.js:921
+#: js/viewfeed.js:959
+#: js/viewfeed.js:1007
+#: js/viewfeed.js:1933
 #: plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
-#: js/viewfeed.js:817
-#: js/viewfeed.js:882
-#: js/viewfeed.js:916
+#: js/viewfeed.js:679
+#: js/viewfeed.js:701
+#: js/viewfeed.js:722
+#: js/viewfeed.js:781
+#: js/viewfeed.js:809
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
 
-#: js/viewfeed.js:1046
+#: js/viewfeed.js:929
 #, fuzzy, perl-format
 msgid "Delete %d selected article in %s?"
 msgid_plural "Delete %d selected articles in %s?"
 msgstr[0] "删除 %s 中选择的 %d 篇文章？"
 
-#: js/viewfeed.js:1048
+#: js/viewfeed.js:931
 #, fuzzy, perl-format
 msgid "Delete %d selected article?"
 msgid_plural "Delete %d selected articles?"
 msgstr[0] "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1090
+#: js/viewfeed.js:968
 #, fuzzy, perl-format
 msgid "Archive %d selected article in %s?"
 msgid_plural "Archive %d selected articles in %s?"
 msgstr[0] "将 %s 中的 %d 篇选中的文章存档？"
 
-#: js/viewfeed.js:1093
+#: js/viewfeed.js:971
 #, fuzzy, perl-format
 msgid "Move %d archived article back?"
 msgid_plural "Move %d archived articles back?"
 msgstr[0] "将存档的 %d 篇文章移回原处？"
 
-#: js/viewfeed.js:1095
+#: js/viewfeed.js:973
 msgid "Please note that unstarred articles might get purged on next feed update."
 msgstr ""
 
-#: js/viewfeed.js:1140
+#: js/viewfeed.js:1013
 #, fuzzy, perl-format
 msgid "Mark %d selected article in %s as read?"
 msgid_plural "Mark %d selected articles in %s as read?"
 msgstr[0] "将 %s 中选中的 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1164
+#: js/viewfeed.js:1033
 msgid "Edit article Tags"
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1170
+#: js/viewfeed.js:1039
 #, fuzzy
 msgid "Saving article tags..."
 msgstr "编辑文章的自定义标签"
 
-#: js/viewfeed.js:1326
-#: js/viewfeed.js:113
-#: js/viewfeed.js:184
-#, fuzzy
-msgid "Click to open next unread feed."
-msgstr "点击以编辑信息源"
-
-#: js/viewfeed.js:1984
+#: js/viewfeed.js:1672
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:2090
+#: js/viewfeed.js:1679
+#, fuzzy
+msgid "Display article URL"
+msgstr "显示 URL"
+
+#: js/viewfeed.js:1789
 msgid "Assign label"
 msgstr "添加预定义标签"
 
-#: js/viewfeed.js:2095
+#: js/viewfeed.js:1794
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:2182
+#: js/viewfeed.js:1826
 #, fuzzy
 msgid "Select articles in group"
 msgstr "选择鼠标指向的文章"
 
-#: js/viewfeed.js:2191
+#: js/viewfeed.js:1836
 #, fuzzy
 msgid "Mark group as read"
 msgstr "标记为已读"
 
-#: js/viewfeed.js:2203
+#: js/viewfeed.js:1848
 msgid "Mark feed as read"
 msgstr "标记信息源为已读"
 
-#: js/viewfeed.js:2258
+#: js/viewfeed.js:1901
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:2300
+#: js/viewfeed.js:1964
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
 
-#: js/viewfeed.js:2333
+#: js/viewfeed.js:1995
 #, fuzzy
 msgid "Article URL:"
 msgstr "全部文章"
@@ -3353,30 +3296,6 @@ msgstr "全部文章"
 msgid "Sorry, your browser does not support sandboxed iframes."
 msgstr "对不起，你的浏览器不支持沙箱iframe。"
 
-#: plugins/af_psql_trgm/init.js:11
-#, fuzzy
-msgid "Related articles"
-msgstr "删除文章"
-
-#: plugins/note/note.js:17
-#, fuzzy
-msgid "Saving article note..."
-msgstr "编辑文章注记"
-
-#: plugins/googlereaderimport/init.js:18
-msgid "Google Reader Import"
-msgstr "导入Google Reader"
-
-#: plugins/googlereaderimport/init.js:42
-#, fuzzy
-msgid "Please choose a file first."
-msgstr "请先选择一个 OPML 文件。"
-
-#: plugins/mailto/init.js:21
-#: plugins/mail/mail.js:21
-msgid "Forward article by email"
-msgstr "用邮件转发文章"
-
 #: plugins/import_export/import_export.js:13
 msgid "Export Data"
 msgstr "导出数据"
@@ -3395,10 +3314,15 @@ msgstr "导入数据"
 msgid "Please choose the file first."
 msgstr "请先选择文件。"
 
-#: plugins/shorten_expanded/init.js:37
+#: plugins/mailto/init.js:21
+#: plugins/mail/mail.js:21
+msgid "Forward article by email"
+msgstr "用邮件转发文章"
+
+#: plugins/af_psql_trgm/init.js:11
 #, fuzzy
-msgid "Click to expand article"
-msgstr "点击以展开文章。"
+msgid "Related articles"
+msgstr "删除文章"
 
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
@@ -3409,31 +3333,10 @@ msgstr ""
 msgid "Your message has been sent."
 msgstr "您的个人数据已保存。"
 
-#: plugins/instances/instances.js:10
-msgid "Link Instance"
-msgstr "链接实例"
-
-#: plugins/instances/instances.js:73
-msgid "Edit Instance"
-msgstr "编辑实例"
-
-#: plugins/instances/instances.js:122
-msgid "Remove selected instances?"
-msgstr "移除选中的实例？"
-
-#: plugins/instances/instances.js:125
+#: plugins/shorten_expanded/init.js:39
 #, fuzzy
-msgid "Removing selected instances..."
-msgstr "移除选中的实例？"
-
-#: plugins/instances/instances.js:139
-#: plugins/instances/instances.js:151
-msgid "No instances are selected."
-msgstr "未选中任何实例。"
-
-#: plugins/instances/instances.js:156
-msgid "Please select only one instance."
-msgstr "请仅选择一个实例。"
+msgid "Click to expand article"
+msgstr "点击以展开文章。"
 
 #: plugins/share/share.js:10
 msgid "Share article by URL"
@@ -3462,7 +3365,7 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1518
+#: js/prefs.js:1433
 msgid "Clearing URLs..."
 msgstr "清理 URLs..."
 
@@ -3470,263 +3373,506 @@ msgstr "清理 URLs..."
 msgid "Shared URLs cleared."
 msgstr "分享的URL已被清除。"
 
-#: js/feedlist.js:406
-#: js/feedlist.js:434
+#: plugins/note/note.js:17
+#, fuzzy
+msgid "Saving article note..."
+msgstr "编辑文章注记"
+
+#: js/feedlist.js:429
 msgid "Mark all articles in %s as read?"
 msgstr "将 %s 中的全部文章标记为已读？"
 
-#: js/feedlist.js:425
+#: js/feedlist.js:487
 #, fuzzy
-msgid "Mark all articles in %s older than 1 day as read?"
+msgid "Mark %w in %s older than 1 day as read?"
 msgstr "将 %s 中的一天前的全部文章标记为已读？"
 
-#: js/feedlist.js:428
+#: js/feedlist.js:490
 #, fuzzy
-msgid "Mark all articles in %s older than 1 week as read?"
+msgid "Mark %w in %s older than 1 week as read?"
 msgstr "将 %s 中的一周前的全部文章标记为已读？"
 
-#: js/feedlist.js:431
+#: js/feedlist.js:493
 #, fuzzy
-msgid "Mark all articles in %s older than 2 weeks as read?"
+msgid "Mark %w in %s older than 2 weeks as read?"
 msgstr "将 %s 中的两周前的全部文章标记为已读？"
 
-#: js/functions.js:615
+#: js/feedlist.js:496
+#, fuzzy
+msgid "Mark %w in %s as read?"
+msgstr "将 %s 中的全部文章标记为已读？"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "search results"
+msgstr "搜索结果：%s"
+
+#: js/feedlist.js:499
+#, fuzzy
+msgid "all articles"
+msgstr "全部文章"
+
+#: js/functions.js:506
 msgid "Error explained"
 msgstr "Error释义 "
 
-#: js/functions.js:697
+#: js/functions.js:559
 msgid "Upload complete."
 msgstr "上传完成。"
 
-#: js/functions.js:721
+#: js/functions.js:576
 msgid "Remove stored feed icon?"
 msgstr "移除已保存的信息源图标？"
 
-#: js/functions.js:726
+#: js/functions.js:581
 #, fuzzy
 msgid "Removing feed icon..."
 msgstr "移除已保存的信息源图标？"
 
-#: js/functions.js:731
+#: js/functions.js:586
 #, fuzzy
 msgid "Feed icon removed."
 msgstr "找不到信息源。"
 
-#: js/functions.js:753
+#: js/functions.js:602
 msgid "Please select an image file to upload."
 msgstr "请选择图片文件上传。"
 
-#: js/functions.js:755
+#: js/functions.js:604
 msgid "Upload new icon for this feed?"
 msgstr "为本信息源上传一个新的图标？"
 
-#: js/functions.js:756
+#: js/functions.js:605
 #, fuzzy
 msgid "Uploading, please wait..."
 msgstr "读取中，请稍候……"
 
-#: js/functions.js:772
+#: js/functions.js:615
 msgid "Please enter label caption:"
 msgstr "请填写预定义标签的说明："
 
-#: js/functions.js:777
+#: js/functions.js:620
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：没有标题。"
 
-#: js/functions.js:820
+#: js/functions.js:659
 msgid "Subscribe to Feed"
 msgstr "订阅信息源"
 
-#: js/functions.js:839
+#: js/functions.js:688
 msgid "Failed to parse output. This can indicate server timeout and/or network issues. Backend output was logged to browser console."
 msgstr "解析输出失败。 这可能由于服务器超时或网络问题。 服务器的输出已经被记录在浏览器console控制台中。"
 
-#: js/functions.js:854
+#: js/functions.js:703
 msgid "Subscribed to %s"
 msgstr "已订阅至 %s"
 
-#: js/functions.js:859
+#: js/functions.js:708
 msgid "Specified URL seems to be invalid."
 msgstr "指定的 URL 无效。"
 
-#: js/functions.js:862
+#: js/functions.js:711
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr "指定的 URL 没有包含任何信息源。"
 
-#: js/functions.js:874
+#: js/functions.js:723
 #, fuzzy
 msgid "Expand to select feed"
 msgstr "编辑选定的信息源"
 
-#: js/functions.js:886
+#: js/functions.js:735
 #, fuzzy
 msgid "Couldn't download the specified URL: %s"
 msgstr "无法下载指定的 URL 。"
 
-#: js/functions.js:890
+#: js/functions.js:739
 msgid "XML validation failed: %s"
 msgstr "XML验证失败："
 
-#: js/functions.js:895
+#: js/functions.js:744
 msgid "You are already subscribed to this feed."
 msgstr "您已经订阅过这个信息源啦。"
 
-#: js/functions.js:1025
+#: js/functions.js:865
 #, fuzzy
 msgid "Edit rule"
 msgstr "编辑过滤器"
 
-#: js/functions.js:1586
+#: js/functions.js:1381
 msgid "Edit Feed"
 msgstr "编辑信息源"
 
-#: js/functions.js:1624
+#: js/functions.js:1414
 msgid "More Feeds"
 msgstr "更多信息源"
 
-#: js/functions.js:1878
+#: js/functions.js:1610
 msgid "Help"
 msgstr "帮助"
 
-#: js/prefs.js:1083
+#: js/prefs.js:1028
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
 msgstr ""
 
-#: js/prefs.js:1089
+#: js/prefs.js:1034
 #, fuzzy
 msgid "Removing category..."
 msgstr "创建类别"
 
-#: js/prefs.js:1110
+#: js/prefs.js:1052
 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 
-#: js/prefs.js:1113
+#: js/prefs.js:1055
 #, fuzzy
 msgid "Removing selected categories..."
 msgstr "移除选定的类别"
 
-#: js/prefs.js:1126
+#: js/prefs.js:1068
 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 
-#: js/prefs.js:1134
+#: js/prefs.js:1075
 #, fuzzy
 msgid "Category title:"
 msgstr "类别"
 
-#: js/prefs.js:1138
+#: js/prefs.js:1079
 #, fuzzy
 msgid "Creating category..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:1165
+#: js/prefs.js:1102
 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 
-#: js/prefs.js:1214
+#: js/prefs.js:1146
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
-#: js/prefs.js:1303
+#: js/prefs.js:1223
 #, fuzzy
 msgid "Clearing feed..."
 msgstr "清空信息源数据"
 
-#: js/prefs.js:1323
+#: js/prefs.js:1243
 msgid "Rescore articles in selected feeds?"
 msgstr "为选中信息源中的文章重置评分？"
 
-#: js/prefs.js:1326
+#: js/prefs.js:1246
 #, fuzzy
 msgid "Rescoring selected feeds..."
 msgstr "为选中信息源中的文章重置评分？"
 
-#: js/prefs.js:1346
+#: js/prefs.js:1266
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr "重置所有文章的评分？这可能将花费很长时间。"
 
-#: js/prefs.js:1349
+#: js/prefs.js:1269
 #, fuzzy
 msgid "Rescoring feeds..."
 msgstr "为信息源重新评分"
 
-#: js/prefs.js:1366
+#: js/prefs.js:1285
 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 
-#: js/prefs.js:1403
+#: js/prefs.js:1317
 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 
-#: js/prefs.js:1412
+#: js/prefs.js:1326
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
-#: js/prefs.js:1415
+#: js/prefs.js:1329
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "移除选中的偏好文件"
 
-#: js/prefs.js:1430
+#: js/prefs.js:1345
 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 
-#: js/prefs.js:1438
-#: js/prefs.js:1491
+#: js/prefs.js:1353
+#: js/prefs.js:1406
 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 
-#: js/prefs.js:1454
-#: js/prefs.js:1507
+#: js/prefs.js:1370
+#: js/prefs.js:1422
 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 
-#: js/prefs.js:1459
+#: js/prefs.js:1375
 #, fuzzy
 msgid "Creating profile..."
 msgstr "创建偏好文件"
 
-#: js/prefs.js:1515
+#: js/prefs.js:1430
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1525
+#: js/prefs.js:1440
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "生成一个新的 URL"
 
-#: js/prefs.js:1616
+#: js/prefs.js:1512
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/tt-rss.js:654
-msgid "Select item(s) by tags"
-msgstr "通过自定义标签选择"
+#: js/tt-rss.js:685
+msgid "You can't unsubscribe from the category."
+msgstr "您不能取消订阅一个类别。"
+
+#: js/viewfeed.js:127
+#: js/viewfeed.js:177
+#: js/viewfeed.js:194
+#, fuzzy
+msgid "Click to open next unread feed."
+msgstr "点击以编辑信息源"
 
-#: js/viewfeed.js:117
+#: js/viewfeed.js:131
 #, fuzzy
 msgid "Cancel search"
 msgstr "取消"
 
-#: js/viewfeed.js:1438
+#: js/viewfeed.js:191
+#, fuzzy
+msgid "New articles found, reload feed to continue."
+msgstr "暂时没有文章。"
+
+#: js/viewfeed.js:426
+msgid "Unstar article"
+msgstr "取消星标"
+
+#: js/viewfeed.js:430
+msgid "Star article"
+msgstr "加星标"
+
+#: js/viewfeed.js:480
+msgid "Unpublish article"
+msgstr "取消发布文章"
+
+#: js/viewfeed.js:484
+msgid "Publish article"
+msgstr "发布文章"
+
+#: js/viewfeed.js:624
+#, fuzzy
+msgid "%d article selected"
+msgid_plural "%d articles selected"
+msgstr[0] "未选中任何文章。"
+
+#: js/viewfeed.js:1288
 msgid "No article is selected."
 msgstr "未选中任何文章。"
 
-#: js/viewfeed.js:1473
+#: js/viewfeed.js:1323
 msgid "No articles found to mark"
 msgstr "未找到需要标记的文章"
 
-#: js/viewfeed.js:1475
+#: js/viewfeed.js:1325
 #, fuzzy
 msgid "Mark %d article as read?"
 msgid_plural "Mark %d articles as read?"
 msgstr[0] "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1990
+#~ msgid "Resubscribe to push updates"
+#~ msgstr "重新订阅以推送更新"
+
+#~ msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
+#~ msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
+
+#~ msgid "Linked"
+#~ msgstr "链接"
+
+#~ msgid "Instance"
+#~ msgstr "实例"
+
+#~ msgid "Instance URL"
+#~ msgstr "实例 URL："
+
+#~ msgid "Access key:"
+#~ msgstr "访问密钥："
+
+#~ msgid "Access key"
+#~ msgstr "访问密钥"
+
+#~ msgid "Use one access key for both linked instances."
+#~ msgstr "为两个相联的实例使用一个访问密钥。"
+
+#~ msgid "Generate new key"
+#~ msgstr "生成新的密钥"
+
+#~ msgid "Link instance"
+#~ msgstr "链接实例"
+
+#~ msgid "You can connect other instances of Tiny Tiny RSS to this one to share Popular feeds. Link to this instance of Tiny Tiny RSS by using this URL:"
+#~ msgstr "您可以与其他的 Tiny Tiny RSS 实例相联，以共享最受欢迎的信息源列表。通过这个 URL 为本实例建立链接："
+
+#~ msgid "Last connected"
+#~ msgstr "上次连接"
+
+#~ msgid "Status"
+#~ msgstr "状态"
+
+#~ msgid "Stored feeds"
+#~ msgstr "保存的信息源"
+
+#~ msgid "Create link"
+#~ msgstr "创建链接"
+
+#~ msgid "Reset subscription? Tiny Tiny RSS will try to subscribe to the notification hub again on next feed update."
+#~ msgstr "重置订阅？ Tiny Tiny RSS 将会在下次信息源更新的时候尝试再次订阅信息提醒中心。"
+
 #, fuzzy
-msgid "Display article URL"
-msgstr "显示 URL"
+#~ msgid "Subscription reset."
+#~ msgstr "订阅信息源"
+
+#~ msgid "Link Instance"
+#~ msgstr "链接实例"
+
+#~ msgid "Edit Instance"
+#~ msgstr "编辑实例"
+
+#~ msgid "Remove selected instances?"
+#~ msgstr "移除选中的实例？"
+
+#, fuzzy
+#~ msgid "Removing selected instances..."
+#~ msgstr "移除选中的实例？"
+
+#~ msgid "No instances are selected."
+#~ msgstr "未选中任何实例。"
+
+#~ msgid "Please select only one instance."
+#~ msgstr "请仅选择一个实例。"
+
+#~ msgid "The error will be reported to the configured log destination."
+#~ msgstr "error会保存在配置的目标日志中"
+
+#, fuzzy
+#~ msgid "Are you sure to report this exception to tt-rss.org? The report will include information about your web browser and tt-rss configuration. Your IP will be saved in the database."
+#~ msgstr "您确认将该异常报告至 tt-rss.org ？报告将包含您的浏览器信息。您的IP将被存入数据库。"
+
+#, fuzzy
+#~ msgid "More..."
+#~ msgstr "更多……"
+
+#, fuzzy
+#~ msgid "Dismiss selected"
+#~ msgstr "不再显示所选的文章"
+
+#, fuzzy
+#~ msgid "Dismiss read"
+#~ msgstr "不再显示已读文章"
+
+#~ msgid "Session failed to validate (incorrect IP)"
+#~ msgstr "无法验证会话（IP 错误）"
+
+#~ msgid "Details"
+#~ msgstr "详细"
+
+#, fuzzy
+#~ msgid "No recent articles matching this filter have been found."
+#~ msgstr "本过滤器下没有匹配到文章。"
+
+#~ msgid "All done. %d out of %d articles imported."
+#~ msgstr "完成。已成功导入%d条文章，全部%d条文章。"
+
+#~ msgid "The document has incorrect format."
+#~ msgstr "文档格式错误。"
+
+#~ msgid "Import starred or shared items from Google Reader"
+#~ msgstr "从Google Reader中导入加星或共享条目。"
+
+#~ msgid "Paste your starred.json or shared.json into the form below."
+#~ msgstr "把你的starred.json 或 shared.json复制到下面的表格中。"
+
+#~ msgid "Import my Starred items"
+#~ msgstr "导入我的加星条目"
+
+#, fuzzy
+#~ msgid "Statistics"
+#~ msgstr "状态"
+
+#, fuzzy
+#~ msgid "Last matched articles"
+#~ msgstr "加星标文章"
+
+#, fuzzy
+#~ msgid "Clear database"
+#~ msgstr "清空信息源数据"
+
+#, fuzzy
+#~ msgid "Currently stored as: %s"
+#~ msgstr "当前服务器系统时间: %s (UTC)"
+
+#~ msgid "Google Reader Import"
+#~ msgstr "导入Google Reader"
+
+#, fuzzy
+#~ msgid "Please choose a file first."
+#~ msgstr "请先选择一个 OPML 文件。"
+
+#, fuzzy
+#~ msgid "Clear classifier database?"
+#~ msgstr "清空信息源数据"
+
+#~ msgid "with parameters:"
+#~ msgstr "指定参数："
+
+#~ msgid "Select by tags..."
+#~ msgstr "通过自定义标签选择"
+
+#~ msgid "Limit search to:"
+#~ msgstr "限制搜索条件："
+
+#~ msgid "This feed"
+#~ msgstr "本信息源"
+
+#~ msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
+#~ msgstr "使用复杂的表达式可能没有返回结果。"
+
+#~ msgid "Old password cannot be blank."
+#~ msgstr "请输入之前使用的密码。"
+
+#~ msgid "New password cannot be blank."
+#~ msgstr "请输入一个新密码。"
+
+#~ msgid "Entered passwords do not match."
+#~ msgstr "两次输入的密码不一致。"
+
+#~ msgid "Function not supported by authentication module."
+#~ msgstr "认证模块不支持该功能。"
+
+#~ msgid "Match:"
+#~ msgstr "匹配："
+
+#~ msgid "Any"
+#~ msgstr "任意"
+
+#, fuzzy
+#~ msgid "All tags."
+#~ msgstr "所有自定义标签"
+
+#~ msgid "Which Tags?"
+#~ msgstr "哪些自定义标签？"
+
+#~ msgid "Display entries"
+#~ msgstr "显示条目"
+
+#~ msgid "Select item(s) by tags"
+#~ msgstr "通过自定义标签选择"
+
+#, fuzzy
+#~ msgid "Unread First"
+#~ msgstr "未读优先"
+
+#~ msgid "Unknown option: %s"
+#~ msgstr "未知选项： %s"
 
 #~ msgid "New version of Tiny Tiny RSS is available!"
 #~ msgstr "Tiny Tiny RSS 有新版本啦！"
@@ -3788,9 +3934,6 @@ msgstr "显示 URL"
 #~ msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
 #~ msgstr "请先备份你的tt-rss目录。 敲击'yes'来继续下一步。"
 
-#~ msgid "New version available!"
-#~ msgstr "有可用的新版本啦！"
-
 #~ msgid "From:"
 #~ msgstr "发信人："
 
@@ -4072,9 +4215,6 @@ msgstr "显示 URL"
 #~ msgid "Mark articles below/above active one as read"
 #~ msgstr "将当前项以下/以上的文章标记为已读"
 
-#~ msgid "Scroll article content"
-#~ msgstr "滚动文章内容"
-
 #~ msgid "Other actions"
 #~ msgstr "其他动作"