From b6bf3e74fb0f9ba2417992ec1cf92a2b3531eb0a Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Fri, 18 Mar 2011 18:25:21 +0300
Subject: update translations

---
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 14370 -> 13933 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 369 +++++++++++++++++------------------
 2 files changed, 184 insertions(+), 185 deletions(-)

(limited to 'locale/zh_CN/LC_MESSAGES')

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index d251aa422..706c974fb 100644
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 589c216ca..f4f3c4648 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-16 15:50+0300\n"
+"POT-Creation-Date: 2011-03-18 18:25+0300\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"
@@ -13,118 +13,122 @@ msgstr ""
 "X-Poedit-Country: china\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#: backend.php:92
+#: backend.php:81
 msgid "Use default"
 msgstr "用户默认"
 
-#: backend.php:93
+#: backend.php:82
 msgid "Never purge"
 msgstr "从未"
 
-#: backend.php:94
+#: backend.php:83
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:95
+#: backend.php:84
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:96
+#: backend.php:85
 msgid "1 month old"
 msgstr "1月前"
 
-#: backend.php:97
+#: backend.php:86
 msgid "2 months old"
 msgstr "2月前"
 
-#: backend.php:98
+#: backend.php:87
 msgid "3 months old"
 msgstr "3月前"
 
-#: backend.php:101
+#: backend.php:90
 #, fuzzy
 msgid "Default interval"
 msgstr "更新间隔:"
 
-#: backend.php:102 backend.php:112
+#: backend.php:91 backend.php:101
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:103 backend.php:113
+#: backend.php:92 backend.php:102
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:104 backend.php:114
+#: backend.php:93 backend.php:103
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:105 backend.php:115
+#: backend.php:94 backend.php:104
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:106 backend.php:116
+#: backend.php:95 backend.php:105
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:107 backend.php:117
+#: backend.php:96 backend.php:106
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:108 backend.php:118
+#: backend.php:97 backend.php:107
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:109 backend.php:119
+#: backend.php:98 backend.php:108
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:122 tt-rss.php:147 modules/pref-prefs.php:347
+#: backend.php:111 tt-rss.php:147 modules/pref-prefs.php:347
 msgid "Default"
 msgstr "默认"
 
-#: backend.php:123
+#: backend.php:112
 #, fuzzy
 msgid "Magpie"
 msgstr "页"
 
-#: backend.php:124
+#: backend.php:113
 msgid "SimplePie"
 msgstr ""
 
-#: backend.php:125
+#: backend.php:114
 msgid "Twitter OAuth"
 msgstr ""
 
-#: backend.php:134 modules/pref-users.php:131
+#: backend.php:123 modules/pref-users.php:131
 msgid "User"
 msgstr "用户"
 
-#: backend.php:135
+#: backend.php:124
 msgid "Power User"
 msgstr ""
 
-#: backend.php:136
+#: backend.php:125
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:182 prefs.php:103 modules/pref-feeds.php:41
+#: backend.php:176 prefs.php:103 modules/pref-feeds.php:41
 #: modules/pref-feeds.php:1176 modules/pref-feeds.php:1213
 #, fuzzy
 msgid "Feeds"
 msgstr "Feed"
 
-#: backend.php:209
+#: backend.php:203
 #, fuzzy
 msgid "Article not found."
 msgstr "未找到Feed."
 
-#: backend.php:526 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
+#: backend.php:282 functions.php:4769
+msgid "Feed not found."
+msgstr "未找到Feed."
+
+#: backend.php:520 digest.php:61 prefs.php:66 tt-rss.php:62 tt-rss.php:111
 #: tt-rss.php:196 modules/pref-feeds.php:1262 modules/pref-filters.php:424
-#: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1558
+#: modules/pref-labels.php:293 digest.js:129 viewfeed.js:1459
 msgid "Loading, please wait..."
 msgstr "读取中，请等待..."
 
