From b7c62dbb358021b580b75d0eeac2597f6eff3105 Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 11 Apr 2013 22:01:31 +0400
Subject: rebase translations

---
 locale/zh_CN/LC_MESSAGES/messages.mo | Bin 34292 -> 34292 bytes
 locale/zh_CN/LC_MESSAGES/messages.po | 525 ++++++++++++++++++-----------------
 2 files changed, 271 insertions(+), 254 deletions(-)

(limited to 'locale/zh_CN/LC_MESSAGES')

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index a6e1ee66e..ee9c1aa06 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 229b0d56d..1a86eb35f 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-09 22:28+0400\n"
+"POT-Creation-Date: 2013-04-11 22:01+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"
@@ -18,88 +18,88 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: backend.php:69
+#: backend.php:74
 msgid "Use default"
 msgstr "使用默认"
 
-#: backend.php:70
+#: backend.php:75
 msgid "Never purge"
 msgstr "从不清理"
 
-#: backend.php:71
+#: backend.php:76
 msgid "1 week old"
 msgstr "1周前"
 
-#: backend.php:72
+#: backend.php:77
 msgid "2 weeks old"
 msgstr "2周前"
 
-#: backend.php:73
+#: backend.php:78
 msgid "1 month old"
 msgstr "1个月前"
 
-#: backend.php:74
+#: backend.php:79
 msgid "2 months old"
 msgstr "2个月前"
 
-#: backend.php:75
+#: backend.php:80
 msgid "3 months old"
 msgstr "3个月前"
 
-#: backend.php:78
+#: backend.php:83
 msgid "Default interval"
 msgstr "默认间隔"
 
-#: backend.php:79
-#: backend.php:89
+#: backend.php:84
+#: backend.php:94
 msgid "Disable updates"
 msgstr "禁用更新"
 
-#: backend.php:80
-#: backend.php:90
+#: backend.php:85
+#: backend.php:95
 msgid "Each 15 minutes"
 msgstr "每15分钟"
 
-#: backend.php:81
-#: backend.php:91
+#: backend.php:86
+#: backend.php:96
 msgid "Each 30 minutes"
 msgstr "每30分钟"
 
-#: backend.php:82
-#: backend.php:92
+#: backend.php:87
+#: backend.php:97
 msgid "Hourly"
 msgstr "每小时"
 
-#: backend.php:83
-#: backend.php:93
+#: backend.php:88
+#: backend.php:98
 msgid "Each 4 hours"
 msgstr "每4小时"
 
-#: backend.php:84
-#: backend.php:94
+#: backend.php:89
+#: backend.php:99
 msgid "Each 12 hours"
 msgstr "每12小时"
 
-#: backend.php:85
-#: backend.php:95
+#: backend.php:90
+#: backend.php:100
 msgid "Daily"
 msgstr "每天"
 
-#: backend.php:86
-#: backend.php:96
+#: backend.php:91
+#: backend.php:101
 msgid "Weekly"
 msgstr "每周"
 
-#: backend.php:99
+#: backend.php:104
 #: classes/pref/users.php:123
 msgid "User"
 msgstr "用户"
 
-#: backend.php:100
+#: backend.php:105
 msgid "Power User"
 msgstr "Power User"
 
-#: backend.php:101
+#: backend.php:106
 msgid "Administrator"
 msgstr "管理员"
 
@@ -162,7 +162,7 @@ msgstr "SQL 脱出测试失败，请检查您的数据库和 PHP 设置。"
 #: classes/backend.php:5
 #: classes/pref/labels.php:296
 #: classes/pref/filters.php:680
-#: classes/pref/feeds.php:1331
+#: classes/pref/feeds.php:1348
 #: plugins/digest/digest_body.php:63
 #: js/feedlist.js:128
 #: js/feedlist.js:438
@@ -210,13 +210,13 @@ msgid "All Articles"
 msgstr "全部文章"
 
 #: index.php:174
-#: include/functions.php:1961
+#: include/functions.php:1972
 #: classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
 #: index.php:175
-#: include/functions.php:1962
+#: include/functions.php:1973
 #: classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
@@ -262,7 +262,7 @@ msgstr "标题"
 
 #: index.php:192
 #: index.php:241
-#: include/functions.php:1951
+#: include/functions.php:1962
 #: classes/feeds.php:111
 #: classes/feeds.php:440
 #: js/FeedTree.js:128
@@ -322,8 +322,8 @@ msgid "Rescore feed"
 msgstr "为信息源重新评分"
 
 #: index.php:239
