update translations

6 files changed, 129 insertions, 174 deletions

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index 608d2d5ed..aa2d118c0 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.mo
+++ b/locale/fr_FR/LC_MESSAGES/messages.mo
diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index f91a67d95..95fae4eca 100644
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-12 00:43+0400\n"
+"POT-Creation-Date: 2007-08-12 10:23+0400\n"
 "PO-Revision-Date: 2007-08-10 16:30+0200\n"
 "Last-Translator: Thibaut Cousin <[email protected]>\n"
 "Language-Team: Français <[email protected]>\n"
@@ -151,8 +151,8 @@ msgstr ""
 msgid "All feeds"
 msgstr "Tous les flux"
 
-#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
-#: functions.php:3442 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3424
+#: functions.php:3454 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Sans catégorie"
 
@@ -160,7 +160,7 @@ msgstr "Sans catégorie"
 msgid "Special"
 msgstr "Spécial"
 
-#: functions.php:2296 functions.php:3286
+#: functions.php:2296 functions.php:3297
 msgid "Labels"
 msgstr "Intitulé"
 
@@ -199,7 +199,7 @@ msgstr ""
 "Pour vous désinscrire, modifiez votre configuration ou contactez "
 "l'administrateur de votre TIny Tiny RSS.\n"
 
-#: functions.php:3137 functions.php:3179 functions.php:4085
+#: functions.php:3137 functions.php:3179 functions.php:4097
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
@@ -283,27 +283,27 @@ msgstr "Flux"
 msgid "Generated feed"
 msgstr "Flux généré"
 
-#: functions.php:3484
+#: functions.php:3496
 msgid "No feeds to display."
 msgstr "Aucun flux à afficher."
 
-#: functions.php:3501
+#: functions.php:3513
 msgid "Tags"
 msgstr "Étiquettes"
 
-#: functions.php:3723
+#: functions.php:3735
 msgid " - by "
 msgstr "- par "
 
-#: functions.php:3772
+#: functions.php:3784
 msgid "no tags"
 msgstr "aucune étiquette"
 
-#: functions.php:3843
+#: functions.php:3855
 msgid "Feed not found."
 msgstr "Flux non trouvé."
 
-#: functions.php:3905
+#: functions.php:3917
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
@@ -311,7 +311,7 @@ msgstr ""
 "Impossible d'afficher le flux (la requête l'a pas abouti). Veuillez vérifier "
 "la syntaxe de son intitulé ou la configuration locale."
 
-#: functions.php:4148
+#: functions.php:4160
 msgid "No articles found."
 msgstr "Aucun article trouvé."
 
@@ -558,6 +558,11 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
+#: localized_js.php:111
+#, fuzzy, php-format
+msgid "Unsubscribe from %s?"
+msgstr "Se désinscrire des flux sélectionnés&nbsp;?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 59ee04ebe..89f11bc4b 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.mo
+++ b/locale/ru_RU/LC_MESSAGES/messages.mo
diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 55c7bdcf1..e031a120b 100644
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-12 00:43+0400\n"
+"POT-Creation-Date: 2007-08-12 10:23+0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -145,8 +145,8 @@ msgstr ""
 msgid "All feeds"
 msgstr "Все каналы"
 
-#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
-#: functions.php:3442 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3424
+#: functions.php:3454 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "Нет категории"
 
@@ -154,7 +154,7 @@ msgstr "Нет категории"
 msgid "Special"
 msgstr "Особые"
 
-#: functions.php:2296 functions.php:3286
+#: functions.php:2296 functions.php:3297
 msgid "Labels"
 msgstr "Метки"
 
@@ -190,7 +190,7 @@ msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr ""
 
-#: functions.php:3137 functions.php:3179 functions.php:4085
+#: functions.php:3137 functions.php:3179 functions.php:4097
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
@@ -275,33 +275,33 @@ msgstr "Канал"
 msgid "Generated feed"
 msgstr ""
 
-#: functions.php:3484
+#: functions.php:3496
 msgid "No feeds to display."
 msgstr "Нет каналов для отображения."
 
-#: functions.php:3501
+#: functions.php:3513
 msgid "Tags"
 msgstr "Теги"
 
-#: functions.php:3723
+#: functions.php:3735
 msgid " - by "
 msgstr ", автор - "
 
