From 1f8c187de33bd225161958080d8a49c006dc8303 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Wed, 3 Nov 2010 13:39:09 +0300
Subject: replace tt-rss.spb.ru references with tt-rss.org; update translations

---
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 17322 -> 17322 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 279 ++++++++++++++++++++---------------
 2 files changed, 163 insertions(+), 116 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 8c07b2bb8..b53022c90 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 405acd149..f2d01285e 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: 2010-10-13 14:48+0400\n"
+"POT-Creation-Date: 2010-11-03 13:38+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"
@@ -102,12 +102,66 @@ msgstr ""
 msgid "Administrator"
 msgstr "管理员"
 
-#: backend.php:544 login_form.php:142 modules/backend-rpc.php:61
+#: backend.php:552 login_form.php:142 modules/backend-rpc.php:61
 #: modules/popup-dialog.php:106
 #, fuzzy
 msgid "Default profile"
 msgstr "默认文章限制"
 
+#: digest.php:58
+#, fuzzy
+msgid ""
+"Your browser doesn't support Javascript, which is required\n"
+"\t\t\tfor this application to function properly. Please check your\n"
+"\t\t\tbrowser settings."
+msgstr "您的浏览器不支持Javascript, 请检查设置。"
+
+#: digest.php:64 prefs.php:64 prefs.php:124 tt-rss.php:66 digest.js:132
+msgid "Loading, please wait..."
+msgstr "读取中，请等待..."
+
+#: digest.php:72 prefs.php:141 tt-rss.php:100
+#, fuzzy
+msgid "Fatal Exception"
+msgstr "致命错误"
+
+#: digest.php:74 functions.php:4989 prefs.php:143 tt-rss.php:102
+#: 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:1132 modules/pref-users.php:96
+msgid "Close this window"
+msgstr "关闭此窗口"
+
+#: digest.php:84 prefs.php:91 tt-rss.php:113
+msgid "Hello,"
+msgstr "你好,"
+
+#: digest.php:88 prefs.php:95 tt-rss.php:123 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "注销"
+
+#: digest.php:93
+#, fuzzy
+msgid "Tiny Tiny RSS"
+msgstr "返回Tiny Tiny RSS"
+
+#: digest.php:114
+#, fuzzy
+msgid "feeds"
+msgstr "Feed"
+
+#: digest.php:120
+#, fuzzy
+msgid "headlines"
+msgstr "最新提要："
+
+#: digest.php:142
+msgid "You are viewing the digest page. Click to open full version."
+msgstr ""
+
 #: errors.php:3
 msgid "Unknown error"
 msgstr "未知错误"
@@ -172,265 +226,257 @@ msgstr ""
 msgid "SQL escaping test failed, check your database and PHP configuration"
 msgstr ""
 
-#: functions.php:1936
+#: functions.php:1938
 msgid "Session failed to validate (incorrect IP)"
 msgstr ""
 
-#: functions.php:2006
+#: functions.php:2008
 msgid "Incorrect username or password"
 msgstr ""
 
-#: functions.php:2989 modules/popup-dialog.php:418
+#: functions.php:2991 modules/popup-dialog.php:418
 #: modules/pref-filters.php:420
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:3021 functions.php:3060 functions.php:4465 functions.php:4493
+#: functions.php:3023 functions.php:3062 functions.php:4471 functions.php:4499
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1325
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3050 functions.php:3706 modules/backend-rpc.php:874
+#: functions.php:3052 functions.php:3712 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3052 functions.php:3708 prefs.php:115
+#: functions.php:3054 functions.php:3714 prefs.php:115
 #: 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:3099 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