-#: classes/pref/feeds.php:717
-#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:734
+#: classes/pref/feeds.php:1300
 #: js/PrefFeedTree.js:73
 msgid "Unsubscribe"
 msgstr "取消订阅"
@@ -349,7 +349,7 @@ msgid "Show tag cloud..."
 msgstr "显示标签云"
 
 #: index.php:248
-#: include/functions.php:1937
+#: include/functions.php:1948
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "锁定加星标的项"
@@ -379,7 +379,7 @@ msgstr "注销"
 
 #: prefs.php:36
 #: prefs.php:121
-#: include/functions.php:1964
+#: include/functions.php:1975
 #: classes/pref/prefs.php:446
 msgid "Preferences"
 msgstr "偏好设置"
@@ -394,8 +394,8 @@ msgstr "退出偏好设置"
 
 #: prefs.php:124
 #: classes/pref/feeds.php:107
-#: classes/pref/feeds.php:1209
-#: classes/pref/feeds.php:1272
+#: classes/pref/feeds.php:1226
+#: classes/pref/feeds.php:1289
 msgid "Feeds"
 msgstr "信息源"
 
@@ -405,8 +405,8 @@ msgid "Filters"
 msgstr "过滤器"
 
 #: prefs.php:130
-#: include/functions.php:1150
-#: include/functions.php:1787
+#: include/functions.php:1161
+#: include/functions.php:1798
 #: classes/pref/labels.php:90
 #: plugins/mobile/mobile-functions.php:198
 msgid "Labels"
@@ -495,10 +495,10 @@ msgid "Tiny Tiny RSS data update script."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
 #: include/digest.php:109
-#: include/functions.php:1159
-#: include/functions.php:1688
-#: include/functions.php:1773
-#: include/functions.php:1795
+#: include/functions.php:1170
+#: include/functions.php:1699
+#: include/functions.php:1784
+#: include/functions.php:1806
 #: classes/opml.php:416
 #: classes/pref/feeds.php:222
 msgid "Uncategorized"
@@ -514,341 +514,341 @@ msgstr[0] "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:1148
-#: include/functions.php:1785
+#: include/functions.php:1159
+#: include/functions.php:1796
 #: plugins/mobile/mobile-functions.php:171
 msgid "Special"
 msgstr "特殊区域"
 
-#: include/functions.php:1637
+#: include/functions.php:1648
 #: classes/feeds.php:1110
 #: classes/pref/filters.php:427
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1838
+#: include/functions.php:1849
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1840
+#: include/functions.php:1851
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1842
+#: include/functions.php:1853
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1844
-#: include/functions.php:1959
+#: include/functions.php:1855
+#: include/functions.php:1970
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1846
+#: include/functions.php:1857
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1848
+#: include/functions.php:1859
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1911
+#: include/functions.php:1922
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1912
+#: include/functions.php:1923
 #, fuzzy
 msgid "Open next feed"
 msgstr "自动显示下一个信息源"
 
-#: include/functions.php:1913
+#: include/functions.php:1924
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1914
+#: include/functions.php:1925
 #, fuzzy
 msgid "Open next article"
 msgstr "打开原文"
 
-#: include/functions.php:1915
+#: include/functions.php:1926
 #, fuzzy
 msgid "Open previous article"
 msgstr "打开原文"
 
-#: include/functions.php:1916
+#: include/functions.php:1927
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1917
+#: include/functions.php:1928
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1918
+#: include/functions.php:1929
 msgid "Move to next article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1919
+#: include/functions.php:1930
 msgid "Move to previous article (don't expand or mark read)"
 msgstr ""
 
-#: include/functions.php:1920
+#: include/functions.php:1931
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1921
+#: include/functions.php:1932
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1922
+#: include/functions.php:1933
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions.php:1923
+#: include/functions.php:1934
 #: js/viewfeed.js:1918
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1924
+#: include/functions.php:1935
 #: js/viewfeed.js:1896
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions.php:1925
+#: include/functions.php:1936
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1926
+#: include/functions.php:1937
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "不再显示所选的文章"
 
-#: include/functions.php:1927
+#: include/functions.php:1938
 #, fuzzy
 msgid "Dismiss read"
 msgstr "不再显示已读文章"
 
-#: include/functions.php:1928
+#: include/functions.php:1939
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1929
+#: include/functions.php:1940
 #: js/viewfeed.js:1937
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1930
+#: include/functions.php:1941
 #: js/viewfeed.js:1931
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1931
+#: include/functions.php:1942
 #, fuzzy
 msgid "Scroll down"
 msgstr "全部完成。"
 