-#: backend.php:539 login_form.php:153 modules/backend-rpc.php:66
+#: backend.php:533 login_form.php:153 modules/backend-rpc.php:66
 #: modules/popup-dialog.php:109
 #, fuzzy
 msgid "Default profile"
@@ -237,10 +241,6 @@ msgstr "最新提要："
 msgid "You are viewing the digest page. Click to open full version."
 msgstr ""
 
-#: errors.php:4
-msgid "Unknown error"
-msgstr "未知错误"
-
 #: errors.php:6
 msgid ""
 "This program requires XmlHttpRequest to function properly. Your browser "
@@ -291,8 +291,9 @@ msgid "Configuration check failed"
 msgstr "设置检查失败"
 
 #: errors.php:28
+#, fuzzy
 msgid ""
-"Your version of MySQL is not currently supported. Please see \n"
+"Your version of MySQL is not currently supported. Please see\n"
 "\t\tofficial site for more information."
 msgstr ""
 "不支持你的MySQL版本. 请访问 \n"
@@ -302,188 +303,188 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1928
+#: functions.php:1892
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2000
+#: functions.php:1964
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2995 modules/popup-dialog.php:394
+#: functions.php:2942 modules/popup-dialog.php:394
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:3027 functions.php:3070 functions.php:4317 functions.php:4326
+#: functions.php:2974 functions.php:3017 functions.php:4265 functions.php:4274
 #: modules/pref-feeds.php:86
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3060 functions.php:3662 mobile/functions.php:168
+#: functions.php:3007 functions.php:3609 mobile/functions.php:168
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3062 functions.php:3664 prefs.php:109
+#: functions.php:3009 functions.php:3611 prefs.php:109
 #: modules/pref-labels.php:89 help/4.php:12 mobile/functions.php:195
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3108 help/3.php:61
+#: functions.php:3055 help/3.php:61
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3110 help/3.php:62
+#: functions.php:3057 help/3.php:62
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3112 help/3.php:60
+#: functions.php:3059 help/3.php:60
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3114 help/3.php:59
+#: functions.php:3061 help/3.php:59
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3116
+#: functions.php:3063
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4084
+#: functions.php:4031
 msgid "Select:"
 msgstr "选择："
 
-#: functions.php:4085 modules/pref-feeds.php:1207 modules/pref-filters.php:399
+#: functions.php:4032 modules/pref-feeds.php:1207 modules/pref-filters.php:399
 #: modules/pref-labels.php:272 modules/pref-users.php:382
 msgid "All"
 msgstr "所有"
 
-#: functions.php:4086 functions.php:4098 tt-rss.php:139
+#: functions.php:4033 functions.php:4045 tt-rss.php:139
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4087
+#: functions.php:4034
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4088 modules/pref-feeds.php:1209 modules/pref-filters.php:401
+#: functions.php:4035 modules/pref-feeds.php:1209 modules/pref-filters.php:401
 #: modules/pref-labels.php:274 modules/pref-users.php:384
 msgid "None"
 msgstr "无"
 
-#: functions.php:4094 tt-rss.php:165
+#: functions.php:4041 tt-rss.php:165
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4096
+#: functions.php:4043
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4099 tt-rss.php:137
+#: functions.php:4046 tt-rss.php:137
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4100 tt-rss.php:138
+#: functions.php:4047 tt-rss.php:138
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4102
+#: functions.php:4049
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4104 functions.php:4122 localized_schema.php:10
+#: functions.php:4051 functions.php:4069 localized_schema.php:10
 #: tt-rss.php:159 tt-rss.php:174 digest.js:365 digest.js:436 digest.js:592
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4107
+#: functions.php:4054
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4109
+#: functions.php:4056
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4110
+#: functions.php:4057
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4114 functions.php:4682 functions.php:5303
+#: functions.php:4061 functions.php:4627 functions.php:5229
 msgid "Forward by email"
 msgstr ""
 
-#: functions.php:4120 PrefFilterTree.js:29
+#: functions.php:4067 PrefFilterTree.js:29
 msgid "Feed:"
 msgstr "Feed:"
 
