X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=locale%2Fzh_CN%2FLC_MESSAGES%2Fstatusnet.po;h=6cf519b3a21fd33f5d8413882de6d301dbe02d01;hb=f059977c5769d863eb5a51bf05ac496ba49339b0;hp=6849962c84f55152af17a228257699bd887b6c42;hpb=87d46e1ae5e5effcc985021ff5af3f10815f3d3c;p=quix0rs-gnu-social.git

diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 6849962c84..6cf519b3a2 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -5,11 +5,13 @@
 # Author: Chenxiaoqino
 # Author: Happy
 # Author: Hydra
+# Author: Hzy980512
 # Author: March
 # Author: Shizhao
 # Author: Sweeite012f
 # Author: Tommyang
 # Author: Xiaomingyan
+# Author: Yfdyh000
 # Author: ZhengYiFeng
 # --
 # This file is distributed under the same license as the StatusNet package.
@@ -18,18 +20,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-07-21 12:19+0000\n"
-"PO-Revision-Date: 2011-07-21 12:22:25+0000\n"
-"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"POT-Creation-Date: 2012-05-26 21:11+0000\n"
+"PO-Revision-Date: 2012-05-26 21:13:34+0000\n"
+"Language-Team: Simplified Chinese <https://translatewiki.net/wiki/Portal:zh-"
 "hans>\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.19alpha (r92662); Translate extension (2011-07-09)\n"
-"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Generator: MediaWiki 1.20alpha (0154924); Translate 2012-04-11\n"
+"X-Translation-Project: translatewiki.net <https://translatewiki.net>\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2011-07-01 11:17:02+0000\n"
+"X-POT-Import-Date: 2012-04-22 22:02:21+0000\n"
 
 #. TRANS: Database error message.
 #, php-format
@@ -42,12 +44,6 @@ msgstr ""
 "%1$s 的数据库响应不正确，所以该站点将无法正常工作。站点管理员可能知道该问题，"
 "但是你可以通过 %2$s 联系他们确认。或几分钟后重试一下。"
 
-#. TRANS: Error message.
-msgid ""
-"An important error occured, probably related to email setup. Check logfiles "
-"for more info."
-msgstr "出现了一个重要错误，可能与电子邮件设置有关。详细信息请检查日志文件。"
-
 #. TRANS: Error message.
 msgid "An error occurred."
 msgstr "出现了一个错误。"
@@ -106,11 +102,11 @@ msgstr "禁止新用户注册。"
 msgid "Closed"
 msgstr "封闭（不允许新用户注册）"
 
-#. TRANS: Title for button to save access settings in site admin panel.
-msgid "Save access settings"
-msgstr "保存访问设置"
+#. TRANS: Button title to save access settings in site admin panel.
+msgid "Save access settings."
+msgstr "保存访问设置。"
 
-#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text to save access settings in site admin panel.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button text in the license admin panel.
@@ -218,7 +214,6 @@ msgstr "没有这个页面。"
 #. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
 #. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
-#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
 #. TRANS: Client error displayed trying to make a micro summary without providing a valid user.
 #. TRANS: Client error displayed trying to send a direct message to a non-existing user.
 #. TRANS: Client error displayed trying to use "one time password login" without using an existing user.
@@ -313,7 +308,6 @@ msgstr ""
 
 #. TRANS: Button text for inviting more users to the StatusNet instance.
 #. TRANS: Less business/enterprise-oriented language for public sites.
-#, fuzzy
 msgctxt "BUTTON"
 msgid "Send invite"
 msgstr "发送邀请。"
@@ -326,8 +320,6 @@ msgstr "发送邀请。"
 #. TRANS: %s is a username.
 #. TRANS: Menu item title in personal group navigation menu.
 #. TRANS: %s is a username.
-#. TRANS: Menu item title in settings navigation panel.
-#. TRANS: %s is a username.
 #, php-format
 msgid "%s and friends"
 msgstr "%s 和好友们"
@@ -435,16 +427,18 @@ msgstr "屏蔽用户失败。"
 msgid "Unblock user failed."
 msgstr "取消屏蔽用户失败。"
 
-#, fuzzy
-msgid "no conversation id"
-msgstr "对话"
+#. TRANS: Client exception thrown when no conversation ID is given.
+msgid "No conversation ID."
+msgstr "对话。"
 
+#. TRANS: Client exception thrown when referring to a non-existing conversation ID (%d).
 #, php-format
-msgid "No conversation with id %d"
-msgstr ""
+msgid "No conversation with ID %d."
+msgstr "没有ID为%d的对话。"
 
-#. TRANS: Timeline title for user and friends. %s is a user nickname.
-#. TRANS: Title for page with a conversion (multiple notices in context).
+#. TRANS: Title for conversion timeline.
+#, fuzzy
+msgctxt "TITLE"
 msgid "Conversation"
 msgstr "对话"
 
@@ -1184,8 +1178,6 @@ msgstr "你必须登录才能离开小组。"
 #. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for a non-existing group.
 #. TRANS: Client error displayed when trying to view group members for an object that is not a group.
-#. TRANS: Client error displayed when trying to view group members for a non-existing group.
-#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
 #. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
 #. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
 #. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
@@ -1194,10 +1186,10 @@ msgstr "你必须登录才能离开小组。"
 #. TRANS: Client error displayed when trying to leave a non-local group.
 #. TRANS: Client error displayed when trying to leave a non-existing group.
 #. TRANS: Client error displayed when providing an invalid group ID on the Make Admin page.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 #. TRANS: Command exception text shown when a group is requested that does not exist.
 #. TRANS: Error text shown when trying to leave a group that does not exist.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
 msgid "No such group."
 msgstr "没有这个组。"
 
@@ -1701,6 +1693,10 @@ msgstr "确认地址"
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "你账户的地址 \"%s\" 已被确认。"
 
+#. TRANS: Title for page with a conversion (multiple notices in context).
+msgid "Conversation"
+msgstr "对话"
+
 #. TRANS: Title for link to notice feed.
 #. TRANS: %s is a user nickname.
 #, fuzzy
@@ -1772,7 +1768,8 @@ msgid "Enter \"%s\" to confirm that you want to delete your account."
 msgstr "输入\"%s\"，以确认您要删除您的帐户。"
 
 #. TRANS: Button title for user account deletion.
-msgid "Permanently delete your account"
+#, fuzzy
+msgid "Permanently delete your account."
 msgstr "永久删除您的帐户"
 
 #. TRANS: Client error displayed trying to delete an application while not logged in.
@@ -1927,6 +1924,79 @@ msgstr "加入收藏"
 msgid "No such document \"%s\"."
 msgstr "没有这样的文档\"%s\"。"
 
