Merge remote-tracking branch 'upstream/master'

1 files changed, 168 insertions, 161 deletions

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index cc5a4ba95..9eb832614 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-03-19 22:42+0400\n"
+"POT-Creation-Date: 2013-03-20 10:24+0400\n"
 "PO-Revision-Date: 2012-02-14 08:32+0000\n"
 "Last-Translator: Sai <[email protected]>\n"
 "Language-Team: Chinese (China) (http://www.transifex.net/projects/p/tt-rss/"
@@ -278,11 +278,11 @@ msgstr "自动适应"
 msgid "All Articles"
 msgstr "全部文章"
 
-#: index.php:169 include/functions.php:1911 classes/feeds.php:106
+#: index.php:169 include/functions.php:1915 classes/feeds.php:106
 msgid "Starred"
 msgstr "加星标的"
 
-#: index.php:170 include/functions.php:1912 classes/feeds.php:107
+#: index.php:170 include/functions.php:1916 classes/feeds.php:107
 msgid "Published"
 msgstr "已发布"
 
@@ -322,7 +322,7 @@ msgstr "评分"
 msgid "Update"
 msgstr "更新列表"
 
-#: index.php:191 index.php:221 include/functions.php:1902
+#: index.php:191 index.php:221 include/functions.php:1906
 #: include/localized_schema.php:10 classes/feeds.php:111 classes/feeds.php:136
 #: classes/feeds.php:408 js/FeedTree.js:128 js/FeedTree.js:156
 #: plugins/digest/digest.js:630
@@ -383,7 +383,7 @@ msgstr "切换至摘要模式"
 msgid "Show tag cloud..."
 msgstr "显示标签云"
 
-#: index.php:229 include/functions.php:1889
+#: index.php:229 include/functions.php:1893
 #, fuzzy
 msgid "Toggle widescreen mode"
 msgstr "锁定加星标的项"
@@ -409,8 +409,8 @@ msgstr "快捷键帮助"
 msgid "Logout"
 msgstr "注销"
 
-#: prefs.php:28 prefs.php:99 include/functions.php:1914
-#: classes/pref/prefs.php:371
+#: prefs.php:28 prefs.php:99 include/functions.php:1918
+#: classes/pref/prefs.php:377
 msgid "Preferences"
 msgstr "偏好设置"
 
@@ -431,8 +431,8 @@ msgstr "信息源"
 msgid "Filters"
 msgstr "过滤器"
 
-#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1117
-#: include/functions.php:1738 classes/pref/labels.php:90
+#: prefs.php:108 mobile/mobile-functions.php:205 include/functions.php:1121
+#: include/functions.php:1742 classes/pref/labels.php:90
 msgid "Labels"
 msgstr "预定义标签"
 
@@ -526,8 +526,8 @@ msgstr ""
 msgid "Home"
 msgstr "主页"
 
-#: mobile/mobile-functions.php:178 include/functions.php:1115
-#: include/functions.php:1736
+#: mobile/mobile-functions.php:178 include/functions.php:1119
+#: include/functions.php:1740
 msgid "Special"
 msgstr "特殊区域"
 
@@ -569,9 +569,9 @@ msgstr "以未读文章数量排列信息源"
 msgid "Reverse headline order (oldest first)"
 msgstr "反转标题列表顺序（最旧的在上面）"
 
-#: include/digest.php:131 include/functions.php:1126
-#: include/functions.php:1639 include/functions.php:1724
-#: include/functions.php:1746 classes/opml.php:416 classes/pref/feeds.php:188
+#: include/digest.php:131 include/functions.php:1130
+#: include/functions.php:1643 include/functions.php:1728
+#: include/functions.php:1750 classes/opml.php:416 classes/pref/feeds.php:188
 msgid "Uncategorized"
 msgstr "未分类"
 
@@ -584,313 +584,314 @@ msgstr "%d 个存档的文章"
 msgid "No feeds found."
 msgstr "未找到信息源。"
 