-#: functions.php:4124 modules/popup-dialog.php:737
+#: functions.php:4071 modules/popup-dialog.php:737
 #, fuzzy
 msgid "View as RSS"
 msgstr "编辑标签"
 
-#: functions.php:4134 functions.php:4734
+#: functions.php:4081 functions.php:4679
 msgid "Visit the website"
 msgstr ""
 
-#: functions.php:4180
+#: functions.php:4127
 #, fuzzy
 msgid "View as RSS feed"
 msgstr "隐藏我的Feed列表"
 
-#: functions.php:4504 viewfeed.js:2342
+#: functions.php:4452 viewfeed.js:2243
 #, fuzzy
 msgid "Click to play"
 msgstr "星级文章"
 
-#: functions.php:4505 viewfeed.js:2341
+#: functions.php:4453 viewfeed.js:2242
 msgid "Play"
 msgstr ""
 
-#: functions.php:4634
+#: functions.php:4579
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4663 functions.php:5281
+#: functions.php:4608 functions.php:5207
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4669 functions.php:5290
+#: functions.php:4614 functions.php:5216
 #, fuzzy
 msgid "Open article in new tab"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4676 functions.php:5297 viewfeed.js:2286
+#: functions.php:4621 functions.php:5223 viewfeed.js:2187
 #, fuzzy
 msgid "Edit article note"
 msgstr "编辑标签"
 
-#: functions.php:4689 functions.php:5310 digest.js:435
+#: functions.php:4634 functions.php:5236 digest.js:435
 msgid "Share on Twitter"
 msgstr ""
 
-#: functions.php:4695
+#: functions.php:4640
 #, fuzzy
 msgid "Close this panel"
 msgstr "关闭此窗口"
 
-#: functions.php:4712 functions.php:5212
+#: functions.php:4657 functions.php:5138
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4725 functions.php:5225 modules/popup-dialog.php:251
+#: functions.php:4670 functions.php:5151 modules/popup-dialog.php:251
 #: modules/pref-feeds.php:298
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4766 modules/help.php:21 modules/popup-dialog.php:53
+#: functions.php:4709 modules/help.php:21 modules/popup-dialog.php:53
 #: modules/popup-dialog.php:172 modules/popup-dialog.php:196
 #: modules/popup-dialog.php:234 modules/popup-dialog.php:563
 #: modules/popup-dialog.php:622 modules/popup-dialog.php:760
@@ -492,98 +493,88 @@ msgstr "Feed"
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:4823
-msgid "Feed not found."
-msgstr "未找到Feed."
-
-#: functions.php:4892
-msgid ""
-"Could not display feed (query failed). Please check label match syntax or "
-"local configuration."
-msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
-
-#: functions.php:5047 functions.php:5128
+#: functions.php:4975 functions.php:5054
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5316
+#: functions.php:5242
 #, fuzzy
 msgid "Dismiss article"
 msgstr "发布文章"
 
-#: functions.php:5335
+#: functions.php:5261
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5338
+#: functions.php:5264
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5341
+#: functions.php:5267
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5345
+#: functions.php:5271
 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:5347
+#: functions.php:5273
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5362 functions.php:6668
+#: functions.php:5288 functions.php:6613
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr ""
 
-#: functions.php:5372 functions.php:6678
+#: functions.php:5298 functions.php:6623
 msgid "Some feeds have update errors (click for details)"
 msgstr "有些feed更新错误(点击了解详情) "
 
-#: functions.php:6178 tt-rss.php:179
+#: functions.php:6105 tt-rss.php:179
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6192
+#: functions.php:6119
 #, fuzzy
 msgid "Remove:"
 msgstr "移除"
 
-#: functions.php:6196
+#: functions.php:6123
 #, fuzzy
 msgid "Assign:"
 msgstr "指定标签"
 
-#: functions.php:6244
+#: functions.php:6171
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6267
+#: functions.php:6194
 msgid "edit note"
 msgstr ""
 