-#: functions.php:3772
+#: functions.php:3784
 msgid "no tags"
 msgstr "нет тегов"
 
-#: functions.php:3843
+#: functions.php:3855
 msgid "Feed not found."
 msgstr "Канал не найден."
 
-#: functions.php:3905
+#: functions.php:3917
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr ""
 
-#: functions.php:4148
+#: functions.php:4160
 msgid "No articles found."
 msgstr "Статей не найдено."
 
@@ -548,6 +548,11 @@ msgstr ""
 msgid "Can't subscribe: no feed URL given."
 msgstr ""
 
+#: localized_js.php:111
+#, fuzzy, php-format
+msgid "Unsubscribe from %s?"
+msgstr "Отписаться от выбранных каналов?"
+
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
 msgid "Title"
diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index e586b5f17..a0cabb62d 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 01053d5bb..009ad4f31 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -1,20 +1,16 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
 msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-12 00:43+0400\n"
-"PO-Revision-Date: 2007-06-10 11:56+0800\n"
+"POT-Creation-Date: 2007-08-12 10:23+0400\n"
+"PO-Revision-Date: 2007-08-12 12:18+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Country: china\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: backend.php:94 backend.php:103
 msgid "Use default"
@@ -49,9 +45,8 @@ msgid "Disable updates"
 msgstr "禁用更新"
 
 #: backend.php:105
-#, fuzzy
 msgid "Each 15 minutes"
-msgstr "每30分钟"
+msgstr "每15分钟"
 
 #: backend.php:106
 msgid "Each 30 minutes"
@@ -146,8 +141,8 @@ msgstr ""
 msgid "All feeds"
 msgstr "所有feed"
 
-#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3412
-#: functions.php:3442 modules/pref-feeds.php:890
+#: functions.php:2265 functions.php:2304 functions.php:2628 functions.php:3424
+#: functions.php:3454 modules/pref-feeds.php:890
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -155,7 +150,7 @@ msgstr "未分类"
 msgid "Special"
 msgstr "专用"
 
-#: functions.php:2296 functions.php:3286
+#: functions.php:2296 functions.php:3297
 msgid "Labels"
 msgstr "标记"
 
@@ -164,9 +159,8 @@ msgid "Starred articles"
 msgstr "星级文章"
 
 #: functions.php:2316 functions.php:2652 functions.php:3270
-#, fuzzy
 msgid "Published articles"
-msgstr "星级文章"
+msgstr "已发布文章"
 
 #: functions.php:2614 functions.php:2616
 msgid "Search results"
@@ -178,7 +172,7 @@ msgstr "搜索"
 
 #: functions.php:2885
 msgid "New headlines for last 24 hours, as of "
-msgstr "24小时最新头条,截至"
+msgstr "24小时最新提要,截至"
 
 #: functions.php:2929
 msgid ""
@@ -191,7 +185,7 @@ msgid ""
 "To unsubscribe, visit your configuration options or contact instance owner.\n"
 msgstr "若要退订,访问你的配置选项或联络管理员。\n"
 
-#: functions.php:3137 functions.php:3179 functions.php:4085
+#: functions.php:3137 functions.php:3179 functions.php:4097
 #: modules/pref-feeds.php:615 modules/pref-feeds.php:852
 #: modules/pref-filters.php:255 modules/pref-labels.php:234
 #: modules/pref-users.php:208
@@ -216,9 +210,8 @@ msgid "None"
 msgstr "无"
 
 #: functions.php:3142
-#, fuzzy
 msgid "Toggle"
-msgstr "触发:"
+msgstr "触发开关"
 
 #: functions.php:3144 functions.php:3185 tt-rss.php:171
 msgid "Starred"
@@ -226,7 +219,7 @@ msgstr "星级"
 
 #: functions.php:3145
 msgid "Published"
-msgstr ""
+msgstr "已发布"
 
 #: functions.php:3148 localized_schema.php:15
 msgid "Mark as read"
@@ -276,33 +269,33 @@ msgstr "Feed"
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:3484
+#: functions.php:3496
 msgid "No feeds to display."
 msgstr "无feed显示。"
 
-#: functions.php:3501
+#: functions.php:3513
 msgid "Tags"
 msgstr "标签"
 