-#: include/functions.php:1932
+#: include/functions.php:1943
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1933
+#: include/functions.php:1944
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1934
+#: include/functions.php:1945
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1935
+#: include/functions.php:1946
 #, fuzzy
 msgid "Close/collapse article"
 msgstr "选择所有文章"
 
-#: include/functions.php:1936
+#: include/functions.php:1947
 #, fuzzy
 msgid "Toggle article expansion (combined mode)"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1938
+#: include/functions.php:1949
 #: plugins/embed_original/init.php:33
 #, fuzzy
 msgid "Toggle embed original"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1939
+#: include/functions.php:1950
 #, fuzzy
 msgid "Article selection"
 msgstr "反选文章"
 
-#: include/functions.php:1940
+#: include/functions.php:1951
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1941
+#: include/functions.php:1952
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1942
+#: include/functions.php:1953
 #, fuzzy
 msgid "Select starred"
 msgstr "加星标"
 
-#: include/functions.php:1943
+#: include/functions.php:1954
 #, fuzzy
 msgid "Select published"
 msgstr "选择未读文章"
 
-#: include/functions.php:1944
+#: include/functions.php:1955
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1945
+#: include/functions.php:1956
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1946
-#: classes/pref/feeds.php:521
-#: classes/pref/feeds.php:754
+#: include/functions.php:1957
+#: classes/pref/feeds.php:538
+#: classes/pref/feeds.php:771
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1947
+#: include/functions.php:1958
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新活动的信息源"
 
-#: include/functions.php:1948
+#: include/functions.php:1959
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: include/functions.php:1949
-#: classes/pref/feeds.php:1275
+#: include/functions.php:1960
+#: classes/pref/feeds.php:1292
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1950
+#: include/functions.php:1961
 #: js/FeedTree.js:135
 #: js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1952
+#: include/functions.php:1963
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1953
+#: include/functions.php:1964
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1954
+#: include/functions.php:1965
 #: js/FeedTree.js:178
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1955
+#: include/functions.php:1966
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到类别："
 
-#: include/functions.php:1956
+#: include/functions.php:1967
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1957
+#: include/functions.php:1968
 #, fuzzy
 msgid "Toggle auto expand in combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1958
+#: include/functions.php:1969
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1960
+#: include/functions.php:1971
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1963
+#: include/functions.php:1974
 #: js/tt-rss.js:447
 #: js/tt-rss.js:606
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1965
+#: include/functions.php:1976
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1966
+#: include/functions.php:1977
 #: classes/pref/labels.php:281
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1967
+#: include/functions.php:1978
 #: classes/pref/filters.php:654
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1968
+#: include/functions.php:1979
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折叠侧边栏"
 
-#: include/functions.php:1969
+#: include/functions.php:1980
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:2492
+#: include/functions.php:2503
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2985
+#: include/functions.php:2996
 #: js/viewfeed.js:2024
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:2986
+#: include/functions.php:2997
 #: js/viewfeed.js:2023
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3104
+#: include/functions.php:3115
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3126
-#: include/functions.php:3426
+#: include/functions.php:3137
+#: include/functions.php:3437
 #: classes/article.php:281
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3136
+#: include/functions.php:3147
 #: classes/feeds.php:689
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3170
+#: include/functions.php:3181
 #: classes/feeds.php:641
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3183
+#: include/functions.php:3194
 #: classes/feeds.php:654
-#: classes/pref/feeds.php:540
+#: classes/pref/feeds.php:557
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3215
+#: include/functions.php:3226
 #: classes/dlg.php:37
 #: classes/dlg.php:60
 #: classes/dlg.php:93
@@ -861,25 +861,25 @@ msgstr "信息源 URL"
 #: classes/pref/users.php:99
 #: classes/pref/filters.php:147
 #: classes/pref/prefs.php:1107
-#: classes/pref/feeds.php:1588
-#: classes/pref/feeds.php:1660
-#: plugins/import_export/init.php:406
-#: plugins/import_export/init.php:429
-#: plugins/googlereaderimport/init.php:173
+#: classes/pref/feeds.php:1605
+#: classes/pref/feeds.php:1677
+#: plugins/import_export/init.php:408
+#: plugins/import_export/init.php:453
+#: plugins/googlereaderimport/init.php:197
 #: plugins/share/init.php:67
 #: plugins/updater/init.php:370
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:3451
+#: include/functions.php:3462
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:3686
+#: include/functions.php:3697
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:3742
+#: include/functions.php:3753
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
@@ -950,8 +950,8 @@ msgstr "本文的标签，请用逗号分开："
 #: classes/pref/labels.php:79
 #: classes/pref/filters.php:405
 #: classes/pref/prefs.php:989
