release 1.4.1

2 files changed, 629 insertions, 715 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 020f8a981..43a01a75c 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 ef94e906f..dd95228d1 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-02-18 16:07+0300\n"
+"POT-Creation-Date: 2010-03-22 22:16+0300\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <[email protected]>\n"
 "Language-Team: hicode.org <[email protected]>\n"
@@ -200,8 +200,7 @@ msgstr "专用"
 msgid "Labels"
 msgstr "标记"
 
-#: functions.php:3087 localized_js.php:166 help/3.php:60 offline.js:493
-#: offline.js:1425
+#: functions.php:3087 help/3.php:60 offline.js:493 offline.js:1425
 msgid "Starred articles"
 msgstr "星级文章"
 
@@ -214,8 +213,7 @@ msgstr "已发布文章"
 msgid "Fresh articles"
 msgstr "星级文章"
 
-#: functions.php:3093 localized_js.php:42 help/3.php:58 offline.js:488
-#: offline.js:1427
+#: functions.php:3093 help/3.php:58 offline.js:488 offline.js:1427
 #, fuzzy
 msgid "All articles"
 msgstr "所有文章"
@@ -229,46 +227,44 @@ msgstr "星级文章"
 msgid "Generated feed"
 msgstr "产生feed"
 
-#: functions.php:4205 functions.php:5553 localized_js.php:161
-#: 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
+#: functions.php:4205 functions.php:5553 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:4206 localized_js.php:41 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
+#: functions.php:4206 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:4207 functions.php:4224 localized_js.php:184 tt-rss.php:213
+#: functions.php:4207 functions.php:4224 tt-rss.php:213
 msgid "Unread"
 msgstr "未读"
 
-#: functions.php:4208 localized_js.php:79
+#: functions.php:4208
 #, fuzzy
 msgid "Invert"
 msgstr "(逆)"
 
-#: functions.php:4209 localized_js.php:106 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
+#: functions.php:4209 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:4217 localized_js.php:35 tt-rss.php:178 offline.js:184
+#: functions.php:4217 tt-rss.php:178 offline.js:184
 msgid "Actions..."
 msgstr "激活..."
 
-#: functions.php:4223 localized_js.php:163
+#: functions.php:4223
 #, fuzzy
 msgid "Selection toggle:"
 msgstr "选择："
 
-#: functions.php:4225 localized_js.php:165 tt-rss.php:212
+#: functions.php:4225 tt-rss.php:212
 msgid "Starred"
 msgstr "星级"
 
@@ -303,7 +299,7 @@ msgstr "默认"
 msgid "Assign label:"
 msgstr "指定标签"
 
-#: functions.php:4283 localized_js.php:59
+#: functions.php:4283
 msgid "Click to collapse category"
 msgstr ""
 
@@ -414,7 +410,7 @@ msgid ""
 "(see the Actions menu above) or use a filter."
 msgstr ""
 
-#: functions.php:5618 localized_js.php:99 offline.js:443
+#: functions.php:5618 offline.js:443
 #, fuzzy
 msgid "No articles found to display."
 msgstr "未找到文章。"
@@ -437,697 +433,6 @@ msgstr "无标签"
 msgid "edit note"
 msgstr ""
 