-#: functions.php:3723
+#: functions.php:3735
 msgid " - by "
 msgstr ", 由 - "
 
-#: functions.php:3772
+#: functions.php:3784
 msgid "no tags"
 msgstr "无标签"
 
-#: functions.php:3843
+#: functions.php:3855
 msgid "Feed not found."
 msgstr "未找到Feed."
 
-#: functions.php:3905
+#: functions.php:3917
 msgid ""
 "Could not display feed (query failed). Please check label match syntax or "
 "local configuration."
 msgstr "无法显示feed(查询失败); 请核对标签匹配语法或本地配置."
 
-#: functions.php:4148
+#: functions.php:4160
 msgid "No articles found."
 msgstr "未找到文章。"
 
@@ -506,7 +499,7 @@ msgstr "无选定文章。"
 
 #: localized_js.php:90
 msgid "Could not update headlines (missing XML object)"
-msgstr "更新头条失败（缺少XML支持）"
+msgstr "更新提要失败（缺少XML支持）"
 
 #: localized_js.php:91
 msgid "Could not display article (missing XML object)"
@@ -518,37 +511,40 @@ msgstr "无选定feed."
 
 #: localized_js.php:93
 msgid "Replace current publishing address with a new one?"
-msgstr ""
+msgstr "使用新地址替换当前地址？"
 
 #: localized_js.php:94
 msgid "Address changed."
-msgstr ""
+msgstr "地址已经变更"
 
 #: localized_js.php:95
-#, fuzzy
 msgid "Could not change address."
-msgstr "未能更新数据库"
+msgstr "未能更新地址"
 
 #: localized_js.php:96
 msgid "You can't unsubscribe from the category."
-msgstr ""
+msgstr "您不能从分类中取消订阅。"
 
 #: localized_js.php:97
-#, fuzzy
 msgid "Please select some feed first."
-msgstr "请只选择一个feed."
+msgstr "请先选择若干feed"
 
 #: localized_js.php:98
 msgid "You can't edit this kind of feed."
-msgstr ""
+msgstr "您不能编辑本分类feed"
 
 #: localized_js.php:109
 msgid "Can't add filter: nothing to match on."
-msgstr ""
+msgstr "未能添加过滤：无匹配。"
 
 #: localized_js.php:110
 msgid "Can't subscribe: no feed URL given."
-msgstr ""
+msgstr "未能订阅：无 feed URL。"
+
+#: localized_js.php:111
+#, fuzzy, php-format
+msgid "Unsubscribe from %s?"
+msgstr "退订选定feed?"
 
 #: localized_schema.php:9 modules/popup-dialog.php:172
 #: modules/pref-feeds.php:865 modules/pref-feeds.php:926
@@ -556,46 +552,40 @@ msgid "Title"
 msgstr "标题"
 
 #: localized_schema.php:10
-#, fuzzy
 msgid "Title or Content"
 msgstr "标题或内容"
 
 #: localized_schema.php:11
-#, fuzzy
 msgid "Link"
-msgstr "链接:"
+msgstr "链接"
 
 #: localized_schema.php:12 modules/popup-dialog.php:173
 msgid "Content"
 msgstr "内容"
 
 #: localized_schema.php:14
-#, fuzzy
 msgid "Filter article"
-msgstr "星级文章"
+msgstr "过滤文章"
 
 #: localized_schema.php:16
-#, fuzzy
 msgid "Set starred"
-msgstr "星级"
+msgstr "设置星级"
 
 #: localized_schema.php:17
-#, fuzzy
 msgid "Publish article"
-msgstr "星级文章"
+msgstr "发布文章"
 
 #: localized_schema.php:18
-#, fuzzy
 msgid "Assign tags"
-msgstr "无标签"
+msgstr "指定标签"
 
 #: localized_schema.php:22
 msgid "General"
-msgstr ""
+msgstr "常规"
 
 #: localized_schema.php:24
 msgid "Allow duplicate posts"
-msgstr ""
+msgstr "允许重复文章"
 
 #: localized_schema.php:25
 msgid ""
@@ -603,67 +593,66 @@ msgid ""
 "with partially colliding userbase. When disabled, it forces same posts from "
 "different feeds to appear only once."
 msgstr ""
