From c050148df4b81eca3c0e1110b94a649e9b56f9b0 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Mon, 1 Apr 2013 19:17:25 +0400
Subject: =?UTF-8?q?fix=20broken=20header=20of=20ru=5FRU=20translation=20th?=
 =?UTF-8?q?anks=20to=20Tom=C3=A1=C5=A1=20Chv=C3=A1tal;=20rebase=20translat?=
 =?UTF-8?q?ions?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 37932 -> 37932 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 397 +++++++++++++++++------------------
 2 files changed, 197 insertions(+), 200 deletions(-)

(limited to 'locale/zh_CN')

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 9777da46b..e70eae4c9 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 dec9b899b..e12fdce8a 100644
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 16:28+0400\n"
+"POT-Creation-Date: 2013-04-01 19:15+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <lazycai.ffsky@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/language/zh_CN/)\n"
@@ -91,7 +91,7 @@ msgid "Weekly"
 msgstr "每周"
 
 #: backend.php:101
-#: classes/pref/users.php:139
+#: classes/pref/users.php:123
 msgid "User"
 msgstr "用户"
 
@@ -253,8 +253,9 @@ msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 
 #: index.php:135
 #: index.php:154
-#: index.php:263
+#: index.php:273
 #: prefs.php:103
+#: test.php:11
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
@@ -306,13 +307,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:176
-#: include/functions.php:1924
+#: include/functions.php:1925
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
 #: index.php:177
-#: include/functions.php:1925
+#: include/functions.php:1926
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
@@ -357,11 +358,11 @@ msgid "Mark feed as read"
 msgstr "标记信息源为已读"
 
 #: index.php:195
-#: index.php:234
-#: include/functions.php:1914
+#: index.php:237
+#: include/functions.php:1915
 #: include/localized_schema.php:10
 #: classes/feeds.php:111
-#: classes/feeds.php:437
+#: classes/feeds.php:441
 #: js/FeedTree.js:128
 #: js/FeedTree.js:156
 #: plugins/digest/digest.js:647
@@ -369,8 +370,8 @@ msgid "Mark as read"
 msgstr "标记为已读"
 
 #: index.php:196
-#: include/functions.php:1810
-#: include/functions.php:1922
+#: include/functions.php:1811
+#: include/functions.php:1923
 msgid "All articles"
 msgstr "全部文章"
 
@@ -386,98 +387,94 @@ msgstr ""
 msgid "Older than two weeks"
 msgstr ""
 
-#: index.php:204
-msgid "Refresh"
-msgstr ""
-
-#: index.php:211
+#: index.php:214
 msgid "Communication problem with server."
 msgstr ""
 
-#: index.php:219
+#: index.php:222
 msgid "New version of Tiny Tiny RSS is available!"
 msgstr "Tiny Tiny RSS 有新版本啦！"
 
-#: index.php:224
+#: index.php:227
 msgid "Actions..."
 msgstr "动作"
 
-#: index.php:226
+#: index.php:229
 #, fuzzy
 msgid "Preferences..."
 msgstr "偏好设置"
 
-#: index.php:227
+#: index.php:230
 msgid "Search..."
 msgstr "搜索"
 
-#: index.php:228
+#: index.php:231
 msgid "Feed actions:"
 msgstr "信息源操作："
 
-#: index.php:229
+#: index.php:232
 #: classes/handler/public.php:556
 msgid "Subscribe to feed..."
 msgstr "订阅信息源"
 
-#: index.php:230
+#: index.php:233
 msgid "Edit this feed..."
 msgstr "编辑信息源"
 
-#: index.php:231
+#: index.php:234
 msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
-#: index.php:232
+#: index.php:235
 #: classes/pref/feeds.php:717
 #: classes/pref/feeds.php:1304
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "取消订阅"
 
-#: index.php:233
+#: index.php:236
 msgid "All feeds:"
 msgstr "全部信息源："
 
-#: index.php:235
+#: index.php:238
 msgid "(Un)hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: index.php:236
+#: index.php:239
 msgid "Other actions:"
 msgstr "其他操作："
 
