X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=locale%2Fzh_CN%2FLC_MESSAGES%2Fmessages.po;h=005861802736b7dc5ca4206d8885194822346401;hb=392989678f633acb0d18f0dc7a980cac55aaee5b;hp=f28cddcec2544666d7844f93dbc810ae601b59bb;hpb=8702ded6a1d5780903c5344b1240707e498bda7a;p=tt-rss.git

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index f28cddce..00586180 100644
--- 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: 2018-04-28 17:03+0300\n"
+"POT-Creation-Date: 2018-09-07 10:24+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"
@@ -170,13 +170,13 @@ msgstr "找不到信息源。"
 msgid "Plugin not found"
 msgstr "未找到用户"
 
-#: index.php:153
-#: index.php:169
-#: index.php:287
-#: prefs.php:122
+#: index.php:151
+#: index.php:167
+#: index.php:285
+#: prefs.php:120
 #: classes/backend.php:5
 #: classes/pref/labels.php:294
-#: classes/pref/feeds.php:1238
+#: classes/pref/feeds.php:1230
 #: classes/pref/filters.php:822
 #: js/feedlist.js:148
 #: js/feedlist.js:491
@@ -185,219 +185,219 @@ msgstr "未找到用户"
 #: js/functions.js:1336
 #: js/prefs.js:562
 #: js/prefs.js:754
-#: js/prefs.js:1484
-#: js/prefs.js:1499
-#: js/tt-rss.js:546
+#: js/prefs.js:1488
+#: js/prefs.js:1503
+#: js/tt-rss.js:547
 #: js/viewfeed.js:1180
 #: plugins/import_export/import_export.js:17
 #: js/functions.js:565
-#: js/prefs.js:1196
-#: js/prefs.js:1249
-#: js/prefs.js:1288
-#: js/prefs.js:1301
-#: js/prefs.js:1312
-#: js/prefs.js:1327
-#: js/tt-rss.js:563
+#: js/prefs.js:1200
+#: js/prefs.js:1253
+#: js/prefs.js:1292
+#: js/prefs.js:1305
+#: js/prefs.js:1316
+#: js/prefs.js:1331
+#: js/tt-rss.js:564
 #: js/viewfeed.js:760
 msgid "Loading, please wait..."
 msgstr "读取中，请稍候……"
 
-#: index.php:191
+#: index.php:189
 msgid "Show articles"
 msgstr "显示文章"
 
-#: index.php:194
+#: index.php:192
 msgid "Adaptive"
 msgstr "自动适应"
 
-#: index.php:195
+#: index.php:193
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:196
-#: include/functions.php:1198
+#: index.php:194
+#: include/functions.php:1227
 #: classes/feeds.php:110
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:197
-#: include/functions.php:1199
+#: index.php:195
+#: include/functions.php:1228
 #: classes/feeds.php:111
 msgid "Published"
 msgstr "已发布"
 
-#: index.php:198
+#: index.php:196
 #: classes/feeds.php:103
 #: classes/feeds.php:109
 msgid "Unread"
 msgstr "未读"
 
-#: index.php:199
+#: index.php:197
 msgid "With Note"
 msgstr "笔记"
 
-#: index.php:200
+#: index.php:198
 msgid "Ignore Scoring"
 msgstr "忽略评分"
 
-#: index.php:203
+#: index.php:201
 msgid "Sort articles"
 msgstr "排序文章"
 
-#: index.php:206
+#: index.php:204
 msgid "Default"
 msgstr "默认"
 
-#: index.php:207
+#: index.php:205
 msgid "Newest first"
 msgstr "最新优先"
 
-#: index.php:208
+#: index.php:206
 msgid "Oldest first"
 msgstr "最早优先"
 
-#: index.php:209
+#: index.php:207
 msgid "Title"
 msgstr "标题"
 
-#: index.php:213
-#: index.php:253
-#: include/functions.php:1186
+#: index.php:211
+#: index.php:251
+#: include/functions.php:1215
 #: classes/feeds.php:115
-#: js/FeedTree.js:138
-#: js/FeedTree.js:166
+#: js/FeedTree.js:41
+#: js/FeedTree.js:69
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: index.php:216
+#: index.php:214
 msgid "Older than one day"
 msgstr "一天前"
 
-#: index.php:219
+#: index.php:217
 msgid "Older than one week"
 msgstr "一周前"
 
-#: index.php:222
+#: index.php:220
 msgid "Older than two weeks"
 msgstr "两周前"
 
-#: index.php:238
+#: index.php:236
 msgid "Communication problem with server."
 msgstr "连接服务器出错."
 
-#: index.php:243
+#: index.php:241
 msgid "Actions..."
 msgstr "操作"
 
-#: index.php:245
+#: index.php:243
 #, fuzzy
 msgid "Preferences..."
 msgstr "偏好设置"
 
-#: index.php:246
+#: index.php:244
 msgid "Search..."
 msgstr "搜索"
 
-#: index.php:247
+#: index.php:245
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:248
+#: index.php:246
 #: classes/handler/public.php:551
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
-#: index.php:249
+#: index.php:247
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
-#: index.php:250
+#: index.php:248
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:251
-#: classes/pref/feeds.php:778
-#: classes/pref/feeds.php:1211
-#: js/PrefFeedTree.js:80
+#: index.php:249
+#: classes/pref/feeds.php:770
+#: classes/pref/feeds.php:1203
+#: js/PrefFeedTree.js:61
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:252
+#: index.php:250
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:254
+#: index.php:252
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:255
+#: index.php:253
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:256
-#: include/functions.php:1172
+#: index.php:254
+#: include/functions.php:1201
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "切换宽屏模式"
 
-#: index.php:257
+#: index.php:255
 msgid "Create label..."
 msgstr "创建预定义标签"
 
-#: index.php:258
+#: index.php:256
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: index.php:259
+#: index.php:257
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:268
+#: index.php:266
 msgid "Logout"
 msgstr "注销"
 
-#: index.php:274
+#: index.php:272
 msgid "Updates are available from Git."
 msgstr ""
 
 #: prefs.php:33
-#: prefs.php:140
-#: include/functions.php:1201
+#: prefs.php:138
+#: include/functions.php:1230
 #: classes/pref/prefs.php:425
 msgid "Preferences"
 msgstr "偏好设置"
 
-#: prefs.php:131
+#: prefs.php:129
 msgid "Keyboard shortcuts"
 msgstr "快捷键"
 
-#: prefs.php:132
+#: prefs.php:130
 msgid "Exit preferences"
 msgstr "退出偏好设置"
 
-#: prefs.php:143
+#: prefs.php:141
 #: classes/pref/feeds.php:114
-#: classes/pref/feeds.php:1146
-#: classes/pref/feeds.php:1200
+#: classes/pref/feeds.php:1138
+#: classes/pref/feeds.php:1192
 msgid "Feeds"
 msgstr "信息源"
 
-#: prefs.php:146
+#: prefs.php:144
 #: classes/pref/filters.php:276
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:149
+#: prefs.php:147
 #: classes/pref/labels.php:94
-#: classes/feeds.php:1708
+#: classes/feeds.php:1710
 msgid "Labels"
 msgstr "预定义标签"
 
-#: prefs.php:153
+#: prefs.php:151
 msgid "Users"
 msgstr "用户"
 
-#: prefs.php:156
+#: prefs.php:154
 msgid "System"
 msgstr "系统"
 
@@ -474,7 +474,7 @@ msgstr "帐号创建成功。"
 msgid "New user registrations are currently closed."
 msgstr "用户注册功能目前没有启用。"
 
-#: update.php:67
+#: update.php:66
 #, fuzzy
 msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据更新脚本。"
@@ -491,7 +491,7 @@ msgstr "全部信息源"
 #: classes/opml.php:512
 #: classes/digest.php:120
 #: classes/pref/feeds.php:233
-#: classes/feeds.php:1720
+#: classes/feeds.php:1722
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -505,305 +505,305 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:954
+#: include/functions.php:983
 #, php-format
 msgid "%d min"
 msgstr ""
 
-#: include/functions.php:1148
+#: include/functions.php:1177
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1149
+#: include/functions.php:1178
 #, fuzzy
 msgid "Open next feed"
 msgstr "显示下一个信息源"
 
-#: include/functions.php:1150
+#: include/functions.php:1179
 msgid "Open previous feed"
 msgstr "显示前一个信息源"
 
-#: include/functions.php:1151
+#: include/functions.php:1180
 #, fuzzy
 msgid "Open next article"
 msgstr "显示下一篇文章"
 
-#: include/functions.php:1152
+#: include/functions.php:1181
 #, fuzzy
 msgid "Open previous article"
 msgstr "显示前一篇文章"
 
-#: include/functions.php:1153
+#: include/functions.php:1182
 msgid "Open next article (don't scroll long articles)"
 msgstr "显示下一篇文章 (不要在长文章中滚动)"
 
-#: include/functions.php:1154
+#: include/functions.php:1183
 msgid "Open previous article (don't scroll long articles)"
 msgstr "显示前一篇文章 (不要在长文章中滚动)"
 