+"当遇到一些有行星状主从结构聚合，程序出现写入冲突的时候，这个选项是有用的。当"
+"该选项被禁用时，强制来自不用RSS源的同一文章只显示一次。"
 
 #: localized_schema.php:26
 msgid "Default interval between feed updates (in minutes)"
-msgstr ""
+msgstr "默认更新间隔时间（以分钟为单位）"
 
 #: localized_schema.php:27
-#, fuzzy
 msgid "Enable e-mail digest"
-msgstr "包括电子邮件文摘"
+msgstr "开启电子邮件摘要"
 
 #: localized_schema.php:28
 msgid ""
 "This option enables sending daily digest of new (and unread) headlines on "
 "your configured e-mail address"
-msgstr ""
+msgstr "启用这个选项将每天发送新的(和未读的) 标题摘要到您设置的电子邮箱"
 
 #: localized_schema.php:29
 msgid "Purge old posts after this number of days (0 - disables)"
-msgstr ""
+msgstr "从这个天数之后清除旧的文章（0为不启用）"
 
 #: localized_schema.php:30
 msgid "Update post on checksum change"
-msgstr ""
+msgstr "更新后校验修改"
 
 #: localized_schema.php:32
 msgid "Interface"
-msgstr ""
+msgstr "界面"
 
 #: localized_schema.php:34
-#, fuzzy
 msgid "Combined feed display"
-msgstr "无feed显示。"
+msgstr "feed联合显示。"
 
 #: localized_schema.php:35
 msgid ""
 "Display expanded list of feed articles, instead of separate displays for "
 "headlines and article content"
-msgstr ""
+msgstr "展开显示feed文章，替代分开显示提要和文章内容的形式"
 
 #: localized_schema.php:36
 msgid "Default article limit"
-msgstr ""
+msgstr "默认文章限制"
 
 #: localized_schema.php:37
-#, fuzzy
 msgid "Enable feed categories"
-msgstr "编辑分类"
+msgstr "开启feed分类"
 
 #: localized_schema.php:38
 msgid "Hide feeds with no unread messages"
-msgstr ""
+msgstr "隐藏feed源以读信息"
 
 #: localized_schema.php:39
 msgid "Mark articles as read automatically"
-msgstr ""
+msgstr "自动标志文章为已读"
 
 #: localized_schema.php:40
 msgid ""
 "This option enables marking articles as read automatically in combined mode "
 "while you scroll article list."
-msgstr ""
+msgstr "启用该选项时，当你在联合模式下滚动文章列表时自动编辑文章为已读。"
 
 #: localized_schema.php:41
 msgid "On catchup show next feed"
@@ -674,93 +663,92 @@ msgid ""
 "When \"Mark as read\" button is clicked in toolbar, automatically open next "
 "feed with unread articles."
 msgstr ""
+"当工具栏上 \"标志为已读 \" 按钮被点击时,自动打开下一个RSS源中未读文章。"
 
 #: localized_schema.php:43
 msgid "Open article links in new browser window"
-msgstr ""
+msgstr "新窗口打开文章连结"
 
 #: localized_schema.php:44
 msgid "Reverse headline order (oldest first)"
-msgstr ""
+msgstr "反向提要排列（从旧到新）"
 
 #: localized_schema.php:45
 msgid "Show content preview in headlines list"
-msgstr ""
+msgstr "在提要列表中显示内容预览"
 
 #: localized_schema.php:46
 msgid "Sort feeds by unread articles count"
-msgstr ""
+msgstr "以未读文章数量排序feed源"
 
 #: localized_schema.php:47
 msgid "User stylesheet URL"
-msgstr ""
+msgstr "用户样式表 URL"
 
 #: localized_schema.php:48
 msgid "Link to user stylesheet to override default style, disabled if empty."
-msgstr ""
+msgstr "用户样式表优先，留空为不启用。"
 
 #: localized_schema.php:50
 msgid "Advanced"
-msgstr ""
+msgstr "高级"
 
 #: localized_schema.php:52
 msgid "Blacklisted tags"
-msgstr ""
+msgstr "被列入黑名单的标签"
 
 #: localized_schema.php:53
 msgid ""
 "When auto-detecting tags in articles these tags will not be applied (comma-"
 "separated list)."