-#: index.php:238
+#: index.php:241
 msgid "Switch to digest..."
 msgstr "切换至摘要模式"
 
-#: index.php:240
+#: index.php:243
 msgid "Show tag cloud..."
 msgstr "显示标签云"
 
-#: index.php:241
-#: include/functions.php:1900
+#: index.php:244
+#: include/functions.php:1901
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "锁定加星标的项"
 
-#: index.php:242
+#: index.php:245
 msgid "Select by tags..."
 msgstr "通过自定义标签选择"
 
-#: index.php:243
+#: index.php:246
 msgid "Create label..."
 msgstr "创建预定义标签"
 
-#: index.php:244
+#: index.php:247
 msgid "Create filter..."
 msgstr "创建过滤器"
 
-#: index.php:245
+#: index.php:248
 msgid "Keyboard shortcuts help"
 msgstr "快捷键帮助"
 
-#: index.php:247
+#: index.php:257
 #: plugins/digest/digest_body.php:77
 #: plugins/mobile/mobile-functions.php:62
 #: plugins/mobile/mobile-functions.php:237
@@ -486,7 +483,7 @@ msgstr "注销"
 
 #: prefs.php:36
 #: prefs.php:121
-#: include/functions.php:1927
+#: include/functions.php:1928
 #: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "偏好设置"
@@ -512,8 +509,8 @@ msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:130
-#: include/functions.php:1117
-#: include/functions.php:1753
+#: include/functions.php:1118
+#: include/functions.php:1754
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
@@ -584,10 +581,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
 #: include/digest.php:109
-#: include/functions.php:1126
-#: include/functions.php:1654
-#: include/functions.php:1739
-#: include/functions.php:1761
+#: include/functions.php:1127
+#: include/functions.php:1655
+#: include/functions.php:1740
+#: include/functions.php:1762
 #: classes/opml.php:416
 #: classes/pref/feeds.php:222
 msgid "Uncategorized"
@@ -603,323 +600,323 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:1115
-#: include/functions.php:1751
+#: include/functions.php:1116
+#: include/functions.php:1752
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "特殊区域"
 
-#: include/functions.php:1603
-#: classes/feeds.php:1097
+#: include/functions.php:1604
+#: classes/feeds.php:1101
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1804
+#: include/functions.php:1805
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1806
+#: include/functions.php:1807
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1808
+#: include/functions.php:1809
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1812
+#: include/functions.php:1813
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1814
+#: include/functions.php:1815
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1877
+#: include/functions.php:1878
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1878
+#: include/functions.php:1879
 #, fuzzy
 msgid "Open next feed"
 msgstr "自动显示下一个信息源"
 
-#: include/functions.php:1879
+#: include/functions.php:1880
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1880
+#: include/functions.php:1881
 #, fuzzy
 msgid "Open next article"
 msgstr "打开原文"
 
-#: include/functions.php:1881
+#: include/functions.php:1882
 #, fuzzy
 msgid "Open previous article"
 msgstr "打开原文"
 
-#: include/functions.php:1882
+#: include/functions.php:1883
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1883
+#: include/functions.php:1884
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1885
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1885
+#: include/functions.php:1886
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1886
+#: include/functions.php:1887
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions.php:1887
+#: include/functions.php:1888
 #: js/viewfeed.js:1908
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1888
+#: include/functions.php:1889
 #: js/viewfeed.js:1886
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions.php:1889
+#: include/functions.php:1890
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1890
+#: include/functions.php:1891
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "不再显示所选的文章"
 
-#: include/functions.php:1891
+#: include/functions.php:1892
 #, fuzzy
 msgid "Dismiss read"
 msgstr "不再显示已读文章"
 
-#: include/functions.php:1892
+#: include/functions.php:1893
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1893
+#: include/functions.php:1894
 #: js/viewfeed.js:1927
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1894
+#: include/functions.php:1895
 #: js/viewfeed.js:1921
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1895
+#: include/functions.php:1896
 #, fuzzy
 msgid "Scroll down"
 msgstr "全部完成。"
 