-#: include/functions.php:697
+#: include/functions.php:701
 msgid "Session failed to validate (incorrect IP)"
 msgstr "无法验证会话（IP 错误）"
 
-#: include/functions.php:1588 classes/dlg.php:371 classes/pref/filters.php:368
+#: include/functions.php:1592 classes/dlg.php:371 classes/pref/filters.php:368
 msgid "All feeds"
 msgstr "全部信息源"
 
-#: include/functions.php:1789
+#: include/functions.php:1793
 msgid "Starred articles"
 msgstr "加星标文章"
 
-#: include/functions.php:1791
+#: include/functions.php:1795
 msgid "Published articles"
 msgstr "已发布文章"
 
-#: include/functions.php:1793
+#: include/functions.php:1797
 msgid "Fresh articles"
 msgstr "最新更新的文章"
 
-#: include/functions.php:1795 include/functions.php:1909
+#: include/functions.php:1799 include/functions.php:1913
 msgid "All articles"
 msgstr "全部文章"
 
-#: include/functions.php:1797
+#: include/functions.php:1801
 msgid "Archived articles"
 msgstr "存档的文章"
 
-#: include/functions.php:1799
+#: include/functions.php:1803
 msgid "Recently read"
 msgstr ""
 
-#: include/functions.php:1866
+#: include/functions.php:1870
 msgid "Navigation"
 msgstr "导航"
 
-#: include/functions.php:1867
+#: include/functions.php:1871
 #, fuzzy
 msgid "Open next feed"
 msgstr "自动显示下一个信息源"
 
-#: include/functions.php:1868
+#: include/functions.php:1872
 msgid "Open previous feed"
 msgstr ""
 
-#: include/functions.php:1869
+#: include/functions.php:1873
 #, fuzzy
 msgid "Open next article"
 msgstr "打开原文"
 
-#: include/functions.php:1870
+#: include/functions.php:1874
 #, fuzzy
 msgid "Open previous article"
 msgstr "打开原文"
 
-#: include/functions.php:1871
+#: include/functions.php:1875
 msgid "Open next article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1872
+#: include/functions.php:1876
 msgid "Open previous article (don't scroll long articles)"
 msgstr ""
 
-#: include/functions.php:1873
+#: include/functions.php:1877
 msgid "Show search dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:1874
+#: include/functions.php:1878
 #, fuzzy
 msgid "Article"
 msgstr "全部文章"
 
-#: include/functions.php:1875
+#: include/functions.php:1879
 msgid "Toggle starred"
 msgstr "锁定加星标的项"
 
-#: include/functions.php:1876
+#: include/functions.php:1880
 msgid "Toggle published"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1877
+#: include/functions.php:1881
 msgid "Toggle unread"
 msgstr "锁定未读项"
 
-#: include/functions.php:1878
+#: include/functions.php:1882
 msgid "Edit tags"
 msgstr "编辑自定义标签"
 
-#: include/functions.php:1879
+#: include/functions.php:1883
 #, fuzzy
 msgid "Dismiss selected"
 msgstr "不再显示所选的文章"
 
-#: include/functions.php:1880
+#: include/functions.php:1884
 #, fuzzy
 msgid "Dismiss read"
 msgstr "不再显示已读文章"
 
-#: include/functions.php:1881
+#: include/functions.php:1885
 #, fuzzy
 msgid "Open in new window"
 msgstr "在新窗口打开文章"
 
-#: include/functions.php:1882 js/viewfeed.js:1758
+#: include/functions.php:1886 js/viewfeed.js:1798
 msgid "Mark below as read"
 msgstr ""
 
-#: include/functions.php:1883 js/viewfeed.js:1752
+#: include/functions.php:1887 js/viewfeed.js:1792
 msgid "Mark above as read"
 msgstr ""
 