-#: classes/pref/feeds.php:733
-#: classes/pref/feeds.php:881
+#: classes/pref/feeds.php:750
+#: classes/pref/feeds.php:898
 #: plugins/nsfw/init.php:86
 #: plugins/note/init.php:53
 #: plugins/instances/init.php:248
@@ -971,9 +971,9 @@ msgstr "保存"
 #: classes/pref/filters.php:880
 #: classes/pref/filters.php:947
 #: classes/pref/prefs.php:991
-#: classes/pref/feeds.php:734
-#: classes/pref/feeds.php:884
-#: classes/pref/feeds.php:1800
+#: classes/pref/feeds.php:751
+#: classes/pref/feeds.php:901
+#: classes/pref/feeds.php:1817
 #: plugins/mail/init.php:126
 #: plugins/note/init.php:55
 #: plugins/instances/init.php:251
@@ -993,8 +993,8 @@ msgid "Title:"
 msgstr "标题"
 
 #: classes/handler/public.php:434
-#: classes/pref/feeds.php:538
-#: classes/pref/feeds.php:769
+#: classes/pref/feeds.php:555
+#: classes/pref/feeds.php:786
 #: plugins/instances/init.php:215
 #: plugins/instances/init.php:405
 msgid "URL:"
@@ -1198,7 +1198,7 @@ msgstr "以RSS信息源方式阅读"
 
 #: classes/feeds.php:84
 #: classes/feeds.php:138
-#: classes/pref/feeds.php:1440
+#: classes/pref/feeds.php:1457
 msgid "View as RSS"
 msgstr "以 RSS 形式阅读"
 
@@ -1215,9 +1215,9 @@ msgstr "选择："
 #: classes/pref/filters.php:737
 #: classes/pref/filters.php:764
 #: classes/pref/prefs.php:1003
-#: classes/pref/feeds.php:1266
-#: classes/pref/feeds.php:1536
-#: classes/pref/feeds.php:1606
+#: classes/pref/feeds.php:1283
+#: classes/pref/feeds.php:1553
+#: classes/pref/feeds.php:1623
 #: plugins/instances/init.php:290
 msgid "All"
 msgstr "全部"
@@ -1235,9 +1235,9 @@ msgstr "反选"
 #: classes/pref/filters.php:739
 #: classes/pref/filters.php:766
 #: classes/pref/prefs.php:1005
-#: classes/pref/feeds.php:1268
-#: classes/pref/feeds.php:1538
-#: classes/pref/feeds.php:1608
+#: classes/pref/feeds.php:1285
+#: classes/pref/feeds.php:1555
+#: classes/pref/feeds.php:1625
 #: plugins/instances/init.php:292
 msgid "None"
 msgstr "无"
@@ -1349,9 +1349,9 @@ msgid "Feed or site URL"
 msgstr "信息源 URL"
 
 #: classes/feeds.php:989
-#: classes/pref/feeds.php:560
-#: classes/pref/feeds.php:782
-#: classes/pref/feeds.php:1764
+#: classes/pref/feeds.php:577
+#: classes/pref/feeds.php:799
+#: classes/pref/feeds.php:1781
 msgid "Place in category:"
 msgstr "加入到类别："
 
@@ -1361,24 +1361,24 @@ msgstr "可用的信息源"
 
 #: classes/feeds.php:1009
 #: classes/pref/users.php:139
-#: classes/pref/feeds.php:590
-#: classes/pref/feeds.php:818
+#: classes/pref/feeds.php:607
+#: classes/pref/feeds.php:835
 msgid "Authentication"
 msgstr "登录密码"
 
 #: classes/feeds.php:1013
 #: classes/pref/users.php:402
-#: classes/pref/feeds.php:596
-#: classes/pref/feeds.php:822
-#: classes/pref/feeds.php:1778
+#: classes/pref/feeds.php:613
+#: classes/pref/feeds.php:839
+#: classes/pref/feeds.php:1795
 msgid "Login"
 msgstr "登陆"
 
 #: classes/feeds.php:1016
 #: classes/pref/prefs.php:271
-#: classes/pref/feeds.php:602
-#: classes/pref/feeds.php:828
-#: classes/pref/feeds.php:1781
+#: classes/pref/feeds.php:619
+#: classes/pref/feeds.php:845
+#: classes/pref/feeds.php:1798
 msgid "Password"
 msgstr "密码"
 