+#. TRANS: Menu item in administrator navigation panel.
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in personal group navigation menu.
+msgctxt "MENU"
+msgid "Home"
+msgstr "主页"
+
+msgctxt "MENU"
+msgid "Docs"
+msgstr ""
+
+#. TRANS: Secondary navigation menu item leading to help on StatusNet.
+msgctxt "MENU"
+msgid "Help"
+msgstr "帮助"
+
+#, fuzzy
+msgid "Getting started"
+msgstr "设置已保存。"
+
+#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
+msgctxt "MENU"
+msgid "About"
+msgstr "关于"
+
+#, fuzzy
+msgid "About this site"
+msgstr "取消屏蔽这个用户。"
+
+#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
+msgctxt "MENU"
+msgid "FAQ"
+msgstr "FAQ"
+
+msgid "Frequently asked questions"
+msgstr "常见问题"
+
+#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
+#. TRANS: StatusNet site, where to report bugs, ...
+msgctxt "MENU"
+msgid "Contact"
+msgstr "联系"
+
+#, fuzzy
+msgid "Contact info"
+msgstr "联系"
+
+#, fuzzy
+msgctxt "MENU"
+msgid "Tags"
+msgstr "标签"
+
+msgid "Using tags"
+msgstr ""
+
+#. TRANS: Menu item in default local navigation panel.
+#. TRANS: Menu item in search group navigation panel.
+#. TRANS: Menu item in local navigation menu.
+msgctxt "MENU"
+msgid "Groups"
+msgstr "组"
+
+#, fuzzy
+msgid "Using groups"
+msgstr "用户小组"
+
+msgctxt "MENU"
+msgid "API"
+msgstr "API"
+
+msgid "RESTful API"
+msgstr ""
+
 #. TRANS: Title for "Edit application" form.
 #. TRANS: Form legend.
 msgid "Edit application"
@@ -2632,10 +2702,10 @@ msgstr "IM 设置"
 #. TRANS: Instant messaging settings page instructions.
 #. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
 #. TRANS: the order and formatting of link text and link should remain unchanged.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"You can send and receive notices through instant messaging [instant messages]"
-"(%%doc.im%%). Configure your addresses and settings below."
+"You can send and receive notices through [instant messaging](%%doc.im%%). "
+"Configure your addresses and settings below."
 msgstr ""
 "你可以通过即时通讯 [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它们。"
 
@@ -2953,12 +3023,6 @@ msgstr "与许可协议一起出现的图片 URL。"
 msgid "Save license settings."
 msgstr "保存许可协议设置。"
 
-#. TRANS: Client error displayed when trying to log in while already logged in.
-#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
-#. TRANS: Client error displayed when trying to register while already logged in.
-msgid "Already logged in."
-msgstr "已登录。"
-
 #. TRANS: Form validation error displayed when trying to log in with incorrect credentials.
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
@@ -3301,6 +3365,33 @@ msgstr "请只用HTTP明文的%sURLs的地址。"
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
+#. TRANS: Page title for profile settings.
+#, fuzzy
+msgid "Old school UI settings"
+msgstr "IM 设置"
+
+#. TRANS: Usage instructions for profile settings.
+msgid "If you like it \"the old way\", you can set that here."
+msgstr ""
+
+#. TRANS: Confirmation shown when user profile settings are saved.
+#. TRANS: Message after successful saving of administrative settings.
+msgid "Settings saved."
+msgstr "设置已保存。"
+
+msgid "Only stream mode (no conversations) in timelines"
+msgstr ""
+
+msgid "Show conversation page as hierarchical trees"
+msgstr ""
+
+msgid "Show nicknames (not full names) in timelines"
+msgstr ""
+
+#. TRANS: Button text to save a list.
+msgid "Save"
+msgstr "保存"
+
 #. TRANS: ShortName in the OpenSearch interface when trying to find users.
 msgid "People Search"
 msgstr "搜索用户"
@@ -3309,6 +3400,11 @@ msgstr "搜索用户"
 msgid "Notice Search"
 msgstr "搜索消息"
 
+#. TRANS: Client error displayed trying to use "one time password login" when already logged in.
+#. TRANS: Client error displayed when trying to register while already logged in.
+msgid "Already logged in."
+msgstr "已登录。"
+
 #. TRANS: Client error displayed trying to use "one time password login" without specifying a user.
 msgid "No user ID specified."
 msgstr "没用指定用户 ID。"
@@ -3436,12 +3532,6 @@ msgstr "主题目录无法读取：%s。"
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 
-#. TRANS: Client error in Paths admin panel.
-#. TRANS: %s is the background directory that could not be written to.
-#, php-format
-msgid "Background directory not writable: %s."
-msgstr "背景目录无法写入：%s。"
-
 #. TRANS: Client error in Paths admin panel.
 #. TRANS: %s is the locales directory that could not be read from.
 #, php-format
@@ -3609,8 +3699,8 @@ msgid "Server to direct SSL requests to."
 msgstr "直接SSL请求的服务器"
 
 #. TRANS: Button title text to store form data in the Paths admin panel.
-msgid "Save paths"
-msgstr "保存路径"
+msgid "Save path settings."
+msgstr "保存路径设置。"
 
 #. TRANS: Instructions for the "People search" page.
 #. TRANS: %%site.name%% is the name of the StatusNet site.
@@ -3736,13 +3826,13 @@ msgstr "转到"
 #. TRANS: Message displayed for anonymous users on page that displays lists by a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists created by **%s**. Lists are how you sort similar people on %"
 "%%%site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "这些是由 **%s** 创建的名单。名单可以方便汇集相似的人在 %%%%site.name%%%%里，"
 "一个 [微博客](http://en.wikipedia.org/wiki/Micro-blogging) 服务，基于自由软"
@@ -3769,13 +3859,13 @@ msgstr "有 %1$s 的名单，第 %2$d 页"
 #. TRANS: Message displayed for anonymous users on page that displays lists for a user.
 #. TRANS: This message contains Markdown links in the form [description](links).
 #. TRANS: %s is a tagger nickname.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "These are lists for **%s**. lists are how you sort similar people on %%%%"
 "site.name%%%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service based on the Free Software [StatusNet](http://status.net/) "
 "tool. You can easily keep track of what they are doing by subscribing to the "
-"tag's timeline."
+"list's timeline."
 msgstr ""
 "这些是有 **%s** 的名单。名单可以方便汇集相似的人在 %%%%site.name%%%%里，一个 "
 "[微博客](http://en.wikipedia.org/wiki/Micro-blogging) 服务，基于自由软件 "
@@ -3969,6 +4059,8 @@ msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 
 #. TRANS: Field label in form for profile settings.
+#. TRANS: Title for group tag cloud section.
+#. TRANS: %s is a group name.
 msgid "Tags"
 msgstr "标签"
 
@@ -3996,8 +4088,8 @@ msgstr "你一般处于哪个时区？"
 
 #. TRANS: Checkbox label in form for profile settings.
 msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)."
-msgstr "自动关注任何关注我的人（这个选项适合机器人）"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
 
 #. TRANS: Dropdown field label on profile settings, for what policies to apply when someone else tries to subscribe to your updates.
 msgid "Subscription policy"
@@ -4061,11 +4153,6 @@ msgstr "无法保存位置设置。"
 msgid "Could not save tags."
 msgstr "无法保存标签。"
 
-#. TRANS: Confirmation shown when user profile settings are saved.
-#. TRANS: Message after successful saving of administrative settings.
-msgid "Settings saved."
-msgstr "设置已保存。"
-
 #. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
 #. TRANS: Page title for page where a user account can be restored from backup.
 msgid "Restore account"
@@ -4078,7 +4165,8 @@ msgid "Beyond the page limit (%s)."
 msgstr "超出页面限制(%s)。"
 
 #. TRANS: Server error displayed when a public timeline cannot be retrieved.