-#: include/functions.php:1884
+#: include/functions.php:1888
 #, fuzzy
 msgid "Scroll down"
 msgstr "全部完成。"
 
-#: include/functions.php:1885
+#: include/functions.php:1889
 msgid "Scroll up"
 msgstr ""
 
-#: include/functions.php:1886
+#: include/functions.php:1890
 #, fuzzy
 msgid "Select article under cursor"
 msgstr "选择鼠标指向的文章"
 
-#: include/functions.php:1887
+#: include/functions.php:1891
 msgid "Email article"
 msgstr "通过邮件发送文章"
 
-#: include/functions.php:1888 plugins/close_button/init.php:24
-msgid "Close article"
-msgstr ""
+#: include/functions.php:1892
+#, fuzzy
+msgid "Close/collapse article"
+msgstr "选择所有文章"
 
-#: include/functions.php:1890
+#: include/functions.php:1894
 #, fuzzy
 msgid "Article selection"
 msgstr "反选文章"
 
-#: include/functions.php:1891
+#: include/functions.php:1895
 msgid "Select all articles"
 msgstr "选择所有文章"
 
-#: include/functions.php:1892
+#: include/functions.php:1896
 #, fuzzy
 msgid "Select unread"
 msgstr "选择未读文章"
 
-#: include/functions.php:1893
+#: include/functions.php:1897
 #, fuzzy
 msgid "Select starred"
 msgstr "加星标"
 
-#: include/functions.php:1894
+#: include/functions.php:1898
 #, fuzzy
 msgid "Select published"
 msgstr "选择未读文章"
 
-#: include/functions.php:1895
+#: include/functions.php:1899
 #, fuzzy
 msgid "Invert selection"
 msgstr "反选文章"
 
-#: include/functions.php:1896
+#: include/functions.php:1900
 #, fuzzy
 msgid "Deselect everything"
 msgstr "取消选择所有文章"
 
-#: include/functions.php:1897 classes/pref/feeds.php:488
+#: include/functions.php:1901 classes/pref/feeds.php:488
 #: classes/pref/feeds.php:719
 msgid "Feed"
 msgstr "信息源"
 
-#: include/functions.php:1898
+#: include/functions.php:1902
 #, fuzzy
 msgid "Refresh current feed"
 msgstr "刷新活动的信息源"
 
-#: include/functions.php:1899
+#: include/functions.php:1903
 #, fuzzy
 msgid "Un/hide read feeds"
 msgstr "隐藏（显示）已读信息"
 
-#: include/functions.php:1900 classes/pref/feeds.php:1240
+#: include/functions.php:1904 classes/pref/feeds.php:1240
 msgid "Subscribe to feed"
 msgstr "订阅信息源"
 
-#: include/functions.php:1901 js/FeedTree.js:135 js/PrefFeedTree.js:67
+#: include/functions.php:1905 js/FeedTree.js:135 js/PrefFeedTree.js:67
 msgid "Edit feed"
 msgstr "编辑信息源"
 
-#: include/functions.php:1903
+#: include/functions.php:1907
 #, fuzzy
 msgid "Reverse headlines"
 msgstr "反向排序"
 
-#: include/functions.php:1904
+#: include/functions.php:1908
 #, fuzzy
 msgid "Debug feed update"
 msgstr "禁用更新"
 
-#: include/functions.php:1905 js/FeedTree.js:177
+#: include/functions.php:1909 js/FeedTree.js:177
 msgid "Mark all feeds as read"
 msgstr "标记所有信息源为已读"
 
-#: include/functions.php:1906
+#: include/functions.php:1910
 #, fuzzy
 msgid "Un/collapse current category"
 msgstr "加入到类别："
 
-#: include/functions.php:1907
+#: include/functions.php:1911
 #, fuzzy
 msgid "Toggle combined mode"
 msgstr "锁定发布的项"
 
-#: include/functions.php:1908
+#: include/functions.php:1912
 #, fuzzy
 msgid "Go to"
 msgstr "跳转至……"
 