@@ -1388,7 +1388,7 @@ msgstr "这个信息源需要认证"
 
 #: classes/feeds.php:1031
 #: classes/feeds.php:1087
-#: classes/pref/feeds.php:1799
+#: classes/pref/feeds.php:1816
 msgid "Subscribe"
 msgstr "订阅"
 
@@ -1400,7 +1400,7 @@ msgstr "更多信息源"
 #: classes/feeds.php:1148
 #: classes/pref/users.php:332
 #: classes/pref/filters.php:641
-#: classes/pref/feeds.php:1259
+#: classes/pref/feeds.php:1276
 #: js/tt-rss.js:170
 msgid "Search"
 msgstr "搜索"
@@ -1422,7 +1422,7 @@ msgstr "限制："
 #: classes/pref/labels.php:284
 #: classes/pref/filters.php:398
 #: classes/pref/filters.php:667
-#: classes/pref/feeds.php:707
+#: classes/pref/feeds.php:724
 #: plugins/instances/init.php:297
 msgid "Remove"
 msgstr "移除"
@@ -1507,12 +1507,33 @@ msgstr "创建过滤器"
 msgid "Processing category: %s"
 msgstr "加入到类别："
 
-#: classes/opml.php:468
+#: classes/opml.php:465
+#: plugins/import_export/init.php:421
+#: plugins/googlereaderimport/init.php:70
+#, php-format
+msgid "Upload failed with error code %d"
+msgstr ""
+
+#: classes/opml.php:479
+#: plugins/import_export/init.php:435
+#: plugins/googlereaderimport/init.php:84
+#, fuzzy
+msgid "Unable to move uploaded file."
+msgstr "错误：无法加载文章。"
+
+#: classes/opml.php:483
+#: plugins/import_export/init.php:439
+#: plugins/googlereaderimport/init.php:88
 msgid "Error: please upload OPML file."
 msgstr "错误：请上传 OPML 文件。"
 
-#: classes/opml.php:475
-#: plugins/googlereaderimport/init.php:166
+#: classes/opml.php:492
+#, fuzzy
+msgid "Error: unable to find moved OPML file."
+msgstr "错误：无法加载文章。"
+
+#: classes/opml.php:499
+#: plugins/googlereaderimport/init.php:190
 msgid "Error while parsing document."
 msgstr "解析文档时发生错误。"
 
@@ -1551,8 +1572,8 @@ msgid "Change password to"
 msgstr "更改密码为："
 
 #: classes/pref/users.php:161
-#: classes/pref/feeds.php:610
-#: classes/pref/feeds.php:834
+#: classes/pref/feeds.php:627
+#: classes/pref/feeds.php:851
 msgid "Options"
 msgstr "选项"
 
@@ -1597,9 +1618,9 @@ msgstr "[tt-rss] 密码更换提醒"
 #: classes/pref/filters.php:734
 #: classes/pref/filters.php:761
 #: classes/pref/prefs.php:1000
-#: classes/pref/feeds.php:1263
-#: classes/pref/feeds.php:1533
-#: classes/pref/feeds.php:1603
+#: classes/pref/feeds.php:1280
+#: classes/pref/feeds.php:1550
+#: classes/pref/feeds.php:1620
 #: plugins/instances/init.php:287
 msgid "Select"
 msgstr "选择"
@@ -1734,13 +1755,13 @@ msgid "Combine"
 msgstr ""
 
 #: classes/pref/filters.php:663
-#: classes/pref/feeds.php:1279
-#: classes/pref/feeds.php:1293
+#: classes/pref/feeds.php:1296
+#: classes/pref/feeds.php:1310
 msgid "Reset sort order"
 msgstr "重置排序"
 
 #: classes/pref/filters.php:671
-#: classes/pref/feeds.php:1318
+#: classes/pref/feeds.php:1335
 msgid "Rescore articles"
 msgstr "为文章重新评分"
 
@@ -2257,244 +2278,244 @@ msgstr "启用偏好文件"
 msgid "Check to enable field"
 msgstr "勾选以启用"
 
-#: classes/pref/feeds.php:527
+#: classes/pref/feeds.php:544
 msgid "Feed Title"
 msgstr "信息源标题"
 
-#: classes/pref/feeds.php:568
-#: classes/pref/feeds.php:793
+#: classes/pref/feeds.php:585
+#: classes/pref/feeds.php:810
 msgid "Update"
 msgstr "更新列表"
 