-msgid "Could not retrieve public stream."
+#, fuzzy
+msgid "Could not retrieve public timeline."
 msgstr "无法获取到公共的时间线。"
 
 #. TRANS: Title for all public timeline pages but the first.
@@ -4093,19 +4181,23 @@ msgid "Public timeline"
 msgstr "公共时间线"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Activity Streams JSON)"
+#, fuzzy
+msgid "Public Timeline Feed (Activity Streams JSON)"
 msgstr "公共流饲料 （活动流 JSON）"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 1.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 1.0)"
 msgstr "公开的 RSS 聚合 (RSS 1.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (RSS 2.0)"
+#, fuzzy
+msgid "Public Timeline Feed (RSS 2.0)"
 msgstr "公开的 RSS 聚合 (RSS 2.0)"
 
 #. TRANS: Link description for public timeline feed.
-msgid "Public Stream Feed (Atom)"
+#, fuzzy
+msgid "Public Timeline Feed (Atom)"
 msgstr "公开的 RSS 聚合 (Atom)"
 
 #. TRANS: Text displayed for public feed when there are no public notices.
@@ -4150,44 +4242,6 @@ msgstr ""
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微博"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
-#. TRANS: Title for page with public list cloud.
-msgid "Public list cloud"
-msgstr "公开标签云"
-
-#. TRANS: Page notice for page with public list cloud.
-#. TRANS: %s is a StatusNet sitename.
-#, php-format
-msgid "These are largest lists on %s"
-msgstr "这些是 %s 上最流行的标签"
-
-#. TRANS: Empty list message on page with public list cloud.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid "No one has [listed](%%doc.tags%%) anyone yet."
-msgstr "还没有人拥有 [名单] （%%doc.tags%%）。"
-
-#. TRANS: Additional empty list message on page with public list cloud for logged in users.
-msgid "Be the first to list someone!"
-msgstr "成为第一个创建名单的人！"
-
-#. TRANS: Additional empty list message on page with public list cloud for anonymous users.
-#. TRANS: This message contains Markdown links in the form [description](link).
-#, php-format
-msgid ""
-"Why not [register an account](%%action.register%%) and be the first to list "
-"someone!"
-msgstr "现在就[注册](%%action.register%%)并创建第一个名单！"
-
-#. TRANS: DT element on on page with public list cloud.
-msgid "List cloud"
-msgstr "名单云"
-
-#. TRANS: Link title for number of listed people. %d is the number of listed people.
-#, php-format
-msgid "1 person listed"
-msgid_plural "%d people listed"
-msgstr[0] "列表中有1人"
-
 #. TRANS: Public RSS feed description. %s is the StatusNet site name.
 #, php-format
 msgid "%s updates from everyone."
@@ -4652,8 +4706,9 @@ msgid "Feed will be restored. Please wait a few minutes for results."
 msgstr "将还原订阅源。请等待几分钟。"
 
 #. TRANS: Form instructions for feed restore.
+#, fuzzy
 msgid ""
-"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"You can upload a backed-up timeline in <a href=\"http://activitystrea.ms/"
 "\">Activity Streams</a> format."
 msgstr ""
 "你可以以<a href=\"http://activitystrea.ms/\">Activity Streams</a>格式上传一个"
@@ -4768,6 +4823,26 @@ msgstr "重置key和secret"
 msgid "Application info"
 msgstr "应用程序信息"
 
+#. TRANS: Field label on application page.
+msgid "Consumer key"
+msgstr "Consumer key"
+
+#. TRANS: Field label on application page.
+msgid "Consumer secret"
+msgstr "Consumer secret"
+
+#. TRANS: Field label on application page.
+msgid "Request token URL"
+msgstr "请求令牌URL"
+
+#. TRANS: Field label on application page.
+msgid "Access token URL"
+msgstr "访问令牌URL"
+
+#. TRANS: Field label on application page.
+msgid "Authorize URL"
+msgstr "授权URL"
+
 #. TRANS: Note on the OAuth application page about signature support.
 msgid ""
 "Note: HMAC-SHA1 signatures are supported. The plaintext signature method is "
@@ -4876,42 +4951,8 @@ msgstr "%s小组的消息聚合 (Atom)"
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 
-#. TRANS: Header for mini list of group members on a group page (h2).
-msgid "Members"
-msgstr "小组成员"
-
-#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#. TRANS: Content of "Listed" page if there are no listed users.
-#. TRANS: Content of "People following tag x" if there are no subscribed users.
-#. TRANS: Empty list message for tags.
-#. TRANS: Text for user subscription statistics if the user has no subscriptions.
-#. TRANS: Text for user subscriber statistics if user has no subscribers.
-#. TRANS: Text for user user group membership statistics if user is not a member of any group.
-#. TRANS: Default content for section/sidebar widget.
-msgid "(None)"
-msgstr "（无）"
-
-#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-msgid "All members"
-msgstr "所有成员"
-
-#. TRANS: Header for group statistics on a group page (h2).
-#. TRANS: H2 text for user statistics.
-msgid "Statistics"
-msgstr "统计"
-
-#. TRANS: Label for group creation date.
-msgctxt "LABEL"
-msgid "Created"
-msgstr "已创建"
-
-#. TRANS: Label for member count in statistics on group page.
-msgctxt "LABEL"
-msgid "Members"
-msgstr "成员"
-
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
 #, php-format
@@ -4929,25 +4970,20 @@ msgstr ""
 "%%doc.help%%%%)）"
 
 #. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
-#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
+#. TRANS: %s is the group name, %%%%site.name%%%% is the site name,
 #. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
 "[StatusNet](http://status.net/) tool. Its members share short messages about "
-"their life and interests. "
+"their life and interests."
 msgstr ""
 "**%s** 是%%%%site.name%%%%上的一个小组，%%%%site.name%%%%是一个基于自由软件 "
 "[StatusNet](http://status.net/) 的[微博客](http://zh.wikipedia.org/zh-hans/%"
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和各种兴"
 "趣的消息。"
 
-#. TRANS: Title for list of group administrators on a group page.
-msgctxt "TITLE"
-msgid "Admins"
-msgstr "管理员"
-
 #. TRANS: Client error displayed requesting a single message that does not exist.
 msgid "No such message."
 msgstr "未找到此消息。"
@@ -5039,9 +5075,21 @@ msgid ""
 msgstr "为何不[加入我们](%%action.register%%)开始关注这时间线呢！"
 
 #. TRANS: Header on show list page.
+#. TRANS: Link description for link to list of users tagged with a tag (so part of a list).
 msgid "Listed"
 msgstr "已有名单"
 
+#. TRANS: Content of "Listed" page if there are no listed users.
+#. TRANS: Content of "People following tag x" if there are no subscribed users.
+#. TRANS: Description for mini list of group members on a group page when the group has no members.
+#. TRANS: Empty list message for tags.
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#. TRANS: Default content for section/sidebar widget.
+msgid "(None)"
+msgstr "（无）"
+
 #. TRANS: Link for more "People in list x by a user"
 #. TRANS: if there are more than the mini list's maximum.
 msgid "Show all"
@@ -5052,24 +5100,19 @@ msgstr "显示全部"
 msgid "Subscribers"
 msgstr "关注者"
 