-#: include/functions.php:1910
+#: include/functions.php:1914
 msgid "Fresh"
 msgstr ""
 
-#: include/functions.php:1913
+#: include/functions.php:1917
 msgid "Tag cloud"
 msgstr "标签云"
 
-#: include/functions.php:1915
+#: include/functions.php:1919
 #, fuzzy
 msgid "Other"
 msgstr "其他信息源"
 
-#: include/functions.php:1916 classes/pref/labels.php:281
+#: include/functions.php:1920 classes/pref/labels.php:281
 msgid "Create label"
 msgstr "创建预定义标签"
 
-#: include/functions.php:1917 classes/pref/filters.php:587
+#: include/functions.php:1921 classes/pref/filters.php:587
 msgid "Create filter"
 msgstr "创建过滤器"
 
-#: include/functions.php:1918
+#: include/functions.php:1922
 #, fuzzy
 msgid "Un/collapse sidebar"
 msgstr "折叠侧边栏"
 
-#: include/functions.php:1919
+#: include/functions.php:1923
 #, fuzzy
 msgid "Show help dialog"
 msgstr "显示搜索对话框"
 
-#: include/functions.php:2401
+#: include/functions.php:2405
 #, php-format
 msgid "Search results: %s"
 msgstr ""
 
-#: include/functions.php:2886 js/viewfeed.js:1845
+#: include/functions.php:2892 js/viewfeed.js:1885
 msgid "Click to play"
 msgstr "点击播放"
 
-#: include/functions.php:2887 js/viewfeed.js:1844
+#: include/functions.php:2893 js/viewfeed.js:1884
 msgid "Play"
 msgstr "播放"
 
-#: include/functions.php:3007
+#: include/functions.php:3014
 msgid " - "
 msgstr " - "
 
-#: include/functions.php:3029 include/functions.php:3346 classes/rpc.php:360
+#: include/functions.php:3036 include/functions.php:3353 classes/rpc.php:360
 msgid "no tags"
 msgstr "无标签"
 
-#: include/functions.php:3039 classes/feeds.php:650
+#: include/functions.php:3046 classes/feeds.php:653
 msgid "Edit tags for this article"
 msgstr "为本文编辑自定义标签"
 
-#: include/functions.php:3068 classes/feeds.php:605
+#: include/functions.php:3075 classes/feeds.php:608
 msgid "Originally from:"
 msgstr "来源："
 
-#: include/functions.php:3081 classes/feeds.php:618 classes/pref/feeds.php:507
+#: include/functions.php:3088 classes/feeds.php:621 classes/pref/feeds.php:507
 msgid "Feed URL"
 msgstr "信息源 URL"
 
-#: include/functions.php:3110
+#: include/functions.php:3117
 msgid "Related"
 msgstr ""
 
-#: include/functions.php:3137 classes/dlg.php:43 classes/dlg.php:162
+#: include/functions.php:3144 classes/dlg.php:43 classes/dlg.php:162
 #: classes/dlg.php:185 classes/dlg.php:222 classes/dlg.php:508
 #: classes/dlg.php:543 classes/dlg.php:574 classes/dlg.php:608
 #: classes/dlg.php:620 classes/backend.php:105 classes/pref/users.php:106
 #: classes/pref/filters.php:108 classes/pref/feeds.php:1553
 #: classes/pref/feeds.php:1624 plugins/import_export/init.php:407
 #: plugins/import_export/init.php:431 plugins/share/init.php:67
-#: plugins/updater/init.php:329
+#: plugins/updater/init.php:330
 msgid "Close this window"
 msgstr "关闭本窗口"
 
-#: include/functions.php:3371
+#: include/functions.php:3378
 msgid "(edit note)"
 msgstr "（编辑注记）"
 
-#: include/functions.php:3604
+#: include/functions.php:3611
 msgid "unknown type"
 msgstr "未知类型"
 