-#: functions.php:3099 modules/pref-feeds.php:1516 help/3.php:61
+#: functions.php:3101 modules/pref-feeds.php:1516 help/3.php:61
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3103 help/3.php:59
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3105 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3105
+#: functions.php:3107
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4218
+#: functions.php:4224
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4223 functions.php:5573 modules/popup-dialog.php:82
+#: functions.php:4229 functions.php:5579 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:4224 modules/popup-dialog.php:83 modules/pref-feeds.php:1080
+#: functions.php:4230 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:4225 functions.php:4242 tt-rss.php:219
+#: functions.php:4231 functions.php:4248 tt-rss.php:219
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4226
+#: functions.php:4232
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4227 modules/popup-dialog.php:84 modules/pref-feeds.php:1081
+#: functions.php:4233 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:4235 tt-rss.php:179 offline.js:184
+#: functions.php:4241 tt-rss.php:179 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4241
+#: functions.php:4247
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4243 tt-rss.php:218
+#: functions.php:4249 tt-rss.php:218
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4244
+#: functions.php:4250
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4245
+#: functions.php:4251
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4246 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
+#: functions.php:4252 localized_schema.php:16 tt-rss.php:188 tt-rss.php:236
+#: digest.js:365 digest.js:435 digest.js:589
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4252
+#: functions.php:4258
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4254
+#: functions.php:4260
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4255
+#: functions.php:4261
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4260
+#: functions.php:4266
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4301
+#: functions.php:4307
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4511
+#: functions.php:4517
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4528
+#: functions.php:4534
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4687
+#: functions.php:4693
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4813
+#: functions.php:4819
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4838 functions.php:5600
+#: functions.php:4844 functions.php:5606
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4844 functions.php:5583
+#: functions.php:4850 functions.php:5589
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4851 functions.php:5590
+#: functions.php:4857 functions.php:5596
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4868 functions.php:5459
+#: functions.php:4874 functions.php:5465
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4881 functions.php:5472
+#: functions.php:4887 functions.php:5478
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4921 functions.php:5502
+#: functions.php:4927 functions.php:5508
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4961 functions.php:5547
+#: functions.php:4967 functions.php:5553
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4963 functions.php:5549
+#: functions.php:4969 functions.php:5555
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4983 prefs.php:143 tt-rss.php:102 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:1132
-#: modules/pref-users.php:96
-msgid "Close this window"
-msgstr "关闭此窗口"
-
-#: functions.php:5039
+#: functions.php:5045
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:5108
+#: functions.php:5114
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:5272 functions.php:5359
+#: functions.php:5278 functions.php:5365
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5435 functions.php:5442
+#: functions.php:5441 functions.php:5448 digest.js:441
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5607
+#: functions.php:5613
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5626
+#: functions.php:5632
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5629
+#: functions.php:5635
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5632
+#: functions.php:5638
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5636
+#: functions.php:5642
 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:5638 offline.js:443
+#: functions.php:5644 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6393 tt-rss.php:199
+#: functions.php:6399 tt-rss.php:199
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6406
+#: functions.php:6412
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6458
+#: functions.php:6464
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6487
+#: functions.php:6493
 msgid "edit note"
 msgstr ""
 
@@ -463,7 +509,8 @@ msgstr "过滤文章"
 msgid "Set starred"
 msgstr "设置星级"
 
-#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
+#: localized_schema.php:18 digest.js:412 digest.js:702 viewfeed.js:545
+#: viewfeed.js:659
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -784,10 +831,6 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
-#: prefs.php:64 prefs.php:124 tt-rss.php:66
-msgid "Loading, please wait..."
-msgstr "读取中，请等待..."
-
 #: prefs.php:71 prefs.php:127 tt-rss.php:74
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -795,19 +838,10 @@ msgid ""
 "\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
-#: prefs.php:91 tt-rss.php:113
-msgid "Hello,"
-msgstr "你好,"
-
 #: prefs.php:93 help/4.php:14
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
-#: prefs.php:95 tt-rss.php:123 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "注销"
-
 #: prefs.php:103
 #, fuzzy
 msgid "Keyboard shortcuts"
@@ -832,11 +866,6 @@ msgstr "标题:"
 msgid "Users"
 msgstr "用户"
 