-#. TRANS: Link for more "People following tag x"
-#. TRANS: if there are more than the mini list's maximum.
-msgid "All subscribers"
-msgstr "所有关注者"
-
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag.
 #, php-format
 msgid "Notices by %1$s tagged %2$s"
 msgstr "%1$s 带有标签 %2$s 的消息"
 
-#. TRANS: Page title showing tagged notices in one user's stream.
+#. TRANS: Page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$s is the hash tag, %3$d is the page number.
 #, php-format
 msgid "Notices by %1$s tagged %2$s, page %3$d"
 msgstr "%1$s 带有标签 %2$s 的消息，第 %3$d 页"
 
-#. TRANS: Extended page title showing tagged notices in one user's stream.
+#. TRANS: Extended page title showing tagged notices in one user's timeline.
 #. TRANS: %1$s is the username, %2$d is the page number.
 #, php-format
 msgid "Notices by %1$s, page %2$d"
@@ -5111,7 +5154,7 @@ msgstr "%s的消息聚合 (Atom)"
 msgid "FOAF for %s"
 msgstr "%s的FOAF"
 
-#. TRANS: First sentence of empty list message for a stream. $1%s is a user nickname.
+#. TRANS: First sentence of empty list message for a timeline. $1%s is a user nickname.
 #, php-format
 msgid "This is the timeline for %1$s, but %1$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%1$s还没有发布任何内容。"
@@ -5122,7 +5165,7 @@ msgid ""
 "would be a good time to start :)"
 msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢，现在开始吧 :)"
 
-#. TRANS: Second sentence of empty  list message for a non-self stream. %1$s is a user nickname, %2$s is a part of a URL.
+#. TRANS: Second sentence of empty  list message for a non-self timeline. %1$s is a user nickname, %2$s is a part of a URL.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5132,7 +5175,7 @@ msgstr ""
 "你可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)。"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are open.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are open.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
 #, php-format
 msgid ""
@@ -5146,13 +5189,13 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)服务。[现在加入](%%%%action.register%%%%)并关注**%"
 "s**的消息和享受更多乐趣! （[阅读更多](%%%%doc.help%%%%)）"
 
-#. TRANS: Announcement for anonymous users showing a stream if site registrations are closed or invite only.
+#. TRANS: Announcement for anonymous users showing a timeline if site registrations are closed or invite only.
 #. TRANS: This message contains a Markdown link. Keep "](" together.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
-"[StatusNet](http://status.net/) tool. "
+"[StatusNet](http://status.net/) tool."
 msgstr ""
 "**%s**在%%%%site.name%%%%有一个账号，%%%%site.name%%%%是一个基于自由软件"
 "[StatusNet](http://status.net/)的[微博客](http://zh.wikipedia.org/zh-hans/%"
@@ -5214,7 +5257,7 @@ msgstr "防刷新限制至少要1秒或者更长。"
 #. TRANS: Fieldset legend on site settings panel.
 msgctxt "LEGEND"
 msgid "General"
-msgstr "一般"
+msgstr "常规"
 
 #. TRANS: Field label on site settings panel.
 msgctxt "LABEL"
@@ -5332,7 +5375,7 @@ msgstr "网站公告文字"
 msgid "Site-wide notice text (255 characters maximum; HTML allowed)"
 msgstr "整个网站的公告文字（最长255字符；可使用HTML）"
 
-#. TRANS: Title for button to save site notice in admin panel.
+#. TRANS: Button title to save site notice in admin panel.
 msgid "Save site notice."
 msgstr "保存网站公告。"
 
@@ -5521,7 +5564,7 @@ msgstr "报告 URL"
 msgid "Snapshots will be sent to this URL."
 msgstr "快照将被发送到这个 URL。"
 
-#. TRANS: Title for button to save snapshot settings.
+#. TRANS: Button title to save snapshot settings.
 msgid "Save snapshot settings."
 msgstr "保存快照设置"
 
@@ -5647,13 +5690,12 @@ msgstr "这是%s关注的用户。"
 #. TRANS: This message contains Markdown URLs. The link description is between
 #. TRANS: square brackets, and the link between parentheses. Do not separate "]("
 #. TRANS: and do not change the URL part.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 "people you know. Try [people search](%%action.peoplesearch%%), look for "
 "members in groups you're interested in and in our [featured users](%%action."
-"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
-"automatically subscribe to people you already follow there."
+"featured%%)."
 msgstr ""
 "你现在还看不到其他人的消息，试着去关注一些你认识的人。试一下 [用户搜索](%%"
 "action.peoplesearch%%)，在我们的 [推荐用户](%%action.featured%%) 中找一些你感"
@@ -5923,7 +5965,7 @@ msgstr "邀请已启用"
 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 
-#. TRANS: Title for button to save user settings in user admin panel.
+#. TRANS: Button title to save user settings in user admin panel.
 msgid "Save user settings."
 msgstr "保存用户设置。"
 
@@ -5965,9 +6007,9 @@ msgstr "StatusNet %s"
 
 #. TRANS: Content part of StatusNet version page.
 #. TRANS: %1$s is the engine name (StatusNet) and %2$s is the StatusNet version.
-#, php-format
+#, fuzzy, php-format
 msgid ""
-"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, "
+"This site is powered by %1$s version %2$s, Copyright 2008-2011 StatusNet, "
 "Inc. and contributors."
 msgstr ""
 "此网站使用%1$s版本%2$s，2008-2010 StatusNet, Inc. 和其他贡献者版权所有。"
@@ -5981,21 +6023,23 @@ msgid "License"
 msgstr "许可协议"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "StatusNet is free software: you can redistribute it and/or modify it under "
 "the terms of the GNU Affero General Public License as published by the Free "
 "Software Foundation, either version 3 of the License, or (at your option) "
-"any later version. "
+"any later version."
 msgstr ""
 "StatusNet 是一个免费软件，你可以在遵守自由软件基金会发布的 GNU Affero GPL 或"
 "第三版或以后的版本的情况下重新部署或者修改它，"
 
 #. TRANS: Content part of StatusNet version page.
+#, fuzzy
 msgid ""
 "This program is distributed in the hope that it will be useful, but WITHOUT "
 "ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
 "FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License "
-"for more details. "
+"for more details."
 msgstr ""
 "这个程序的发布是希望它可以有用，但没有任何的担保；也没有售后性或者符合其他特"
 "别目的的担保。查看 GNU Affero GPL 了解更多信息。"
@@ -6051,16 +6095,25 @@ msgstr "不能处理 URL “%s”"
 msgid "Robin thinks something is impossible."
 msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
 
-#. TRANS: Message given if an upload is larger than the configured maximum.
-#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#. TRANS: %1$s is used for plural.
+#. TRANS: Message used to be inserted as %2$s in  the text "No file may
+#. TRANS: be larger than %1$d byte and the file you sent was %2$s.".
+#. TRANS: %1$d is the number of bytes of an uploaded file.
 #, php-format
+msgid "%1$d byte"
+msgid_plural "%1$d bytes"
+msgstr[0] ""
+
+#. TRANS: Message given if an upload is larger than the configured maximum.
+#. TRANS: %1$d (used for plural) is the byte limit for uploads,
+#. TRANS: %2$s is the proper form of "n bytes". This is the only ways to have
+#. TRANS: gettext support multiple plurals in the same message, unfortunately...
+#, fuzzy, php-format
 msgid ""