-#: include/functions.php:1155
+#: include/functions.php:1184
 msgid "Move to next article (don't expand or mark read)"
 msgstr "跳转至下一篇文章 (不要展开或标记为已读)"
 
-#: include/functions.php:1156
+#: include/functions.php:1185
 msgid "Move to previous article (don't expand or mark read)"
 msgstr "跳转至前一篇文章 (不要展开或标记为已读)"
 
-#: include/functions.php:1157
+#: include/functions.php:1186
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1158
+#: include/functions.php:1187
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1159
+#: include/functions.php:1188
 #: js/viewfeed.js:1695
 msgid "Toggle starred"
-msgstr "锁定加星标的项"
+msgstr "加星此文章"
 
-#: include/functions.php:1160
+#: include/functions.php:1189
 #: js/viewfeed.js:1707
 msgid "Toggle published"
-msgstr "锁定发布的项"
+msgstr "发布此文章"
 
-#: include/functions.php:1161
+#: include/functions.php:1190
 #: js/viewfeed.js:1682
 msgid "Toggle unread"
-msgstr "锁定未读项"
+msgstr "标记为未读"
 
-#: include/functions.php:1162
+#: include/functions.php:1191
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1163
+#: include/functions.php:1192
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1164
+#: include/functions.php:1193
 #: js/viewfeed.js:1728
 msgid "Mark below as read"
 msgstr "将下面文章标为已读"
 
-#: include/functions.php:1165
+#: include/functions.php:1194
 #: js/viewfeed.js:1721
 msgid "Mark above as read"
 msgstr "将上面文章标为已读"
 
-#: include/functions.php:1166
+#: include/functions.php:1195
 #, fuzzy
 msgid "Scroll down"
 msgstr "向下滚动"
 
-#: include/functions.php:1167
+#: include/functions.php:1196
 msgid "Scroll up"
 msgstr "向上滚动"
 
-#: include/functions.php:1168
+#: include/functions.php:1197
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1169
+#: include/functions.php:1198
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1170
+#: include/functions.php:1199
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "关闭/折叠文章"
 
-#: include/functions.php:1171
+#: include/functions.php:1200
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
-msgstr "切换文章展开 (连续模式)"
+msgstr "切换文章展开 (合并模式)"
 
-#: include/functions.php:1173
+#: include/functions.php:1202
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "切换嵌入模式"
 
-#: include/functions.php:1174
+#: include/functions.php:1203
 #, fuzzy
 msgid "Article selection"
 msgstr "文章选择"
 
-#: include/functions.php:1175
+#: include/functions.php:1204
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1176
+#: include/functions.php:1205
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1177
+#: include/functions.php:1206
 #, fuzzy
 msgid "Select starred"
 msgstr "选择加星标文章"
 
-#: include/functions.php:1178
+#: include/functions.php:1207
 #, fuzzy
 msgid "Select published"
 msgstr "选择已发布文章"
 
-#: include/functions.php:1179
+#: include/functions.php:1208
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1180
+#: include/functions.php:1209
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1181
-#: classes/pref/feeds.php:524
-#: classes/pref/feeds.php:802
+#: include/functions.php:1210
+#: classes/pref/feeds.php:522
+#: classes/pref/feeds.php:794
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1182
+#: include/functions.php:1211
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新当前信息源"
 
-#: include/functions.php:1183
+#: include/functions.php:1212
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "显示/隐藏 已读信息"
 
-#: include/functions.php:1184
-#: classes/pref/feeds.php:1203
+#: include/functions.php:1213
+#: classes/pref/feeds.php:1195
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1185
-#: js/FeedTree.js:145
-#: js/PrefFeedTree.js:74
+#: include/functions.php:1214
+#: js/FeedTree.js:48
+#: js/PrefFeedTree.js:55
 #: js/viewfeed.js:1846
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1187
+#: include/functions.php:1216
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1188
+#: include/functions.php:1217
 msgid "Toggle headline grouping"
 msgstr ""
 
-#: include/functions.php:1189
+#: include/functions.php:1218
 #, fuzzy
 msgid "Debug feed update"
 msgstr "调试信息源更新"
 
-#: include/functions.php:1190
+#: include/functions.php:1219
 #, fuzzy
 msgid "Debug viewfeed()"
-msgstr "调试信息源更新"
+msgstr "调试 viewfeed()"
 
-#: include/functions.php:1191
-#: js/FeedTree.js:194
+#: include/functions.php:1220
+#: js/FeedTree.js:97
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1192
+#: include/functions.php:1221
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "展开/折叠 当前分类"
 
-#: include/functions.php:1193
+#: include/functions.php:1222
 #, fuzzy
 msgid "Toggle combined mode"
-msgstr "切换连续模式"
+msgstr "切换合并模式"
 
-#: include/functions.php:1194
+#: include/functions.php:1223
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
-msgstr "切换连续模式中的自动展开功能"
+msgstr "切换合并模式中的自动展开功能"
 
-#: include/functions.php:1195
+#: include/functions.php:1224
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1196
-#: classes/feeds.php:1581
+#: include/functions.php:1225
+#: classes/feeds.php:1583
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1197
+#: include/functions.php:1226
 msgid "Fresh"
 msgstr "最新的"
 
-#: include/functions.php:1200
-#: js/tt-rss.js:490
-#: js/tt-rss.js:659
+#: include/functions.php:1229
+#: js/tt-rss.js:491
+#: js/tt-rss.js:660
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1202
+#: include/functions.php:1231
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1203
+#: include/functions.php:1232
 #: classes/pref/labels.php:279
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1204
+#: include/functions.php:1233
 #: classes/pref/filters.php:801
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1205
+#: include/functions.php:1234
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "收起侧边栏"
 
-#: include/functions.php:1206
+#: include/functions.php:1235
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示帮助对话框"
 
-#: include/functions.php:2507
+#: include/functions.php:2582
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "没有错误，文件上传成功"
 
-#: include/functions.php:2508
+#: include/functions.php:2583
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "上传的文件大小超过了 php.ini 中定义的限制 upload_max_filesize"
 
-#: include/functions.php:2509
+#: include/functions.php:2584
 msgid "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form"
-msgstr ""
+msgstr "上传的文件大小超过了 HTML form 中定义的限制 MAX_FILE_SIZE"
 
-#: include/functions.php:2510
+#: include/functions.php:2585
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "上传文件中断"
 
-#: include/functions.php:2511
+#: include/functions.php:2586
 #, fuzzy
 msgid "No file was uploaded"
 msgstr "没有文件上传。"
 
-#: include/functions.php:2512
+#: include/functions.php:2587
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "无法找到临时文件夹"
 
-#: include/functions.php:2513
+#: include/functions.php:2588
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "文件写入硬盘失败"
 
-#: include/functions.php:2514
+#: include/functions.php:2589
 msgid "A PHP extension stopped the file upload."
-msgstr ""
+msgstr "文件上传被某个 PHP 扩展终止"
 
 #: include/login_form.php:107
 #: classes/handler/public.php:446
@@ -827,7 +827,7 @@ msgstr "偏好："
 
 #: include/login_form.php:133
 #: classes/handler/public.php:252
-#: classes/pref/prefs.php:1043
+#: classes/pref/prefs.php:1037
 #: classes/rpc.php:69
 msgid "Default profile"
 msgstr "默认偏好设置"
@@ -875,14 +875,14 @@ msgstr "本文的标签，请用逗号分开："
 #: classes/article.php:236
 #: classes/pref/labels.php:82
 #: classes/pref/users.php:103
-#: classes/pref/feeds.php:782
-#: classes/pref/feeds.php:922
+#: classes/pref/feeds.php:774
+#: classes/pref/feeds.php:914
 #: classes/pref/filters.php:525
-#: classes/pref/prefs.php:988
+#: classes/pref/prefs.php:982
 #: plugins/nsfw/init.php:85
 #: plugins/note/init.php:58
-#: plugins/af_readability/init.php:69
-#: plugins/af_redditimgur/init.php:62
+#: plugins/af_readability/init.php:80
+#: plugins/af_redditimgur/init.php:66
 #: plugins/af_psql_trgm/init.php:188
 #: plugins/mail/init.php:65
 #: plugins/af_zz_imgproxy/init.php:238
@@ -894,25 +894,25 @@ msgstr "保存"
 #: classes/handler/public.php:457
 #: classes/pref/labels.php:84
 #: classes/pref/users.php:105
-#: classes/pref/feeds.php:783
-#: classes/pref/feeds.php:925
-#: classes/pref/feeds.php:1680
+#: classes/pref/feeds.php:775
+#: classes/pref/feeds.php:917
+#: classes/pref/feeds.php:1672
 #: classes/pref/filters.php:528
 #: classes/pref/filters.php:945
 #: classes/pref/filters.php:1022
 #: classes/pref/filters.php:1115