-#: include/functions.php:1896
+#: include/functions.php:1897
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1897
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1898
+#: include/functions.php:1899
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1899
+#: include/functions.php:1900
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "选择所有文章"
 
-#: include/functions.php:1901
+#: include/functions.php:1902
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1902
+#: include/functions.php:1903
 #, fuzzy
 msgid "Article selection"
 msgstr "反选文章"
 
-#: include/functions.php:1903
+#: include/functions.php:1904
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1904
+#: include/functions.php:1905
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1905
+#: include/functions.php:1906
 #, fuzzy
 msgid "Select starred"
 msgstr "加星标"
 
-#: include/functions.php:1906
+#: include/functions.php:1907
 #, fuzzy
 msgid "Select published"
 msgstr "选择未读文章"
 
-#: include/functions.php:1907
+#: include/functions.php:1908
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1908
+#: include/functions.php:1909
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1909
+#: include/functions.php:1910
 #: classes/pref/feeds.php:521
 #: classes/pref/feeds.php:754
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1910
+#: include/functions.php:1911
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新活动的信息源"
 
-#: include/functions.php:1911
+#: include/functions.php:1912
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: include/functions.php:1912
+#: include/functions.php:1913
 #: classes/pref/feeds.php:1275
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1913
+#: include/functions.php:1914
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1915
+#: include/functions.php:1916
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1916
+#: include/functions.php:1917
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1917
+#: include/functions.php:1918
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1918
+#: include/functions.php:1919
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到类别："
 
-#: include/functions.php:1919
+#: include/functions.php:1920
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1920
+#: include/functions.php:1921
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1921
+#: include/functions.php:1922
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1923
+#: include/functions.php:1924
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1926
+#: include/functions.php:1927
 #: js/tt-rss.js:431
 #: js/tt-rss.js:584
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1928
+#: include/functions.php:1929
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1929
+#: include/functions.php:1930
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1930
+#: include/functions.php:1931
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1931
+#: include/functions.php:1932
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折叠侧边栏"
 
-#: include/functions.php:1932
+#: include/functions.php:1933
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:2417
+#: include/functions.php:2418
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2908
+#: include/functions.php:2909
 #: js/viewfeed.js:2014
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:2909
+#: include/functions.php:2910
 #: js/viewfeed.js:2013
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3026
+#: include/functions.php:3027
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3048
-#: include/functions.php:3342
+#: include/functions.php:3049
+#: include/functions.php:3343
 #: classes/rpc.php:408
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3058
-#: classes/feeds.php:682
+#: include/functions.php:3059
+#: classes/feeds.php:686
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3087
-#: classes/feeds.php:638
+#: include/functions.php:3088
+#: classes/feeds.php:642
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3100
-#: classes/feeds.php:651
+#: include/functions.php:3101
+#: classes/feeds.php:655
 #: classes/pref/feeds.php:540
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3131
+#: include/functions.php:3132
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
@@ -929,7 +926,7 @@ msgstr "信息源 URL"
 #: classes/dlg.php:250
 #: classes/dlg.php:262
 #: classes/backend.php:105
-#: classes/pref/users.php:106
+#: classes/pref/users.php:99
 #: classes/pref/filters.php:147
 #: classes/pref/prefs.php:1012
 #: classes/pref/feeds.php:1588
@@ -942,15 +939,15 @@ msgstr "信息源 URL"
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:3367
+#: include/functions.php:3368
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:3600
+#: include/functions.php:3601
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:3656
+#: include/functions.php:3657
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
@@ -1253,7 +1250,7 @@ msgstr ""
 msgid "Log in"
 msgstr "登录"
 
-#: include/sessions.php:53
+#: include/sessions.php:55
 msgid "Session failed to validate (incorrect IP)"
 msgstr "无法验证会话（IP 错误）"
 
@@ -1266,7 +1263,7 @@ msgid "Tags for this article (separated by commas):"
 msgstr "本文的标签，请用逗号分开："
 
 #: classes/article.php:204