-"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d byte and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgid_plural ""
-"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
-"Try to upload a smaller version."
+"No file may be larger than %1$d bytes and the file you sent was %2$s. Try to "
+"upload a smaller version."
 msgstr[0] "文件不能大于%1$d字节，而你上传的文件是%2$d字节。换个小点的试一下。"
 
 #. TRANS: Message given if an upload would exceed user quota.
@@ -6125,8 +6178,9 @@ msgstr "无法更新本地小组。"
 msgid "Could not create login token for %s"
 msgstr "无法创建别名。"
 
-#, fuzzy
-msgid "Cannot instantiate class "
+#. TRANS: Exception thrown when a program code class (%s) cannot be instantiated.
+#, fuzzy, php-format
+msgid "Cannot instantiate class %s."
 msgstr "无法保存新密码。"
 
 #. TRANS: Exception thrown when database name or Data Source Name could not be found.
@@ -6277,10 +6331,10 @@ msgstr ""
 "标签。"
 
 #. TRANS: Client exception thrown when trying to add more people than allowed to a list.
-#, php-format
+#, fuzzy, php-format
 msgid ""
 "You already have %1$d or more people in list %2$s, which is the maximum "
-"allowed number.Try unlisting others first."
+"allowed number. Try unlisting others first."
 msgstr ""
 "你已经有了 %1$d 或更多的人到列表 %2$s，达到了允许添加的人数上限。试下将其他人"
 "从列表中删除。"
@@ -6445,13 +6499,6 @@ msgctxt "role"
 msgid "Moderator"
 msgstr "审核员"
 
-#. TRANS: Link text for link that will subscribe to a remote profile.
-#. TRANS: Button text to subscribe to a user.
-#. TRANS: Button text for subscribing to a list.
-msgctxt "BUTTON"
-msgid "Subscribe"
-msgstr "关注"
-
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 #, php-format
 msgid "%1$s - %2$s"
@@ -6637,19 +6684,10 @@ msgid "saveSettings() not implemented."
 msgstr "saveSettings() 尚未实现。"
 
 #. TRANS: Header in administrator navigation panel.
-#. TRANS: Header in settings navigation panel.
 msgctxt "HEADER"
 msgid "Home"
 msgstr "主页"
 
-#. TRANS: Menu item in administrator navigation panel.
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in personal group navigation menu.
-#. TRANS: Menu item in settings navigation panel.
-msgctxt "MENU"
-msgid "Home"
-msgstr "主页"
-
 #. TRANS: Header in administrator navigation panel.
 msgctxt "HEADER"
 msgid "Admin"
@@ -6840,13 +6878,14 @@ msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 
 #. TRANS: Submit button title.
-msgid "Cancel"
-msgstr "取消"
+#, fuzzy
+msgid "Cancel application changes."
+msgstr "关联的应用"
 
 #. TRANS: Submit button title.
-#. TRANS: Button text to save a list.
-msgid "Save"
-msgstr "保存"
+#, fuzzy
+msgid "Save application changes."
+msgstr "新应用"
 
 #. TRANS: Name for an anonymous application in application list.
 msgid "Unknown application"
@@ -7335,7 +7374,7 @@ msgstr "将带有所给 id 的消息标记为“收藏”"
 #. TRANS: Help message for IM/SMS command "repeat #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "repeat a notice with a given id"
-msgstr ""
+msgstr "用已给id重复通知"
 
 #. TRANS: Help message for IM/SMS command "repeat <nickname>".
 msgctxt "COMMANDHELP"
@@ -7345,7 +7384,7 @@ msgstr "转发用户的最后一条消息"
 #. TRANS: Help message for IM/SMS command "reply #<notice_id>".
 msgctxt "COMMANDHELP"
 msgid "reply to notice with a given id"
-msgstr ""
+msgstr "用已给出的id回复通知"
 
 #. TRANS: Help message for IM/SMS command "reply <nickname>".
 msgctxt "COMMANDHELP"
@@ -7429,6 +7468,11 @@ msgstr "或许你想运行安装程序来解决这个问题。"
 msgid "Go to the installer."
 msgstr "去安装程序。"
 
+#. TRANS: Header on conversation page. Hidden by default (h2).
+#. TRANS: Label for user statistics.
+msgid "Notices"
+msgstr "消息"
+
 #. TRANS: Page title for when a database error occurs.
 msgid "Database error"
 msgstr "数据库错误"
@@ -7439,13 +7483,6 @@ msgctxt "MENU"
 msgid "Public"
 msgstr "公共"
 
-#. TRANS: Menu item in default local navigation panel.
-#. TRANS: Menu item in search group navigation panel.
-#. TRANS: Menu item in local navigation menu.
-msgctxt "MENU"
-msgid "Groups"
-msgstr "组"
-
 #. TRANS: Menu item in default local navigation panel.
 #. TRANS: Menu item title in local navigation menu.
 msgctxt "MENU"
@@ -7467,7 +7504,6 @@ msgid "Unable to find services for %s."
 msgstr "无法找到 %s 的服务。"
 
 #. TRANS: Form legend for removing the favourite status for a favourite notice.
-#. TRANS: Title for button text for removing the favourite status for a favourite notice.
 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 
@@ -7476,8 +7512,12 @@ msgctxt "BUTTON"
 msgid "Disfavor favorite"
 msgstr "不赞成的最爱"
 
+#. TRANS: Button title for removing the favourite status for a favourite notice.
+#, fuzzy
+msgid "Remove this notice from your list of favorite notices."
+msgstr "无法获取收藏的消息。"
+
 #. TRANS: Form legend for adding the favourite status to a notice.
-#. TRANS: Title for button text for adding the favourite status to a notice.
 msgid "Favor this notice"
 msgstr "收藏"
 
@@ -7486,6 +7526,11 @@ msgctxt "BUTTON"
 msgid "Favor"
 msgstr "请"
 
+#. TRANS: Button title for adding the favourite status to a notice.
+#, fuzzy
+msgid "Add this notice to your list of favorite notices."
+msgstr "无法获取收藏的消息。"
+
 #. TRANS: Feed type name.
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
@@ -7537,6 +7582,28 @@ msgstr "选择要窄列表中的标记。"
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
+#. TRANS: Header for mini list of group members on a group page (h2).
+msgid "Members"
+msgstr "小组成员"
+
+#. TRANS: Link to all group members from mini list of group members if group has more than n members.
+msgid "All members"
+msgstr "所有成员"
+
+#. TRANS: Header for mini list of users with a pending membership request on a group page (h2).
+#, fuzzy
+msgid "Pending"
+msgstr "挂起（%d）"
+
+#. TRANS: Header for mini list of users that are blocked in a group page (h2).
+msgid "Blocked"
+msgstr "屏蔽用户"
+
+#. TRANS: Title for list of group administrators on a group page.
+msgctxt "TITLE"
+msgid "Admins"
+msgstr "管理员"
+
 #. TRANS: Button text for the form that will block a user from a group.
 msgctxt "BUTTON"
 msgid "Block"
@@ -7544,8 +7611,8 @@ msgstr "屏蔽"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Block this user"
-msgstr "屏蔽这个用户"
+msgid "Block this user so that they can no longer post messages to it."
+msgstr ""
 
 #. TRANS: Field title on group edit form.
 msgid "URL of the homepage or blog of the group or topic."