-#: classes/pref/prefs.php:990
-#: classes/feeds.php:1035
-#: classes/feeds.php:1087
-#: classes/feeds.php:1126
+#: classes/pref/prefs.php:984
+#: classes/feeds.php:1037
+#: classes/feeds.php:1089
+#: classes/feeds.php:1128
 #: plugins/note/init.php:60
 #: plugins/mail/init.php:179
 msgid "Cancel"
 msgstr "取消"
 
 #: classes/article.php:337
-#: classes/article.php:682
-#: classes/article.php:837
+#: classes/article.php:720
+#: classes/article.php:875
 msgid "no tags"
 msgstr "无标签"
 
@@ -925,40 +925,40 @@ msgstr "未知类型"
 msgid "Attachments"
 msgstr "附件："
 
-#: classes/article.php:624
-#: classes/feeds.php:659
+#: classes/article.php:626
+#: classes/feeds.php:661
 #, fuzzy
 msgid "comment"
 msgid_plural "comments"
 msgstr[0] "评论些什么？"
 
-#: classes/article.php:628
-#: classes/feeds.php:663
+#: classes/article.php:630
+#: classes/feeds.php:665
 #, fuzzy
 msgid "comments"
 msgstr "评论些什么？"
 
-#: classes/article.php:651
+#: classes/article.php:689
 msgid " - "
 msgstr " - "
 
-#: classes/article.php:692
-#: classes/feeds.php:645
+#: classes/article.php:730
+#: classes/feeds.php:647
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: classes/article.php:725
-#: classes/feeds.php:600
+#: classes/article.php:763
+#: classes/feeds.php:602
 msgid "Originally from:"
 msgstr "来源："
 
-#: classes/article.php:736
-#: classes/pref/feeds.php:541
-#: classes/feeds.php:611
+#: classes/article.php:774
+#: classes/pref/feeds.php:539
+#: classes/feeds.php:613
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: classes/article.php:773
+#: classes/article.php:811
 #: classes/backend.php:103
 #: classes/dlg.php:33
 #: classes/dlg.php:56
@@ -966,18 +966,18 @@ msgstr "信息源 URL"
 #: classes/dlg.php:154
 #: classes/dlg.php:181
 #: classes/dlg.php:197
-#: classes/pref/feeds.php:1474
-#: classes/pref/feeds.php:1541
+#: classes/pref/feeds.php:1466
+#: classes/pref/feeds.php:1533
 #: classes/pref/filters.php:208
-#: classes/pref/prefs.php:1105
+#: classes/pref/prefs.php:1099
 #: plugins/af_psql_trgm/init.php:109
-#: plugins/import_export/init.php:425
-#: plugins/import_export/init.php:471
+#: plugins/import_export/init.php:446
+#: plugins/import_export/init.php:490
 #: plugins/share/init.php:128
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: classes/article.php:875
+#: classes/article.php:913
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
@@ -1035,13 +1035,13 @@ msgid "Upload failed with error code %d"
 msgstr "上传错误，错误代码：%d"
 
 #: classes/opml.php:570
-#: plugins/import_export/init.php:452
+#: plugins/import_export/init.php:471
 #, fuzzy
 msgid "Unable to move uploaded file."
 msgstr "无法移动已上传文件。"
 
 #: classes/opml.php:574
-#: plugins/import_export/init.php:456
+#: plugins/import_export/init.php:475
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传 OPML 文件。"
 
@@ -1126,7 +1126,7 @@ msgid "Title:"
 msgstr "标题"
 
 #: classes/handler/public.php:397
-#: classes/pref/feeds.php:539
+#: classes/pref/feeds.php:537
 msgid "URL:"
 msgstr "URL："
 
@@ -1265,54 +1265,54 @@ msgstr "创建预定义标签 <b>%s</b>"
 
 #: classes/pref/labels.php:270
 #: classes/pref/users.php:356
-#: classes/pref/feeds.php:1191
-#: classes/pref/feeds.php:1422
-#: classes/pref/feeds.php:1487
+#: classes/pref/feeds.php:1183
+#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1479
 #: classes/pref/filters.php:388
 #: classes/pref/filters.php:446
 #: classes/pref/filters.php:792
 #: classes/pref/filters.php:875
 #: classes/pref/filters.php:902
-#: classes/pref/prefs.php:999
+#: classes/pref/prefs.php:993
 msgid "Select"
 msgstr "选择"
 
 #: classes/pref/labels.php:273
 #: classes/pref/users.php:359
-#: classes/pref/feeds.php:1194
-#: classes/pref/feeds.php:1425
-#: classes/pref/feeds.php:1490
+#: classes/pref/feeds.php:1186
+#: classes/pref/feeds.php:1417
+#: classes/pref/feeds.php:1482
 #: classes/pref/filters.php:391
 #: classes/pref/filters.php:449
 #: classes/pref/filters.php:795
 #: classes/pref/filters.php:878
 #: classes/pref/filters.php:905
-#: classes/pref/prefs.php:1002
+#: classes/pref/prefs.php:996
 #: classes/feeds.php:102
 msgid "All"
 msgstr "全部"
 
 #: classes/pref/labels.php:275
 #: classes/pref/users.php:361
-#: classes/pref/feeds.php:1196
-#: classes/pref/feeds.php:1427
-#: classes/pref/feeds.php:1492
+#: classes/pref/feeds.php:1188
+#: classes/pref/feeds.php:1419
+#: classes/pref/feeds.php:1484
 #: classes/pref/filters.php:393
 #: classes/pref/filters.php:451
 #: classes/pref/filters.php:797
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:907
-#: classes/pref/prefs.php:1004
+#: classes/pref/prefs.php:998
 #: classes/feeds.php:105
 msgid "None"
 msgstr "无"
 
 #: classes/pref/labels.php:282
 #: classes/pref/users.php:370
-#: classes/pref/feeds.php:760
+#: classes/pref/feeds.php:752
 #: classes/pref/filters.php:518
 #: classes/pref/filters.php:814
-#: classes/feeds.php:1086
+#: classes/feeds.php:1088
 msgid "Remove"
 msgstr "移除"
 
@@ -1331,9 +1331,9 @@ msgid "Edit user"
 msgstr "编辑过滤器"
 
 #: classes/pref/users.php:61
-#: classes/pref/feeds.php:630
-#: classes/pref/feeds.php:857
-#: classes/feeds.php:1007
+#: classes/pref/feeds.php:622
+#: classes/pref/feeds.php:849
+#: classes/feeds.php:1009
 msgid "Authentication"
 msgstr "登录认证"
 
@@ -1342,8 +1342,8 @@ msgid "Access level: "
 msgstr "访问级别："
 
 #: classes/pref/users.php:82
-#: classes/pref/feeds.php:656
-#: classes/pref/feeds.php:875
+#: classes/pref/feeds.php:648
+#: classes/pref/feeds.php:867
 msgid "Options"
 msgstr "选项"
 
@@ -1409,10 +1409,10 @@ msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
 #: classes/pref/users.php:346
-#: classes/pref/feeds.php:1187
+#: classes/pref/feeds.php:1179
 #: classes/pref/filters.php:788
-#: classes/feeds.php:1057
-#: classes/feeds.php:1125
+#: classes/feeds.php:1059
+#: classes/feeds.php:1127
 #: js/tt-rss.js:165
 msgid "Search"
 msgstr "搜索"
@@ -1427,10 +1427,10 @@ msgid "Edit"
 msgstr "编辑"
 
 #: classes/pref/users.php:404
-#: classes/pref/feeds.php:634
-#: classes/pref/feeds.php:861
-#: classes/pref/feeds.php:1657
-#: classes/feeds.php:1011
+#: classes/pref/feeds.php:626
+#: classes/pref/feeds.php:853
+#: classes/pref/feeds.php:1649
+#: classes/feeds.php:1013
 msgid "Login"
 msgstr "登陆"
 
@@ -1503,243 +1503,245 @@ msgstr[0] "(%d 个信息源)"
 msgid "General"
 msgstr "通用"
 
-#: classes/pref/feeds.php:530
+#: classes/pref/feeds.php:528
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref/feeds.php:562
-#: classes/pref/feeds.php:809
-#: classes/pref/feeds.php:1643
-#: classes/feeds.php:987
+#: classes/pref/feeds.php:560
+#: classes/pref/feeds.php:801
+#: classes/pref/feeds.php:1635
+#: classes/feeds.php:989
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: classes/pref/feeds.php:574
+#: classes/pref/feeds.php:572
 #, fuzzy
 msgid "Site URL:"
 msgstr "全部文章"
 
-#: classes/pref/feeds.php:576
+#: classes/pref/feeds.php:574
 #, fuzzy
 msgid "Site URL"
 msgstr "信息源 URL"
 
-#: classes/pref/feeds.php:587
-#: classes/pref/feeds.php:823
+#: classes/pref/feeds.php:585
+#: classes/pref/feeds.php:815
 #, fuzzy
 msgid "Language:"
 msgstr "语言："
 
-#: classes/pref/feeds.php:594
-#: classes/pref/feeds.php:832
+#: classes/pref/feeds.php:592
+#: classes/pref/feeds.php:824
 msgid "Update"
 msgstr "更新列表"
 