-#: classes/pref/feeds.php:583
-#: classes/pref/feeds.php:809
+#: classes/pref/feeds.php:600
+#: classes/pref/feeds.php:826
 msgid "Article purging:"
 msgstr "文章清理："
 
-#: classes/pref/feeds.php:606
+#: classes/pref/feeds.php:623
 msgid "<b>Hint:</b> you need to fill in your login information if your feed requires authentication, except for Twitter feeds."
 msgstr "<b>提示：</b>如果您的信息源需要验证，那么您需要填写登录信息。Twitter 信息源除外。"
 
-#: classes/pref/feeds.php:622
-#: classes/pref/feeds.php:838
+#: classes/pref/feeds.php:639
+#: classes/pref/feeds.php:855
 msgid "Hide from Popular feeds"
 msgstr "从最受欢迎的信息源中隐藏"
 
-#: classes/pref/feeds.php:634
-#: classes/pref/feeds.php:844
+#: classes/pref/feeds.php:651
+#: classes/pref/feeds.php:861
 msgid "Include in e-mail digest"
 msgstr "包含电子邮件摘要"
 
-#: classes/pref/feeds.php:647
-#: classes/pref/feeds.php:850
+#: classes/pref/feeds.php:664
+#: classes/pref/feeds.php:867
 msgid "Always display image attachments"
 msgstr "始终显示图片附件"
 
-#: classes/pref/feeds.php:660
-#: classes/pref/feeds.php:858
+#: classes/pref/feeds.php:677
+#: classes/pref/feeds.php:875
 msgid "Do not embed images"
 msgstr ""
 
-#: classes/pref/feeds.php:673
-#: classes/pref/feeds.php:866
+#: classes/pref/feeds.php:690
+#: classes/pref/feeds.php:883
 msgid "Cache images locally"
 msgstr "本地缓存图片"
 
-#: classes/pref/feeds.php:685
-#: classes/pref/feeds.php:872
+#: classes/pref/feeds.php:702
+#: classes/pref/feeds.php:889
 msgid "Mark updated articles as unread"
 msgstr "将已更新的文章标记为未读"
 
-#: classes/pref/feeds.php:691
+#: classes/pref/feeds.php:708
 msgid "Icon"
 msgstr "图标"
 
-#: classes/pref/feeds.php:705
+#: classes/pref/feeds.php:722
 msgid "Replace"
 msgstr "替换"
 
-#: classes/pref/feeds.php:724
+#: classes/pref/feeds.php:741
 msgid "Resubscribe to push updates"
 msgstr "重新订阅以推送更新"
 
-#: classes/pref/feeds.php:731
+#: classes/pref/feeds.php:748
 msgid "Resets PubSubHubbub subscription status for push-enabled feeds."
 msgstr "为启用推送的信息源重置 PubSubHubbub 订阅。"
 
-#: classes/pref/feeds.php:1112
-#: classes/pref/feeds.php:1165
+#: classes/pref/feeds.php:1129
+#: classes/pref/feeds.php:1182
 msgid "All done."
 msgstr "全部完成。"
 
-#: classes/pref/feeds.php:1220
+#: classes/pref/feeds.php:1237
 msgid "Feeds with errors"
 msgstr "有错误的信息源"
 
-#: classes/pref/feeds.php:1240
+#: classes/pref/feeds.php:1257
 #, fuzzy
 msgid "Inactive feeds"
 msgstr "刷新活动的信息源"
 
-#: classes/pref/feeds.php:1277
+#: classes/pref/feeds.php:1294
 msgid "Edit selected feeds"
 msgstr "编辑选定的信息源"
 
-#: classes/pref/feeds.php:1281
+#: classes/pref/feeds.php:1298
 #: js/prefs.js:1765
 msgid "Batch subscribe"
 msgstr ""
 
-#: classes/pref/feeds.php:1288
+#: classes/pref/feeds.php:1305
 #, fuzzy
 msgid "Categories"
 msgstr "信息源类别"
 
-#: classes/pref/feeds.php:1291
+#: classes/pref/feeds.php:1308
 #, fuzzy
 msgid "Add category"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1295
+#: classes/pref/feeds.php:1312
 #, fuzzy
 msgid "Remove selected"
 msgstr "移除选中的信息源？"
 
-#: classes/pref/feeds.php:1304
+#: classes/pref/feeds.php:1321
 #, fuzzy
 msgid "(Un)hide empty categories"
 msgstr "编辑类别"
 
-#: classes/pref/feeds.php:1309
+#: classes/pref/feeds.php:1326
 msgid "More actions..."
 msgstr "更多动作"
 