@@ -7592,62 +7659,9 @@ msgctxt "GROUPADMIN"
 msgid "Admin"
 msgstr "管理员"
 
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Group"
-msgstr "小组"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group"
-msgstr "%s小组"
-
-#. TRANS: Menu item in the group navigation page.
-msgctxt "MENU"
-msgid "Members"
-msgstr "组员"
-
-#. TRANS: Tooltip for menu item in the group navigation page.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s group members"
-msgstr "%s 小组成员"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %d is the number of pending members.
-#, php-format
-msgctxt "MENU"
-msgid "Pending members (%d)"
-msgid_plural "Pending members (%d)"
-msgstr[0] ""
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s pending members"
-msgstr "%s 挂起的成员"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Blocked"
-msgstr "屏蔽的用户"
-
-#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: %s is the nickname of the group.
-#, php-format
-msgctxt "TOOLTIP"
-msgid "%s blocked users"
-msgstr "%s 屏蔽的用户"
-
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Admin"
-msgstr "管理"
+#. TRANS: Group actions header (h2). Text hidden by default.
+msgid "Group actions"
+msgstr "小组动作"
 
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
@@ -7656,11 +7670,6 @@ msgctxt "TOOLTIP"
 msgid "Edit %s group properties"
 msgstr "编辑 %s 小组设置"
 
-#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
-msgctxt "MENU"
-msgid "Logo"
-msgstr "Logo"
-
 #. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
 #. TRANS: %s is the nickname of the group.
 #, php-format
@@ -7668,9 +7677,10 @@ msgctxt "TOOLTIP"
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s logo"
 
-#. TRANS: Group actions header (h2). Text hidden by default.
-msgid "Group actions"
-msgstr "小组动作"
+#. TRANS: Link text for link on user profile.
+msgctxt "MENU"
+msgid "Logo"
+msgstr "Logo"
 
 #. TRANS: Title for groups with the most members section.
 msgid "Popular groups"
@@ -7680,18 +7690,20 @@ msgstr "热门的小组"
 msgid "Active groups"
 msgstr "活跃的小组"
 
+#. TRANS: Link description for seeing all groups.
+#. TRANS: Link description for seeing all lists.
 #, fuzzy
 msgid "See all"
 msgstr "显示全部"
 
-msgid "See all groups you belong to"
+#. TRANS: Link title for seeing all groups.
+msgid "See all groups you belong to."
 msgstr ""
 
-#. TRANS: Title for group tag cloud section.
-#. TRANS: %s is a group name.
-#, php-format
-msgid "Tags in %s group's notices"
-msgstr "这个组所发布的消息的标签"
+#. TRANS: Menu item title in personal group navigation menu.
+#. TRANS: %s is a username.
+msgid "Back to top"
+msgstr "返回顶部"
 
 #. TRANS: Client exception 406
 msgid "This page is not available in a media type you accept"
@@ -7818,8 +7830,9 @@ msgctxt "BUTTON"
 msgid "Leave"
 msgstr "离开"
 
+#. TRANS: Link title for seeing all lists.
 #, fuzzy
-msgid "See all lists you have created"
+msgid "See all lists you have created."
 msgstr "你已经登记的程序。"
 
 #. TRANS: Menu item for logging in to the StatusNet site.
@@ -8118,7 +8131,7 @@ msgstr "%1$s (@%2$s) 给你发送了一条消息"
 #. TRANS: Body of @-reply notification e-mail.
 #. TRANS: %1$s is the sending user's name, $2$s is the StatusNet sitename,
 #. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
-#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %5$s is the text "The full conversation can be read here:" and a URL to the full conversion if it exists (otherwise empty),
 #. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replies for the addressed user,
 #, fuzzy, php-format
 msgid ""
@@ -8165,6 +8178,10 @@ msgstr ""
 
 #. TRANS: Subject of group join notification e-mail.
 #. TRANS: %1$s is the joining user's nickname, %2$s is the group name, and %3$s is the StatusNet sitename.
+#, fuzzy, php-format
+msgid "%1$s has joined your group %2$s on %3$s"
+msgstr "%1$s加入了%2$s小组。"
+
 #. TRANS: Main body of group join notification e-mail.
 #. TRANS: %1$s is the subscriber's long name, %2$s is the group name, and %3$s is the StatusNet sitename,
 #. TRANS: %4$s is a block of profile info about the subscriber.
@@ -8251,8 +8268,8 @@ msgstr "设置管理员"
 
 #. TRANS: Submit button title.
 msgctxt "TOOLTIP"
-msgid "Make this user an admin"
-msgstr "将这个用户设为管理员"
+msgid "Make this user an admin."
+msgstr "将此用户设为管理员"
 
 #. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
 msgid "There was a database error while saving your file. Please try again."
@@ -8364,6 +8381,7 @@ msgstr "不知道如何处理这种类型的目标。"
 msgid "You must implement either adaptNoticeListItem() or showNotice()."
 msgstr ""
 
+#. TRANS: Link description to show more items in a list.
 msgid "More ▼"
 msgstr ""
 
@@ -8450,8 +8468,13 @@ msgstr "查看对话"
 msgid "Repeated by"
 msgstr "转发来自"
 
+#, fuzzy
+msgid " "
+msgstr "、"
+
 #. TRANS: Link title in notice list item to reply to a notice.
-msgid "Reply to this notice"
+#, fuzzy
+msgid "Reply to this notice."
 msgstr "回复"
 
 #. TRANS: Link text in notice list item to reply to a notice.
@@ -8459,8 +8482,9 @@ msgid "Reply"
 msgstr "回复"
 
 #. TRANS: Link title in notice list item to delete a notice.
-msgid "Delete this notice"
-msgstr "删除"
+#, fuzzy
+msgid "Delete this notice from the timeline."
+msgstr "删除此通知。"
 
 #. TRANS: Title for repeat form status in notice list when a notice has been repeated.
 msgid "Notice repeated."
@@ -8562,10 +8586,6 @@ msgstr "编辑"
 msgid "Edit %s list by you."
 msgstr "编辑 %s 由您的列表。"
 
-#. TRANS: Link description for link to list of users tagged with a tag.
-msgid "Tagged"
-msgstr "标签"
-
 #. TRANS: Title for link to edit list settings.
 msgid "Edit list settings."
 msgstr "编辑列表中的设置。"
@@ -8723,6 +8743,11 @@ msgstr "设置"
 msgid "Change your personal settings."
 msgstr "更改您的个人设置。"
 
+#. TRANS: Menu item in primary navigation panel.
+msgctxt "MENU"
+msgid "Admin"
+msgstr "管理"
+
 #. TRANS: Menu item title in primary navigation panel.
 msgid "Site configuration."
 msgstr "网站配置。"
@@ -8740,14 +8765,8 @@ msgstr "从网站注销。"
 msgid "Login to the site."
 msgstr "请登录网站。"
 
-#. TRANS: Menu item in primary navigation panel.
-msgctxt "MENU"
-msgid "Search"
-msgstr "搜索"
-
-#. TRANS: Menu item title in primary navigation panel.
-msgid "Search the site."
-msgstr "搜索网站。"
+msgid "This profile has been silenced by site moderators"
+msgstr ""
 
 #. TRANS: H2 text for user subscription statistics.
 msgid "Following"
