update translations

2 files changed, 113 insertions, 88 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index f8ad16455..ebeb4780d 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.mo
+++ b/locale/zh_CN/LC_MESSAGES/messages.mo
diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 80254d4d1..db22cd2a1 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-06-07 23:12+0400\n"
+"POT-Creation-Date: 2010-06-30 13:14+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -172,191 +172,191 @@ 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:2986 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
+#: functions.php:3018 functions.php:3057 functions.php:4455 functions.php:4483
 #: modules/backend-rpc.php:869 modules/pref-feeds.php:1333
 msgid "Uncategorized"
 msgstr "未分类"
 
-#: functions.php:3050 functions.php:3699 modules/backend-rpc.php:874
+#: functions.php:3047 functions.php:3696 modules/backend-rpc.php:874
 #: mobile/functions.php:170
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:3052 functions.php:3701 prefs.php:114
+#: functions.php:3049 functions.php:3698 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:3094 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:3096 modules/pref-feeds.php:1512 help/3.php:61
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: functions.php:3101 help/3.php:59
+#: functions.php:3098 help/3.php:59
 #, fuzzy
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3103 help/3.php:58 offline.js:488 offline.js:1427
+#: functions.php:3100 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
 
-#: functions.php:3105
+#: functions.php:3102
 #, fuzzy
 msgid "Archived articles"
 msgstr "星级文章"
 
-#: functions.php:4211
+#: functions.php:4208
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4216 functions.php:5564 modules/popup-dialog.php:82
+#: functions.php:4213 functions.php:5561 modules/popup-dialog.php:82
 #: modules/pref-feeds.php:1087 modules/pref-feeds.php:1297
 #: 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
+#: functions.php:4214 modules/popup-dialog.php:83 modules/pref-feeds.php:1088
 #: modules/pref-feeds.php:1298 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:4215 functions.php:4232 tt-rss.php:213
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4219
+#: functions.php:4216
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4220 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
+#: functions.php:4217 modules/popup-dialog.php:84 modules/pref-feeds.php:1089
 #: modules/pref-feeds.php:1299 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:4225 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4234
+#: functions.php:4231
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4236 tt-rss.php:212
+#: functions.php:4233 tt-rss.php:212
 msgid "Starred"
 msgstr "星级"
 
-#: functions.php:4237
+#: functions.php:4234
 msgid "Published"
 msgstr "已发布"
 
-#: functions.php:4238
+#: functions.php:4235
 #, fuzzy
 msgid "Selection:"
 msgstr "选择："
 
-#: functions.php:4239 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
+#: functions.php:4236 localized_schema.php:16 tt-rss.php:187 tt-rss.php:230
 msgid "Mark as read"
 msgstr "标记为已读"
 
-#: functions.php:4245
+#: functions.php:4242
 msgid "Archive"
 msgstr ""
 
-#: functions.php:4247
+#: functions.php:4244
 msgid "Move back"
 msgstr ""
 
-#: functions.php:4248
+#: functions.php:4245
 #, fuzzy
 msgid "Delete"
 msgstr "默认"
 
-#: functions.php:4253
+#: functions.php:4250
 #, fuzzy
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4294
+#: functions.php:4291
 msgid "Click to collapse category"
 msgstr ""
 
-#: functions.php:4504
+#: functions.php:4501
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:4521
+#: functions.php:4518
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:4680
+#: functions.php:4677
 msgid "audio/mpeg"
 msgstr ""
 
-#: functions.php:4806
+#: functions.php:4803
 #, fuzzy
 msgid " - "
 msgstr ", 由 - "
 
-#: functions.php:4831 functions.php:5591
+#: functions.php:4828 functions.php:5588
 msgid "Edit tags for this article"
 msgstr ""
 
-#: functions.php:4837 functions.php:5574
+#: functions.php:4834 functions.php:5571
 #, fuzzy
 msgid "Show article summary in new window"
 msgstr "新窗口打开文章连结"
 
-#: functions.php:4844 functions.php:5581
+#: functions.php:4841 functions.php:5578
 #, fuzzy
 msgid "Publish article with a note"
 msgstr "发布文章"
 
-#: functions.php:4861 functions.php:5452
+#: functions.php:4858 functions.php:5449
 msgid "Originally from:"
 msgstr ""
 
-#: functions.php:4874 functions.php:5465
+#: functions.php:4871 functions.php:5462
 #, fuzzy
 msgid "Feed URL"
 msgstr "Feed"
 