-#: functions.php:6658
+#: functions.php:6603
 msgid "No feed selected."
 msgstr "无选定feed."
 
-#: functions.php:6846
+#: functions.php:6787
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:6886
+#: functions.php:6827
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:6888
+#: functions.php:6829
 msgid "Attachments:"
 msgstr ""
 
@@ -617,7 +608,7 @@ msgstr "过滤文章"
 msgid "Set starred"
 msgstr "设置星级"
 
-#: localized_schema.php:12 digest.js:412 digest.js:694 viewfeed.js:470
+#: localized_schema.php:12 digest.js:412 digest.js:694 viewfeed.js:401
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -625,7 +616,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "指定标签"
 
-#: localized_schema.php:14 viewfeed.js:2227
+#: localized_schema.php:14 viewfeed.js:2128
 #, fuzzy
 msgid "Assign label"
 msgstr "指定标签"
@@ -819,7 +810,7 @@ msgstr ""
 msgid "Sort headlines by feed date"
 msgstr "以未读文章数量排序feed源"
 
-#: localized_schema.php:57 prefs.js:1720
+#: localized_schema.php:57 prefs.js:1676
 #, fuzzy
 msgid "Customize stylesheet"
 msgstr "用户样式表 URL"
@@ -1086,20 +1077,20 @@ msgstr ""
 msgid "Register"
 msgstr "重置密码"
 
-#: modules/backend-rpc.php:830
+#: modules/backend-rpc.php:828
 msgid "Your request could not be completed."
 msgstr ""
 
-#: modules/backend-rpc.php:834
+#: modules/backend-rpc.php:832
 msgid "Feed update has been scheduled."
 msgstr ""
 
-#: modules/backend-rpc.php:842
+#: modules/backend-rpc.php:840
 #, fuzzy
 msgid "Category update has been scheduled."
 msgstr "密码已更改."
 
-#: modules/backend-rpc.php:855
+#: modules/backend-rpc.php:853
 #, fuzzy
 msgid "Can't update this kind of feed."
 msgstr "您不能编辑本分类feed"
@@ -2244,12 +2235,12 @@ msgid ""
 msgstr ""
 
 #: mobile/functions.php:58 mobile/functions.php:134 mobile/functions.php:170
-#: mobile/functions.php:197 mobile/functions.php:233 mobile/functions.php:363
+#: mobile/functions.php:197 mobile/functions.php:233 mobile/functions.php:367
 #: mobile/prefs.php:25
 msgid "Home"
 msgstr ""
 
-#: mobile/functions.php:399
+#: mobile/functions.php:403
 msgid "Nothing found (click to reload feed)."
 msgstr ""
 
@@ -2287,7 +2278,7 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
-#: digest.js:24 tt-rss.js:529 tt-rss.js:542
+#: digest.js:24 tt-rss.js:506 tt-rss.js:519
 #, fuzzy
 msgid "Mark all articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
@@ -2302,17 +2293,17 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Error: unable to load article."
 msgstr "错误：请上传OPML文件。"
 
-#: digest.js:405 digest.js:654 viewfeed.js:427
+#: digest.js:405 digest.js:654 viewfeed.js:358
 #, fuzzy
 msgid "Unstar article"
 msgstr "星级文章"
 
-#: digest.js:407 digest.js:658 viewfeed.js:432
+#: digest.js:407 digest.js:658 viewfeed.js:363
 #, fuzzy
 msgid "Star article"
 msgstr "星级文章"
 
-#: digest.js:410 digest.js:689 viewfeed.js:465
+#: digest.js:410 digest.js:689 viewfeed.js:396
 #, fuzzy
 msgid "Unpublish article"
 msgstr "发布文章"
@@ -2341,7 +2332,7 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Load more..."
 msgstr "读取帮助..."
 
-#: feedlist.js:276
+#: feedlist.js:272
 msgid "New articles available in this feed (click to show)"
 msgstr ""
 