-#: include/functions.php:3654
+#: include/functions.php:3661
 #, fuzzy
 msgid "Attachments"
 msgstr "附件："
@@ -928,7 +929,7 @@ msgstr "发布文章"
 msgid "Assign tags"
 msgstr "添加自定义标签"
 
-#: include/localized_schema.php:14 js/viewfeed.js:1809
+#: include/localized_schema.php:14 js/viewfeed.js:1849
 msgid "Assign label"
 msgstr "添加预定义标签"
 
@@ -1364,7 +1365,7 @@ msgstr "登录密码"
 msgid "Login"
 msgstr "登陆"
 
-#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:196
+#: classes/dlg.php:276 classes/dlg.php:732 classes/pref/prefs.php:202
 #: classes/pref/feeds.php:569 classes/pref/feeds.php:793
 msgid "Password"
 msgstr "密码"
@@ -1465,7 +1466,7 @@ msgstr "以 RSS 形式阅读"
 msgid "You can view this feed as RSS using the following URL:"
 msgstr "您可以通过如下 URL 以 RSS 方式查看本信息源："
 
-#: classes/dlg.php:591 plugins/updater/init.php:303
+#: classes/dlg.php:591 plugins/updater/init.php:304
 #, php-format
 msgid "New version of Tiny Tiny RSS is available (%s)."
 msgstr "Tiny Tiny RSS 有可用的新版本 (%s)。"
@@ -1597,7 +1598,7 @@ msgstr "通过邮件转发"
 msgid "Feed:"
 msgstr "信息源："
 
-#: classes/feeds.php:201 classes/feeds.php:795
+#: classes/feeds.php:201 classes/feeds.php:798
 msgid "Feed not found."
 msgstr "找不到信息源。"
 
@@ -1605,19 +1606,24 @@ msgstr "找不到信息源。"
 msgid "mark as read"
 msgstr "标记为已读"
 
-#: classes/feeds.php:696
+#: classes/feeds.php:553
+#, fuzzy
+msgid "Collapse article"
+msgstr "全部文章"
+
+#: classes/feeds.php:699
 msgid "No unread articles found to display."
 msgstr "没有未读文章。"
 
-#: classes/feeds.php:699
+#: classes/feeds.php:702
 msgid "No updated articles found to display."
 msgstr "没有最新更新的文章。"
 
-#: classes/feeds.php:702
+#: classes/feeds.php:705
 msgid "No starred articles found to display."
 msgstr "没有加星标的文章。"
 
-#: classes/feeds.php:706
+#: classes/feeds.php:709
 msgid ""
 "No articles found to display. You can assign articles to labels manually "
 "(see the Actions menu above) or use a filter."
@@ -1625,20 +1631,20 @@ msgstr ""
 "本标签下没有文章。你可以通过手动或过滤器的方式为文章添加预定义标签（参考上方"
 "动作菜单）。"
 
-#: classes/feeds.php:708
+#: classes/feeds.php:711
 msgid "No articles found to display."
 msgstr "暂时没有文章。"
 
-#: classes/feeds.php:723 classes/feeds.php:904
+#: classes/feeds.php:726 classes/feeds.php:907
 #, php-format
 msgid "Feeds last updated at %s"
 msgstr "上次信息源更新时间：%s"
 
-#: classes/feeds.php:733 classes/feeds.php:914
+#: classes/feeds.php:736 classes/feeds.php:917
 msgid "Some feeds have update errors (click for details)"
 msgstr "部分信息源更新错误（点击了解详情）"
 
-#: classes/feeds.php:894
+#: classes/feeds.php:897
 msgid "No feed selected."
 msgstr "没有选中的信息源。"
 
@@ -1966,179 +1972,170 @@ msgstr "两次输入的密码不一致。"
 msgid "Function not supported by authentication module."
 msgstr ""
 