-#: classes/pref/feeds.php:609
-#: classes/pref/feeds.php:848
+#: classes/pref/feeds.php:607
+#: classes/pref/feeds.php:840
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:640
-#: classes/pref/feeds.php:869
-#: classes/pref/feeds.php:1660
+#: classes/pref/feeds.php:632
+#: classes/pref/feeds.php:861
+#: classes/pref/feeds.php:1652
 #: classes/pref/prefs.php:243
-#: classes/feeds.php:1015
+#: classes/feeds.php:1017
 msgid "Password"
 msgstr "密码"
 
-#: classes/pref/feeds.php:644
+#: classes/pref/feeds.php:636
 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/feeds.php:654
-#: classes/feeds.php:1026
+#: classes/pref/feeds.php:646
+#: classes/feeds.php:1028
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/pref/feeds.php:670
-#: classes/pref/feeds.php:879
+#: classes/pref/feeds.php:662
+#: classes/pref/feeds.php:871
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:682
-#: classes/pref/feeds.php:885
+#: classes/pref/feeds.php:674
+#: classes/pref/feeds.php:877
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:695
-#: classes/pref/feeds.php:891
+#: classes/pref/feeds.php:687
+#: classes/pref/feeds.php:883
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:708
-#: classes/pref/feeds.php:899
-msgid "Do not embed images"
+#: classes/pref/feeds.php:700
+#: classes/pref/feeds.php:891
+#, fuzzy
+msgid "Do not embed media"
 msgstr "不要嵌入图片"
 
-#: classes/pref/feeds.php:721
-#: classes/pref/feeds.php:907
+#: classes/pref/feeds.php:713
+#: classes/pref/feeds.php:899
 msgid "Cache media"
 msgstr ""
 
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:913
+#: classes/pref/feeds.php:725
+#: classes/pref/feeds.php:905
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:737
+#: classes/pref/feeds.php:729
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:751
-#: classes/pref/feeds.php:1292
+#: classes/pref/feeds.php:743
+#: classes/pref/feeds.php:1284
+#: plugins/import_export/init.php:71
 #, fuzzy
 msgid "Choose file..."
 msgstr "创建过滤器"
 
-#: classes/pref/feeds.php:758
+#: classes/pref/feeds.php:750
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:765
+#: classes/pref/feeds.php:757
 #: classes/pref/prefs.php:679
 msgid "Plugins"
 msgstr "插件"
 
-#: classes/pref/feeds.php:1162
+#: classes/pref/feeds.php:1154
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1169
+#: classes/pref/feeds.php:1161
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1205
+#: classes/pref/feeds.php:1197
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1207
-#: classes/pref/feeds.php:1221
+#: classes/pref/feeds.php:1199
+#: classes/pref/feeds.php:1213
 #: classes/pref/filters.php:810
 msgid "Reset sort order"
 msgstr "重置排序"
 
-#: classes/pref/feeds.php:1209
-#: js/prefs.js:1458
+#: classes/pref/feeds.php:1201
+#: js/prefs.js:1462
 msgid "Batch subscribe"
 msgstr "批量订阅"
 
-#: classes/pref/feeds.php:1216
+#: classes/pref/feeds.php:1208
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1219
+#: classes/pref/feeds.php:1211
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1223
+#: classes/pref/feeds.php:1215
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源"
 
-#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1272
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1282
+#: classes/pref/feeds.php:1274
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr "使用OPML你可以导出或导入信息源feeds列表、过滤器、标签以及设置。"
 
-#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:1275
 msgid "Only main settings profile can be migrated using OPML."
 msgstr "只有主要设置能够通过OPML文件来进行迁移。"
 
-#: classes/pref/feeds.php:1298
+#: classes/pref/feeds.php:1290
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1296
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1306
+#: classes/pref/feeds.php:1298
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1310
+#: classes/pref/feeds.php:1302
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1314
+#: classes/pref/feeds.php:1306
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1310
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1319
+#: classes/pref/feeds.php:1311
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1326
+#: classes/pref/feeds.php:1318
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1328
+#: classes/pref/feeds.php:1320
 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/feeds.php:1335
+#: classes/pref/feeds.php:1327
 #: classes/feeds.php:54
 #: classes/feeds.php:140
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
-#: classes/pref/feeds.php:1336
+#: classes/pref/feeds.php:1328
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1339
+#: classes/pref/feeds.php:1331
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1418
+#: classes/pref/feeds.php:1410
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1452
-#: classes/pref/feeds.php:1517
+#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1509
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1470
-#: classes/pref/feeds.php:1537
+#: classes/pref/feeds.php:1462
+#: classes/pref/feeds.php:1529
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1640
+#: classes/pref/feeds.php:1632
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr "每行添加一条RSS源"
 
-#: classes/pref/feeds.php:1649
+#: classes/pref/feeds.php:1641
 msgid "Feeds to subscribe, One per line"
 msgstr "所有将订阅的Feeds, 每行一条"
 
-#: classes/pref/feeds.php:1672
+#: classes/pref/feeds.php:1664
 msgid "Feeds require authentication."
 msgstr "Feed需要登录认证。"
 
-#: classes/pref/feeds.php:1679
-#: classes/feeds.php:1029
-#: classes/feeds.php:1085
+#: classes/pref/feeds.php:1671
+#: classes/feeds.php:1031
+#: classes/feeds.php:1087
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -1810,7 +1812,7 @@ msgstr "测试"
 
 #: classes/pref/filters.php:804
 msgid "Combine"
-msgstr "连续"
+msgstr "合并"
 
 #: classes/pref/filters.php:942
 msgid "Create"
@@ -1829,14 +1831,14 @@ msgid "on field"
 msgstr "on field"
 
 #: classes/pref/filters.php:1001
-#: js/PrefFilterTree.js:64
+#: js/PrefFilterTree.js:43
 msgid "in"
 msgstr "在"
 
 #: classes/pref/filters.php:1014
 #, fuzzy
 msgid "Wiki: Filters"
-msgstr "过滤器"
+msgstr "Wiki: 过滤器"
 
 #: classes/pref/filters.php:1019
 #, fuzzy
@@ -1850,12 +1852,12 @@ msgstr "添加规则"
 
 #: classes/pref/filters.php:1042
 msgid "Perform Action"
-msgstr "执行动作"
+msgstr "执行操作"
 
 #: classes/pref/filters.php:1093
 #, fuzzy
 msgid "No actions available"
-msgstr "有可用的新版本啦！"
+msgstr "无操作可用"
 
 #: classes/pref/filters.php:1112
 #, fuzzy
@@ -1871,13 +1873,13 @@ msgstr "添加操作"
 #: classes/pref/filters.php:1139
 #, fuzzy
 msgid "[No caption]"
-msgstr "[无标题]"
+msgstr "[无题注]"
 
 #: classes/pref/filters.php:1141
 #, php-format
 msgid "%s (%d rule)"
 msgid_plural "%s (%d rules)"
-msgstr[0] ""
+msgstr[0] "%s (%d 规则)"
 
 #: classes/pref/filters.php:1155
 #, fuzzy
@@ -1905,7 +1907,7 @@ msgstr "摘要"
 #: classes/pref/prefs.php:25
 #, fuzzy
 msgid "Allow duplicate articles"
-msgstr "允许重复文章"
+msgstr "允许重复的文章"
 
 #: classes/pref/prefs.php:26
 msgid "Blacklisted tags"
@@ -1914,7 +1916,7 @@ msgstr "被列入黑名单的标签"
 #: classes/pref/prefs.php:26
 #, fuzzy
 msgid "When auto-detecting tags in articles these tags will not be applied (comma-separated list)."
-msgstr "自动检测文章标签时，这些标签将被忽略（半角逗号隔开的列表）。"
+msgstr "自动检测文章标签时，忽略这些标签（多个标签以半角逗号分隔）。"
 
 #: classes/pref/prefs.php:27
 msgid "Automatically mark articles as read"
@@ -1927,7 +1929,7 @@ msgstr "在滚动页面的同时自动将文章标记为已读。"
 
 #: classes/pref/prefs.php:28
 msgid "Automatically expand articles in combined mode"
-msgstr "在连续模式下自动展开文章"
+msgstr "在合并模式下自动展开文章"
 
 #: classes/pref/prefs.php:29
 msgid "Combined feed display"
@@ -1952,7 +1954,7 @@ msgstr "默认更新间隔"
 
 #: classes/pref/prefs.php:32
 msgid "Shortest interval at which a feed will be checked for updates regardless of update method"
-msgstr ""
+msgstr "全局最短更新间隔，适用于所有更新方法"
 
 #: classes/pref/prefs.php:33
 msgid "Mark articles in e-mail digest as read"
@@ -1978,11 +1980,11 @@ msgstr "用户所在时区"
 
 #: classes/pref/prefs.php:36
 msgid "Enable API access"