@@ -2350,115 +2341,115 @@ msgstr ""
 msgid "Update feed"
 msgstr "星级文章"
 
-#: functions.js:62
+#: functions.js:70
 msgid ""
 "Are you sure to report this exception to tt-rss.org? The report will include "
 "your browser information. Your IP would be saved in the database."
 msgstr ""
 
-#: functions.js:628
+#: functions.js:631
 msgid "Date syntax appears to be correct."
 msgstr ""
 
-#: functions.js:631
+#: functions.js:634
 #, fuzzy
 msgid "Date syntax is incorrect."
 msgstr "原密码错误."
 
-#: functions.js:767
+#: functions.js:770
 #, fuzzy
 msgid "Remove stored feed icon?"
 msgstr "移除选定标记?"
 
-#: functions.js:799
+#: functions.js:802
 #, fuzzy
 msgid "Please select an image file to upload."
 msgstr "请只选择一个feed."
 
-#: functions.js:801
+#: functions.js:804
 msgid "Upload new icon for this feed?"
 msgstr ""
 
-#: functions.js:818
+#: functions.js:821
 #, fuzzy
 msgid "Please enter label caption:"
 msgstr "请输入标签主题"
 
-#: functions.js:823
+#: functions.js:826
 msgid "Can't create label: missing caption."
 msgstr "创建标签失败：缺少标题。"
 
-#: functions.js:865
+#: functions.js:868
 #, fuzzy
 msgid "Subscribe to Feed"
 msgstr "订阅feed"
 
-#: functions.js:873
+#: functions.js:876
 #, fuzzy
 msgid "Subscribing to feed..."
 msgstr "订阅feed"
 
-#: functions.js:891
+#: functions.js:894
 #, fuzzy
 msgid "Subscribed to %s"
 msgstr "订阅feed:"
 
-#: functions.js:896
+#: functions.js:899
 msgid "Specified URL seems to be invalid."
 msgstr ""
 
-#: functions.js:899
+#: functions.js:902
 msgid "Specified URL doesn't seem to contain any feeds."
 msgstr ""
 
-#: functions.js:935
+#: functions.js:938
 #, fuzzy
 msgid "Couldn't download the specified URL."
 msgstr "未能订阅：无 feed URL。"
 
-#: functions.js:938
+#: functions.js:941
 #, fuzzy
 msgid "You are already subscribed to this feed."
 msgstr "您不能从分类中取消订阅。"
 
-#: functions.js:967
+#: functions.js:970
 #, fuzzy
 msgid "Create Filter"
 msgstr "创建过滤器"
 
-#: functions.js:1017 tt-rss.js:414
+#: functions.js:1020 tt-rss.js:391
 msgid "Unsubscribe from %s?"
 msgstr "退订%s?"
 
-#: functions.js:1134
+#: functions.js:1127
 #, fuzzy
 msgid "Please enter category title:"
 msgstr "请输入标签主题"
 
-#: functions.js:1165
+#: functions.js:1158
 msgid "Generate new syndication address for this feed?"
 msgstr ""
 
-#: functions.js:1349 tt-rss.js:393 tt-rss.js:866
+#: functions.js:1342 tt-rss.js:370 tt-rss.js:843
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: functions.js:1361
+#: functions.js:1354
 #, fuzzy
 msgid "Edit Feed"
 msgstr "输入feed"
 
-#: functions.js:1399
+#: functions.js:1392
 #, fuzzy
 msgid "More Feeds"
 msgstr "移除feed中..."
 
-#: functions.js:1438 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
-#: prefs.js:667 prefs.js:1350
+#: functions.js:1431 prefs.js:399 prefs.js:429 prefs.js:461 prefs.js:647
+#: prefs.js:667 prefs.js:1323
 msgid "No feeds are selected."
 msgstr "未选择feed."
 
-#: functions.js:1480
+#: functions.js:1473
 msgid ""
 "Remove selected feeds from the archive? Feeds with stored articles will not "
 "be removed."