-#: classes/pref/prefs.php:63
+#: classes/pref/prefs.php:69
 msgid "The configuration was saved."
 msgstr "设置已保存。"
 
-#: classes/pref/prefs.php:77
+#: classes/pref/prefs.php:83
 #, php-format
 msgid "Unknown option: %s"
 msgstr "未知选项： %s"
 
-#: classes/pref/prefs.php:91
+#: classes/pref/prefs.php:97
 msgid "Your personal data has been saved."
 msgstr "您的个人数据已保存。"
 
-#: classes/pref/prefs.php:131
+#: classes/pref/prefs.php:137
 #, fuzzy
 msgid "Personal data / Authentication"
 msgstr "登录密码"
 
-#: classes/pref/prefs.php:151
+#: classes/pref/prefs.php:157
 msgid "Personal data"
 msgstr ""
 
-#: classes/pref/prefs.php:161
+#: classes/pref/prefs.php:167
 msgid "Full name"
 msgstr "姓名"
 
-#: classes/pref/prefs.php:165
+#: classes/pref/prefs.php:171
 msgid "E-mail"
 msgstr "电子邮件"
 
-#: classes/pref/prefs.php:171
+#: classes/pref/prefs.php:177
 msgid "Access level"
 msgstr "访问级别"
 
-#: classes/pref/prefs.php:181
+#: classes/pref/prefs.php:187
 msgid "Save data"
 msgstr "保存信息"
 
-#: classes/pref/prefs.php:203
+#: classes/pref/prefs.php:209
 msgid "Your password is at default value, please change it."
 msgstr "您还在使用系统默认的密码，请修改。"
 
-#: classes/pref/prefs.php:235
+#: classes/pref/prefs.php:241
 msgid "Old password"
 msgstr "原密码"
 
-#: classes/pref/prefs.php:238
+#: classes/pref/prefs.php:244
 msgid "New password"
 msgstr "新密码"
 
-#: classes/pref/prefs.php:243
+#: classes/pref/prefs.php:249
 msgid "Confirm password"
 msgstr "确认密码"
 
-#: classes/pref/prefs.php:253
+#: classes/pref/prefs.php:259
 msgid "Change password"
 msgstr "更改密码"
 
-#: classes/pref/prefs.php:259
+#: classes/pref/prefs.php:265
 msgid "One time passwords / Authenticator"
 msgstr ""
 
-#: classes/pref/prefs.php:288 classes/pref/prefs.php:339
+#: classes/pref/prefs.php:294 classes/pref/prefs.php:345
 #, fuzzy
 msgid "Enter your password"
 msgstr "用户名或密码错误"
 
-#: classes/pref/prefs.php:299
+#: classes/pref/prefs.php:305
 #, fuzzy
 msgid "Disable OTP"
 msgstr "禁用更新"
 
-#: classes/pref/prefs.php:305
+#: classes/pref/prefs.php:311
 msgid ""
 "You will need a compatible Authenticator to use this. Changing your password "
 "would automatically disable OTP."
 msgstr ""
 
-#: classes/pref/prefs.php:307
+#: classes/pref/prefs.php:313
 msgid "Scan the following code by the Authenticator application:"
 msgstr ""
 
-#: classes/pref/prefs.php:348
+#: classes/pref/prefs.php:354
 msgid "I have scanned the code and would like to enable OTP"
 msgstr ""
 
-#: classes/pref/prefs.php:356
+#: classes/pref/prefs.php:362
 #, fuzzy
 msgid "Enable OTP"
 msgstr "已启用"
 
-#: classes/pref/prefs.php:482
+#: classes/pref/prefs.php:493
 msgid "Customize"
 msgstr "自定义"
 
-#: classes/pref/prefs.php:501 classes/pref/prefs.php:508
-#: classes/pref/prefs.php:513
-msgid "Yes"
-msgstr "是"
-
-#: classes/pref/prefs.php:503 classes/pref/prefs.php:513
-msgid "No"
-msgstr "否"
-
-#: classes/pref/prefs.php:543
+#: classes/pref/prefs.php:552
 msgid "Register"
 msgstr "注册"
 