-msgstr "启用API访问"
+msgstr "启用 API 访问"
 
 #: classes/pref/prefs.php:36
 msgid "Allows external clients to access this account through the API"
-msgstr "允许外部客户端通过API来访问该账户"
+msgstr "允许外部客户端通过 API 来访问该账户"
 
 #: classes/pref/prefs.php:37
 msgid "Enable feed categories"
@@ -2012,7 +2014,7 @@ 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> 函数相同."
+msgstr "所使用的语法与 PHP <a href='http://php.net/manual/function.date.php'>date()</a> 函数相同."
 
 #: classes/pref/prefs.php:43
 msgid "On catchup show next feed"
@@ -2061,7 +2063,7 @@ msgstr "在 tt-rss 处注册您的 SSL 证书"
 
 #: classes/pref/prefs.php:51
 #, fuzzy
-msgid "Do not embed images in articles"
+msgid "Do not embed media in articles"
 msgstr "不要显示文章中的图片"
 
 #: classes/pref/prefs.php:52
@@ -2073,7 +2075,7 @@ msgid "Strip all but most common HTML tags when reading articles."
 msgstr "仅加载几个最常用的 HTML 标签"
 
 #: classes/pref/prefs.php:53
-#: js/prefs.js:1420
+#: js/prefs.js:1424
 msgid "Customize stylesheet"
 msgstr "自定义样式"
 
@@ -2105,7 +2107,7 @@ msgstr "主题："
 
 #: classes/pref/prefs.php:57
 msgid "Select one of the available CSS themes"
-msgstr "选择一个可用的CSS主题"
+msgstr "选择一个可用的 CSS 主题"
 
 #: classes/pref/prefs.php:126
 msgid "The configuration was saved."
@@ -2122,7 +2124,7 @@ msgstr "你的偏好设置已经重置为默认值。"
 #: classes/pref/prefs.php:179
 #, fuzzy
 msgid "Personal data / Authentication"
-msgstr "登录密码"
+msgstr "个人数据 / 用户认证"
 
 #: classes/pref/prefs.php:199
 msgid "Personal data"
@@ -2146,7 +2148,7 @@ msgstr "保存信息"
 
 #: classes/pref/prefs.php:279
 msgid "Changing your current password will disable OTP."
-msgstr "更改当前密码会使OTP动态口令失效。"
+msgstr "更改当前密码会使 OTP 动态口令失效。"
 
 #: classes/pref/prefs.php:284
 msgid "Old password"
@@ -2181,11 +2183,11 @@ msgstr "用户名或密码错误"
 #: classes/pref/prefs.php:348
 #, fuzzy
 msgid "Disable OTP"
-msgstr "禁用OTP动态口令"
+msgstr "禁用 OTP 动态口令"
 
 #: classes/pref/prefs.php:354
 msgid "You will need a compatible Authenticator to use this. Changing your password would automatically disable OTP."
-msgstr "更改当前密码会自动禁用OTP动态口令。"
+msgstr "更改当前密码会自动禁用 OTP 动态口令。"
 
 #: classes/pref/prefs.php:356
 msgid "Scan the following code by the Authenticator application:"
@@ -2194,20 +2196,20 @@ msgstr "使用认证应用扫描下面编码"
 #: classes/pref/prefs.php:393
 #, fuzzy
 msgid "Enter the generated one time password"
-msgstr "请填写动态口令："
+msgstr "请填写生成的 OTP 动态口令："
 
 #: classes/pref/prefs.php:407
 #, fuzzy
 msgid "Enable OTP"
-msgstr "已启用"
+msgstr "已启用 OTP 动态口令"
 
 #: classes/pref/prefs.php:413
 msgid "PHP GD functions are required for OTP support."
-msgstr ""
+msgstr "OTP 动态口令需要开启 PHP GD"
 
 #: classes/pref/prefs.php:456
 msgid "Some preferences are only available in default profile."
-msgstr ""
+msgstr "部分设置仅支持默认偏好"
 
 #: classes/pref/prefs.php:545
 msgid "Customize"
@@ -2253,7 +2255,7 @@ msgstr "系统插件"
 
 #: classes/pref/prefs.php:712
 msgid "System plugins are enabled in <strong>config.php</strong> for all users."
-msgstr ""
+msgstr "在 <strong>config.php</strong> 中启用的系统插件适用于所有用户"
 
 #: classes/pref/prefs.php:717
 #: classes/pref/prefs.php:773
@@ -2295,42 +2297,42 @@ msgstr "用户插件"
 msgid "Enable selected plugins"
 msgstr "启用信息源分类"
 
-#: classes/pref/prefs.php:912
+#: classes/pref/prefs.php:906
 #, fuzzy
 msgid "Incorrect one time password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:917
-#: classes/pref/prefs.php:948
+#: classes/pref/prefs.php:911
+#: classes/pref/prefs.php:942
 #, fuzzy
 msgid "Incorrect password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:973
+#: classes/pref/prefs.php:967
 #, 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:1013
+#: classes/pref/prefs.php:1007
 msgid "Create profile"
 msgstr "创建偏好文件"
 
-#: classes/pref/prefs.php:1037
-#: classes/pref/prefs.php:1065
+#: classes/pref/prefs.php:1031
+#: classes/pref/prefs.php:1059
 msgid "(active)"
 msgstr "（当前使用的）"
 
-#: classes/pref/prefs.php:1099
+#: classes/pref/prefs.php:1093
 msgid "Remove selected profiles"
 msgstr "移除选中的偏好文件"
 
-#: classes/pref/prefs.php:1101
+#: classes/pref/prefs.php:1095
 msgid "Activate profile"
 msgstr "启用偏好文件"
 
 #: classes/feeds.php:53
 msgid "View as RSS feed"
-msgstr "以RSS信息源方式阅读"
+msgstr "以 RSS 信息源方式阅读"
 
 #: classes/feeds.php:62
 #, fuzzy, php-format
@@ -2379,7 +2381,7 @@ msgid "Feed:"
 msgstr "信息源："
 
 #: classes/feeds.php:193
-#: classes/feeds.php:817
+#: classes/feeds.php:819
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
@@ -2394,121 +2396,121 @@ msgid "Imported at %s"
 msgstr "导入"
 
 #: classes/feeds.php:394
-#: classes/feeds.php:485
+#: classes/feeds.php:487
 #, fuzzy
 msgid "mark feed as read"
 msgstr "标记信息源为已读"
 
-#: classes/feeds.php:540
+#: classes/feeds.php:542
 #, fuzzy
 msgid "Collapse article"
 msgstr "折叠文章"
 
-#: classes/feeds.php:701
+#: classes/feeds.php:703
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:704
+#: classes/feeds.php:706
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:707
+#: classes/feeds.php:709
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:711
+#: classes/feeds.php:713
 #, 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/feeds.php:713
+#: classes/feeds.php:715
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:729
-#: classes/feeds.php:920
+#: classes/feeds.php:731
+#: classes/feeds.php:922
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:741
-#: classes/feeds.php:932
+#: classes/feeds.php:743
+#: classes/feeds.php:934
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:909
+#: classes/feeds.php:911
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: classes/feeds.php:973
-#: classes/feeds.php:981
+#: classes/feeds.php:975
+#: classes/feeds.php:983
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/feeds.php:995
+#: classes/feeds.php:997
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:1032
+#: classes/feeds.php:1034
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1061
+#: classes/feeds.php:1063
 msgid "Popular feeds"
-msgstr "最受欢迎的信息源"
+msgstr "热门信息源"
 
-#: classes/feeds.php:1062
+#: classes/feeds.php:1064
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1065
+#: classes/feeds.php:1067
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1099
+#: classes/feeds.php:1101
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1107
+#: classes/feeds.php:1109
 #, php-format
 msgid "in %s"
 msgstr ""
 
-#: classes/feeds.php:1112
+#: classes/feeds.php:1114
 msgid "Used for word stemming"
-msgstr ""
+msgstr "词干提取"
 
-#: classes/feeds.php:1121
+#: classes/feeds.php:1123
 #, fuzzy
 msgid "Search syntax"
 msgstr "搜索语法"
 
-#: classes/feeds.php:1575
+#: classes/feeds.php:1577
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: classes/feeds.php:1577
+#: classes/feeds.php:1579
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: classes/feeds.php:1579
+#: classes/feeds.php:1581
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: classes/feeds.php:1583
+#: classes/feeds.php:1585
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: classes/feeds.php:1585
+#: classes/feeds.php:1587
 msgid "Recently read"
 msgstr "最近的阅读"
 
-#: classes/feeds.php:1706
+#: classes/feeds.php:1708
 msgid "Special"
 msgstr "特殊区域"
 
-#: classes/feeds.php:1963
+#: classes/feeds.php:1965
 #, php-format
 msgid "Search results: %s"
 msgstr "搜索结果：%s"
@@ -2516,15 +2518,15 @@ msgstr "搜索结果：%s"
 #: plugins/nsfw/init.php:30
 #: plugins/nsfw/init.php:42
 msgid "Not work safe (click to toggle)"