-#: localized_js.php:36 prefs.js:2121
-#, fuzzy
-msgid "Activate selected profile?"
-msgstr "移除选定的过滤器？"
-
-#: localized_js.php:37
-msgid "Adding feed..."
-msgstr "添加feed中..."
-
-#: localized_js.php:38
-msgid "Adding feed category..."
-msgstr "添加feed分类..."
-
-#: localized_js.php:39
-#, fuzzy
-msgid "Adding profile..."
-msgstr "添加feed中..."
-
-#: localized_js.php:40
-msgid "Adding user..."
-msgstr "添加用户..."
-
-#: localized_js.php:43 viewfeed.js:1348
-#, fuzzy, php-format
-msgid "Archive %d selected articles in %s?"
-msgstr "标记  %s 中所有所选Feed为已读..."
-
-#: localized_js.php:44
-#, fuzzy
-msgid "Assign score to article:"
-msgstr "星级文章"
-
-#: localized_js.php:45
-#, fuzzy
-msgid "Assign selected articles to label?"
-msgstr "标记  %s 中所有所选Feed为已读..."
-
-#: localized_js.php:46 prefs.js:285
-msgid "Can't add category: no name specified."
-msgstr "添加分类失败：未指定分类名"
-
-#: localized_js.php:47 functions.js:1315
-msgid "Can't add filter: nothing to match on."
-msgstr "未能添加过滤：无匹配。"
-
-#: localized_js.php:48 prefs.js:263
-#, fuzzy
-msgid "Can't add profile: no name specified."
-msgstr "添加分类失败：未指定分类名"
-
-#: localized_js.php:49 functions.js:2122
-msgid "Can't create label: missing caption."
-msgstr "创建标签失败：缺少标题。"
-
-#: localized_js.php:50 prefs.js:314
-#, fuzzy
-msgid "Can't create user: no login specified."
-msgstr "添加用户失败：未登录。"
-
-#: localized_js.php:51
-msgid "Can't open article: received invalid article link"
-msgstr ""
-
-#: localized_js.php:52 functions.js:1350
-msgid "Can't subscribe: no feed URL given."
-msgstr "未能订阅：无 feed URL。"
-
-#: localized_js.php:53 functions.js:1386
-#, fuzzy
-msgid "Can't subscribe to the specified URL."
-msgstr "未能订阅：无 feed URL。"
-
-#: localized_js.php:54
-#, fuzzy
-msgid "Category reordering disabled"
-msgstr "移除选定分类?"
-
-#: localized_js.php:55
-#, fuzzy
-msgid "Category reordering enabled"
-msgstr "移除选定分类?"
-
-#: localized_js.php:56
-#, fuzzy
-msgid "Changing password..."
-msgstr "更改密码"
-
-#: localized_js.php:57
-#, fuzzy
-msgid "Clearing feed..."
-msgstr "保存feed中..."
-
-#: localized_js.php:58
-#, fuzzy
-msgid "Clearing selected feed..."
-msgstr "移除选定的过滤器..."
-
-#: localized_js.php:60
-#, fuzzy
-msgid "comments"
-msgstr "内容"
-
-#: localized_js.php:61
-#, fuzzy
-msgid "Could not change feed URL."
-msgstr "未能更新地址"
-
-#: localized_js.php:62
-msgid "Could not display article (missing XML object)"
-msgstr "显示条目失败（缺少XML支持）"
-
-#: localized_js.php:63
-#, fuzzy
-msgid "Could not update headlines (missing XML data)"
-msgstr "更新提要失败（缺少XML支持）"
-
-#: localized_js.php:64
-msgid "Could not update headlines (missing XML object)"
-msgstr "更新提要失败（缺少XML支持）"
-
-#: localized_js.php:65 offline.js:636
-msgid "Data for offline browsing has not been downloaded yet."
-msgstr ""
-
-#: localized_js.php:66 viewfeed.js:1300
-#, fuzzy, php-format
-msgid "Delete %d selected articles?"
-msgstr "移除选定标记?"
-
-#: localized_js.php:67 viewfeed.js:1298
-#, fuzzy, php-format
-msgid "Delete %d selected articles in %s?"
-msgstr "标记  %s 中所有所选Feed为已读..."
-
-#: localized_js.php:68 tt-rss.js:74
-msgid "display feeds"
-msgstr "显示Feed"
-
-#: localized_js.php:69 modules/pref-prefs.php:47
-msgid "Entered passwords do not match."
-msgstr "两次输入密码不通."
-
-#: localized_js.php:70
-msgid "Entire feed"
-msgstr "输入feed"
-
-#: localized_js.php:71 prefs.js:578
-#, fuzzy
-msgid "Erase all non-starred articles in selected feed?"
-msgstr "标记  %s 中所有访问过的主题为已读"
-
-#: localized_js.php:72 prefs.js:235
-msgid "Error: Invalid feed URL."
-msgstr ""
-
-#: localized_js.php:73 prefs.js:233
-#, fuzzy
-msgid "Error: No feed URL given."
-msgstr "未能订阅：无 feed URL。"
-
-#: localized_js.php:74
-#, fuzzy
-msgid "Error while trying to load more headlines"
-msgstr "解析文档时发生错误。"
-
-#: localized_js.php:75
-#, fuzzy
-msgid "Failed to load article in new window"
-msgstr "新窗口打开文章连结"
-
-#: localized_js.php:76
-#, fuzzy
-msgid "Failed to open window for the article"
-msgstr "请输入标签主题"
-
-#: localized_js.php:77
-#, fuzzy
-msgid "Feed icon removed."
-msgstr "未找到Feed."
-
-#: localized_js.php:78 prefs.js:600
-msgid "How many days of articles to keep (0 - use default)?"
-msgstr ""
-
-#: localized_js.php:80 offline.js:1655
-msgid "Last sync: Cancelled."
-msgstr ""
-
-#: localized_js.php:81 offline.js:835
-msgid "Last sync: Error receiving data."
-msgstr ""
-
-#: localized_js.php:82 offline.js:806
-#, php-format
-msgid "Last sync: %s"
-msgstr ""
-
-#: localized_js.php:83
-#, fuzzy
-msgid "Loading feed list..."
-msgstr "读取中，请等待..."
-
-#: localized_js.php:84 prefs.php:63 prefs.php:123 tt-rss.php:65
-msgid "Loading, please wait..."
-msgstr "读取中，请等待..."
-
-#: localized_js.php:85
-msgid "Local data removed."
-msgstr ""
-
-#: localized_js.php:86 prefs.js:745
-msgid "Login field cannot be blank."
-msgstr "登陆框不能留空。"
-
-#: localized_js.php:87 tt-rss.js:251
-#, fuzzy
-msgid "Mark all articles as read?"
-msgstr "标记  %s 中所有访问过的主题为已读"
-
-#: localized_js.php:88 tt-rss.js:727 tt-rss.js:740
-#, fuzzy, php-format
-msgid "Mark all articles in %s as read?"
-msgstr "标记  %s 中所有访问过的主题为已读"
-
-#: localized_js.php:89 viewfeed.js:1256
-#, php-format
-msgid "Mark all visible articles in %s as read?"
-msgstr "标记  %s 中所有访问过的主题为已读"
-
-#: localized_js.php:90
-msgid "Mark as read:"
-msgstr "标记为已读："
-
-#: localized_js.php:91 viewfeed.js:2020
-#, fuzzy, php-format
-msgid "Mark %d article(s) as read?"
-msgstr "标记  %s 中所有所选Feed为已读..."
-
-#: localized_js.php:92 viewfeed.js:1401
-#, fuzzy, php-format
-msgid "Mark %d selected articles in %s as read?"
-msgstr "标记  %s 中所有所选Feed为已读..."
-
-#: localized_js.php:93
-msgid "Marking all feeds as read..."
-msgstr "标记所有Feed未已读..."
-
-#: localized_js.php:94 viewfeed.js:1351
-#, php-format
-msgid "Move %d archived articles back?"
-msgstr ""
-
-#: localized_js.php:95 functions.js:1952
-msgid "New articles available in this feed (click to show)"
-msgstr ""
-
-#: localized_js.php:96 modules/pref-prefs.php:42
-msgid "New password cannot be blank."
-msgstr "新密码不可留空."
-
-#: localized_js.php:97 viewfeed.js:1977
-#, fuzzy
-msgid "No article is selected."
-msgstr "无选定文章。"
-
-#: localized_js.php:98 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."
-msgstr "无选定文章。"
-
-#: localized_js.php:100 viewfeed.js:2018
-#, fuzzy
-msgid "No articles found to mark"
-msgstr "未找到文章。"
-
-#: localized_js.php:101 prefs.js:678
-msgid "No categories are selected."
-msgstr "未选定分类。"
-
-#: localized_js.php:102 functions.js:1999 functions.js:2030 prefs.js:557
-#: prefs.js:587 prefs.js:619 prefs.js:908 prefs.js:928 prefs.js:1795
-msgid "No feeds are selected."
-msgstr "未选择feed."
-
-#: localized_js.php:103 tt-rss.php:238 tt-rss.php:252
-msgid "No feed selected."
-msgstr "无选定feed."
-
-#: localized_js.php:104 prefs.js:519 prefs.js:888
-msgid "No filters are selected."
-msgstr "未选定过滤器。"
-
-#: localized_js.php:105 prefs.js:454
-msgid "No labels are selected."
-msgstr "未选定标记."
-
-#: localized_js.php:107 prefs.js:969
-msgid "No OPML file to upload."
-msgstr "无OPML文件上传."
-
-#: localized_js.php:108 prefs.js:648
-#, fuzzy
-msgid "No profiles selected."
-msgstr "无选定文章。"
-
-#: localized_js.php:109 prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
-msgid "No users are selected."
-msgstr "未选定用户."
-
-#: localized_js.php:110 modules/pref-prefs.php:37
-msgid "Old password cannot be blank."
-msgstr "原密码不可留空."
-
-#: localized_js.php:111 prefs.js:2137
-msgid "Please choose a profile to activate."
-msgstr ""
-
-#: localized_js.php:112 viewfeed.js:2255
-#, fuzzy
-msgid "Please enter a note for this article:"
-msgstr "请输入标签主题"
-
-#: localized_js.php:113 functions.js:2117
-#, fuzzy
-msgid "Please enter label caption:"
-msgstr "请输入标签主题"
-
-#: localized_js.php:114 prefs.js:307
-#, fuzzy
-msgid "Please enter login:"
-msgstr "请输入标签主题"
-
-#: localized_js.php:115 prefs.js:1989
-#, fuzzy
-msgid "Please enter new label background color:"
-msgstr "请输入标签主题"
-
-#: localized_js.php:116 prefs.js:1987
-#, fuzzy
-msgid "Please enter new label foreground color:"
-msgstr "请输入标签主题"
-
-#: localized_js.php:117 functions.js:2098
-#, fuzzy
-msgid "Please select an image file to upload."
-msgstr "请只选择一个feed."
-
-#: localized_js.php:118 prefs.js:572
-msgid "Please select only one feed."
-msgstr "请只选择一个feed."
-
-#: localized_js.php:119 prefs.js:893
-msgid "Please select only one filter."
-msgstr "请只选择一个过滤器."
-
-#: localized_js.php:120 prefs.js:803 prefs.js:824 prefs.js:863
-msgid "Please select only one user."
-msgstr "请只选择一个用户."
-
-#: localized_js.php:121 tt-rss.js:562 tt-rss.js:755 tt-rss.js:930
-msgid "Please select some feed first."
-msgstr "请先选择若干feed"
-
-#: localized_js.php:122 viewfeed.js:585 viewfeed.js:652
-#, fuzzy
-msgid "Please wait..."
-msgstr "读取中，请等待..."
-
-#: localized_js.php:123
-msgid "Please wait until operation finishes."
-msgstr ""
-
-#: localized_js.php:124 localized_schema.php:18 viewfeed.js:545
-#: viewfeed.js:659
-msgid "Publish article"
-msgstr "发布文章"
-
-#: localized_js.php:125
-#, fuzzy
-msgid "Purging selected feed..."
-msgstr "移除选定的过滤器..."
-
-#: localized_js.php:126 prefs.js:1821
-#, fuzzy, php-format
-msgid "Remove filter %s?"
-msgstr "移除选定的过滤器？"
-
-#: localized_js.php:127
-#, fuzzy
-msgid "Remove selected articles from label?"
-msgstr "移除选定标记?"
-
-#: localized_js.php:128 prefs.js:660
-msgid "Remove selected categories?"
-msgstr "移除选定分类?"
-
-#: localized_js.php:129 functions.js:2014
-msgid ""
-"Remove selected feeds from the archive? Feeds with stored articles will not "
-"be removed."
-msgstr ""
-
-#: localized_js.php:130 prefs.js:503
-msgid "Remove selected filters?"
-msgstr "移除选定的过滤器？"
-
-#: localized_js.php:131 prefs.js:438
-msgid "Remove selected labels?"
-msgstr "移除选定标记?"
-
-#: localized_js.php:132 prefs.js:632
-msgid ""
-"Remove selected profiles? Active and default profiles will not be removed."
-msgstr ""
-
-#: localized_js.php:133 prefs.js:468
-msgid "Remove selected users?"
-msgstr "移除选定用户?"
-
-#: localized_js.php:134 functions.js:2066
-#, fuzzy
-msgid "Remove stored feed icon?"
-msgstr "移除选定标记?"
-
-#: localized_js.php:135
-msgid "Removing feed..."
-msgstr "移除feed中..."
-
-#: localized_js.php:136
-#, fuzzy
-msgid "Removing filter..."
-msgstr "移除feed中..."
-
-#: localized_js.php:137
-#, fuzzy
-msgid "Removing offline data..."
-msgstr "移除feed中..."
-
-#: localized_js.php:138
-msgid "Removing selected categories..."
-msgstr "移除选定分类..."
-
-#: localized_js.php:139
-msgid "Removing selected filters..."
-msgstr "移除选定的过滤器..."
-
-#: localized_js.php:140
-msgid "Removing selected labels..."
-msgstr "移除选定标记..."
-
-#: localized_js.php:141
-#, fuzzy
-msgid "Removing selected profiles..."
-msgstr "移除选定的过滤器..."
-
-#: localized_js.php:142
-msgid "Removing selected users..."
-msgstr "移除选定用户..."
-
-#: localized_js.php:143 prefs.js:1641
-msgid "Replace current publishing address with a new one?"
-msgstr "使用新地址替换当前地址？"
-
-#: localized_js.php:144 prefs.js:1802
-msgid "Rescore all articles? This operation may take a lot of time."
-msgstr ""
-
-#: localized_js.php:145 tt-rss.js:935
-#, fuzzy, php-format
-msgid "Rescore articles in %s?"
-msgstr "星级文章"
-
-#: localized_js.php:146 prefs.js:1779
-#, fuzzy
-msgid "Rescore articles in selected feeds?"
-msgstr "无选定文章。"
-
-#: localized_js.php:147
-#, fuzzy
-msgid "Rescore last 100 articles in selected feeds?"
-msgstr "无选定文章。"
-
-#: localized_js.php:148
-#, fuzzy
-msgid "Rescoring articles..."
-msgstr "星级文章"
-
-#: localized_js.php:149 tt-rss.js:618
-#, fuzzy
-msgid "Reset category order?"
-msgstr "移除选定分类?"
-
-#: localized_js.php:150 prefs.js:1962
-#, fuzzy
-msgid "Reset label colors to default?"
-msgstr "重置默认项？"
-
-#: localized_js.php:151 prefs.js:828
-msgid "Reset password of selected user?"
-msgstr "重置选定用户密码?"
-
-#: localized_js.php:152
-msgid "Resetting password for selected user..."
-msgstr "重置选定用户密码..."
-
-#: localized_js.php:153 prefs.js:1229
-msgid "Reset to defaults?"
-msgstr "重置默认项？"
-
-#: localized_js.php:154 prefs.js:1882
-#, fuzzy
-msgid "Save changes to selected feeds?"
-msgstr "无选定文章。"
-
-#: localized_js.php:155 prefs.js:1678
-#, fuzzy
-msgid "Save current configuration?"
-msgstr "保存设置"
-
-#: localized_js.php:156
-#, fuzzy
-msgid "Saving article tags..."
-msgstr "保存分类..."
-
-#: localized_js.php:157
-msgid "Saving feed..."
-msgstr "保存feed中..."
-
-#: localized_js.php:158
-#, fuzzy
-msgid "Saving feeds..."
-msgstr "保存feed中..."
-
-#: localized_js.php:159
-msgid "Saving filter..."
-msgstr "保存过滤器..."
-
-#: localized_js.php:160
-msgid "Saving user..."
-msgstr "保存用户..."
-
-#: localized_js.php:162
-msgid "Selection"
-msgstr "选择："
-
-#: localized_js.php:164 viewfeed.js:528 viewfeed.js:592
-#, fuzzy
-msgid "Star article"
-msgstr "星级文章"
-
-#: localized_js.php:167 functions.js:1989
-#, fuzzy, php-format
-msgid "Subscribed to %d feed(s)."
-msgstr "订阅feed:"
-
-#: localized_js.php:168 functions.js:1377
-#, fuzzy, php-format
-msgid "Subscribed to %s"
-msgstr "订阅feed:"
-
-#: localized_js.php:169 functions.js:1354
-#, fuzzy
-msgid "Subscribing to feed..."
-msgstr "订阅feed"
-
-#: localized_js.php:170 offline.js:1195
-msgid "Switch Tiny Tiny RSS into offline mode?"
-msgstr ""
-
-#: localized_js.php:171 offline.js:888
-msgid "Synchronizing..."
-msgstr ""
-
-#: localized_js.php:172 offline.js:733
-#, fuzzy
-msgid "Synchronizing articles..."
-msgstr "星级文章"
-
-#: localized_js.php:173 offline.js:778
-#, fuzzy, php-format
-msgid "Synchronizing articles (%d)..."
-msgstr "星级文章"
-
-#: localized_js.php:174 offline.js:696
-#, fuzzy
-msgid "Synchronizing categories..."
-msgstr "保存分类..."
-
-#: localized_js.php:175 offline.js:677
-#, fuzzy
-msgid "Synchronizing feeds..."
-msgstr "保存feed中..."
-
-#: localized_js.php:176 offline.js:714
-#, fuzzy
-msgid "Synchronizing labels..."
-msgstr "保存标记..."
-
-#: localized_js.php:177 tt-rss.php:169 tt-rss.js:79
-msgid "tag cloud"
-msgstr "标签簇"
-
-#: localized_js.php:178 offline.js:1672
-msgid ""
-"This will remove all offline data stored by Tiny Tiny RSS on this computer. "
-"Continue?"
-msgstr ""
-
-#: localized_js.php:179 offline.js:1743
-msgid ""
-"Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
-msgstr ""
-
-#: localized_js.php:180
-#, fuzzy
-msgid "Tiny Tiny RSS is in offline mode."
-msgstr "Tiny Tiny RSS 数据库是最新版。"
-
-#: localized_js.php:181 offline.js:1223
-msgid "Tiny Tiny RSS will reload. Go online?"
-msgstr ""
-
-#: localized_js.php:182
-msgid "Trying to change e-mail..."
-msgstr "尝试更改e-mail..."
-
-#: localized_js.php:183 viewfeed.js:648
-#, fuzzy
-msgid "Unpublish article"
-msgstr "发布文章"
-
-#: localized_js.php:185 viewfeed.js:577
-#, fuzzy
-msgid "Unstar article"
-msgstr "星级文章"
-
-#: localized_js.php:186 functions.js:2162 tt-rss.js:568
-#, php-format
-msgid "Unsubscribe from %s?"
-msgstr "退订%s?"
-
-#: localized_js.php:187 prefs.js:538
-msgid "Unsubscribe from selected feeds?"
-msgstr "退订选定feed?"
-
-#: localized_js.php:188
-msgid "Upload complete."
-msgstr ""
-
-#: localized_js.php:189
-#, fuzzy
-msgid "Upload failed."
-msgstr "星级文章"
-
-#: localized_js.php:190
-msgid "Upload failed: icon is too big."
-msgstr ""
-
-#: localized_js.php:191 functions.js:2100
-msgid "Upload new icon for this feed?"
-msgstr ""
-
-#: localized_js.php:192 functions.js:1389
-#, fuzzy
-msgid "You are already subscribed to this feed."
-msgstr "您不能从分类中取消订阅。"
-
-#: localized_js.php:193 tt-rss.js:760
-msgid "You can't edit this kind of feed."
-msgstr "您不能编辑本分类feed"
-
-#: localized_js.php:194 tt-rss.js:925
-#, fuzzy
-msgid "You can't rescore this kind of feed."
-msgstr "您不能编辑本分类feed"
-
-#: localized_js.php:195 tt-rss.js:557
-msgid "You can't unsubscribe from the category."
-msgstr "您不能从分类中取消订阅。"
-
-#: localized_js.php:196
-msgid "You have to synchronize some articles before going into offline mode."
-msgstr ""
-
-#: localized_js.php:197
-msgid ""
-"You won't be able to access offline version of Tiny Tiny RSS until you "
-"switch it into offline mode again. Go online?"
-msgstr ""
-
 #: localized_schema.php:9 tt-rss.php:222 modules/popup-dialog.php:381
 #: modules/pref-feeds.php:1310 modules/pref-feeds.php:1369
 msgid "Title"
