update translations; release 1.4.3

[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 c44db46d59694cdcc241bfe8ac4b2b1fa4210781..9da82cb55755e190a937c80ba68ee1f7c6475e77 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-31 15:56+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -12,97 +12,97 @@ msgstr ""
 "X-Poedit-Country: china\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:107
+#: backend.php:113
 msgid "Use default"
 msgstr "用户默认"
 
-#: backend.php:108
+#: backend.php:114
 msgid "Never purge"
 msgstr "从未"
 
-#: backend.php:109
+#: backend.php:115
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:110
+#: backend.php:116
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:111
+#: backend.php:117
 msgid "1 month old"
 msgstr "1月前"
 
-#: backend.php:112
+#: backend.php:118
 msgid "2 months old"
 msgstr "2月前"
 
-#: backend.php:113
+#: backend.php:119
 msgid "3 months old"
 msgstr "3月前"
 
-#: backend.php:116
+#: backend.php:122
 #, fuzzy
 msgid "Default interval"
 msgstr "更新间隔:"
 
-#: backend.php:117 backend.php:127
+#: backend.php:123 backend.php:133
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:118 backend.php:128
+#: backend.php:124 backend.php:134
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:119 backend.php:129
+#: backend.php:125 backend.php:135
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:120 backend.php:130
+#: backend.php:126 backend.php:136
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:121 backend.php:131
+#: backend.php:127 backend.php:137
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:122 backend.php:132
+#: backend.php:128 backend.php:138
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:123 backend.php:133
+#: backend.php:129 backend.php:139
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:124 backend.php:134
+#: backend.php:130 backend.php:140
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:137 tt-rss.php:220 modules/pref-prefs.php:329
+#: backend.php:143 tt-rss.php:225 modules/pref-prefs.php:329
 msgid "Default"
 msgstr "默认"
 
-#: backend.php:138
+#: backend.php:144
 #, fuzzy
 msgid "Magpie"
 msgstr "页"
 
-#: backend.php:139
+#: backend.php:145
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:148 modules/pref-users.php:126
+#: backend.php:154 modules/pref-users.php:126
 msgid "User"
 msgstr "用户"
 
-#: backend.php:149
+#: backend.php:155
 msgid "Power User"
 msgstr ""
 
-#: backend.php:150
+#: backend.php:156
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:538 login_form.php:142 modules/backend-rpc.php:61
+#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61
 #: modules/popup-dialog.php:106
 #, fuzzy
 msgid "Default profile"
@@ -172,270 +172,270 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1938
+#: functions.php:1935
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2008
+#: functions.php:2005
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2988 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:3021 functions.php:3060 functions.php:4458 functions.php:4486
-#: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
+#: functions.php:3020 functions.php:3059 functions.php:4464 functions.php:4492
+#: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3049 functions.php:3705 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3051 functions.php:3707 prefs.php:114
 #: modules/backend-rpc.php:879 help/4.php:12 mobile/functions.php:197
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3097 help/3.php:60 offline.js:493 offline.js:1425
+#: functions.php:3096 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3099 modules/pref-feeds.php:1492 help/3.php:61
+#: functions.php:3098 modules/pref-feeds.php:1516 help/3.php:61
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3100 help/3.php:59
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3102 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3105
+#: functions.php:3104
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4211
+#: functions.php:4217
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
-#: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
+#: functions.php:4222 functions.php:5570 modules/popup-dialog.php:82
+#: modules/pref-feeds.php:1079 modules/pref-feeds.php:1289
 #: modules/pref-filters.php:377 modules/pref-labels.php:183
 #: modules/pref-users.php:419 offline.js:408
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4217 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
-#: modules/pref-feeds.php:1298 modules/pref-filters.php:378
+#: functions.php:4223 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: modules/pref-feeds.php:1290 modules/pref-filters.php:378
 #: modules/pref-labels.php:184 modules/pref-users.php:420
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4218 functions.php:4235 tt-rss.php:213
+#: functions.php:4224 functions.php:4241 tt-rss.php:218
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4219
+#: functions.php:4225
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
-#: modules/pref-feeds.php:1299 modules/pref-filters.php:379
+#: functions.php:4226 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: modules/pref-feeds.php:1291 modules/pref-filters.php:379
 #: modules/pref-labels.php:185 modules/pref-users.php:421
 msgid "None"
 msgstr "无"
 
-#: functions.php:4228 tt-rss.php:178 offline.js:184
+#: functions.php:4234 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4234
+#: functions.php:4240
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4242 tt-rss.php:217
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4237
+#: functions.php:4243
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4238
+#: functions.php:4244
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4245 localized_schema.php:16 tt-rss.php:187 tt-rss.php:235
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4245
+#: functions.php:4251
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4253
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4248
+#: functions.php:4254
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4253
+#: functions.php:4259
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4294
+#: functions.php:4300
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4504
+#: functions.php:4510
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4521
+#: functions.php:4527
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4680
+#: functions.php:4686
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4806
+#: functions.php:4812
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4837 functions.php:5597
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4843 functions.php:5580
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4850 functions.php:5587
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4867 functions.php:5458
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4880 functions.php:5471
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4920 functions.php:5501
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4960 functions.php:5544
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4962 functions.php:5546
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4982 prefs.php:142 tt-rss.php:101 modules/help.php:21
 #: modules/popup-dialog.php:53 modules/popup-dialog.php:154
 #: modules/popup-dialog.php:181 modules/popup-dialog.php:208
 #: modules/popup-dialog.php:257 modules/popup-dialog.php:602
-#: modules/popup-dialog.php:661 modules/pref-feeds.php:1140
+#: modules/popup-dialog.php:661 modules/pref-feeds.php:1132
 #: modules/pref-users.php:96
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:5032
+#: functions.php:5038
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:5101
+#: functions.php:5107
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5265 functions.php:5352
+#: functions.php:5271 functions.php:5358
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5434 functions.php:5441
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5598
+#: functions.php:5604
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5617
+#: functions.php:5623
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5620
+#: functions.php:5626
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5623
+#: functions.php:5629
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5627
+#: functions.php:5633
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5629 offline.js:443
+#: functions.php:5635 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6390 tt-rss.php:198
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6402
+#: functions.php:6403
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6454
+#: functions.php:6455
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6483
+#: functions.php:6484
 msgid "edit note"
 msgstr ""
 
-#: localized_schema.php:9 tt-rss.php:222 modules/popup-dialog.php:408
-#: modules/pref-feeds.php:1310 modules/pref-feeds.php:1369
+#: localized_schema.php:9 tt-rss.php:227 modules/popup-dialog.php:408
+#: modules/pref-feeds.php:1302 modules/pref-feeds.php:1361
 msgid "Title"
 msgstr "标题"
 
@@ -732,13 +732,13 @@ msgstr ""
 msgid "Enable external API"
 msgstr ""
 
-#: login_form.php:120 modules/popup-dialog.php:298 modules/pref-feeds.php:339
-#: modules/pref-feeds.php:561 mobile/login_form.php:38
+#: login_form.php:120 modules/popup-dialog.php:298 modules/pref-feeds.php:337
+#: modules/pref-feeds.php:557 mobile/login_form.php:38
 msgid "Login:"
 msgstr "登陆:"
 
-#: login_form.php:124 modules/popup-dialog.php:300 modules/pref-feeds.php:344
-#: modules/pref-feeds.php:567 mobile/login_form.php:43
+#: login_form.php:124 modules/popup-dialog.php:300 modules/pref-feeds.php:342
+#: modules/pref-feeds.php:563 mobile/login_form.php:43
 msgid "Password:"
 msgstr "密码:"
 
@@ -764,23 +764,23 @@ msgstr ""
 msgid "Limit bandwidth usage"
 msgstr ""
 
-#: opml.php:131 opml.php:135
+#: opml.php:161 opml.php:166
 msgid "OPML Utility"
 msgstr "通用OPML"
 
-#: opml.php:156
+#: opml.php:187
 msgid "Importing OPML (using DOMXML extension)..."
 msgstr "导入 OPML（需要DOMXML扩展）"
 
-#: opml.php:160
+#: opml.php:191
 msgid "Importing OPML (using DOMDocument extension)..."
 msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
 
-#: opml.php:164 modules/popup-dialog.php:45
+#: opml.php:195 modules/popup-dialog.php:45
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
 msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 
-#: opml.php:168
+#: opml.php:199
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
@@ -808,7 +808,7 @@ msgstr "退出我的最爱"
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:102 tt-rss.php:196
+#: prefs.php:102
 #, fuzzy
 msgid "Keyboard shortcuts"
 msgstr "&nbsp;&nbsp;创建过滤器"
@@ -844,7 +844,7 @@ msgstr "Feed 浏览器有限制"
 
 #: register.php:155 register.php:200 register.php:213 register.php:228
 #: register.php:246 register.php:331 register.php:341 register.php:353
-#: update.php:94 update.php:162 modules/pref-feeds.php:954
+#: update.php:94 update.php:162 modules/pref-feeds.php:950
 msgid "Return to Tiny Tiny RSS"
 msgstr "返回Tiny Tiny RSS"
 
@@ -962,7 +962,7 @@ msgstr "输入feed"
 msgid "Rescore feed"
 msgstr "移除feed中..."
 
-#: tt-rss.php:184 modules/pref-feeds.php:465 modules/pref-feeds.php:1193
+#: tt-rss.php:184 modules/pref-feeds.php:463 modules/pref-feeds.php:1185
 msgid "Unsubscribe"
 msgstr "退订"
 
@@ -976,74 +976,89 @@ msgid "(Un)hide read feeds"
 msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 
 #: tt-rss.php:190
+#, fuzzy
+msgid "Categories:"
+msgstr "分类:"
+
+#: tt-rss.php:192
+#, fuzzy
+msgid "Toggle reordering mode"
+msgstr "移除选定分类?"
+
+#: tt-rss.php:193
+#, fuzzy
+msgid "Reset order"
+msgstr "重置密码"
+
+#: tt-rss.php:196
 msgid "Other actions:"
 msgstr "其他操作:"
 
-#: tt-rss.php:193
+#: tt-rss.php:199
 #, fuzzy
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: tt-rss.php:194
+#: tt-rss.php:200
 #, fuzzy
 msgid "Reset UI layout"
 msgstr "&nbsp;&nbsp;订阅feed"
 
-#: tt-rss.php:195
+#: tt-rss.php:201
 #, fuzzy
-msgid "Reset category order"
-msgstr "移除选定分类?"
+msgid "Keyboard shortcuts help"
+msgstr "&nbsp;&nbsp;创建过滤器"
 
-#: tt-rss.php:205
+#: tt-rss.php:210
 #, fuzzy
 msgid "Collapse feedlist"
 msgstr "隐藏我的Feed列表"
 
-#: tt-rss.php:208
+#: tt-rss.php:213
 #, fuzzy
 msgid "Show articles"
 msgstr "星级文章"
 
-#: tt-rss.php:210
+#: tt-rss.php:215
 msgid "Adaptive"
 msgstr "自适应"
 
-#: tt-rss.php:211
+#: tt-rss.php:216
 msgid "All Articles"
 msgstr "所有文章"
 
-#: tt-rss.php:214
+#: tt-rss.php:219
 msgid "Ignore Scoring"
 msgstr ""
 
-#: tt-rss.php:215 modules/pref-feeds.php:1316 modules/pref-feeds.php:1377
+#: tt-rss.php:220 modules/pref-feeds.php:1308 modules/pref-feeds.php:1369
 msgid "Updated"
 msgstr "已更新"
 
-#: tt-rss.php:218
+#: tt-rss.php:223
 #, fuzzy
 msgid "Sort articles"
 msgstr "星级文章"
 
-#: tt-rss.php:221 modules/popup-dialog.php:489 modules/pref-filters.php:51
+#: tt-rss.php:226 modules/popup-dialog.php:489 modules/pref-filters.php:51
 #: modules/pref-filters.php:469
 #, fuzzy
 msgid "Date"
 msgstr "更新"
 
-#: tt-rss.php:223
+#: tt-rss.php:228
 msgid "Score"
 msgstr ""
 
-#: tt-rss.php:227 modules/pref-feeds.php:296 modules/pref-feeds.php:524
+#: tt-rss.php:232 modules/pref-feeds.php:296 modules/pref-feeds.php:522
 msgid "Update"
 msgstr "更新"
 
-#: tt-rss.php:238 tt-rss.php:252
+#: tt-rss.php:243 tt-rss.php:257
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: tt-rss.php:242
+#: tt-rss.php:247
 msgid "Drag me to resize panels"
 msgstr ""
 
@@ -1125,26 +1140,31 @@ msgstr "你好,"
 msgid "Help topic not found."
 msgstr "未找到帮助主题。"
 
-#: modules/opml_domdoc.php:52 modules/opml_domxml.php:54
+#: modules/opml_domdoc.php:56 modules/opml_domxml.php:54
 #, fuzzy, php-format
 msgid "<li>Adding category <b>%s</b>.</li>"
 msgstr "添加分类 <b>%s</b>."
 
-#: modules/opml_domdoc.php:101 modules/opml_domxml.php:103
+#: modules/opml_domdoc.php:78
+#, php-format
+msgid "Setting preference key %s to %s"
+msgstr ""
+
+#: modules/opml_domdoc.php:124 modules/opml_domxml.php:103
 #, fuzzy
 msgid "is already imported."
 msgstr "已导入"
 
-#: modules/opml_domdoc.php:121 modules/opml_domxml.php:122
+#: modules/opml_domdoc.php:144 modules/opml_domxml.php:122
 #, fuzzy
 msgid "OK"
 msgstr "OK！"
 
-#: modules/opml_domdoc.php:130 modules/opml_domxml.php:134
+#: modules/opml_domdoc.php:153 modules/opml_domxml.php:134
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
-#: modules/opml_domdoc.php:134 modules/opml_domxml.php:138
+#: modules/opml_domdoc.php:157 modules/opml_domxml.php:138
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传OPML文件。"
 
@@ -1182,7 +1202,7 @@ msgid "(active)"
 msgstr "自适应"
 
 #: modules/popup-dialog.php:148 modules/popup-dialog.php:377
-#: modules/pref-feeds.php:455 modules/pref-feeds.php:1136
+#: modules/pref-feeds.php:453 modules/pref-feeds.php:1128
 #: modules/pref-filters.php:153 modules/pref-filters.php:321
 #: modules/pref-labels.php:140 modules/pref-users.php:378
 msgid "Remove"
@@ -1258,24 +1278,24 @@ msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
 #: modules/popup-dialog.php:275 modules/pref-feeds.php:197
-#: modules/pref-feeds.php:488 modules/pref-filters.php:407
+#: modules/pref-feeds.php:486 modules/pref-filters.php:407
 msgid "Feed"
 msgstr "Feed"
 
 #: modules/popup-dialog.php:278 modules/pref-feeds.php:213
-#: modules/pref-feeds.php:502
+#: modules/pref-feeds.php:500
 #, fuzzy
 msgid "URL:"
 msgstr "Feed URL:"
 
 #: modules/popup-dialog.php:287 modules/pref-feeds.php:225
-#: modules/pref-feeds.php:514
+#: modules/pref-feeds.php:512
 #, fuzzy
 msgid "Place in category:"
 msgstr "保存分类..."
 
-#: modules/popup-dialog.php:295 modules/pref-feeds.php:332
-#: modules/pref-feeds.php:558 modules/pref-prefs.php:235
+#: modules/popup-dialog.php:295 modules/pref-feeds.php:330
+#: modules/pref-feeds.php:554 modules/pref-prefs.php:235
 #: modules/pref-users.php:142
 msgid "Authentication"
 msgstr "认证"
@@ -1295,8 +1315,8 @@ msgstr "移除feed中..."
 
 #: modules/popup-dialog.php:318 modules/popup-dialog.php:378
 #: modules/popup-dialog.php:452 modules/popup-dialog.php:570
-#: modules/popup-dialog.php:639 modules/pref-feeds.php:468
-#: modules/pref-feeds.php:623 modules/pref-filters.php:160
+#: modules/popup-dialog.php:639 modules/pref-feeds.php:466
+#: modules/pref-feeds.php:619 modules/pref-filters.php:160
 #: modules/pref-users.php:181
 msgid "Cancel"
 msgstr "取消"
@@ -1307,7 +1327,7 @@ msgid "Feed Browser"
 msgstr "Feed编辑"
 
 #: modules/popup-dialog.php:344 modules/popup-dialog.php:386
-#: modules/popup-dialog.php:451 modules/pref-feeds.php:1177
+#: modules/popup-dialog.php:451 modules/pref-feeds.php:1169
 #: modules/pref-filters.php:308 modules/pref-labels.php:131
 #: modules/pref-users.php:361
 msgid "Search"
@@ -1393,8 +1413,8 @@ msgstr "完成更新"
 msgid "with parameters:"
 msgstr ""
 
-#: modules/popup-dialog.php:549 modules/pref-feeds.php:355
-#: modules/pref-feeds.php:576 modules/pref-filters.php:121
+#: modules/popup-dialog.php:549 modules/pref-feeds.php:353
+#: modules/pref-feeds.php:572 modules/pref-filters.php:121
 #: modules/pref-users.php:164
 #, fuzzy
 msgid "Options"
@@ -1428,8 +1448,8 @@ msgstr "编辑标签"
 msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开:"
 
-#: modules/popup-dialog.php:638 modules/pref-feeds.php:467
-#: modules/pref-feeds.php:621 modules/pref-filters.php:157
+#: modules/popup-dialog.php:638 modules/pref-feeds.php:465
+#: modules/pref-feeds.php:617 modules/pref-filters.php:157
 #: modules/pref-users.php:179
 msgid "Save"
 msgstr "保存"
@@ -1466,204 +1486,239 @@ msgstr "链接:"
 msgid "Not linked"
 msgstr "无链接"
 
-#: modules/pref-feeds.php:310 modules/pref-feeds.php:537
+#: modules/pref-feeds.php:309 modules/pref-feeds.php:534
 msgid "using"
 msgstr ""
 
-#: modules/pref-feeds.php:322 modules/pref-feeds.php:549
+#: modules/pref-feeds.php:320 modules/pref-feeds.php:545
 msgid "Article purging:"
 msgstr "文章清理:"
 
-#: modules/pref-feeds.php:369 modules/pref-feeds.php:582
+#: modules/pref-feeds.php:367 modules/pref-feeds.php:578
 #, fuzzy
 msgid "Hide from Popular feeds"
 msgstr "隐藏我的Feed列表"
 
-#: modules/pref-feeds.php:380 modules/pref-feeds.php:587
+#: modules/pref-feeds.php:378 modules/pref-feeds.php:583
 msgid "Right-to-left content"
 msgstr "由右-左阅读习惯"
 
-#: modules/pref-feeds.php:392 modules/pref-feeds.php:593
+#: modules/pref-feeds.php:390 modules/pref-feeds.php:589
 msgid "Include in e-mail digest"
 msgstr "包括电子邮件文摘"
 
-#: modules/pref-feeds.php:405 modules/pref-feeds.php:599
+#: modules/pref-feeds.php:403 modules/pref-feeds.php:595
 msgid "Always display image attachments"
 msgstr ""
 
-#: modules/pref-feeds.php:427 modules/pref-feeds.php:607
+#: modules/pref-feeds.php:425 modules/pref-feeds.php:603
 msgid "Cache images locally"
 msgstr ""
 
-#: modules/pref-feeds.php:439
+#: modules/pref-feeds.php:437
 #, fuzzy
 msgid "Icon"
 msgstr "操作"
 
-#: modules/pref-feeds.php:453
+#: modules/pref-feeds.php:451
 msgid "Replace"
 msgstr ""
 
-#: modules/pref-feeds.php:478
+#: modules/pref-feeds.php:476
 #, fuzzy
 msgid "Multiple Feed Editor"
 msgstr "Feed编辑"
 
-#: modules/pref-feeds.php:842 modules/pref-feeds.php:889
+#: modules/pref-feeds.php:838 modules/pref-feeds.php:885
 msgid "All done."
 msgstr ""
 
-#: modules/pref-feeds.php:920
+#: modules/pref-feeds.php:916
 #, php-format
 msgid "Subscribed to <b>%s</b>."
 msgstr "订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:923
+#: modules/pref-feeds.php:919
 #, fuzzy, php-format
 msgid "Could not subscribe to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:926
+#: modules/pref-feeds.php:922
 #, php-format
 msgid "Already subscribed to <b>%s</b>."
 msgstr "已经订阅到 <b>%s</b>."
 
-#: modules/pref-feeds.php:949
+#: modules/pref-feeds.php:945
 msgid "Edit subscription options"
 msgstr ""
 
-#: modules/pref-feeds.php:1033
+#: modules/pref-feeds.php:1027
 msgid "Category editor"
 msgstr "分类编辑"
 
-#: modules/pref-feeds.php:1056
+#: modules/pref-feeds.php:1049
 #, php-format
 msgid "Category <b>$%s</b> already exists in the database."
 msgstr "分类 <b>$%s</b>已经存在."
 
-#: modules/pref-feeds.php:1077
+#: modules/pref-feeds.php:1069
 msgid "Create category"
 msgstr "创建分类"
 
-#: modules/pref-feeds.php:1130
+#: modules/pref-feeds.php:1122
 msgid "No feed categories defined."
 msgstr "未定义feed分类"
 
-#: modules/pref-feeds.php:1160
+#: modules/pref-feeds.php:1152
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: modules/pref-feeds.php:1181 help/3.php:45 help/4.php:22
+#: modules/pref-feeds.php:1173 help/3.php:45 help/4.php:22
 msgid "Subscribe to feed"
 msgstr "订阅feed"
 
-#: modules/pref-feeds.php:1184
+#: modules/pref-feeds.php:1176
 #, fuzzy
 msgid "Edit feeds"
 msgstr "输入feed"
 
-#: modules/pref-feeds.php:1189
+#: modules/pref-feeds.php:1181
 msgid "Edit categories"
 msgstr "编辑分类"
 
-#: modules/pref-feeds.php:1198
+#: modules/pref-feeds.php:1190
 #, fuzzy
 msgid "More actions..."
 msgstr "激活..."
 
-#: modules/pref-feeds.php:1202
+#: modules/pref-feeds.php:1194
 msgid "Manual purge"
 msgstr ""
 
-#: modules/pref-feeds.php:1206
+#: modules/pref-feeds.php:1198
 #, fuzzy
 msgid "Clear feed data"
 msgstr "所有Feed已更新。"
 
-#: modules/pref-feeds.php:1207 modules/pref-filters.php:324
+#: modules/pref-feeds.php:1199 modules/pref-filters.php:324
 #, fuzzy
 msgid "Rescore articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1296
+#: modules/pref-feeds.php:1288
 msgid "Show last article times"
 msgstr "显示最近文章时间"
 
-#: modules/pref-feeds.php:1313 modules/pref-feeds.php:1373
+#: modules/pref-feeds.php:1305 modules/pref-feeds.php:1365
 msgid "Last&nbsp;Article"
 msgstr "最后&nbsp;文章"
 
-#: modules/pref-feeds.php:1398 modules/pref-filters.php:487
+#: modules/pref-feeds.php:1390 modules/pref-filters.php:487
 #: modules/pref-users.php:467
 msgid "Click to edit"
 msgstr ""
 
-#: modules/pref-feeds.php:1412
+#: modules/pref-feeds.php:1404
 #, php-format
 msgid "(linked to %s)"
 msgstr ""
 
-#: modules/pref-feeds.php:1439
+#: modules/pref-feeds.php:1431
 #, fuzzy
 msgid "You don't have any subscribed feeds."
 msgstr "您不能从分类中取消订阅。"
 
-#: modules/pref-feeds.php:1441
+#: modules/pref-feeds.php:1433
 #, fuzzy
 msgid "No matching feeds found."
 msgstr "未找到文章。"
 
-#: modules/pref-feeds.php:1447
+#: modules/pref-feeds.php:1439
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1451
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1453
+msgid "Note: Only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1468
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1473
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1479
+#, fuzzy
+msgid ""
+"Your OPML can be published publicly and can be subscribed by anyone who "
+"knows the URL below."
+msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
+
+#: modules/pref-feeds.php:1481
+msgid ""
+"Note: Published OPML does not include your Tiny Tiny RSS settings, feeds "
+"that require authentication or feeds hidden from Popular feeds."
+msgstr ""
+
+#: modules/pref-feeds.php:1484 modules/pref-feeds.php:1525
+#, fuzzy
+msgid "Display URL"
+msgstr "显示标签"
+
+#: modules/pref-feeds.php:1489
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1491
 msgid ""
 "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the "
 "link below."
 msgstr ""
 
-#: modules/pref-feeds.php:1487
+#: modules/pref-feeds.php:1498
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1502
-#, fuzzy
+#: modules/pref-feeds.php:1504
+msgid "Subscribing via bookmarklet"
+msgstr ""
+
+#: modules/pref-feeds.php:1506
 msgid ""
-"Published articles are exported as a public RSS feed and can be subscribed "
-"by anyone who knows the URL specified below."
-msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
+"Drag the link below to your browser toolbar, open the feed you're interested "
+"in in your browser and click on the link to subscribe to it."
+msgstr ""
+
+#: modules/pref-feeds.php:1510
+#, fuzzy, php-format
+msgid "Subscribe to %s in Tiny Tiny RSS?"
+msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1505 modules/pref-feeds.php:1510
+#: modules/pref-feeds.php:1514
 #, fuzzy
-msgid "Display URL"
-msgstr "显示标签"
+msgid "Subscribe in Tiny Tiny RSS"
+msgstr "返回Tiny Tiny RSS"
 
-#: modules/pref-feeds.php:1507
+#: modules/pref-feeds.php:1522
 #, fuzzy
 msgid ""
-"Your OPML can be published publicly and can be subscribed by anyone who "
-"knows the URL below."
+"Published articles are exported as a public RSS feed and can be subscribed "
+"by anyone who knows the URL specified below."
 msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
-#: modules/pref-feeds.php:1613
+#: modules/pref-feeds.php:1630
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1659
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2236,78 +2291,78 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
-#: functions.js:1315
+#: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
 
-#: functions.js:1350
+#: functions.js:1367
 msgid "Can't subscribe: no feed URL given."
 msgstr "未能订阅：无 feed URL。"
 
-#: functions.js:1354
+#: functions.js:1371
 #, fuzzy
 msgid "Subscribing to feed..."
 msgstr "订阅feed"
 
-#: functions.js:1377
+#: functions.js:1394
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "订阅feed:"
 
-#: functions.js:1386
+#: functions.js:1403
 #, fuzzy
 msgid "Can't subscribe to the specified URL."
 msgstr "未能订阅：无 feed URL。"
 
-#: functions.js:1389
+#: functions.js:1406
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "您不能从分类中取消订阅。"
 
-#: functions.js:1952
+#: functions.js:1967
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
-#: functions.js:1989
+#: functions.js:2004
 #, fuzzy
 msgid "Subscribed to %d feed(s)."
 msgstr "订阅feed:"
 
-#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619
+#: functions.js:2014 functions.js:2045 prefs.js:557 prefs.js:587 prefs.js:619
 #: prefs.js:908 prefs.js:928 prefs.js:1831
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: functions.js:2014
+#: functions.js:2029
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
 msgstr ""
 
-#: functions.js:2066
+#: functions.js:2081
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "移除选定标记?"
 
-#: functions.js:2098
+#: functions.js:2113
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "请只选择一个feed."
 
-#: functions.js:2100
+#: functions.js:2115
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: functions.js:2117
+#: functions.js:2132
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "请输入标签主题"
 
-#: functions.js:2122
+#: functions.js:2137
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: functions.js:2162 tt-rss.js:568
+#: functions.js:2177 tt-rss.js:568
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
@@ -2412,8 +2467,10 @@ msgid "No labels are selected."
 msgstr "未选定标记."
 
 #: prefs.js:468
-msgid "Remove selected users?"
-msgstr "移除选定用户?"
+msgid ""
+"Remove selected users? Neither default admin nor your account will be "
+"removed."
+msgstr ""
 
 #: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
 msgid "No users are selected."
@@ -2556,30 +2613,30 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: tt-rss.js:562 tt-rss.js:755 tt-rss.js:930
+#: tt-rss.js:562 tt-rss.js:767 tt-rss.js:942
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: tt-rss.js:618
+#: tt-rss.js:630
 #, fuzzy
 msgid "Reset category order?"
 msgstr "移除选定分类?"
 
-#: tt-rss.js:727 tt-rss.js:740
+#: tt-rss.js:739 tt-rss.js:752
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: tt-rss.js:760
+#: tt-rss.js:772
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:925
+#: tt-rss.js:937
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:935
+#: tt-rss.js:947
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
@@ -2657,6 +2714,13 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
+#, fuzzy
+#~ msgid "Reset category order"
+#~ msgstr "移除选定分类?"
+
+#~ msgid "Remove selected users?"
+#~ msgstr "移除选定用户?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "添加feed中..."
 
@@ -3215,9 +3279,6 @@ msgstr "请输入标签主题"
 #~ msgid "Enable icons in feedlist"
 #~ msgstr "feed列表中不启用ico"
 
-#~ msgid "Category:"
-#~ msgstr "分类:"
-
 #~ msgid "Caption:"
 #~ msgstr "说明:"