-msgstr ""
+msgstr "不宜在工作场所观看（点击开启）"
 
 #: plugins/nsfw/init.php:52
 msgid "NSFW Plugin"
-msgstr ""
+msgstr "NSFW 插件"
 
 #: plugins/nsfw/init.php:79
 msgid "Tags to consider NSFW (comma-separated)"
-msgstr ""
+msgstr "不宜在工作场所观看的标签（多个标签以逗号分隔）"
 
 #: plugins/nsfw/init.php:100
 #, fuzzy
@@ -2542,68 +2544,64 @@ msgstr "编辑文章注记"
 msgid "Shared articles"
 msgstr "加星标文章"
 
-#: plugins/auth_internal/init.php:71
+#: plugins/auth_internal/init.php:67
 #, fuzzy
 msgid "Please enter your one time password:"
 msgstr "请填写类别名称："
 
-#: plugins/auth_internal/init.php:212
+#: plugins/auth_internal/init.php:208
 msgid "Password has been changed."
 msgstr "密码更改成功。"
 
-#: plugins/auth_internal/init.php:214
+#: plugins/auth_internal/init.php:210
 msgid "Old password is incorrect."
 msgstr "原密码输入错误。"
 
-#: plugins/af_readability/init.php:22
+#: plugins/af_readability/init.php:25
 msgid "Data saved."
-msgstr ""
+msgstr "数据已保存"
 
-#: plugins/af_readability/init.php:34
+#: plugins/af_readability/init.php:41
 #, fuzzy
 msgid "Inline content"
 msgstr "滚动文章内容"
 
-#: plugins/af_readability/init.php:40
+#: plugins/af_readability/init.php:47
 msgid "Readability settings (af_readability)"
-msgstr ""
+msgstr "Readability 设置 (af_readability)"
 
-#: plugins/af_readability/init.php:67
+#: plugins/af_readability/init.php:78
 msgid "Use Readability for pages shared via bookmarklet."
 msgstr ""
 
-#: plugins/af_readability/init.php:79
+#: plugins/af_readability/init.php:90
 #: plugins/af_psql_trgm/init.php:198
 msgid "Currently enabled for (click to edit):"
-msgstr ""
+msgstr "当前启用（点击编辑）"
 
-#: plugins/af_readability/init.php:96
+#: plugins/af_readability/init.php:107
 #, fuzzy
 msgid "Readability"
 msgstr "检查可用性"
 
-#: plugins/af_readability/init.php:107
+#: plugins/af_readability/init.php:118
 #, fuzzy
 msgid "Inline article content"
 msgstr "滚动文章内容"
 
-#: plugins/af_redditimgur/init.php:27
+#: plugins/af_redditimgur/init.php:30
 msgid "Reddit content settings (af_redditimgur)"
-msgstr ""
+msgstr "Reddit 内容设置"
 
-#: plugins/af_redditimgur/init.php:52
-msgid "Uses Readability (full-text-rss) implementation by <a target='_blank' href='https://bitbucket.org/fivefilters/'>FiveFilters.org</a>"
-msgstr ""
-
-#: plugins/af_redditimgur/init.php:56
+#: plugins/af_redditimgur/init.php:60
 msgid "Extract missing content using Readability"
-msgstr ""
+msgstr "使用 Readability 提取缺失的内容"
 
-#: plugins/af_redditimgur/init.php:61
+#: plugins/af_redditimgur/init.php:65
 msgid "Enable additional duplicate checking"
-msgstr ""
+msgstr "开启额外的重复检查"
 
-#: plugins/af_redditimgur/init.php:75
+#: plugins/af_redditimgur/init.php:79
 #: plugins/af_zz_imgproxy/init.php:252
 #, fuzzy
 msgid "Configuration saved"
@@ -2612,7 +2610,7 @@ msgstr "设置已保存。"
 #: plugins/af_psql_trgm/init.php:29
 #, php-format
 msgid "Data saved (%s, %d)"
-msgstr ""
+msgstr "数据已保存 (%s, %d)"
 
 #: plugins/af_psql_trgm/init.php:119
 #, fuzzy
@@ -2627,20 +2625,20 @@ msgstr "将所有文章标记为已读？"
 
 #: plugins/af_psql_trgm/init.php:164
 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 ""
+msgstr "PostgreSQL trigram 扩展将返回一个文本相似度的浮点数（0-1）。设置过低的阈值可能导致错误的结果，0 为关闭相似度检查。"
 
 #: plugins/af_psql_trgm/init.php:167
 #, fuzzy
 msgid "Global settings"
-msgstr "包含设置"
+msgstr "全局设置"
 
 #: plugins/af_psql_trgm/init.php:171
 msgid "Minimum similarity:"
-msgstr ""
+msgstr "最低相似度："
 
 #: plugins/af_psql_trgm/init.php:176
 msgid "Minimum title length:"
-msgstr ""
+msgstr "最短标题长度："
 
 #: plugins/af_psql_trgm/init.php:181
 #, fuzzy
@@ -2649,95 +2647,95 @@ msgstr "启用信息源分类"
 
 #: plugins/af_psql_trgm/init.php:216
 msgid "Similarity (pg_trgm)"
-msgstr ""
+msgstr "相似度 (pg_trgm)"
 
 #: plugins/af_comics/init.php:49
 msgid "Feeds supported by af_comics"
-msgstr "af_comics的feed源"
+msgstr "af_comics 的 feed 源"
 
 #: plugins/af_comics/init.php:51
 msgid "The following comics are currently supported:"
-msgstr "下面的comics已被支持："
+msgstr "漫画支持支持："
 
 #: plugins/af_comics/init.php:69
 msgid "To subscribe to GoComics use the comic's regular web page as the feed URL (e.g. for the <em>Garfield</em> comic use <code>http://www.gocomics.com/garfield</code>)."
-msgstr ""
+msgstr "订阅 GoComics 时，使用漫画网址作为源地址。例如 <em>Garfield</em>，则地址为<code>http://www.gocomics.com/garfield</code>。"
 
 #: plugins/af_comics/init.php:71
 msgid "Drop any updated filters into <code>filters.local</code> in plugin directory."
-msgstr ""
+msgstr "将新版的过滤器放置于插件目录下的 <code>filters.local</code> 文件夹中"
 
-#: plugins/import_export/init.php:62
+#: plugins/import_export/init.php:53
 msgid "Import and export"
 msgstr "导入和导出"
 
-#: plugins/import_export/init.php:64
+#: plugins/import_export/init.php:55
 msgid "You can export and import your Starred and Archived articles for safekeeping or when migrating between tt-rss instances of same version."
-msgstr "你可以导出和导入所有的加星文章、归档文章，来进行安全备份，或在同版本的tt-rss实例之间迁移。"
+msgstr "你可以导出和导入所有的加星文章、归档文章，来进行安全备份，或在同版本的 tt-rss 实例之间迁移。"
 
-#: plugins/import_export/init.php:69
+#: plugins/import_export/init.php:60
 msgid "Export my data"
 msgstr "导出我的数据"
 
-#: plugins/import_export/init.php:85
+#: plugins/import_export/init.php:78
 msgid "Import"
 msgstr "导入"
 
-#: plugins/import_export/init.php:235
+#: plugins/import_export/init.php:242
 msgid "Could not import: incorrect schema version."
-msgstr "无法导入：不正确的schema版本。"
+msgstr "无法导入：不正确的 schema 版本。"
 
-#: plugins/import_export/init.php:240
+#: plugins/import_export/init.php:247
 msgid "Could not import: unrecognized document format."
 msgstr "无法导入：不可识别的文档格式。"
 
-#: plugins/import_export/init.php:401
+#: plugins/import_export/init.php:422
 msgid "Finished: "
 msgstr "已完成："
 
-#: plugins/import_export/init.php:402
+#: plugins/import_export/init.php:423
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "编辑文章注记"
 
-#: plugins/import_export/init.php:403
+#: plugins/import_export/init.php:424
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
-msgstr[0] "已经导入过。"
+msgstr[0] "已导入。"
 
-#: plugins/import_export/init.php:404
+#: plugins/import_export/init.php:425
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "没有选中的信息源。"
 
-#: plugins/import_export/init.php:409
+#: plugins/import_export/init.php:430
 msgid "Could not load XML document."
-msgstr "无法加载XML文档。"
+msgstr "无法加载 XML 文档。"
 
-#: plugins/import_export/init.php:421
+#: plugins/import_export/init.php:442
 msgid "Prepare data"
 msgstr "准备数据"
 
-#: plugins/import_export/init.php:438
+#: plugins/import_export/init.php:459
 #, fuzzy, php-format
 msgid "Upload failed with error code %d (%s)"
 msgstr "上传错误，错误代码：%d"
 
-#: plugins/import_export/init.php:464
+#: plugins/import_export/init.php:483
 msgid "No file uploaded."
 msgstr "没有文件上传。"
 
 #: plugins/mail/init.php:29
 msgid "Mail addresses saved."