-#: classes/pref/prefs.php:547
+#: classes/pref/prefs.php:556
 msgid "Clear"
 msgstr "清空"
 
-#: classes/pref/prefs.php:553
+#: classes/pref/prefs.php:562
 #, php-format
 msgid "Current server time: %s (UTC)"
 msgstr ""
 
-#: classes/pref/prefs.php:582
+#: classes/pref/prefs.php:595
 msgid "Save configuration"
 msgstr "保存设置"
 
-#: classes/pref/prefs.php:585
+#: classes/pref/prefs.php:598
 msgid "Manage profiles"
 msgstr "管理偏好文件"
 
-#: classes/pref/prefs.php:588
+#: classes/pref/prefs.php:601
 msgid "Reset to defaults"
 msgstr "恢复到默认"
 
-#: classes/pref/prefs.php:600
+#: classes/pref/prefs.php:613
 #, fuzzy
 msgid "Show additional preferences"
 msgstr "退出偏好设置"
 
-#: classes/pref/prefs.php:612 classes/pref/prefs.php:614
+#: classes/pref/prefs.php:625 classes/pref/prefs.php:627
 msgid "Plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:642
+#: classes/pref/prefs.php:655
 msgid "System plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:646 classes/pref/prefs.php:695
+#: classes/pref/prefs.php:659 classes/pref/prefs.php:708
 msgid "Plugin"
 msgstr ""
 
-#: classes/pref/prefs.php:647 classes/pref/prefs.php:696
+#: classes/pref/prefs.php:660 classes/pref/prefs.php:709
 msgid "Description"
 msgstr ""
 
-#: classes/pref/prefs.php:648 classes/pref/prefs.php:697
+#: classes/pref/prefs.php:661 classes/pref/prefs.php:710
 msgid "Version"
 msgstr ""
 
-#: classes/pref/prefs.php:649 classes/pref/prefs.php:698
+#: classes/pref/prefs.php:662 classes/pref/prefs.php:711
 msgid "Author"
 msgstr ""
 
-#: classes/pref/prefs.php:682 classes/pref/prefs.php:733
+#: classes/pref/prefs.php:695 classes/pref/prefs.php:746
 #, fuzzy
 msgid "Clear data"
 msgstr "清空信息源数据"
 
-#: classes/pref/prefs.php:691
+#: classes/pref/prefs.php:704
 msgid "User plugins"
 msgstr ""
 
-#: classes/pref/prefs.php:748
+#: classes/pref/prefs.php:761
 #, fuzzy
 msgid "Enable selected plugins"
 msgstr "启用信息源分类"
 
-#: classes/pref/prefs.php:803 classes/pref/prefs.php:821
+#: classes/pref/prefs.php:816 classes/pref/prefs.php:834
 #, fuzzy
 msgid "Incorrect password"
 msgstr "用户名或密码错误"
@@ -2415,6 +2412,10 @@ msgstr "您好，"
 msgid "Regular version"
 msgstr ""
 
+#: plugins/close_button/init.php:24
+msgid "Close article"
+msgstr ""
+
 #: plugins/nsfw/init.php:32 plugins/nsfw/init.php:43
 msgid "Not work safe (click to toggle)"
 msgstr ""
@@ -2649,29 +2650,29 @@ msgstr "加星标"
 msgid "Share on Google+"
 msgstr "在 Twitter 上分享"
 
-#: plugins/updater/init.php:294 plugins/updater/init.php:306
+#: plugins/updater/init.php:295 plugins/updater/init.php:307
 #: plugins/updater/updater.js:10
 #, fuzzy
 msgid "Update Tiny Tiny RSS"
 msgstr "返回 Tiny Tiny RSS"
 