@@ -2493,7 +2484,7 @@ msgstr "移除选定的过滤器？"
 msgid "Remove selected labels?"
 msgstr "移除选定标记?"
 
-#: prefs.js:296 prefs.js:1391
+#: prefs.js:296 prefs.js:1364
 msgid "No labels are selected."
 msgstr "未选定标记."
 
@@ -2532,7 +2523,7 @@ msgstr "标记  %s 中所有访问过的主题为已读"
 msgid "How many days of articles to keep (0 - use default)?"
 msgstr ""
 
-#: prefs.js:474 prefs.js:1423
+#: prefs.js:474 prefs.js:1396
 msgid ""
 "Remove selected profiles? Active and default profiles will not be removed."
 msgstr ""
@@ -2578,69 +2569,69 @@ msgstr "导入"
 msgid "Please choose an OPML file first."
 msgstr "请先选择若干feed"
 
-#: prefs.js:941
+#: prefs.js:915
 msgid "Reset to defaults?"
 msgstr "重置默认项？"
 
-#: prefs.js:1158
+#: prefs.js:1131
 #, fuzzy
 msgid "Feed Categories"
 msgstr "分类:"
 
-#: prefs.js:1167
+#: prefs.js:1140
 msgid "Remove selected categories?"
 msgstr "移除选定分类?"
 
-#: prefs.js:1186
+#: prefs.js:1159
 msgid "No categories are selected."
 msgstr "未选定分类。"
 
-#: prefs.js:1225
+#: prefs.js:1198
 #, fuzzy
 msgid "Replace current OPML publishing address with a new one?"
 msgstr "使用新地址替换当前地址？"
 
-#: prefs.js:1334
+#: prefs.js:1307
 #, fuzzy
 msgid "Rescore articles in selected feeds?"
 msgstr "无选定文章。"
 
-#: prefs.js:1357
+#: prefs.js:1330
 msgid "Rescore all articles? This operation may take a lot of time."
 msgstr ""
 
-#: prefs.js:1377
+#: prefs.js:1350
 #, fuzzy
 msgid "Reset selected labels to default colors?"
 msgstr "重置默认项？"
 
-#: prefs.js:1414
+#: prefs.js:1387
 msgid "Settings Profiles"
 msgstr ""
 
-#: prefs.js:1441
+#: prefs.js:1414
 #, fuzzy
 msgid "No profiles are selected."
 msgstr "无选定文章。"
 
-#: prefs.js:1449 prefs.js:1502
+#: prefs.js:1422 prefs.js:1475
 #, fuzzy
 msgid "Activate selected profile?"
 msgstr "移除选定的过滤器？"
 
-#: prefs.js:1465 prefs.js:1518
+#: prefs.js:1438 prefs.js:1491
 msgid "Please choose a profile to activate."
 msgstr ""
 
-#: prefs.js:1526
+#: prefs.js:1499
 msgid "This will invalidate all previously generated feed URLs. Continue?"
 msgstr ""
 
-#: prefs.js:1627
+#: prefs.js:1583
 msgid "Label Editor"
 msgstr "标记编辑"
 
-#: prefs.js:1691
+#: prefs.js:1647
 msgid ""
 "This will clear your stored authentication information for Twitter. Continue?"
 msgstr ""
@@ -2650,121 +2641,129 @@ msgstr ""
 msgid "Mark all articles as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: tt-rss.js:403
+#: tt-rss.js:380
 msgid "You can't unsubscribe from the category."
 msgstr "您不能从分类中取消订阅。"
 
-#: tt-rss.js:408 tt-rss.js:616 tt-rss.js:1085
+#: tt-rss.js:385 tt-rss.js:593 tt-rss.js:1010
 msgid "Please select some feed first."
 msgstr "请先选择若干feed"
 
-#: tt-rss.js:611
+#: tt-rss.js:588
 #, fuzzy
 msgid "You can't rescore this kind of feed."
 msgstr "您不能编辑本分类feed"
 