-#: functions.php:4914 functions.php:5495
+#: functions.php:4911 functions.php:5492
 #, fuzzy
 msgid "unknown type"
 msgstr "未知错误"
 
-#: functions.php:4954 functions.php:5538
+#: functions.php:4951 functions.php:5535
 msgid "Attachment:"
 msgstr ""
 
-#: functions.php:4956 functions.php:5540
+#: functions.php:4953 functions.php:5537
 msgid "Attachments:"
 msgstr ""
 
-#: functions.php:4976 prefs.php:142 tt-rss.php:101 modules/help.php:21
+#: functions.php:4973 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
@@ -365,72 +365,72 @@ msgstr ""
 msgid "Close this window"
 msgstr "关闭此窗口"
 
-#: functions.php:5032
+#: functions.php:5029
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:5101
+#: functions.php:5098
 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:5262 functions.php:5349
 #, fuzzy
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: functions.php:5428 functions.php:5435
+#: functions.php:5425 functions.php:5432
 #, fuzzy
 msgid "Click to expand article"
 msgstr "星级文章"
 
-#: functions.php:5598
+#: functions.php:5595
 #, fuzzy
 msgid "toggle unread"
 msgstr "触发开关"
 
-#: functions.php:5617
+#: functions.php:5614
 #, fuzzy
 msgid "No unread articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5620
+#: functions.php:5617
 #, fuzzy
 msgid "No updated articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5623
+#: functions.php:5620
 #, fuzzy
 msgid "No starred articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:5627
+#: functions.php:5624
 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:5626 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
 
-#: functions.php:6389 tt-rss.php:192
+#: functions.php:6386 tt-rss.php:192
 #, fuzzy
 msgid "Create label..."
 msgstr "创建标记"
 
-#: functions.php:6402
+#: functions.php:6399
 #, fuzzy
 msgid "(remove)"
 msgstr "移除"
 
-#: functions.php:6454
+#: functions.php:6451
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:6483
+#: functions.php:6480
 msgid "edit note"
 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 "返回 我的最爱"
 
@@ -1125,26 +1125,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文件。"
 
@@ -1617,53 +1622,68 @@ msgstr "未找到文章。"
 msgid "OPML"
 msgstr "OPML"
 
-#: modules/pref-feeds.php:1470
+#: modules/pref-feeds.php:1459
+msgid ""
+"Using OPML you can export and import your feeds and Tiny Tiny RSS settings."
+msgstr ""
+
+#: modules/pref-feeds.php:1461
+msgid "Note: only main settings profile can be migrated using OPML."
+msgstr ""
+
+#: modules/pref-feeds.php:1476
 msgid "Import"
 msgstr "导入"
 
-#: modules/pref-feeds.php:1475
+#: modules/pref-feeds.php:1481
 msgid "Export OPML"
 msgstr "导出OPML"
 
-#: modules/pref-feeds.php:1478
+#: modules/pref-feeds.php:1487
+#, 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:1489
+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:1492 modules/pref-feeds.php:1521
+#, fuzzy
+msgid "Display URL"
+msgstr "显示标签"
+
+#: modules/pref-feeds.php:1497
 msgid "Firefox Integration"
 msgstr ""
 
-#: modules/pref-feeds.php:1480
+#: modules/pref-feeds.php:1499
 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:1506
 msgid "Click here to register this site as a feed reader."
 msgstr ""
 
-#: modules/pref-feeds.php:1502
+#: modules/pref-feeds.php:1518
 #, fuzzy
 msgid ""
 "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:1505 modules/pref-feeds.php:1510
-#, fuzzy
-msgid "Display URL"
-msgstr "显示标签"
-
-#: modules/pref-feeds.php:1507
-#, 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:1613
+#: modules/pref-feeds.php:1624
 #, fuzzy, php-format
 msgid "%d archived articles"
 msgstr "星级文章"
 
-#: modules/pref-feeds.php:1642
+#: modules/pref-feeds.php:1653
 #, fuzzy
 msgid "No feeds found."
 msgstr "无feed可订阅。"
@@ -2412,8 +2432,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."
@@ -2657,6 +2679,9 @@ msgstr "标记  %s 中所有所选Feed为已读..."
 msgid "Please enter a note for this article:"
 msgstr "请输入标签主题"
 
+#~ msgid "Remove selected users?"
+#~ msgstr "移除选定用户?"
+
 #~ msgid "Adding feed..."
 #~ msgstr "添加feed中..."