-#: plugins/updater/init.php:309
+#: plugins/updater/init.php:310
 #, fuzzy
 msgid "Your Tiny Tiny RSS installation is up to date."
 msgstr "Tiny Tiny RSS 数据库是最新版。"
 
-#: plugins/updater/init.php:319
+#: plugins/updater/init.php:320
 msgid ""
 "Do not close this dialog until updating is finished. Backup your tt-rss "
 "directory before continuing."
 msgstr ""
 
-#: plugins/updater/init.php:322
+#: plugins/updater/init.php:323
 #, fuzzy
 msgid "Ready to update."
 msgstr "上次更新："
 
-#: plugins/updater/init.php:327
+#: plugins/updater/init.php:328
 #, fuzzy
 msgid "Start update"
 msgstr "上次更新："
@@ -2783,7 +2784,7 @@ msgstr "请填写类别名称："
 msgid "Generate new syndication address for this feed?"
 msgstr "为本信息源生成新的群地址？"
 
-#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:721
+#: js/functions.js:1597 js/tt-rss.js:350 js/tt-rss.js:729
 msgid "You can't edit this kind of feed."
 msgstr "您无法编辑这种类型的信息源。"
 
@@ -3037,12 +3038,12 @@ msgstr "无法重置本类信息源的评分。"
 msgid "Rescore articles in %s?"
 msgstr "重置 %s 中文章的评分？"
 
-#: js/tt-rss.js:680
+#: js/tt-rss.js:688
 #, fuzzy
 msgid "Please enable mail plugin first."
 msgstr "请先选几个信息源吧。"
 
-#: js/tt-rss.js:842
+#: js/tt-rss.js:850
 msgid "New version available!"
 msgstr "有可用的新版本啦！"
 
@@ -3068,7 +3069,7 @@ msgstr "取消发布文章"
 
 #: js/viewfeed.js:674 js/viewfeed.js:702 js/viewfeed.js:729 js/viewfeed.js:791
 #: js/viewfeed.js:823 js/viewfeed.js:960 js/viewfeed.js:1003
-#: js/viewfeed.js:1053 js/viewfeed.js:1927 plugins/mailto/init.js:7
+#: js/viewfeed.js:1053 js/viewfeed.js:1967 plugins/mailto/init.js:7
 #: plugins/mail/mail.js:7
 msgid "No articles are selected."
 msgstr "没有选中任何文章。"
@@ -3113,28 +3114,28 @@ msgstr "未找到需要标记的文章"
 msgid "Mark %d article(s) as read?"
 msgstr "将 %d 篇文章标记为已读？"
 
-#: js/viewfeed.js:1744
+#: js/viewfeed.js:1784
 msgid "Open original article"
 msgstr "打开原文"
 
-#: js/viewfeed.js:1814
+#: js/viewfeed.js:1854
 msgid "Remove label"
 msgstr "移除预定义标签"
 
-#: js/viewfeed.js:1838
+#: js/viewfeed.js:1878
 msgid "Playing..."
 msgstr "播放中……"
 
-#: js/viewfeed.js:1839
+#: js/viewfeed.js:1879
 msgid "Click to pause"
 msgstr "点击暂停"
 
-#: js/viewfeed.js:1896
+#: js/viewfeed.js:1936
 #, fuzzy
 msgid "Please enter new score for selected articles:"
 msgstr "删除选中的 %d 篇文章？"
 
-#: js/viewfeed.js:1938
+#: js/viewfeed.js:1978
 #, fuzzy
 msgid "Please enter new score for this article:"
 msgstr "请填写类别名称："
@@ -3215,6 +3216,12 @@ msgid ""
 "before continuing. Please type 'yes' to continue."
 msgstr ""
 
+#~ msgid "Yes"
+#~ msgstr "是"
+
+#~ msgid "No"
+#~ msgstr "否"
+
 #~ msgid "Comments?"
 #~ msgstr "评论些什么？"