-msgstr ""
+msgstr "自动检测文章中标签时，这些标签不适用（用半角逗号隔开）"
 
 #: localized_schema.php:54
-#, fuzzy
 msgid "Confirm marking feed as read"
-msgstr "标记所有Feed未已读..."
+msgstr "确认标记所有Feed为已读..."
 
 #: localized_schema.php:55
 msgid "Enable icons in feedlist"
-msgstr ""
+msgstr "feed列表中不启用ico"
 
 #: localized_schema.php:56
-#, fuzzy
 msgid "Enable labels"
-msgstr "创建标记"
+msgstr "开启标签"
 
 #: localized_schema.php:57
 msgid ""
 "Experimental support for virtual feeds based on user crafted SQL queries. "
 "This feature is highly experimental and at this point not user friendly. Use "
 "with caution."
-msgstr ""
+msgstr "SQL支持，这是测试功能，请谨慎使用。"
 
 #: localized_schema.php:58
 msgid "Long date format"
-msgstr ""
+msgstr "长的时间格式"
 
 #: localized_schema.php:59
 msgid "Set articles as unread on update"
-msgstr ""
+msgstr "更新后标记文章为未读"
 
 #: localized_schema.php:60
 msgid "Short date format"
-msgstr ""
+msgstr "短的时间格式"
 
 #: localized_schema.php:61
 msgid "Show additional information in feedlist"
-msgstr ""
+msgstr "在feed列表中显示附加信息"
 
 #: localized_schema.php:62
 msgid "Strip unsafe tags from articles"
-msgstr ""
+msgstr "从文章中过滤不安全标签"
 
 #: localized_schema.php:63
 msgid "Strip all but most common HTML tags when reading articles."
-msgstr ""
+msgstr "阅读文章时过滤所有常见html标签"
 
 #: localized_schema.php:64
 msgid "Use more accessible date/time format for headlines"
-msgstr ""
+msgstr "提要使用更方便的 日期／时间 格式"
 
 #: login_form.php:55 modules/popup-dialog.php:90 modules/pref-feeds.php:264
 #: modules/pref-users.php:29
@@ -773,7 +761,7 @@ msgstr "密码:"
 
 #: login_form.php:59
 msgid "Language:"
-msgstr ""
+msgstr "语言："
 
 #: opml.php:103 opml.php:107
 msgid "OPML Utility"
@@ -789,7 +777,7 @@ msgstr "导入 OPML（需要DOMXMDocmentL扩展）"
 
 #: opml.php:118
 msgid "DOMXML extension is not found. It is required for PHP versions below 5."
-msgstr ""
+msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 
 #: opml.php:122
 msgid "Return to preferences"
@@ -824,9 +812,8 @@ msgid "Other Feeds"
 msgstr "其他feed"
 
 #: prefs.php:113
-#, fuzzy
 msgid "Published Articles"
-msgstr "所有文章"
+msgstr "已发布文章"
 
 #: prefs.php:115
 msgid "Content Filtering"
@@ -1129,7 +1116,7 @@ msgid ""
 "\t\t\t\t\tperform a feed update. This could indicate a problem like crash\n"
 "\t\t\t\t\tor a hang. Please check the daemon process or contact instance\n"
 "\t\t\t\t\towner."
-msgstr ""
+msgstr "TT-RSS检测到更新时间过长，请刷新或者检查RSS源地址。"
 
 #: modules/popup-dialog.php:51 modules/pref-feeds.php:772
 msgid "Subscribe to feed"
@@ -1158,7 +1145,7 @@ msgstr "取消"
 
 #: modules/popup-dialog.php:110
 msgid "This feed requires authentication."
-msgstr ""
+msgstr "这个feed需要认证"
 
 #: modules/popup-dialog.php:138
 msgid "Where:"
@@ -1203,7 +1190,7 @@ msgstr "创建过滤器"
 #: modules/popup-dialog.php:268 modules/popup-dialog.php:299
 #: modules/pref-filters.php:40 modules/pref-filters.php:72
 msgid "description"
-msgstr ""
+msgstr "描述"
 
 #: modules/popup-dialog.php:273 modules/pref-filters.php:45
 msgid "Match:"
@@ -1268,23 +1255,20 @@ msgid "Showing most popular tags "
 msgstr "显示最热标签"
 
 #: modules/popup-dialog.php:437