@@ -8757,6 +8776,10 @@ msgstr "关注的"
 msgid "Followers"
 msgstr "关注者"
 
+#. TRANS: H2 text for user statistics.
+msgid "Statistics"
+msgstr "统计"
+
 #. TRANS: Label for user statistics.
 msgid "User ID"
 msgstr "用户 ID"
@@ -8765,10 +8788,6 @@ msgstr "用户 ID"
 msgid "Member since"
 msgstr "注册时间"
 
-#. TRANS: Label for user statistics.
-msgid "Notices"
-msgstr "消息"
-
 #. TRANS: Label for user statistics.
 #. TRANS: Average count of posts made per day since account registration.
 msgid "Daily average"
@@ -8854,6 +8873,7 @@ msgid "Keyword(s)"
 msgstr "关键词"
 
 #. TRANS: Button text for searching site.
+#. TRANS: Button text for search button on search form.
 #. TRANS: Button text to search profiles.
 msgctxt "BUTTON"
 msgid "Search"
@@ -8902,21 +8922,6 @@ msgstr "搜索消息内容"
 msgid "Find groups on this site"
 msgstr "搜索本站小组"
 
-#. TRANS: Secondary navigation menu item leading to help on StatusNet.
-msgctxt "MENU"
-msgid "Help"
-msgstr "帮助"
-
-#. TRANS: Secondary navigation menu item leading to text about StatusNet site.
-msgctxt "MENU"
-msgid "About"
-msgstr "关于"
-
-#. TRANS: Secondary navigation menu item leading to Frequently Asked Questions.
-msgctxt "MENU"
-msgid "FAQ"
-msgstr "FAQ"
-
 #. TRANS: Secondary navigation menu item leading to Terms of Service.
 msgctxt "MENU"
 msgid "TOS"
@@ -8937,17 +8942,6 @@ msgctxt "MENU"
 msgid "Version"
 msgstr "版本"
 
-#. TRANS: Secondary navigation menu item leading to e-mail contact information on the
-#. TRANS: StatusNet site, where to report bugs, ...
-msgctxt "MENU"
-msgid "Contact"
-msgstr "联系"
-
-#. TRANS: Secondary navigation menu item. Leads to information about embedding a timeline widget.
-msgctxt "MENU"
-msgid "Badge"
-msgstr "挂件"
-
 #. TRANS: Default title for section/sidebar widget.
 msgid "Untitled section"
 msgstr "无标题章节"
@@ -9028,6 +9022,15 @@ msgstr "关联"
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 
+#. TRANS: Menu item in settings navigation panel.
+msgctxt "MENU"
+msgid "Old school"
+msgstr ""
+
+#. TRANS: Menu item title in settings navigation panel.
+msgid "UI tweaks for old-school users"
+msgstr ""
+
 #. TRANS: Title of form to silence a user.
 msgctxt "TITLE"
 msgid "Silence"
@@ -9126,6 +9129,12 @@ msgstr "邀请加入您的朋友和同事 %s。"
 msgid "Subscribe to this user"
 msgstr "关注这个用户"
 
+#. TRANS: Button text to subscribe to a user.
+#. TRANS: Button text for subscribing to a list.
+msgctxt "BUTTON"
+msgid "Subscribe"
+msgstr "关注"
+
 #. TRANS: Button title to subscribe to a user.
 msgid "Subscribe to this user."
 msgstr "订阅此用户。"
@@ -9243,16 +9252,26 @@ msgid_plural "%%s like this."
 msgstr[0] ""
 
 #. TRANS: List message for notice repeated by logged in user.
+#, fuzzy
 msgctxt "REPEATLIST"
-msgid "You have repeated this notice."
+msgid "You repeated this."
 msgstr "你有重复此通知。"
 
-#. TRANS: List message for repeated notices.
-#. TRANS: %d is the number of users that have repeated a notice.
+#. TRANS: List message for when more than 4 people repeat something.
+#. TRANS: %%s is a list of users liking a notice, %d is the number over 4 that like the notice.
+#. TRANS: Plural is decided on the total number of users liking the notice (count of %%s + %d).
 #, php-format
-msgid "One person has repeated this notice."
-msgid_plural "%d people have repeated this notice."
-msgstr[0] "一人又重复本通知书。 "
+msgid "%%s and %d other repeated this."
+msgid_plural "%%s and %d others repeated this."
+msgstr[0] ""
+
+#. TRANS: List message for favoured notices.
+#. TRANS: %%s is a list of users liking a notice.
+#. TRANS: Plural is based on the number of of users that have favoured a notice.
+#, fuzzy, php-format
+msgid "%%s repeated this."
+msgid_plural "%%s repeated this."
+msgstr[0] "转发给%s"
 
 #. TRANS: Form legend.
 #, php-format
@@ -9274,7 +9293,7 @@ msgstr ""
 #. TRANS: Dropdown field label.
 msgctxt "LABEL"
 msgid "Search in"
-msgstr "中搜索"
+msgstr "搜索于"
 
 #. TRANS: Dropdown field title.
 msgid "Choose a field to search."
@@ -9284,13 +9303,13 @@ msgstr "选择要搜索的字段。"
 #. TRANS: %1$s is a nickname, $2$s is a list.
 #, php-format
 msgid "Remove %1$s from list %2$s"
-msgstr "删除 %1$s 从 %2$s 列表中"
+msgstr "%2$s列表中删除%1$s"
 
 #. TRANS: Legend on form to add a profile to a list.
 #. TRANS: %1$s is a nickname, %2$s is a list.
 #, php-format
 msgid "Add %1$s to list %2$s"
-msgstr "添加 %1$s 到 %2$s 列表中"
+msgstr "添加%1$s到列表%2$s中"
 
 #. TRANS: Title for top posters section.
 msgid "Top posters"
@@ -9344,7 +9363,6 @@ msgid "Unsilence this user"
 msgstr "取消对这个用户的禁言"
 
 #. TRANS: Form legend on unsubscribe form.
-#. TRANS: Button title on unsubscribe form.
 msgid "Unsubscribe from this user"
 msgstr "取消关注这个用户"
 
@@ -9354,6 +9372,11 @@ msgctxt "BUTTON"
 msgid "Unsubscribe"
 msgstr "取消关注"
 
+#. TRANS: Button title on unsubscribe form.
+#, fuzzy
+msgid "Unsubscribe from this user."
+msgstr "取消关注这个用户"
+
 #. TRANS: Exception text shown when no profile can be found for a user.
 #. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
 #, php-format
@@ -9430,198 +9453,3 @@ msgstr "不合法的XML, 缺少XRD根"
 #, php-format
 msgid "Getting backup from file '%s'."
 msgstr "从文件'%s'获取备份。"