-#: classes/pref/users.php:192
+#: classes/pref/users.php:176
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
 #: classes/pref/prefs.php:894
@@ -1281,10 +1278,10 @@ msgstr "保存"
 #: classes/article.php:206
 #: classes/handler/public.php:438
 #: classes/handler/public.php:480
-#: classes/feeds.php:1024
-#: classes/feeds.php:1076
-#: classes/feeds.php:1136
-#: classes/pref/users.php:194
+#: classes/feeds.php:1028
+#: classes/feeds.php:1080
+#: classes/feeds.php:1140
+#: classes/pref/users.php:178
 #: classes/pref/labels.php:81
 #: classes/pref/filters.php:408
 #: classes/pref/filters.php:804
@@ -1403,7 +1400,7 @@ msgid "You will need to provide valid account name and email. New password will
 msgstr ""
 
 #: classes/handler/public.php:764
-#: classes/pref/users.php:378
+#: classes/pref/users.php:360
 msgid "Reset password"
 msgstr "重置密码"
 
@@ -1515,7 +1512,7 @@ msgid "Select:"
 msgstr "选择："
 
 #: classes/feeds.php:92
-#: classes/pref/users.php:363
+#: classes/pref/users.php:345
 #: classes/pref/labels.php:275
 #: classes/pref/filters.php:282
 #: classes/pref/filters.php:330
@@ -1535,7 +1532,7 @@ msgid "Invert"
 msgstr "反选"
 
 #: classes/feeds.php:95
-#: classes/pref/users.php:365
+#: classes/pref/users.php:347
 #: classes/pref/labels.php:277
 #: classes/pref/filters.php:284
 #: classes/pref/filters.php:332
@@ -1595,93 +1592,93 @@ msgstr "通过邮件转发"
 msgid "Feed:"
 msgstr "信息源："
 
-#: classes/feeds.php:201
-#: classes/feeds.php:827
+#: classes/feeds.php:205
+#: classes/feeds.php:831
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
-#: classes/feeds.php:384
+#: classes/feeds.php:388
 #, fuzzy, php-format
 msgid "Imported at %s"
 msgstr "导入"
 
-#: classes/feeds.php:531
+#: classes/feeds.php:535
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:582
+#: classes/feeds.php:586
 #, fuzzy
 msgid "Collapse article"
 msgstr "全部文章"
 
-#: classes/feeds.php:728
+#: classes/feeds.php:732
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:731
+#: classes/feeds.php:735
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:734
+#: classes/feeds.php:738
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:738
+#: classes/feeds.php:742
 msgid "No articles found to display. You can assign articles to labels manually (see the Actions menu above) or use a filter."
 msgstr "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方动作菜单）。"
 
-#: classes/feeds.php:740
+#: classes/feeds.php:744
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:755
-#: classes/feeds.php:919
+#: classes/feeds.php:759
+#: classes/feeds.php:923
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:765
-#: classes/feeds.php:929
+#: classes/feeds.php:769
+#: classes/feeds.php:933
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:909
+#: classes/feeds.php:913
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
-#: classes/feeds.php:962
-#: classes/feeds.php:970
+#: classes/feeds.php:966
+#: classes/feeds.php:974
 #, fuzzy
 msgid "Feed or site URL"
 msgstr "信息源 URL"
 
-#: classes/feeds.php:976
+#: classes/feeds.php:980
 #: classes/pref/feeds.php:560
 #: classes/pref/feeds.php:782
 #: classes/pref/feeds.php:1761
 msgid "Place in category:"
 msgstr "加入到类别："
 
-#: classes/feeds.php:984
+#: classes/feeds.php:988
 msgid "Available feeds"
 msgstr "可用的信息源"
 
-#: classes/feeds.php:996
-#: classes/pref/users.php:155
+#: classes/feeds.php:1000
+#: classes/pref/users.php:139
 #: classes/pref/feeds.php:590
 #: classes/pref/feeds.php:818
 msgid "Authentication"
 msgstr "登录密码"
 