@@ -1157,6 +462,10 @@ msgstr "过滤文章"
 msgid "Set starred"
 msgstr "设置星级"
 
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
+msgid "Publish article"
+msgstr "发布文章"
+
 #: localized_schema.php:19
 msgid "Assign tags"
 msgstr "指定标签"
@@ -1474,6 +783,10 @@ msgstr "未检测到DOMXML 扩展， 要求PHP5以下版本。"
 msgid "Return to preferences"
 msgstr "返回 我的最爱"
 
+#: prefs.php:63 prefs.php:123 tt-rss.php:65
+msgid "Loading, please wait..."
+msgstr "读取中，请等待..."
+
 #: prefs.php:70 prefs.php:126 tt-rss.php:73
 msgid ""
 "Your browser doesn't support Javascript, which is required\n"
@@ -1620,6 +933,10 @@ msgstr ""
 msgid "Go online"
 msgstr "无链接"
 
+#: tt-rss.php:169 tt-rss.js:79
+msgid "tag cloud"
+msgstr "标签簇"
+
 #: tt-rss.php:179
 #, fuzzy
 msgid "Search..."
@@ -1721,6 +1038,10 @@ msgstr ""
 msgid "Update"
 msgstr "更新"
 
+#: tt-rss.php:238 tt-rss.php:252
+msgid "No feed selected."
+msgstr "无选定feed."
+
 #: tt-rss.php:242
 msgid "Drag me to resize panels"
 msgstr ""