-msgstr ""
+msgstr "邮件地址已保存"
 
 #: plugins/mail/init.php:35
 #, fuzzy
 msgid "Mail plugin"
-msgstr "用户插件"
+msgstr "邮件插件"
 
 #: plugins/mail/init.php:37
 msgid "You can set predefined email addressed here (comma-separated list):"
@@ -2753,7 +2751,7 @@ msgstr "[已转发]"
 #: plugins/mail/init.php:118
 #: plugins/mailto/init.php:50
 msgid "Multiple articles"
-msgstr "多个文章"
+msgstr "多篇文章"
 
 #: plugins/mail/init.php:146
 msgid "To:"
@@ -2773,7 +2771,7 @@ msgstr "关闭文章"
 
 #: plugins/bookmarklets/init.php:20
 msgid "Bookmarklets"
-msgstr ""
+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."
@@ -2798,7 +2796,7 @@ msgstr "收缩侧边栏"
 
 #: plugins/af_zz_imgproxy/init.php:208
 msgid "Image proxy settings (af_zz_imgproxy)"
-msgstr ""
+msgstr "图片代理设置 (af_zz_imgproxy)"
 
 #: plugins/af_zz_imgproxy/init.php:232
 #, fuzzy
@@ -2849,22 +2847,22 @@ msgstr "您可以通过以下唯一 URL 分享本文："
 msgid "Unshare article"
 msgstr "取消星标"
 
-#: js/FeedTree.js:172
+#: js/FeedTree.js:75
 #, fuzzy
 msgid "(Un)collapse"
 msgstr "收起侧边栏"
 
-#: js/PrefFeedTree.js:54
+#: js/PrefFeedTree.js:35
 #, fuzzy
 msgid "Edit category"
 msgstr "编辑类别"
 
-#: js/PrefFeedTree.js:61
+#: js/PrefFeedTree.js:42
 #, fuzzy
 msgid "Remove category"
 msgstr "创建类别"
 
-#: js/PrefFilterTree.js:67
+#: js/PrefFilterTree.js:46
 msgid "Inverse"
 msgstr "反选"
 
@@ -2900,7 +2898,7 @@ msgstr "全部文章"
 
 #: js/functions.js:74
 msgid "Close"
-msgstr ""
+msgstr "关闭"
 
 #: js/functions.js:141
 #, fuzzy
@@ -2945,7 +2943,7 @@ msgstr "无法下载指定的 URL 。"
 #: js/functions.js:672
 #, fuzzy, perl-format
 msgid "XML validation failed: %s"
-msgstr "XML验证失败："
+msgstr "XML 验证失败："
 
 #: js/functions.js:676
 msgid "You are already subscribed to this feed."
@@ -2956,13 +2954,13 @@ msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
 #: js/functions.js:1140
-#: js/prefs.js:1091
+#: js/prefs.js:1095
 msgid "Trying to change address..."
 msgstr "尝试更改地址..."
 
 #: js/functions.js:1245
-#: js/tt-rss.js:445
-#: js/tt-rss.js:672
+#: js/tt-rss.js:446
+#: js/tt-rss.js:673
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
@@ -2987,7 +2985,7 @@ msgstr "更多信息源"
 #: js/prefs.js:398
 #: js/prefs.js:540
 #: js/prefs.js:558
-#: js/prefs.js:1073
+#: js/prefs.js:1077
 msgid "No feeds are selected."
 msgstr "没有选择任何信息源。"
 
@@ -3000,12 +2998,12 @@ msgid "Feeds with update errors"
 msgstr "更新错误的信息源"
 
 #: js/functions.js:1446
-#: js/prefs.js:1054
+#: js/prefs.js:1058
 msgid "Remove selected feeds?"
 msgstr "移除选中的信息源？"
 
 #: js/functions.js:1449
-#: js/prefs.js:1057
+#: js/prefs.js:1061
 #, fuzzy
 msgid "Removing selected feeds..."
 msgstr "移除选中的信息源？"
@@ -3051,7 +3049,7 @@ msgid "Removing selected labels..."
 msgstr "移除选中的预定义标签？"
 
 #: js/prefs.js:308
-#: js/prefs.js:1140
+#: js/prefs.js:1144
 msgid "No labels are selected."
 msgstr "没有选择任何预定义标签。"
 
@@ -3146,19 +3144,19 @@ msgstr "请先选择一个 OPML 文件。"
 msgid "Importing, please wait..."
 msgstr "读取中，请稍候……"
 
-#: js/prefs.js:865
+#: js/prefs.js:869
 msgid "Reset to defaults?"
 msgstr "重置为默认状态？"
 
-#: js/prefs.js:1464
+#: js/prefs.js:1468
 msgid "Subscribing to feeds..."
 msgstr "订阅至信息源.."
 
-#: js/prefs.js:1483
+#: js/prefs.js:1487
 msgid "Clear stored data for this plugin?"
 msgstr "清除本插件已保存的数据？"
 
-#: js/prefs.js:1497
+#: js/prefs.js:1501
 msgid "Clear all messages in the error log?"
 msgstr "清除错误日志里的所有消息"
 
@@ -3171,36 +3169,36 @@ msgstr "将所有文章标记为已读？"
 msgid "Marking all feeds as read..."
 msgstr "标记所有信息源为已读"
 
-#: js/tt-rss.js:397
+#: js/tt-rss.js:398
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:526
+#: js/tt-rss.js:527
 #, fuzzy
 msgid "Please enable embed_original plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:539
-#: js/tt-rss.js:722
+#: js/tt-rss.js:540
+#: js/tt-rss.js:723
 msgid "Widescreen is not available in combined mode."
-msgstr ""
+msgstr "在合并模式下无法启用宽"
 
-#: js/tt-rss.js:820
+#: js/tt-rss.js:821
 msgid "You can't rescore this kind of feed."
 msgstr "无法重置本类信息源的评分。"
 
-#: js/tt-rss.js:825
-#: js/tt-rss.js:685
+#: js/tt-rss.js:826
+#: js/tt-rss.js:686
 msgid "Please select some feed first."
-msgstr "请先选几个信息源吧。"
+msgstr "请选择信息源。"
 
-#: js/tt-rss.js:830
+#: js/tt-rss.js:831
 #, perl-format
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:833
+#: js/tt-rss.js:834
 #, fuzzy
 msgid "Rescoring articles..."
 msgstr "为文章重新评分"
@@ -3245,7 +3243,7 @@ msgstr[0] "将存档的 %d 篇文章移回原处？"
 
 #: js/viewfeed.js:969
 msgid "Please note that unstarred articles might get purged on next feed update."
-msgstr ""
+msgstr "未加星的文章可能在下一次文章更新中被清除"
 
 #: js/viewfeed.js:1009
 #, fuzzy, perl-format
@@ -3343,7 +3341,7 @@ msgstr "用邮件转发文章"
 
 #: plugins/mail/mail.js:36
 msgid "Error sending email:"
-msgstr ""
+msgstr "邮件发送错误："
 
 #: plugins/mail/mail.js:38
 #, fuzzy
@@ -3370,7 +3368,7 @@ msgstr "请填写类别名称："
 
 #: plugins/share/share.js:18
 msgid "Trying to change URL..."
-msgstr "尝试更改URL..."
+msgstr "尝试更改 URL..."
 
 #: plugins/share/share.js:55
 #, fuzzy
@@ -3386,13 +3384,13 @@ msgid "This will invalidate all previously shared article URLs. Continue?"
 msgstr "之前共享文章的 URL 将会回到未认证状态。是否继续？"
 
 #: plugins/share/share_prefs.js:6
-#: js/prefs.js:1273
+#: js/prefs.js:1277
 msgid "Clearing URLs..."
 msgstr "清理 URLs..."
 
 #: plugins/share/share_prefs.js:13
 msgid "Shared URLs cleared."
-msgstr "分享的URL已被清除。"
+msgstr "分享的 URL 已被清除。"
 
 #: js/feedlist.js:204
 #, fuzzy
@@ -3454,7 +3452,7 @@ msgstr "信息源动作"
 
 #: js/functions.js:860
 msgid "Looking for articles (%d processed, %f found)..."
-msgstr ""
+msgstr "搜索文章中 (%d 已处理, %f 已发现)..."
 
 #: js/functions.js:890
 #, fuzzy
@@ -3466,108 +3464,108 @@ msgid "Create Filter"
 msgstr "创建过滤器"
 
 #: js/functions.js:1060
-#: js/tt-rss.js:691
+#: js/tt-rss.js:692
 msgid "Unsubscribe from %s?"
 msgstr "从 %s 取消订阅？"
 
 #: js/functions.js:1063
 msgid "Removing feed..."
-msgstr "删除feed..."
+msgstr "删除 feed..."
 
 #: js/functions.js:1489
 msgid "Help"
 msgstr "帮助"
 
-#: js/prefs.js:969
+#: js/prefs.js:973
 msgid "Remove category %s? Any nested feeds would be placed into Uncategorized."
-msgstr ""
+msgstr "删除类别 %s？该类别下的源将被归入未分类中。"
 