-#, fuzzy
 msgid "browse more"
-msgstr "浏览所有"
+msgstr "浏览更多"
 
 #: modules/pref-feed-browser.php:5 modules/pref-feeds.php:53
 msgid "Feed browser is administratively disabled."
 msgstr "Feed 浏览器有限制"
 
 #: modules/pref-feed-browser.php:15
-#, fuzzy
 msgid "Feed information:"
-msgstr "Feed 操作："
+msgstr "Feed 信息："
 
 #: modules/pref-feed-browser.php:51
-#, fuzzy
 msgid "Last headlines:"
-msgstr "最后登陆"
+msgstr "最新提要："
 
 #: modules/pref-feed-browser.php:77
 msgid ""
@@ -1446,11 +1430,11 @@ msgstr "导出OPML"
 msgid ""
 "Published articles are exported as a public RSS feed and can be subscribed "
 "by anyone who knows the address specified below."
-msgstr ""
+msgstr "本站文章作为一个公开的RSS源，可以被大众订阅。"
 
 #: modules/pref-feeds.php:1060
 msgid "Generate another address"
-msgstr ""
+msgstr "生成另一个地址"
 
 #: modules/pref-filters.php:22
 msgid "Filter editor"
@@ -1537,14 +1521,12 @@ msgid "Old password is incorrect."
 msgstr "原密码错误."
 
 #: modules/pref-prefs.php:59 modules/pref-prefs.php:388
-#, fuzzy
 msgid "Save configuration"
-msgstr "设置已保存."
+msgstr "保存设置"
 
 #: modules/pref-prefs.php:127 modules/pref-prefs.php:392
-#, fuzzy
 msgid "Reset to defaults"
-msgstr "重置默认项？"
+msgstr "恢复到默认？"
 
 #: modules/pref-prefs.php:185
 msgid ""
@@ -1597,36 +1579,32 @@ msgid "Select theme"
 msgstr "选择模板"
 
 #: modules/pref-prefs.php:285
-#, fuzzy
 msgid "Default"
-msgstr "用户默认"
+msgstr "默认"
 
 #: modules/pref-prefs.php:301
-#, fuzzy
 msgid "Change theme"
-msgstr "更改 e-mail"
+msgstr "更改模板"
 
 #: modules/pref-prefs.php:353
 msgid "short_desc"
-msgstr ""
+msgstr "short_desc"
 
 #: modules/pref-prefs.php:365 modules/pref-prefs.php:370
 msgid "Yes"
-msgstr ""
+msgstr "是"
 
 #: modules/pref-prefs.php:367 modules/pref-prefs.php:370
-#, fuzzy
 msgid "No"
-msgstr "无"
+msgstr "否"
 
 #: modules/pref-users.php:12
 msgid "User editor"
 msgstr "用户编辑"
 
 #: modules/pref-users.php:33
-#, fuzzy
 msgid "Change password:"
-msgstr "更改密码"
+msgstr "更改密码:"
 
 #: modules/pref-users.php:37
 msgid "E-mail:"
@@ -1688,36 +1666,3 @@ msgstr "用户详细"
 #: modules/pref-users.php:321
 msgid "Reset password"
 msgstr "重置密码"
-
-#~ msgid "Tags:"
-#~ msgstr "标签:"
-
-#~ msgid "Add existing tag:"
-#~ msgstr "添加现有标签г:"
-
-#~ msgid "This category"
-#~ msgstr "本分类"
-
-#~ msgid "Global search results"
-#~ msgstr "全局搜索结果"
-
-#~ msgid "Category search results"
-#~ msgstr "分类搜索结果"
-
-#~ msgid "Feed search results"
-#~ msgstr "Feed搜索结果"
-
-#~ msgid "Label search results"
-#~ msgstr "标记搜索结果"
-
-#~ msgid "<b>Warning:</b> Please backup your database before proceeding."
-#~ msgstr "<b>警告:</b> 请先备份您的数据库."
-
-#~ msgid "Help"
-#~ msgstr "帮助"
-
-#~ msgid "Toggle unread"
-#~ msgstr "未读开关"
-
-#~ msgid "Toggle starred"
-#~ msgstr "星级开关"