@@ -2420,6 +1741,18 @@ msgstr ""
 msgid "background"
 msgstr ""
 
+#: modules/pref-prefs.php:37
+msgid "Old password cannot be blank."
+msgstr "原密码不可留空."
+
+#: modules/pref-prefs.php:42
+msgid "New password cannot be blank."
+msgstr "新密码不可留空."
+
+#: modules/pref-prefs.php:47
+msgid "Entered passwords do not match."
+msgstr "两次输入密码不通."
+
 #: modules/pref-prefs.php:74
 msgid "Password has been changed."
 msgstr "密码已更改."
@@ -2886,6 +2219,587 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
+#: functions.js:1315
+msgid "Can't add filter: nothing to match on."
+msgstr "未能添加过滤：无匹配。"
+
+#: functions.js:1350
+msgid "Can't subscribe: no feed URL given."
+msgstr "未能订阅：无 feed URL。"
+
+#: functions.js:1354
+#, fuzzy
+msgid "Subscribing to feed..."
+msgstr "订阅feed"
+
+#: functions.js:1377
+#, fuzzy
+msgid "Subscribed to %s"
+msgstr "订阅feed:"
+
+#: functions.js:1386
+#, fuzzy
+msgid "Can't subscribe to the specified URL."
+msgstr "未能订阅：无 feed URL。"
+
+#: functions.js:1389
+#, fuzzy
+msgid "You are already subscribed to this feed."
+msgstr "您不能从分类中取消订阅。"
+
+#: functions.js:1952
+msgid "New articles available in this feed (click to show)"
+msgstr ""
+
+#: functions.js:1989
+#, fuzzy
+msgid "Subscribed to %d feed(s)."
+msgstr "订阅feed:"
+
+#: functions.js:1999 functions.js:2030 prefs.js:557 prefs.js:587 prefs.js:619
+#: prefs.js:908 prefs.js:928 prefs.js:1795
+msgid "No feeds are selected."
+msgstr "未选择feed."
+
+#: functions.js:2014
+msgid ""
+"Remove selected feeds from the archive? Feeds with stored articles will not "
+"be removed."
+msgstr ""
+
+#: functions.js:2066
+#, fuzzy
+msgid "Remove stored feed icon?"
+msgstr "移除选定标记?"
+
+#: functions.js:2098
+#, fuzzy
+msgid "Please select an image file to upload."
+msgstr "请只选择一个feed."
+
+#: functions.js:2100
+msgid "Upload new icon for this feed?"
+msgstr ""
+
+#: functions.js:2117
+#, fuzzy
+msgid "Please enter label caption:"
+msgstr "请输入标签主题"
+
+#: functions.js:2122
+msgid "Can't create label: missing caption."
+msgstr "创建标签失败：缺少标题。"
+
+#: functions.js:2162 tt-rss.js:568
+msgid "Unsubscribe from %s?"
+msgstr "退订%s?"
+
+#: offline.js:636
+msgid "Data for offline browsing has not been downloaded yet."
+msgstr ""
+
+#: offline.js:677
+#, fuzzy
+msgid "Synchronizing feeds..."
+msgstr "保存feed中..."
+
+#: offline.js:696
+#, fuzzy
+msgid "Synchronizing categories..."
+msgstr "保存分类..."
+
+#: offline.js:714
+#, fuzzy
+msgid "Synchronizing labels..."
+msgstr "保存标记..."
+
+#: offline.js:733
+#, fuzzy
+msgid "Synchronizing articles..."
+msgstr "星级文章"
+
+#: offline.js:778
+#, fuzzy
+msgid "Synchronizing articles (%d)..."
+msgstr "星级文章"
+
+#: offline.js:806
+msgid "Last sync: %s"
+msgstr ""
+
+#: offline.js:835
+msgid "Last sync: Error receiving data."
+msgstr ""
+
+#: offline.js:888
+msgid "Synchronizing..."
+msgstr ""
+
+#: offline.js:1195
+msgid "Switch Tiny Tiny RSS into offline mode?"
+msgstr ""
+
+#: offline.js:1223
+msgid "Tiny Tiny RSS will reload. Go online?"
+msgstr ""
+
+#: offline.js:1655
+msgid "Last sync: Cancelled."
+msgstr ""
+
+#: offline.js:1672
+msgid ""
+"This will remove all offline data stored by Tiny Tiny RSS on this computer. "
+"Continue?"
+msgstr ""
+
+#: offline.js:1743
+msgid ""
+"Tiny Tiny RSS has trouble accessing its server. Would you like to go offline?"
+msgstr ""
+
+#: prefs.js:233
+#, fuzzy
+msgid "Error: No feed URL given."
+msgstr "未能订阅：无 feed URL。"
+
+#: prefs.js:235
+msgid "Error: Invalid feed URL."
+msgstr ""
+
+#: prefs.js:263
+#, fuzzy
+msgid "Can't add profile: no name specified."
+msgstr "添加分类失败：未指定分类名"
+
+#: prefs.js:285
+msgid "Can't add category: no name specified."
+msgstr "添加分类失败：未指定分类名"
+
+#: prefs.js:307
+#, fuzzy
+msgid "Please enter login:"
+msgstr "请输入标签主题"
+
+#: prefs.js:314
+#, fuzzy
+msgid "Can't create user: no login specified."
+msgstr "添加用户失败：未登录。"
+
+#: prefs.js:438
+msgid "Remove selected labels?"
+msgstr "移除选定标记?"
+
+#: prefs.js:454
+msgid "No labels are selected."
+msgstr "未选定标记."
+
+#: prefs.js:468
+msgid "Remove selected users?"
+msgstr "移除选定用户?"
+
+#: prefs.js:485 prefs.js:798 prefs.js:819 prefs.js:858
+msgid "No users are selected."
+msgstr "未选定用户."
+
+#: prefs.js:503
+msgid "Remove selected filters?"
+msgstr "移除选定的过滤器？"
+
+#: prefs.js:519 prefs.js:888
+msgid "No filters are selected."
+msgstr "未选定过滤器。"
+
+#: prefs.js:538
+msgid "Unsubscribe from selected feeds?"
+msgstr "退订选定feed?"
+
+#: prefs.js:572
+msgid "Please select only one feed."
+msgstr "请只选择一个feed."
+
+#: prefs.js:578
+#, fuzzy
+msgid "Erase all non-starred articles in selected feed?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: prefs.js:600
+msgid "How many days of articles to keep (0 - use default)?"
+msgstr ""
+
+#: prefs.js:632
+msgid ""
+"Remove selected profiles? Active and default profiles will not be removed."
+msgstr ""
+
+#: prefs.js:648
+#, fuzzy
+msgid "No profiles selected."
+msgstr "无选定文章。"
+
+#: prefs.js:660
+msgid "Remove selected categories?"
+msgstr "移除选定分类?"
+
+#: prefs.js:678
+msgid "No categories are selected."
+msgstr "未选定分类。"
+
+#: prefs.js:745
+msgid "Login field cannot be blank."
+msgstr "登陆框不能留空。"
+
+#: prefs.js:803 prefs.js:824 prefs.js:863
+msgid "Please select only one user."
+msgstr "请只选择一个用户."
+
+#: prefs.js:828
+msgid "Reset password of selected user?"
+msgstr "重置选定用户密码?"
+
+#: prefs.js:893
+msgid "Please select only one filter."
+msgstr "请只选择一个过滤器."
+
+#: prefs.js:969
+msgid "No OPML file to upload."
+msgstr "无OPML文件上传."
+
+#: prefs.js:1229
+msgid "Reset to defaults?"
+msgstr "重置默认项？"
+
+#: prefs.js:1641
+msgid "Replace current publishing address with a new one?"
+msgstr "使用新地址替换当前地址？"
+
+#: prefs.js:1678
+#, fuzzy
+msgid "Save current configuration?"
+msgstr "保存设置"
+
+#: prefs.js:1779
+#, fuzzy
+msgid "Rescore articles in selected feeds?"
+msgstr "无选定文章。"
+
+#: prefs.js:1802
+msgid "Rescore all articles? This operation may take a lot of time."
+msgstr ""
+
+#: prefs.js:1821
+#, fuzzy
+msgid "Remove filter %s?"
+msgstr "移除选定的过滤器？"
+
+#: prefs.js:1882
+#, fuzzy
+msgid "Save changes to selected feeds?"
+msgstr "无选定文章。"
+
+#: prefs.js:1962
+#, fuzzy
+msgid "Reset label colors to default?"
+msgstr "重置默认项？"
+
+#: prefs.js:1987
+#, fuzzy
+msgid "Please enter new label foreground color:"
+msgstr "请输入标签主题"
+
+#: prefs.js:1989
+#, fuzzy
+msgid "Please enter new label background color:"
+msgstr "请输入标签主题"
+
+#: prefs.js:2121
+#, fuzzy
+msgid "Activate selected profile?"
+msgstr "移除选定的过滤器？"
+
+#: prefs.js:2137
+msgid "Please choose a profile to activate."
+msgstr ""
+
+#: tt-rss.js:74
+msgid "display feeds"
+msgstr "显示Feed"
+
+#: tt-rss.js:251
+#, fuzzy
+msgid "Mark all articles as read?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: tt-rss.js:557
+msgid "You can't unsubscribe from the category."
+msgstr "您不能从分类中取消订阅。"
+
+#: tt-rss.js:562 tt-rss.js:755 tt-rss.js:930
+msgid "Please select some feed first."
+msgstr "请先选择若干feed"
+
+#: tt-rss.js:618
+#, fuzzy
+msgid "Reset category order?"
+msgstr "移除选定分类?"
+
+#: tt-rss.js:727 tt-rss.js:740
+#, fuzzy
+msgid "Mark all articles in %s as read?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: tt-rss.js:760
+msgid "You can't edit this kind of feed."
+msgstr "您不能编辑本分类feed"
+
+#: tt-rss.js:925
+#, fuzzy
+msgid "You can't rescore this kind of feed."
+msgstr "您不能编辑本分类feed"
+
+#: tt-rss.js:935
+#, fuzzy
+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."
+msgstr "无选定文章。"
+
+#: viewfeed.js:1256
+msgid "Mark all visible articles in %s as read?"
+msgstr "标记  %s 中所有访问过的主题为已读"
+
+#: viewfeed.js:1298
+#, fuzzy
+msgid "Delete %d selected articles in %s?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:1300
+#, fuzzy
+msgid "Delete %d selected articles?"
+msgstr "移除选定标记?"
+
+#: viewfeed.js:1348
+#, fuzzy
+msgid "Archive %d selected articles in %s?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:1351
+msgid "Move %d archived articles back?"
+msgstr ""
+
+#: viewfeed.js:1401
+#, fuzzy
+msgid "Mark %d selected articles in %s as read?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:1977
+#, fuzzy
+msgid "No article is selected."
+msgstr "无选定文章。"
+
+#: viewfeed.js:2018
+#, fuzzy
+msgid "No articles found to mark"
+msgstr "未找到文章。"
+
+#: viewfeed.js:2020
+#, fuzzy
+msgid "Mark %d article(s) as read?"
+msgstr "标记  %s 中所有所选Feed为已读..."
+
+#: viewfeed.js:2255
+#, fuzzy
+msgid "Please enter a note for this article:"
+msgstr "请输入标签主题"
+
+#~ msgid "Adding feed..."
+#~ msgstr "添加feed中..."
+
+#~ msgid "Adding feed category..."
+#~ msgstr "添加feed分类..."
+
+#, fuzzy
+#~ msgid "Adding profile..."
+#~ msgstr "添加feed中..."
+
+#~ msgid "Adding user..."
+#~ msgstr "添加用户..."
+
+#, fuzzy
+#~ msgid "Assign score to article:"
+#~ msgstr "星级文章"
+
+#, fuzzy
+#~ msgid "Assign selected articles to label?"
+#~ msgstr "标记  %s 中所有所选Feed为已读..."
+
+#, fuzzy
+#~ msgid "Category reordering disabled"
+#~ msgstr "移除选定分类?"
+
+#, fuzzy
+#~ msgid "Category reordering enabled"
+#~ msgstr "移除选定分类?"
+
+#, fuzzy
+#~ msgid "Changing password..."
+#~ msgstr "更改密码"
+
+#, fuzzy
+#~ msgid "Clearing feed..."
+#~ msgstr "保存feed中..."
+
+#, fuzzy
+#~ msgid "Clearing selected feed..."
+#~ msgstr "移除选定的过滤器..."
+
+#, fuzzy
+#~ msgid "comments"
+#~ msgstr "内容"
+
+#, fuzzy
+#~ msgid "Could not change feed URL."
+#~ msgstr "未能更新地址"
+
+#~ msgid "Could not display article (missing XML object)"
+#~ msgstr "显示条目失败（缺少XML支持）"
+
+#, fuzzy
+#~ msgid "Could not update headlines (missing XML data)"
+#~ msgstr "更新提要失败（缺少XML支持）"
+
+#~ msgid "Could not update headlines (missing XML object)"
+#~ msgstr "更新提要失败（缺少XML支持）"
+
+#~ msgid "Entire feed"
+#~ msgstr "输入feed"
+
+#, fuzzy
+#~ msgid "Error while trying to load more headlines"
+#~ msgstr "解析文档时发生错误。"
+
+#, fuzzy
+#~ msgid "Failed to load article in new window"
+#~ msgstr "新窗口打开文章连结"
+
+#, fuzzy
+#~ msgid "Failed to open window for the article"
+#~ msgstr "请输入标签主题"
+
+#, fuzzy
+#~ msgid "Feed icon removed."
+#~ msgstr "未找到Feed."
+
+#, fuzzy
+#~ msgid "Loading feed list..."
+#~ msgstr "读取中，请等待..."
+
+#~ msgid "Mark as read:"
+#~ msgstr "标记为已读："
+
+#~ msgid "Marking all feeds as read..."
+#~ msgstr "标记所有Feed未已读..."
+
+#, fuzzy
+#~ msgid "Purging selected feed..."
+#~ msgstr "移除选定的过滤器..."
+
+#, fuzzy
+#~ msgid "Remove selected articles from label?"
+#~ msgstr "移除选定标记?"
+
+#~ msgid "Removing feed..."
+#~ msgstr "移除feed中..."
+
+#, fuzzy
+#~ msgid "Removing filter..."
+#~ msgstr "移除feed中..."
+
+#, fuzzy
+#~ msgid "Removing offline data..."
+#~ msgstr "移除feed中..."
+
+#~ msgid "Removing selected categories..."
+#~ msgstr "移除选定分类..."
+
+#~ msgid "Removing selected filters..."
+#~ msgstr "移除选定的过滤器..."
+
+#~ msgid "Removing selected labels..."
+#~ msgstr "移除选定标记..."
+
+#, fuzzy
+#~ msgid "Removing selected profiles..."
+#~ msgstr "移除选定的过滤器..."
+
+#~ msgid "Removing selected users..."
+#~ msgstr "移除选定用户..."
+
+#, fuzzy
+#~ msgid "Rescore last 100 articles in selected feeds?"
+#~ msgstr "无选定文章。"
+
+#, fuzzy
+#~ msgid "Rescoring articles..."
+#~ msgstr "星级文章"
+
+#~ msgid "Resetting password for selected user..."
+#~ msgstr "重置选定用户密码..."
+
+#, fuzzy
+#~ msgid "Saving article tags..."
+#~ msgstr "保存分类..."
+
+#~ msgid "Saving feed..."
+#~ msgstr "保存feed中..."
+
+#, fuzzy
+#~ msgid "Saving feeds..."
+#~ msgstr "保存feed中..."
+
+#~ msgid "Saving filter..."
+#~ msgstr "保存过滤器..."
+
+#~ msgid "Saving user..."
+#~ msgstr "保存用户..."
+
+#~ msgid "Selection"
+#~ msgstr "选择："
+
+#, fuzzy
+#~ msgid "Tiny Tiny RSS is in offline mode."
+#~ msgstr "Tiny Tiny RSS 数据库是最新版。"
+
+#~ msgid "Trying to change e-mail..."
+#~ msgstr "尝试更改e-mail..."
+
+#, fuzzy
+#~ msgid "Upload failed."
+#~ msgstr "星级文章"
+
 #, fuzzy
 #~ msgid "Display original article content"
 #~ msgstr "显示最近文章时间"