-#: js/prefs.js:975
+#: js/prefs.js:979
 #, fuzzy
 msgid "Removing category..."
 msgstr "创建类别"
 
-#: js/prefs.js:993
+#: js/prefs.js:997
 msgid "Remove selected categories?"
 msgstr "移除选中的类别？"
 
-#: js/prefs.js:996
+#: js/prefs.js:1000
 #, fuzzy
 msgid "Removing selected categories..."
 msgstr "移除选定的类别"
 
-#: js/prefs.js:1009
+#: js/prefs.js:1013
 msgid "No categories are selected."
 msgstr "没有选中任何类别。"
 
-#: js/prefs.js:1016
+#: js/prefs.js:1020
 #, fuzzy
 msgid "Category title:"
 msgstr "类别"
 
-#: js/prefs.js:1020
+#: js/prefs.js:1024
 #, fuzzy
 msgid "Creating category..."
 msgstr "创建过滤器"
 
-#: js/prefs.js:1043
+#: js/prefs.js:1047
 msgid "Feeds without recent updates"
 msgstr "最近没更新的信息源"
 
-#: js/prefs.js:1087
+#: js/prefs.js:1091
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "将当前的 OPML 发布地址更改替换为新地址？"
 
-#: js/prefs.js:1125
+#: js/prefs.js:1129
 msgid "Reset selected labels to default colors?"
 msgstr "将选中的可选标签重置为默认颜色？"
 
-#: js/prefs.js:1157
+#: js/prefs.js:1161
 msgid "Settings Profiles"
 msgstr "偏好文件的设置"
 
-#: js/prefs.js:1166
+#: js/prefs.js:1170
 msgid "Remove selected profiles? Active and default profiles will not be removed."
 msgstr "移除选中的偏好文件？当前偏好与默认偏好不会被移除。"
 
-#: js/prefs.js:1169
+#: js/prefs.js:1173
 #, fuzzy
 msgid "Removing selected profiles..."
 msgstr "移除选中的偏好文件"
 
-#: js/prefs.js:1185
+#: js/prefs.js:1189
 msgid "No profiles are selected."
 msgstr "未选择偏好文件。"
 
-#: js/prefs.js:1193
-#: js/prefs.js:1246
+#: js/prefs.js:1197
+#: js/prefs.js:1250
 msgid "Activate selected profile?"
 msgstr "启用选中的偏好文件？"
 
-#: js/prefs.js:1210
-#: js/prefs.js:1262
+#: js/prefs.js:1214
+#: js/prefs.js:1266
 msgid "Please choose a profile to activate."
 msgstr "请选择希望启用的偏好文件。"
 
-#: js/prefs.js:1215
+#: js/prefs.js:1219
 #, fuzzy
 msgid "Creating profile..."
 msgstr "创建偏好文件"
 
-#: js/prefs.js:1270
+#: js/prefs.js:1274
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr "之前生成的信息源 URL 将会回到未认证状态。是否继续？"
 
-#: js/prefs.js:1280
+#: js/prefs.js:1284
 #, fuzzy
 msgid "Generated URLs cleared."
 msgstr "生成一个新的 URL"
 
-#: js/prefs.js:1352
+#: js/prefs.js:1356
 msgid "Label Editor"
 msgstr "编辑预定义标签"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:681
 msgid "You can't unsubscribe from the category."
 msgstr "您不能取消订阅一个类别。"
 
@@ -3754,7 +3752,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "请仅选择一个实例。"
 
 #~ msgid "The error will be reported to the configured log destination."
-#~ msgstr "error会保存在配置的目标日志中"
+#~ msgstr "错误会保存在预设的日志中"
 
 #, 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."
@@ -3783,16 +3781,16 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "本过滤器下没有匹配到文章。"
 
 #~ msgid "All done. %d out of %d articles imported."
-#~ msgstr "完成。已成功导入%d条文章，全部%d条文章。"
+#~ msgstr "完成。已成功导入 %d 条文章，全部 %d 条文章。"
 
 #~ msgid "The document has incorrect format."
 #~ msgstr "文档格式错误。"
 
 #~ msgid "Import starred or shared items from Google Reader"
-#~ msgstr "从Google Reader中导入加星或共享条目。"
+#~ msgstr "从 Google Reader 中导入加星或共享条目。"
 
 #~ msgid "Paste your starred.json or shared.json into the form below."
-#~ msgstr "把你的starred.json 或 shared.json复制到下面的表格中。"
+#~ msgstr "把你的 starred.json 或 shared.json 复制到下面的输入框中。"
 
 #~ msgid "Import my Starred items"
 #~ msgstr "导入我的加星条目"
@@ -3814,7 +3812,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "当前服务器系统时间: %s (UTC)"
 
 #~ msgid "Google Reader Import"
-#~ msgstr "导入Google Reader"
+#~ msgstr "导入 Google Reader"
 
 #, fuzzy
 #~ msgid "Please choose a file first."
@@ -3837,7 +3835,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "本信息源"
 
 #~ msgid "Complex expressions might not give results while testing due to issues with database server regexp implementation."
-#~ msgstr "使用复杂的表达式可能没有返回结果。"
+#~ msgstr "数据库的正则设置可能导致复杂的表达式返回无结果。"
 
 #~ msgid "Old password cannot be blank."
 #~ msgstr "请输入之前使用的密码。"
@@ -3882,7 +3880,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 
 #, fuzzy
 #~ msgid "Session failed to validate (user agent changed)"
-#~ msgstr "无法验证会话（user agent发生变化）"
+#~ msgstr "无法验证会话（user agent 发生变化）"
 
 #~ msgid "Assign articles to labels automatically"
 #~ msgstr "为文章自动分配预定义标签？"
@@ -3891,7 +3889,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
 
 #~ msgid "You can update using built-in updater in the Preferences or by using update.php"
-#~ msgstr "你可以使用内置的更新器，或者update.php，来进行更新。"
+#~ msgstr "你可以使用内置的更新器，或者 update.php，来进行更新。"
 
 #~ msgid "See the release notes"
 #~ msgstr "查看版本发布记录"
@@ -3918,13 +3916,13 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "在更新完成前不要关闭此对话框。"
 
 #~ msgid "It is suggested to backup your tt-rss directory first."
-#~ msgstr "强烈建议先备份你的tt-rss目录。"
+#~ msgstr "强烈建议先备份你的 tt-rss 目录。"
 
 #~ msgid "Your database will not be modified."
 #~ msgstr "你的数据库将不会被修改。"
 
 #~ msgid "Your current tt-rss installation directory will not be modified. It will be renamed and left in the parent directory. You will be able to migrate all your customized files after update finishes."
-#~ msgstr "你当前的tt-rss安装目录不会被修改。它将会被重命名，保存在父目录里。在更新完成后，你可以迁移所有的自定义文件。"
+#~ msgstr "你当前的 tt-rss 安装目录不会被修改。它将会被重命名，保存在父目录里。在更新完成后，你可以迁移所有的自定义文件。"
 
 #, fuzzy
 #~ msgid "Ready to update."
@@ -3935,7 +3933,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "开始更新"
 
 #~ msgid "Backup your tt-rss directory before continuing. Please type 'yes' to continue."
-#~ msgstr "请先备份你的tt-rss目录。 敲击'yes'来继续下一步。"
+#~ msgstr "请先备份你的 tt-rss 目录。 输入'yes'来继续下一步。"
 
 #~ msgid "From:"
 #~ msgstr "发信人："
@@ -3989,7 +3987,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "主页"
 
 #~ msgid "Nothing found (click to reload feed)."
-#~ msgstr "啥也没找到（点击以重新加载信息源）。"
+#~ msgstr "无结果（点击以重新加载信息源）。"
 
 #~ msgid "Enable categories"
 #~ msgstr "启用类别"
@@ -4070,7 +4068,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "无法找到必要的表结构文件，需要版本："
 
 #~ msgid ", found: "
-#~ msgstr "，找到："
+#~ msgstr "，发现："
 
 #~ msgid "Tiny Tiny RSS database is up to date."
 #~ msgstr "Tiny Tiny RSS 数据库是最新版。"
@@ -4182,7 +4180,7 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 
 #, fuzzy
 #~ msgid "Back to feeds"
-#~ msgstr "很久不活跃的信息源"
+#~ msgstr "返回源列表"
 
 #~ msgid "This will clear your stored authentication information for Twitter. Continue?"
 #~ msgstr "这将会清空所有保存过的 Twitter 认证信息。是否继续？"
@@ -4378,4 +4376,4 @@ msgstr[0] "将 %d 篇文章标记为已读？"
 #~ msgstr "过滤器测试结果"
 
 #~ msgid "When \"Mark as read\" button is clicked in toolbar, automatically open next feed with unread articles."
-#~ msgstr "当工具栏上 \"标记为已读 \" 按钮被点击时，自动打开下一个信息源中的未读文章。"
+#~ msgstr "点击工具栏上的 \"标记为已读 \" 按钮时，自动打开下一个信息源中的未读文章。"