-#: classes/pref/feeds.php:1313
+#: classes/pref/feeds.php:1330
 msgid "Manual purge"
 msgstr "手动清除"
 
-#: classes/pref/feeds.php:1317
+#: classes/pref/feeds.php:1334
 msgid "Clear feed data"
 msgstr "清空信息源数据"
 
-#: classes/pref/feeds.php:1368
+#: classes/pref/feeds.php:1385
 msgid "OPML"
 msgstr "OPML"
 
-#: classes/pref/feeds.php:1370
+#: classes/pref/feeds.php:1387
 msgid "Using OPML you can export and import your feeds, filters, labels and Tiny Tiny RSS settings."
 msgstr ""
 
-#: classes/pref/feeds.php:1372
+#: classes/pref/feeds.php:1389
 msgid "Only main settings profile can be migrated using OPML."
 msgstr ""
 
-#: classes/pref/feeds.php:1385
+#: classes/pref/feeds.php:1402
 #, fuzzy
 msgid "Import my OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1389
+#: classes/pref/feeds.php:1406
 msgid "Filename:"
 msgstr "文件名："
 
-#: classes/pref/feeds.php:1391
+#: classes/pref/feeds.php:1408
 msgid "Include settings"
 msgstr "包含设置"
 
-#: classes/pref/feeds.php:1395
+#: classes/pref/feeds.php:1412
 #, fuzzy
 msgid "Export OPML"
 msgstr "正在导入 OPML ……"
 
-#: classes/pref/feeds.php:1399
+#: classes/pref/feeds.php:1416
 msgid "Your OPML can be published publicly and can be subscribed by anyone who knows the URL below."
 msgstr "您可以公开发布您的 OPML 。网上的任何人都可以通过如下 URL 订阅该文件。"
 
-#: classes/pref/feeds.php:1401
+#: classes/pref/feeds.php:1418
 msgid "Published OPML does not include your Tiny Tiny RSS settings, feeds that require authentication or feeds hidden from Popular feeds."
 msgstr ""
 
-#: classes/pref/feeds.php:1403
+#: classes/pref/feeds.php:1420
 msgid "Public OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1404
+#: classes/pref/feeds.php:1421
 #, fuzzy
 msgid "Display published OPML URL"
 msgstr "公开的 OPML URL"
 
-#: classes/pref/feeds.php:1414
+#: classes/pref/feeds.php:1431
 msgid "Firefox integration"
 msgstr "Firefox 集成"
 
-#: classes/pref/feeds.php:1416
+#: classes/pref/feeds.php:1433
 msgid "This Tiny Tiny RSS site can be used as a Firefox Feed Reader by clicking the link below."
 msgstr "点击如下链接，可以将本 Tiny Tiny RSS 站点作为一个 Firefox 阅读器使用。"
 
-#: classes/pref/feeds.php:1423
+#: classes/pref/feeds.php:1440
 msgid "Click here to register this site as a feed reader."
 msgstr "点击此处将本站注册为信息源阅读器。"
 
-#: classes/pref/feeds.php:1431
+#: classes/pref/feeds.php:1448
 #, fuzzy
 msgid "Published & shared articles / Generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1433
+#: classes/pref/feeds.php:1450
 msgid "Published articles and generated feeds"
 msgstr "已发布的文章和生成的信息源"
 
-#: classes/pref/feeds.php:1435
+#: classes/pref/feeds.php:1452
 msgid "Published articles are exported as a public RSS feed and can be subscribed by anyone who knows the URL specified below."
 msgstr "已发布的文章将会输出为公开的 RSS 信息源，网上的任何人可以通过如下 URL 进行订阅。"
 
-#: classes/pref/feeds.php:1441
+#: classes/pref/feeds.php:1458
 msgid "Display URL"
 msgstr "显示 URL"
 
-#: classes/pref/feeds.php:1444
+#: classes/pref/feeds.php:1461
 msgid "Clear all generated URLs"
 msgstr "清空所有生成的 URL"
 
-#: classes/pref/feeds.php:1446
+#: classes/pref/feeds.php:1463
 msgid "Articles shared by URL"
 msgstr "通过 URL 分享的文章"
 
-#: classes/pref/feeds.php:1448
+#: classes/pref/feeds.php:1465
 msgid "You can disable all articles shared by unique URLs here."
 msgstr "您可以取消所有通过 URL 分享的文章。"
 