-#: classes/feeds.php:1000
-#: classes/pref/users.php:420
+#: classes/feeds.php:1004
+#: classes/pref/users.php:402
 #: classes/pref/feeds.php:596
 #: classes/pref/feeds.php:822
 #: classes/pref/feeds.php:1775
 msgid "Login"
 msgstr "登陆"
 
-#: classes/feeds.php:1003
+#: classes/feeds.php:1007
 #: classes/pref/prefs.php:202
 #: classes/pref/feeds.php:602
 #: classes/pref/feeds.php:828
@@ -1689,43 +1686,43 @@ msgstr "登陆"
 msgid "Password"
 msgstr "密码"
 
-#: classes/feeds.php:1013
+#: classes/feeds.php:1017
 msgid "This feed requires authentication."
 msgstr "这个信息源需要认证"
 
-#: classes/feeds.php:1018
-#: classes/feeds.php:1074
+#: classes/feeds.php:1022
+#: classes/feeds.php:1078
 #: classes/pref/feeds.php:1796
 msgid "Subscribe"
 msgstr "订阅"
 
-#: classes/feeds.php:1021
+#: classes/feeds.php:1025
 msgid "More feeds"
 msgstr "更多信息源"
 
-#: classes/feeds.php:1044
-#: classes/feeds.php:1135
-#: classes/pref/users.php:350
+#: classes/feeds.php:1048
+#: classes/feeds.php:1139
+#: classes/pref/users.php:332
 #: classes/pref/filters.php:641
 #: classes/pref/feeds.php:1259
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "搜索"
 
-#: classes/feeds.php:1048
+#: classes/feeds.php:1052
 msgid "Popular feeds"
 msgstr "最受欢迎的信息源"
 
-#: classes/feeds.php:1049
+#: classes/feeds.php:1053
 msgid "Feed archive"
 msgstr "信息源存档"
 
-#: classes/feeds.php:1052
+#: classes/feeds.php:1056
 msgid "limit:"
 msgstr "限制："
 
-#: classes/feeds.php:1075
-#: classes/pref/users.php:376
+#: classes/feeds.php:1079
+#: classes/pref/users.php:358
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
@@ -1734,15 +1731,15 @@ msgstr "限制："
 msgid "Remove"
 msgstr "移除"
 
-#: classes/feeds.php:1086
+#: classes/feeds.php:1090
 msgid "Look for"
 msgstr "查找"
 
-#: classes/feeds.php:1094
+#: classes/feeds.php:1098
 msgid "Limit search to:"
 msgstr "限制搜索条件："
 
-#: classes/feeds.php:1110
+#: classes/feeds.php:1114
 msgid "This feed"
 msgstr "本信息源"
 
@@ -1828,83 +1825,75 @@ msgstr "解析文档时发生错误。"
 msgid "Your access level is insufficient to open this tab."
 msgstr "您的访问级别不够，无法打开这个舌签。"
 
-#: classes/pref/users.php:27
-msgid "User details"
-msgstr "用户详细资料"
-
-#: classes/pref/users.php:41
+#: classes/pref/users.php:34
 msgid "User not found"
 msgstr "未找到用户"
 
-#: classes/pref/users.php:60
-#: classes/pref/users.php:422
+#: classes/pref/users.php:53
+#: classes/pref/users.php:404
 msgid "Registered"
 msgstr "注册时间"
 
-#: classes/pref/users.php:61
+#: classes/pref/users.php:54
 msgid "Last logged in"
 msgstr "上次登录"
 
-#: classes/pref/users.php:68
+#: classes/pref/users.php:61
 msgid "Subscribed feeds count"
 msgstr "订阅的信息源数量"
 
-#: classes/pref/users.php:72
+#: classes/pref/users.php:65
 msgid "Subscribed feeds"
 msgstr "订阅的信息源"
 
-#: classes/pref/users.php:122
-msgid "User Editor"
-msgstr "编辑用户信息"
-
-#: classes/pref/users.php:158
+#: classes/pref/users.php:142
 msgid "Access level: "
 msgstr "访问级别："
 
-#: classes/pref/users.php:171
+#: classes/pref/users.php:155
 msgid "Change password to"
 msgstr "更改密码为："
 