-#: tt-rss.js:621
+#: tt-rss.js:598
 #, fuzzy
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
-#: tt-rss.js:1125
+#: tt-rss.js:1050
 msgid "New version available!"
 msgstr ""
 
-#: viewfeed.js:664 viewfeed.js:702 viewfeed.js:739 viewfeed.js:801
-#: viewfeed.js:833 viewfeed.js:949 viewfeed.js:993 viewfeed.js:1043
-#: viewfeed.js:1771
+#: viewfeed.js:565 viewfeed.js:603 viewfeed.js:640 viewfeed.js:702
+#: viewfeed.js:734 viewfeed.js:850 viewfeed.js:894 viewfeed.js:944
+#: viewfeed.js:1672
 msgid "No articles are selected."
 msgstr "无选定文章。"
 
-#: viewfeed.js:929
+#: viewfeed.js:830
 msgid "Mark all visible articles in %s as read?"
 msgstr "标记  %s 中所有访问过的主题为已读"
 
-#: viewfeed.js:958
+#: viewfeed.js:859
 #, fuzzy
 msgid "Delete %d selected articles in %s?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:960
+#: viewfeed.js:861
 #, fuzzy
 msgid "Delete %d selected articles?"
 msgstr "移除选定标记?"
 
-#: viewfeed.js:1002
+#: viewfeed.js:903
 #, fuzzy
 msgid "Archive %d selected articles in %s?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1005
+#: viewfeed.js:906
 msgid "Move %d archived articles back?"
 msgstr ""
 
-#: viewfeed.js:1049
+#: viewfeed.js:950
 #, fuzzy
 msgid "Mark %d selected articles in %s as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1073
+#: viewfeed.js:974
 #, fuzzy
 msgid "Edit article Tags"
 msgstr "编辑标签"
 
-#: viewfeed.js:1455
+#: viewfeed.js:1356
 #, fuzzy
 msgid "No article is selected."
 msgstr "无选定文章。"
 
-#: viewfeed.js:1490
+#: viewfeed.js:1391
 #, fuzzy
 msgid "No articles found to mark"
 msgstr "未找到文章。"
 
-#: viewfeed.js:1492
+#: viewfeed.js:1393
 #, fuzzy
 msgid "Mark %d article(s) as read?"
 msgstr "标记  %s 中所有所选Feed为已读..."
 
-#: viewfeed.js:1581
+#: viewfeed.js:1482
 #, fuzzy
 msgid "Unable to load article."
 msgstr "错误：请上传OPML文件。"
 
-#: viewfeed.js:1642
+#: viewfeed.js:1543
 #, fuzzy
 msgid "Loading..."
 msgstr "读取中，请等待..."
 
-#: viewfeed.js:1785
+#: viewfeed.js:1686
 msgid "Forward article by email"
 msgstr ""
 
-#: viewfeed.js:2179
+#: viewfeed.js:2080
 #, fuzzy
 msgid "Open original article"
 msgstr "显示最近文章时间"
 
-#: viewfeed.js:2185
+#: viewfeed.js:2086
 #, fuzzy
 msgid "View in a tt-rss tab"
 msgstr "新窗口打开文章连结"
 
-#: viewfeed.js:2232
+#: viewfeed.js:2133
 #, fuzzy
 msgid "Remove label"
 msgstr "移除选定标记?"
 
-#: viewfeed.js:2335
+#: viewfeed.js:2236
 #, fuzzy
 msgid "Playing..."
 msgstr "读取中，请等待..."
 
-#: viewfeed.js:2336
+#: viewfeed.js:2237
 #, fuzzy
 msgid "Click to pause"
 msgstr "星级文章"
 
+#~ msgid "Unknown error"
+#~ msgstr "未知错误"
+
+#~ msgid ""
+#~ "Could not display feed (query failed). Please check label match syntax or "
+#~ "local configuration."
+#~ msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
+
 #~ msgid "Mark articles as read automatically"
 #~ msgstr "自动标志文章为已读"
 
-- 
cgit v1.2.3