-
-#. TRANS: Server exception. %s is a URL.
-#, fuzzy, php-format
-msgid "Invalid avatar URL %s."
-msgstr "无法读取头像 URL '%s'。"
-
-#. TRANS: Server exception. %s is a URI.
-#, fuzzy, php-format
-msgid "Tried to update avatar for unsaved remote profile %s."
-msgstr "更新远程的个人信息时出错。"
-
-#. TRANS: Server exception. %s is a URL.
-#, fuzzy, php-format
-msgid "Unable to fetch avatar from %s."
-msgstr "无法找到 %s 的服务。"
-
-#. TRANS: Exception. %s is a profile URL.
-#, fuzzy, php-format
-msgid "Could not reach profile page %s."
-msgstr "无法创建个人信息标签。"
-
-#. TRANS: Exception. %s is a URL.
-#, fuzzy, php-format
-msgid "Could not find a feed URL for profile page %s."
-msgstr "无法找到昵称为 %s 的用户。"
-
-#. TRANS: Exception.
-#, fuzzy
-msgid "Not a valid webfinger address."
-msgstr "不是有效的电子邮件。"
-
-#, fuzzy, php-format
-msgid "Could not find a valid profile for \"%s\"."
-msgstr "无法保存个人信息。"
-
-#~ msgid "You cannot list an OMB 0.1 remote profile with this action."
-#~ msgstr "你无法这样操作一个OMB 0.1的远程用户"
-
-#~ msgid "Not expecting this response!"
-#~ msgstr "未预料的响应！"
-
-#~ msgid "User being listened to does not exist."
-#~ msgstr "要查看的用户不存在。"
-
-#~ msgid "You can use the local subscription!"
-#~ msgstr "你可以使用本地关注！"
-
-#~ msgid "That user has blocked you from subscribing."
-#~ msgstr "该用户屏蔽了你，无法关注。"
-
-#~ msgid "You are not authorized."
-#~ msgstr "你没有被授权。"
-
-#~ msgid "Could not convert request token to access token."
-#~ msgstr "无法将 request token 转换为 access token。"
-
-#~ msgid "Remote service uses unknown version of OMB protocol."
-#~ msgstr "远程服务使用了未知版本的 OMB 协议。"
-
-#~ msgid "Error updating remote profile."
-#~ msgstr "更新远程的个人信息时出错。"
-
-#~ msgid "Invalid notice content."
-#~ msgstr "无效的消息内容。"
-
-#~ msgid ""
-#~ "Notice license \"%1$s\" is not compatible with site license \"%2$s\"."
-#~ msgstr "消息的许可协议 “%1$s” 与这个站点的许可协议 “%2$s” 不兼容。"
-
-#~ msgid ""
-#~ "To subscribe, you can [login](%%action.login%%), or [register](%%action."
-#~ "register%%) a new  account. If you already have an account  on a "
-#~ "[compatible microblogging site](%%doc.openmublog%%),  enter your profile "
-#~ "URL below."
-#~ msgstr ""
-#~ "要关注用户或小组，你需要[登录](%%action.login%%)，或[注册](%%action."
-#~ "register%%) 一个新账户。如果你已经在另一个[兼容的微博客](%%doc.openmublog%"
-#~ "%)有账户，请填入你的资料页 URL。"
-
-#~ msgid "Remote subscribe"
-#~ msgstr "远程关注"
-
-#~ msgid "Subscribe to a remote user"
-#~ msgstr "关注一个远程用户"
-
-#~ msgid "User nickname"
-#~ msgstr "昵称"
-
-#~ msgid "Nickname of the user you want to follow."
-#~ msgstr "您要执行的用户的别名。"
-
-#~ msgid "Profile URL"
-#~ msgstr "资料页 URL"
-
-#~ msgid "URL of your profile on another compatible microblogging service."
-#~ msgstr "另一种兼容的微博客服务配置文件的 URL。"
-
-#~ msgid "Invalid profile URL (bad format)."
-#~ msgstr "无效的用户 URL (格式错误)。"
-
-#~ msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
-#~ msgstr "不是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
-
-#~ msgid "That is a local profile! Login to subscribe."
-#~ msgstr "这是一个本地用户！请登录以关注。"
-
-#~ msgid "Could not get a request token."
-#~ msgstr "无法获得一个 request token。"
-
-#~ msgid "You cannot (un)list an OMB 0.1 remote profile with this action."
-#~ msgstr "你不能用这个操作(取消)纳入一个 OMB 0.1 远程用户。"
-
-#~ msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
-#~ msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
-
-#~ msgid ""
-#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
-#~ "$s\"."
-#~ msgstr "消息的许可协议 “%1$s” 与这个站点的许可协议 “%2$s” 不兼容。"
-
-#~ msgid "Authorize subscription"
-#~ msgstr "授权关注"
-
-#~ msgid ""
-#~ "Please check these details to make sure that you want to subscribe to "
-#~ "this user’s notices. If you didn’t just ask to subscribe to someone’s "
-#~ "notices, click \"Reject\"."
-#~ msgstr ""
-#~ "请检查这些详细信息，请确保您要订阅此用户的通知。如果您不只是要求某人的通知"
-#~ "订阅，请单击\"拒绝\"。"
-
-#~ msgid "Reject this subscription."
-#~ msgstr "拒绝此订阅。"
-
-#~ msgid "No authorization request!"
-#~ msgstr "没有授权请求！"
-
-#~ msgid "Subscription authorized"
-#~ msgstr "已授权关注"
-
-#~ msgid ""
-#~ "The subscription has been authorized, but no callback URL was passed. "
-#~ "Check with the site's instructions for details on how to authorize the "
-#~ "subscription. Your subscription token is:"
-#~ msgstr ""
-#~ "已授权关注，但是没有回传 URL。请到网站查看如何授权关注。你的 subscription "
-#~ "token 是："
-
-#~ msgid "Subscription rejected"
-#~ msgstr "关注已拒绝"
-
-#~ msgid ""
-#~ "The subscription has been rejected, but no callback URL was passed. Check "
-#~ "with the site's instructions for details on how to fully reject the "
-#~ "subscription."
-#~ msgstr "关注已拒绝，但是没有回传 URL。请到网站查看如何完全拒绝关注。"
-
-#~ msgid "Listener URI \"%s\" not found here."
-#~ msgstr "Listener URI ‘%s’ 没有找到。"
-
-#~ msgid "Listenee URI \"%s\" is too long."
-#~ msgstr "Listenee URI ‘%s’ 过长。"
-
-#~ msgid "Listenee URI \"%s\" is a local user."
-#~ msgstr "Listenee URI ‘%s’ 是一个本地用户。"
-
-#~ msgid "Profile URL \"%s\" is for a local user."
-#~ msgstr "个人信息 URL “%s” 是为本地用户的。"
-
-#~ msgid "Avatar URL \"%s\" is not valid."
-#~ msgstr "头像地址‘%s’无效。"
-
-#~ msgid "Cannot read avatar URL \"%s\"."
-#~ msgstr "无法读取头像 URL '%s'。"
-
-#~ msgid "Wrong image type for avatar URL \"%s\"."
-#~ msgstr "头像 URL ‘%s’ 图像格式错误。"
-
-#~ msgid "Could not delete subscription OMB token."
-#~ msgstr "无法删除关注 OMB token。"
-
-#~ msgid "Error inserting new profile."
-#~ msgstr "添加新个人信息出错。"
-
-#~ msgid "Error inserting avatar."
-#~ msgstr "添加头像出错。"
-
-#~ msgid "Error inserting remote profile."
-#~ msgstr "添加远程个人信息时出错。"
-
-#~ msgid "Duplicate notice."
-#~ msgstr "复制消息。"
-
-#~ msgid "Could not insert new subscription."
-#~ msgstr "无法插入新的订阅。"