-#: classes/pref/users.php:177
+#: classes/pref/users.php:161
 #: classes/pref/feeds.php:610
 #: classes/pref/feeds.php:834
 msgid "Options"
 msgstr "选项"
 
-#: classes/pref/users.php:180
+#: classes/pref/users.php:164
 msgid "E-mail: "
 msgstr "电子邮件："
 
-#: classes/pref/users.php:258
+#: classes/pref/users.php:240
 #, php-format
 msgid "Added user <b>%s</b> with password <b>%s</b>"
 msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: classes/pref/users.php:265
+#: classes/pref/users.php:247
 #, php-format
 msgid "Could not create user <b>%s</b>"
 msgstr "无法创建用户 <b>%s</b> "
 
-#: classes/pref/users.php:269
+#: classes/pref/users.php:251
 #, php-format
 msgid "User <b>%s</b> already exists."
 msgstr "用户 <b>%s</b> 已存在。"
 
-#: classes/pref/users.php:291
+#: classes/pref/users.php:273
 #, fuzzy, php-format
 msgid "Changed password of user <b>%s</b> to <b>%s</b>"
 msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: classes/pref/users.php:293
+#: classes/pref/users.php:275
 #, fuzzy, php-format
 msgid "Sending new password of user <b>%s</b> to <b>%s</b>"
 msgstr "已添加用户 <b>%s</b> ，密码为<b>%s</b>"
 
-#: classes/pref/users.php:317
+#: classes/pref/users.php:299
 msgid "[tt-rss] Password change notification"
 msgstr "[tt-rss] 密码更换提醒"
 
-#: classes/pref/users.php:360
+#: classes/pref/users.php:342
 #: classes/pref/labels.php:272
 #: classes/pref/filters.php:279
 #: classes/pref/filters.php:327
@@ -1919,38 +1908,38 @@ msgstr "[tt-rss] 密码更换提醒"
 msgid "Select"
 msgstr "选择"
 
-#: classes/pref/users.php:368
+#: classes/pref/users.php:350
 msgid "Create user"
 msgstr "创建用户"
 
-#: classes/pref/users.php:372
+#: classes/pref/users.php:354
 msgid "Details"
 msgstr "详细"
 
-#: classes/pref/users.php:374
+#: classes/pref/users.php:356
 #: classes/pref/filters.php:660
 #: plugins/instances/init.php:296
 msgid "Edit"
 msgstr "编辑"
 
-#: classes/pref/users.php:421
+#: classes/pref/users.php:403
 msgid "Access Level"
 msgstr "访问级别"
 
-#: classes/pref/users.php:423
+#: classes/pref/users.php:405
 msgid "Last login"
 msgstr "最后登陆"
 
-#: classes/pref/users.php:444
+#: classes/pref/users.php:426
 #: plugins/instances/init.php:337
 msgid "Click to edit"
 msgstr "点击进行编辑"
 
-#: classes/pref/users.php:464
+#: classes/pref/users.php:446
 msgid "No users defined."
 msgstr "没有定义用户。"
 
-#: classes/pref/users.php:466
+#: classes/pref/users.php:448
 msgid "No matching users found."
 msgstr "没有匹配的用户。"
 
@@ -3195,6 +3184,10 @@ msgstr "无法创建用户：没有指定登录名。"
 msgid "Adding user..."
 msgstr "创建过滤器"
 
+#: js/prefs.js:94
+msgid "User Editor"
+msgstr "编辑用户信息"
+
 #: js/prefs.js:117
 msgid "Edit Filter"
 msgstr "编辑过滤器"
@@ -3309,6 +3302,10 @@ msgstr "重置选定用户的密码？"
 msgid "Resetting password for selected user..."
 msgstr "重置选定用户的密码？"
 
+#: js/prefs.js:585
+msgid "User details"
+msgstr "用户详细资料"
+
 #: js/prefs.js:602
 msgid "Please select only one filter."
 msgstr "请仅选择一个过滤器。"
-- 
cgit v1.2.3