-#: prefs.php:141 tt-rss.php:100
-#, fuzzy
-msgid "Fatal Exception"
-msgstr "致命错误"
-
 #: register.php:152
 #, fuzzy
 msgid "New user registrations are administratively disabled."
@@ -1399,7 +1428,7 @@ msgstr ""
 msgid "on field"
 msgstr "于:"
 
-#: modules/popup-dialog.php:514 modules/pref-filters.php:77
+#: modules/popup-dialog.php:514 modules/pref-filters.php:77 digest.js:392
 #, fuzzy
 msgid "in"
 msgstr "链接"
@@ -2291,6 +2320,55 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
+#: digest.js:27 tt-rss.js:670 tt-rss.js:683
+#, fuzzy
+msgid "Mark all articles in %s as read?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: digest.js:73
+#, fuzzy
+msgid "Mark %d displayed articles as read?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: digest.js:158
+#, fuzzy
+msgid "Error: unable to load article."
+msgstr "错误：请上传OPML文件。"
+
+#: digest.js:405 digest.js:653 viewfeed.js:577
+#, fuzzy
+msgid "Unstar article"
+msgstr "星级文章"
+
+#: digest.js:407 digest.js:660 viewfeed.js:528 viewfeed.js:592
+#, fuzzy
+msgid "Star article"
+msgstr "星级文章"
+
+#: digest.js:410 digest.js:694 viewfeed.js:648
+#, fuzzy
+msgid "Unpublish article"
+msgstr "发布文章"
+
+#: digest.js:419
+#, fuzzy
+msgid "Click to expand article."
+msgstr "星级文章"
+
+#: digest.js:486
+msgid "%d more..."
+msgstr ""
+
+#: digest.js:591
+#, fuzzy
+msgid "Load more..."
+msgstr "读取帮助..."
+
+#: digest.js:656 digest.js:698 viewfeed.js:585 viewfeed.js:652
+#, fuzzy
+msgid "Please wait..."
+msgstr "读取中，请等待..."
+
 #: functions.js:1252
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
@@ -2622,11 +2700,6 @@ msgstr "请先选择若干feed"
 msgid "Reset category order?"
 msgstr "移除选定分类?"
 
-#: tt-rss.js:670 tt-rss.js:683
-#, fuzzy
-msgid "Mark all articles in %s as read?"
-msgstr "标记  %s 中所有访问过的主题为已读"
-
 #: tt-rss.js:703
 msgid "You can't edit this kind of feed."
 msgstr "您不能编辑本分类feed"
@@ -2641,26 +2714,6 @@ msgstr "您不能编辑本分类feed"
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
-#: viewfeed.js:528 viewfeed.js:592
-#, fuzzy
-msgid "Star article"
-msgstr "星级文章"
-
-#: viewfeed.js:577
-#, fuzzy
-msgid "Unstar article"
-msgstr "星级文章"
-
-#: viewfeed.js:585 viewfeed.js:652
-#, fuzzy
-msgid "Please wait..."
-msgstr "读取中，请等待..."
-
-#: viewfeed.js:648
-#, fuzzy
-msgid "Unpublish article"
-msgstr "发布文章"
-
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3053,9 +3106,6 @@ msgstr "请输入标签主题"
 #~ msgid "Can't create label: missing SQL expression."
 #~ msgstr "创建标签失败：缺少或错误的SQL表达式。"
 
-#~ msgid "Loading help..."
-#~ msgstr "读取帮助..."
-
 #~ msgid "Saving label..."
 #~ msgstr "保存标记..."
 
@@ -3151,9 +3201,6 @@ msgstr "请输入标签主题"
 #~ msgid "Last updated:"
 #~ msgstr "已更新"
 
-#~ msgid "Last headlines:"
-#~ msgstr "最新提要："
-
 #~ msgid "Other feeds: Top 25"
 #~ msgstr " 其他feed: Top 25"
 
-- 
cgit v1.2.3