-#: classes/pref/feeds.php:1451
+#: classes/pref/feeds.php:1468
 msgid "Unshare all articles"
 msgstr "取消所有分享"
 
-#: classes/pref/feeds.php:1529
+#: classes/pref/feeds.php:1546
 msgid "These feeds have not been updated with new content for 3 months (oldest first):"
 msgstr "以下信息源已经有三个月没有内容更新了（最旧的在最上）："
 
-#: classes/pref/feeds.php:1566
-#: classes/pref/feeds.php:1636
+#: classes/pref/feeds.php:1583
+#: classes/pref/feeds.php:1653
 msgid "Click to edit feed"
 msgstr "点击以编辑信息源"
 
-#: classes/pref/feeds.php:1584
-#: classes/pref/feeds.php:1656
+#: classes/pref/feeds.php:1601
+#: classes/pref/feeds.php:1673
 msgid "Unsubscribe from selected feeds"
 msgstr "取消订阅选中的信息源"
 
-#: classes/pref/feeds.php:1595
+#: classes/pref/feeds.php:1612
 msgid "These feeds have not been updated because of errors:"
 msgstr "信息源因为如下错误未能更新："
 
-#: classes/pref/feeds.php:1761
+#: classes/pref/feeds.php:1778
 msgid "Add one valid RSS feed per line (no feed detection is done)"
 msgstr ""
 
-#: classes/pref/feeds.php:1770
+#: classes/pref/feeds.php:1787
 msgid "Feeds to subscribe, One per line"
 msgstr ""
 
-#: classes/pref/feeds.php:1792
+#: classes/pref/feeds.php:1809
 msgid "Feeds require authentication."
 msgstr ""
 
@@ -2676,47 +2697,47 @@ msgstr ""
 msgid "Import"
 msgstr "导入"
 
-#: plugins/import_export/init.php:218
+#: plugins/import_export/init.php:220
 msgid "Could not import: incorrect schema version."
 msgstr ""
 
-#: plugins/import_export/init.php:223
+#: plugins/import_export/init.php:225
 msgid "Could not import: unrecognized document format."
 msgstr ""
 
-#: plugins/import_export/init.php:382
+#: plugins/import_export/init.php:384
 msgid "Finished: "
 msgstr ""
 
-#: plugins/import_export/init.php:383
+#: plugins/import_export/init.php:385
 #, fuzzy, php-format
 msgid "%d article processed, "
 msgid_plural "%d articles processed, "
 msgstr[0] "编辑文章注记"
 
-#: plugins/import_export/init.php:384
+#: plugins/import_export/init.php:386
 #, fuzzy, php-format
 msgid "%d imported, "
 msgid_plural "%d imported, "
 msgstr[0] "已经导入过。"
 
-#: plugins/import_export/init.php:385
+#: plugins/import_export/init.php:387
 #, fuzzy, php-format
 msgid "%d feed created."
 msgid_plural "%d feeds created."
 msgstr[0] "没有选中的信息源。"
 
-#: plugins/import_export/init.php:390
+#: plugins/import_export/init.php:392
 msgid "Could not load XML document."
 msgstr ""
 
-#: plugins/import_export/init.php:402
+#: plugins/import_export/init.php:404
 msgid "Prepare data"
 msgstr ""
 
-#: plugins/import_export/init.php:423
-#, php-format
-msgid "Could not upload file. You might need to adjust upload_max_filesize in PHP.ini (current value = %s)"
+#: plugins/import_export/init.php:447
+#: plugins/googlereaderimport/init.php:96
+msgid "No file uploaded."
 msgstr ""
 
 #: plugins/mail/init.php:87
@@ -2753,28 +2774,24 @@ msgstr ""
 msgid "Set value"
 msgstr "加星标"
 
-#: plugins/googlereaderimport/init.php:72
-msgid "No file uploaded."
-msgstr ""
-
-#: plugins/googlereaderimport/init.php:158
+#: plugins/googlereaderimport/init.php:182
 #, php-format
 msgid "All done. %d out of %d articles imported."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:162
+#: plugins/googlereaderimport/init.php:186
 msgid "The document has incorrect format."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:333
+#: plugins/googlereaderimport/init.php:357
 msgid "Import starred or shared items from Google Reader"
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:337
+#: plugins/googlereaderimport/init.php:361
 msgid "Paste your starred.json or shared.json into the form below."
 msgstr ""
 
-#: plugins/googlereaderimport/init.php:351
+#: plugins/googlereaderimport/init.php:375
 msgid "Import my Starred items"
 msgstr ""
 
-- 
cgit v1.2.3