Fix `msgid' and `msgstr' entries do not both end with '\n'

[quix0rs-gnu-social.git] / locale / zh_CN / LC_MESSAGES / statusnet.po

diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5f7b70af36b46a030d9abbff2ed2cfa50bb68bf8..44d070328c8ddaa35019fa5716f73616ddd7eb13 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,33 +1,35 @@
-# Translation of StatusNet to Simplified Chinese
+# Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
+# Expored from translatewiki.net

 #
 #

-# Author@translatewiki.net: Chenxiaoqino
-# Author@translatewiki.net: Shizhao
-# Author@translatewiki.net: Sweeite012f
-# Author@translatewiki.net: Tommyang
-# Author@translatewiki.net: ZhengYiFeng
+# Author: Brion
+# Author: Chenxiaoqino
+# Author: Shizhao
+# Author: Sweeite012f
+# Author: Tommyang
+# Author: ZhengYiFeng

 # --
 # --

-# Messages of identi.ca
-# Copyright (C) 2008 Gouki <gouki@goukihq.org>

 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
 # This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""

-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"

 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-08-28 15:28+0000\n"
-"PO-Revision-Date: 2010-08-28 15:31:46+0000\n"
-"Language-Team: Simplified Chinese\n"
+"POT-Creation-Date: 2010-10-18 18:35+0000\n"
+"PO-Revision-Date: 2010-10-18 18:42:17+0000\n"
+"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hans>\n"

 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

-"X-Generator: MediaWiki 1.17alpha (r71856); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r74952); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"

-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"

 "Plural-Forms: nplurals=1; plural=0;\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

+"X-POT-Import-Date: 2010-10-09 14:31:24+0000\n"

 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration
 
 #. TRANS: Page title
 #. TRANS: Menu item for site administration

-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363

 msgid "Access"
 msgstr "访问"
 
 msgid "Access"
 msgstr "访问"
 


@@ -80,10 +82,10 @@ msgstr "保存访问设置"
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label to save e-mail preferences.
 #. TRANS: Button label to save IM preferences.
 #. TRANS: Button label to save SMS preferences.

-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:355

 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"
 msgctxt "BUTTON"
 msgid "Save"
 msgstr "保存"


@@ -92,19 +94,20 @@ msgstr "保存"
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."
 #: actions/all.php:68 actions/public.php:98 actions/replies.php:93
 #: actions/showfavorites.php:138 actions/tag.php:52
 msgid "No such page."

-msgstr "æ\9cªæ\89¾å\88°æ­¤æ¶\88æ\81¯。"
+msgstr "没æ\9c\89è¿\99个页é\9d¢。"

 
 

+#. TRANS: Client error given when a user was not found (404).

 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68
 #. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
 #: actions/all.php:79 actions/allrss.php:68

-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:78
+#: actions/apidirectmessagenew.php:72 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87

 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
 #: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
 #: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
 #: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75


@@ -114,7 +117,7 @@ msgstr "未找到此消息。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40

-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59

 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"
 #: lib/mailbox.php:82 lib/profileaction.php:77
 msgid "No such user."
 msgstr "没有这个用户。"


@@ -133,7 +136,7 @@ msgstr "%1$s 和好友，第%2$d页"
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"
 #: lib/personalgroupnav.php:100
 #, php-format
 msgid "%s and friends"

-msgstr "%s å\8f\8a好å\8f\8b"
+msgstr "%s å\92\8c好å\8f\8b们"

 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107
 
 #. TRANS: %1$s is user nickname
 #: actions/all.php:107


@@ -166,7 +169,7 @@ msgid ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""
 "Try subscribing to more people, [join a group](%%action.groups%%) or post "
 "something yourself."
 msgstr ""

-"尝试关注更多的人、[加入一个小组] (%%action.groups%%) 或者自己发一些东西。"
+"尝试关注更多的人、[加入一个小组](%%action.groups%%) 或者自己发一些东西。"

 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146
 
 #. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
 #: actions/all.php:146


@@ -175,7 +178,7 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 "You can try to [nudge %1$s](../%2$s) from their profile or [post something "
 "to them](%%%%action.newnotice%%%%?status_textarea=%3$s)."
 msgstr ""

-"您可以试着到他们的资料页 [呼叫%1$s](../%2$s) 他们或者 [给他们发消息](%%%%"
+"你可以试着到他们的资料页 [呼叫%1$s](../%2$s) 他们或者 [给他们发消息](%%%%"

 "action.newnotice%%%%?status_textarea=%3$s)。"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
 "action.newnotice%%%%?status_textarea=%3$s)。"
 
 #: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211


@@ -189,7 +192,7 @@ msgstr ""
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"
 #. TRANS: H1 text
 #: actions/all.php:182
 msgid "You and friends"

-msgstr "您和好友们"
+msgstr "你和好友们"

 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
 
 #. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
 #. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.


@@ -199,17 +202,18 @@ msgstr "您和好友们"
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s上%1$s和好友们的更新！"
 
 msgid "Updates from %1$s and friends on %2$s!"
 msgstr "%2$s上%1$s和好友们的更新！"
 

+#. TRANS: Client error given when an API method was not found (404).

 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountratelimitstatus.php:72

-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:162
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137

 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
 #: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
 #: actions/apigroupshow.php:116 actions/apihelptest.php:88
 #: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112


@@ -224,48 +228,50 @@ msgstr "%2$s上%1$s和好友们的更新！"
 msgid "API method not found."
 msgstr "API方法没有找到。"
 
 msgid "API method not found."
 msgstr "API方法没有找到。"
 

-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:107
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199

 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 

-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107

 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""
 msgid ""
 "You must specify a parameter named 'device' with a value of one of: sms, im, "
 "none."
 msgstr ""

-"您必须指定一个名为'device'的参数，值可以是以下中的一个：sms, im, none。"
+"你必须指定一个名为'device'的参数，值可以是以下中的一个：sms, im, none。"

 
 

-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134

 msgid "Could not update user."
 msgstr "无法更新用户。"
 
 msgid "Could not update user."
 msgstr "无法更新用户。"
 

-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108

 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
 #: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
 #: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
 #: lib/profileaction.php:84
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 

-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148

 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257

 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #: actions/designadminpanel.php:123 actions/editapplication.php:118
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283


@@ -275,108 +281,123 @@ msgid ""
 "current configuration."
 msgstr "服务器当前的设置无法处理这么多的 POST 数据（%s bytes）。"
 
 "current configuration."
 msgstr "服务器当前的设置无法处理这么多的 POST 数据（%s bytes）。"
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175

 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."
 #: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
 #: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
 #: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
 msgid "Unable to save your design settings."

-msgstr "无法保存您的设计设置。"
+msgstr "无法保存你的外观设置。"

 
 

-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143

 msgid "Could not update your design."
 msgid "Could not update your design."

-msgstr "无法更新您的设计。"
+msgstr "无法更新你的外观。"

 
 

-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106

 msgid "You cannot block yourself!"
 msgid "You cannot block yourself!"

-msgstr "您不能屏蔽自己！"
+msgstr "你不能屏蔽自己！"

 
 

-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127

 msgid "Block user failed."
 msgstr "屏蔽用户失败。"
 
 msgid "Block user failed."
 msgstr "屏蔽用户失败。"
 

-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115

 msgid "Unblock user failed."
 msgstr "取消屏蔽用户失败。"
 
 msgid "Unblock user failed."
 msgstr "取消屏蔽用户失败。"
 

-#: actions/apidirectmessage.php:89
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:91

 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s发来的私信"
 
 #, php-format
 msgid "Direct messages from %s"
 msgstr "%s发来的私信"
 

-#: actions/apidirectmessage.php:93
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:96

 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "所有来自%s的私信"
 
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "所有来自%s的私信"
 

-#: actions/apidirectmessage.php:101
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:105

 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给%s的私信"
 
 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给%s的私信"
 

-#: actions/apidirectmessage.php:105
+#. TRANS: %s is a user nickname.
+#: actions/apidirectmessage.php:110

 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "所有发给%s的私信"
 
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "所有发给%s的私信"
 

-#: actions/apidirectmessagenew.php:118
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117

 msgid "No message text!"
 msgstr "消息没有正文！"
 
 msgid "No message text!"
 msgstr "消息没有正文！"
 

-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
-#, php-format
-msgid "That's too long. Max message size is %d chars."
-msgstr "太长了。最长的信息长度是%d个字符。"
+#: actions/apidirectmessagenew.php:127
+#, fuzzy, php-format
+msgid "That's too long. Maximum message size is %d character."
+msgid_plural "That's too long. Maximum message size is %d characters."
+msgstr[0] "太长了。最长的信息长度是%d个字符。"

 
 

-#: actions/apidirectmessagenew.php:138
+#. TRANS: Client error displayed if a recipient user could not be found (403).
+#: actions/apidirectmessagenew.php:139

 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 

-#: actions/apidirectmessagenew.php:142
+#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
+#: actions/apidirectmessagenew.php:144

 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "不能给未成为好友的用户发送私信。"
 
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "不能给未成为好友的用户发送私信。"
 

-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#. TRANS: Client error displayed trying to direct message self (403).
+#: actions/apidirectmessagenew.php:154
+#, fuzzy
+msgid ""
+"Do not send a message to yourself; just say it to yourself quietly instead."
+msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
+
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111

 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "没有找到此 ID 的消息。"
 
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."
 msgstr "没有找到此 ID 的消息。"
 

-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121

 msgid "This status is already a favorite."
 msgstr "已收藏此状态。"
 
 #. TRANS: Error message text shown when a favorite could not be set.
 msgid "This status is already a favorite."
 msgstr "已收藏此状态。"
 
 #. TRANS: Error message text shown when a favorite could not be set.

-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294

 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 

-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124

 msgid "That status is not a favorite."
 msgstr "此状态未被收藏。"
 
 msgid "That status is not a favorite."
 msgstr "此状态未被收藏。"
 

-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87

 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 

-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110

 msgid "Could not follow user: profile not found."
 msgstr "无法关注用户：未找到用户。"
 
 msgid "Could not follow user: profile not found."
 msgstr "无法关注用户：未找到用户。"
 

-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119

 #, php-format
 msgid "Could not follow user: %s is already on your list."
 #, php-format
 msgid "Could not follow user: %s is already on your list."

-msgstr "无法关注用户：您已经关注了%s。"
+msgstr "无法关注用户：你已经关注了%s。"

 
 

-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110

 msgid "Could not unfollow user: User not found."
 msgstr "无法取消关注用户：未找到用户。"
 
 msgid "Could not unfollow user: User not found."
 msgstr "无法取消关注用户：未找到用户。"
 

-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121

 msgid "You cannot unfollow yourself."
 msgid "You cannot unfollow yourself."

-msgstr "您不能取消关注自己。"
+msgstr "你不能取消关注自己。"

 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."
 
 #: actions/apifriendshipsexists.php:91
 msgid "Two valid IDs or screen_names must be supplied."


@@ -390,102 +411,102 @@ msgstr "无法确定源用户。"
 msgid "Could not find target user."
 msgstr "无法找到目标用户。"
 
 msgid "Could not find target user."
 msgstr "无法找到目标用户。"
 

-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186

 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字且不能使用空格。"
 
 #: actions/newgroup.php:126 actions/profilesettings.php:215
 #: actions/register.php:212
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字且不能使用空格。"
 

-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190

 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 
 #: actions/newgroup.php:130 actions/profilesettings.php:238
 #: actions/register.php:215
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用，换一个吧。"
 

-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193

 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
 #: actions/newgroup.php:133 actions/profilesettings.php:218
 #: actions/register.php:217
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 

-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215

 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/newgroup.php:139 actions/profilesettings.php:222
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 

-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202

 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
 #: actions/newgroup.php:142 actions/profilesettings.php:225
 #: actions/register.php:227
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 

-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190

 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "描述过长(不能超过%d 个字符)。"
 
 #: actions/newapplication.php:172
 #, php-format
 msgid "Description is too long (max %d chars)."
 msgstr "描述过长(不能超过%d 个字符)。"
 

-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208

 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
 #: actions/newgroup.php:148 actions/profilesettings.php:232
 #: actions/register.php:234
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 

-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219

 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "太多别名了！最多%d 个。"
 
 #: actions/newgroup.php:159
 #, php-format
 msgid "Too many aliases! Maximum %d."
 msgstr "太多别名了！最多%d 个。"
 

-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268

 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "无效的别名：“%s”。"
 
 #, php-format
 msgid "Invalid alias: \"%s\"."
 msgstr "无效的别名：“%s”。"
 

-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232

 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%s这个别名已被使用，换一个吧。"
 
 #: actions/newgroup.php:172
 #, php-format
 msgid "Alias \"%s\" already in use. Try another one."
 msgstr "%s这个别名已被使用，换一个吧。"
 

-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238

 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 
 #: actions/newgroup.php:178
 msgid "Alias can't be the same as nickname."
 msgstr "别名不能和昵称相同。"
 

-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92

 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "小组未找到。"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 #: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
 msgid "Group not found."
 msgstr "小组未找到。"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333

 msgid "You are already a member of that group."
 msgid "You are already a member of that group."

-msgstr "您已经是该小组成员。"
+msgstr "你已经是该小组成员。"

 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.

-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338

 msgid "You have been blocked from that group by the admin."
 msgid "You have been blocked from that group by the admin."

-msgstr "您已经被该小组的管理员屏蔽。"
+msgstr "你已经被管理员从该小组中屏蔽。"

 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350

 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
 
 #, php-format
 msgid "Could not join user %1$s to group %2$s."
 msgstr "无法把用户%1$s添加到%2$s小组"
 

-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116

 msgid "You are not a member of this group."
 msgid "You are not a member of this group."

-msgstr "您不是该小组成员。"
+msgstr "你不是该小组成员。"

 
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#: lib/command.php:401
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: lib/command.php:398

 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "无法把用户%1$s从%2$s小组删除"
 #, php-format
 msgid "Could not remove user %1$s from group %2$s."
 msgstr "无法把用户%1$s从%2$s小组删除"


@@ -500,7 +521,7 @@ msgstr "%s 的小组"
 #: actions/apigrouplist.php:108
 #, php-format
 msgid "%1$s groups %2$s is a member of."
 #: actions/apigrouplist.php:108
 #, php-format
 msgid "%1$s groups %2$s is a member of."

-msgstr "%1$s 个小组，%2$s 是其中一个小组成员。"
+msgstr "%1$s 的小组，%2$s 是小组成员。"

 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.
 
 #. TRANS: Message is used as a title. %s is a site name.
 #. TRANS: Message is used as a page title. %s is a nick name.


@@ -514,23 +535,29 @@ msgstr "%s 的小组"
 msgid "groups on %s"
 msgstr "在%s上的小组"
 
 msgid "groups on %s"
 msgstr "在%s上的小组"
 

-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100

 msgid "Upload failed."
 msgstr "上传失败"
 
 msgid "Upload failed."
 msgstr "上传失败"
 

-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:108
+#, fuzzy
+msgid "Invalid request token or verifier."
+msgstr "指定的登录 token 无效。"
+
+#: actions/apioauthauthorize.php:109

 msgid "No oauth_token parameter provided."
 msgstr "没有提供 oauth_token 参数"
 
 msgid "No oauth_token parameter provided."
 msgstr "没有提供 oauth_token 参数"
 

-#: actions/apioauthauthorize.php:106
-msgid "Invalid token."
+#: actions/apioauthauthorize.php:117 actions/apioauthauthorize.php:130
+#, fuzzy
+msgid "Invalid request token."

 msgstr "无效的 token。"
 
 msgstr "无效的 token。"
 

-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:268
+#: actions/deletenotice.php:172 actions/disfavor.php:74
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55

 #: actions/groupblock.php:66 actions/grouplogo.php:312
 #: actions/groupblock.php:66 actions/grouplogo.php:312

-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230

 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135


@@ -542,53 +569,41 @@ msgstr "无效的 token。"
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."
 #: actions/unsubscribe.php:69 actions/userauthorization.php:52
 #: lib/designsettings.php:294
 msgid "There was a problem with your session token. Try again, please."

-msgstr "您的 session 出现了一个问题，请重试。"
+msgstr "你的 session 出现了一个问题，请重试。"

 
 

-#: actions/apioauthauthorize.php:135
+#: actions/apioauthauthorize.php:163

 msgid "Invalid nickname / password!"
 msgstr "用户名或密码不正确。"
 
 msgid "Invalid nickname / password!"
 msgstr "用户名或密码不正确。"
 

-#: actions/apioauthauthorize.php:159
+#: actions/apioauthauthorize.php:193

 msgid "Database error deleting OAuth application user."
 msgstr "删除 OAuth 应用用户时数据库出错。"
 
 msgid "Database error deleting OAuth application user."
 msgstr "删除 OAuth 应用用户时数据库出错。"
 

-#: actions/apioauthauthorize.php:185
+#: actions/apioauthauthorize.php:218

 msgid "Database error inserting OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 
 msgid "Database error inserting OAuth application user."
 msgstr "插入 OAuth 应用用户时数据库出错。"
 

-#: actions/apioauthauthorize.php:214
-#, php-format
-msgid ""
-"The request token %s has been authorized. Please exchange it for an access "
-"token."
-msgstr "Request token 已被批准。请为它换一个 access token。"
-
-#: actions/apioauthauthorize.php:227
-#, php-format
-msgid "The request token %s has been denied and revoked."
-msgstr "%s的 request token 被拒绝并已被取消。"
-

 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.
 #. TRANS: Message given submitting a form with an unknown action in e-mail settings.
 #. TRANS: Message given submitting a form with an unknown action in IM settings.
 #. TRANS: Message given submitting a form with an unknown action in SMS settings.

-#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:265 actions/avatarsettings.php:281

 #: actions/designadminpanel.php:104 actions/editapplication.php:139
 #: actions/designadminpanel.php:104 actions/editapplication.php:139

-#: actions/emailsettings.php:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121

 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
 #: actions/smssettings.php:277 lib/designsettings.php:304
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 

-#: actions/apioauthauthorize.php:259
+#: actions/apioauthauthorize.php:291

 msgid "An application would like to connect to your account"
 msgid "An application would like to connect to your account"

-msgstr "一个应用想连接到您的账号"
+msgstr "一个应用想连接到你的账号"

 
 

-#: actions/apioauthauthorize.php:276
+#: actions/apioauthauthorize.php:308

 msgid "Allow or deny access"
 msgstr "允许或阻止访问"
 
 msgid "Allow or deny access"
 msgstr "允许或阻止访问"
 

-#: actions/apioauthauthorize.php:292
+#: actions/apioauthauthorize.php:324

 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "
 #, php-format
 msgid ""
 "The application <strong>%1$s</strong> by <strong>%2$s</strong> would like "


@@ -596,14 +611,14 @@ msgid ""
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 "来自<strong>%2$s</strong>的<strong>%1$s</strong>应用希望能够<strong>%3$s</"
 "give access to your %4$s account to third parties you trust."
 msgstr ""
 "来自<strong>%2$s</strong>的<strong>%1$s</strong>应用希望能够<strong>%3$s</"

-"strong>您的%4$s账户数据。您应该只允许您信任的第三方程序访问您的%4$s账户。"
+"strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"

 
 #. TRANS: Main menu option when logged in for access to user settings
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: actions/apioauthauthorize.php:310 lib/action.php:450
+#: actions/apioauthauthorize.php:342 lib/action.php:490

 msgid "Account"
 msgstr "帐号"
 
 msgid "Account"
 msgstr "帐号"
 

-#: actions/apioauthauthorize.php:313 actions/login.php:252
+#: actions/apioauthauthorize.php:345 actions/login.php:252

 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: actions/profilesettings.php:106 actions/register.php:431
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152


@@ -612,22 +627,46 @@ msgid "Nickname"
 msgstr "昵称"
 
 #. TRANS: Link description in user account settings menu.
 msgstr "昵称"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:348 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120

 msgid "Password"
 msgstr "密码"
 
 msgid "Password"
 msgstr "密码"
 

-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "阻止"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php:360 lib/applicationeditform.php:353
+msgid "Cancel"
+msgstr "取消"

 
 

-#: actions/apioauthauthorize.php:334
+#: actions/apioauthauthorize.php:366

 msgid "Allow"
 msgstr "允许"
 
 msgid "Allow"
 msgstr "允许"
 

-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
-msgstr "允许或阻止对您账户信息的访问。"
+#: actions/apioauthauthorize.php:383
+#, fuzzy
+msgid "Authorize access to your account information."
+msgstr "允许或阻止对你账户信息的访问。"
+
+#: actions/apioauthauthorize.php:433
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM 确认已取消。"
+
+#: actions/apioauthauthorize.php:435
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "%s的 request token 被拒绝并被取消。"
+
+#: actions/apioauthauthorize.php:453
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "你没有被授权。"
+
+#: actions/apioauthauthorize.php:458
+#, php-format
+msgid ""
+"Please return to %s and enter the following security code to complete the "
+"process."
+msgstr ""

 
 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."
 
 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."


@@ -635,20 +674,20 @@ msgstr "此方法接受POST或DELETE请求。"
 
 #: actions/apistatusesdestroy.php:135
 msgid "You may not delete another user's status."
 
 #: actions/apistatusesdestroy.php:135
 msgid "You may not delete another user's status."

-msgstr "您不能删除其他用户的状态。"
+msgstr "你不能删除其他用户的消息。"

 
 

-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
+#: actions/deletenotice.php:58 actions/shownotice.php:92

 msgid "No such notice."
 msgstr "没有这条消息。"
 
 #. TRANS: Error text shown when trying to repeat an own notice.
 msgid "No such notice."
 msgstr "没有这条消息。"
 
 #. TRANS: Error text shown when trying to repeat an own notice.

-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:535

 msgid "Cannot repeat your own notice."
 msgid "Cannot repeat your own notice."

-msgstr "不能转发您自己的消息。"
+msgstr "不能转发你自己的消息。"

 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:541

 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 
 msgid "Already repeated that notice."
 msgstr "已转发了该消息。"
 


@@ -660,48 +699,48 @@ msgstr "消息已删除。"
 msgid "No status with that ID found."
 msgstr "没有找到此 ID 的消息。"
 
 msgid "No status with that ID found."
 msgstr "没有找到此 ID 的消息。"
 

-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222

 msgid "Client must provide a 'status' parameter with a value."
 msgid "Client must provide a 'status' parameter with a value."

-msgstr "客户端必须提供一个“状态”参数与数值。"
+msgstr "客户端必须提供一个包含内容的“状态”参数。"

 
 

-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157

 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "太长了。最长的消息长度是%d个字符。"
 
 #: lib/mailhandler.php:60
 #, php-format
 msgid "That's too long. Max notice size is %d chars."
 msgstr "太长了。最长的消息长度是%d个字符。"
 

-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96

 msgid "Not found."
 msgstr "未找到。"
 
 msgid "Not found."
 msgstr "未找到。"
 

-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181

 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "每条消息最长%d字符，包括附件的链接 URL。"
 
 #, php-format
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "每条消息最长%d字符，包括附件的链接 URL。"
 

-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263

 msgid "Unsupported format."
 msgstr "不支持的格式。"
 
 #: actions/apitimelinefavorites.php:110
 #, php-format
 msgid "%1$s / Favorites from %2$s"
 msgid "Unsupported format."
 msgstr "不支持的格式。"
 
 #: actions/apitimelinefavorites.php:110
 #, php-format
 msgid "%1$s / Favorites from %2$s"

-msgstr "%1$s 的 %2$s 状态"
+msgstr "%1$s / 来自 %2$s 的收藏"

 
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."
 
 #: actions/apitimelinefavorites.php:119
 #, php-format
 msgid "%1$s updates favorited by %2$s / %2$s."

-msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
+msgstr "%1$s 条消息被 %2$s 收藏 / %2$s"

 
 #: actions/apitimelinementions.php:118
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"
 
 #: actions/apitimelinementions.php:118
 #, php-format
 msgid "%1$s / Updates mentioning %2$s"

-msgstr "%1$s 的 %2$s 状态"
+msgstr "%1$s / 条消息提到了 %2$s"

 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."
 
 #: actions/apitimelinementions.php:131
 #, php-format
 msgid "%1$s updates that reply to updates from %2$s / %3$s."

-msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
+msgstr " %1$s 条消息回复给来自 %2$s 的消息 / %3$s。"

 
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
 #, php-format
 
 #: actions/apitimelinepublic.php:197 actions/publicrss.php:103
 #, php-format


@@ -731,7 +770,7 @@ msgstr "带 %s 标签的消息"
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"
 #: actions/apitimelinetag.php:107 actions/tagrss.php:65
 #, php-format
 msgid "Updates tagged with %1$s on %2$s!"

-msgstr ""
+msgstr "%2$s 上有 %1$s 标签的消息！"

 
 #: actions/apitrends.php:87
 msgid "API method under construction."
 
 #: actions/apitrends.php:87
 msgid "API method under construction."


@@ -758,14 +797,14 @@ msgstr "大小不正确。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230
 
 #. TRANS: Link description in user account settings menu.
 #: actions/avatarsettings.php:67 actions/showgroup.php:230

-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:113

 msgid "Avatar"
 msgstr "头像"
 
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."
 msgid "Avatar"
 msgstr "头像"
 
 #: actions/avatarsettings.php:78
 #, php-format
 msgid "You can upload your personal avatar. The maximum file size is %s."

-msgstr "您可以上传您的个人头像。文件大小限制在%s以下。"
+msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"

 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191
 
 #: actions/avatarsettings.php:106 actions/avatarsettings.php:185
 #: actions/grouplogo.php:181 actions/remotesubscribe.php:191


@@ -781,7 +820,7 @@ msgstr "头像设置"
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"
 #: actions/avatarsettings.php:127 actions/avatarsettings.php:205
 #: actions/grouplogo.php:202 actions/grouplogo.php:262
 msgid "Original"

-msgstr "原始的"
+msgstr "原始"

 
 #: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:213 actions/grouplogo.php:274
 
 #: actions/avatarsettings.php:142 actions/avatarsettings.php:217
 #: actions/grouplogo.php:213 actions/grouplogo.php:274


@@ -789,7 +828,8 @@ msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252
 msgstr "预览"
 
 #: actions/avatarsettings.php:149 actions/showapplication.php:252

-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667

 msgid "Delete"
 msgstr "删除"
 
 msgid "Delete"
 msgstr "删除"
 


@@ -803,11 +843,11 @@ msgstr "剪裁"
 
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."
 
 #: actions/avatarsettings.php:305
 msgid "No file uploaded."

-msgstr "上传文件未成功。"
+msgstr "没有文件被上传。"

 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"
 
 #: actions/avatarsettings.php:332
 msgid "Pick a square area of the image to be your avatar"

-msgstr "请选择一块方形区域作为您的头像"
+msgstr "请选择一块方形区域作为你的头像"

 
 #: actions/avatarsettings.php:347 actions/grouplogo.php:380
 msgid "Lost our file data."
 
 #: actions/avatarsettings.php:347 actions/grouplogo.php:380
 msgid "Lost our file data."


@@ -827,11 +867,11 @@ msgstr "头像已删除。"
 
 #: actions/block.php:69
 msgid "You already blocked that user."
 
 #: actions/block.php:69
 msgid "You already blocked that user."

-msgstr "您已经屏蔽该用户。"
+msgstr "你已经屏蔽该用户。"

 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"
 
 #: actions/block.php:107 actions/block.php:136 actions/groupblock.php:158
 msgid "Block user"

-msgstr "屏蔽用户失败。"
+msgstr "屏蔽用户。"

 
 #: actions/block.php:138
 msgid ""
 
 #: actions/block.php:138
 msgid ""


@@ -839,17 +879,18 @@ msgid ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""
 "unsubscribed from you, unable to subscribe to you in the future, and you "
 "will not be notified of any @-replies from them."
 msgstr ""

-"您确定要屏蔽这个用户吗？屏蔽后，会取消这个用户对您的关注，并且以后也无法关注"
-"您，您也不会收到任何来自这个用户的@回复提醒。"
+"你确定要屏蔽这个用户吗？屏蔽后，会取消这个用户对你的关注，将来也无法再关注"
+"你，你也不会收到任何来自这个用户的@回复提醒。"

 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:153 actions/deleteapplication.php:154
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:153 actions/deleteapplication.php:154

-#: actions/deletenotice.php:147 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:211 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178

 msgctxt "BUTTON"
 msgid "No"
 msgstr "否"
 msgctxt "BUTTON"
 msgid "No"
 msgstr "否"


@@ -862,18 +903,20 @@ msgstr "不要屏蔽这个用户"
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.
 
 #. TRANS: Button label on the user block form.
 #. TRANS: Button label on the delete application form.

+#. TRANS: Button label on the delete group form.

 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:160 actions/deleteapplication.php:161
 #. TRANS: Button label on the delete notice form.
 #. TRANS: Button label on the delete user form.
 #. TRANS: Button label on the form to block a user from a group.
 #: actions/block.php:160 actions/deleteapplication.php:161

-#: actions/deletenotice.php:154 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:218 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185

 msgctxt "BUTTON"
 msgid "Yes"
 msgctxt "BUTTON"
 msgid "Yes"

-msgstr "确定"
+msgstr "是"

 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 lib/blockform.php:79

 msgid "Block this user"
 msgstr "屏蔽这个用户"
 
 msgid "Block this user"
 msgstr "屏蔽这个用户"
 


@@ -884,6 +927,7 @@ msgstr "保存屏蔽信息失败。"
 #. 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.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
 #. 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.
 #: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87

+#: actions/deletegroup.php:87 actions/deletegroup.php:98

 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
 #: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
 #: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
 #: actions/groupdesignsettings.php:100 actions/grouplogo.php:102


@@ -892,8 +936,8 @@ msgstr "保存屏蔽信息失败。"
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86
 #: actions/groupunblock.php:86 actions/joingroup.php:82
 #: actions/joingroup.php:93 actions/leavegroup.php:82
 #: actions/leavegroup.php:93 actions/makeadmin.php:86

-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: lib/command.php:380

 msgid "No such group."
 msgstr "没有这个组。"
 
 msgid "No such group."
 msgstr "没有这个组。"
 


@@ -915,11 +959,13 @@ msgstr "被屏蔽加入此小组的用户列表。"
 msgid "Unblock user from group"
 msgstr "取消小组对用户的屏蔽。"
 
 msgid "Unblock user from group"
 msgstr "取消小组对用户的屏蔽。"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70

 msgid "Unblock"
 msgstr "取消屏蔽"
 
 msgid "Unblock"
 msgstr "取消屏蔽"
 

-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82

 msgid "Unblock this user"
 msgstr "取消屏蔽这个用户。"
 
 msgid "Unblock this user"
 msgstr "取消屏蔽这个用户。"
 


@@ -931,7 +977,7 @@ msgstr "发布到 %s"
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."
 
 #: actions/confirmaddress.php:75
 msgid "No confirmation code."

-msgstr "没有验证码"
+msgstr "没有确认码"

 
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."
 
 #: actions/confirmaddress.php:80
 msgid "Confirmation code not found."


@@ -939,7 +985,7 @@ msgstr "未找到确认码。"
 
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"
 
 #: actions/confirmaddress.php:85
 msgid "That confirmation code is not for you!"

-msgstr "此确认码不是您的！"
+msgstr "此确认码不是你的！"

 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91
 
 #. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
 #: actions/confirmaddress.php:91


@@ -950,7 +996,7 @@ msgstr "不可识别的地址类型%s。"
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."
 #. TRANS: Client error for an already confirmed email/jabbel/sms address.
 #: actions/confirmaddress.php:96
 msgid "That address has already been confirmed."

-msgstr "此地址已被确认。"
+msgstr "此地址已被确认过了。"

 
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 
 #. TRANS: Server error thrown on database error updating e-mail preferences.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.


@@ -958,9 +1004,9 @@ msgstr "此地址已被确认。"
 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.
 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error updating SMS preferences.
 #. TRANS: Server error thrown on database error removing a registered SMS phone number.

-#: actions/confirmaddress.php:116 actions/emailsettings.php:327
-#: actions/emailsettings.php:473 actions/imsettings.php:280
-#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174

 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 #: actions/profilesettings.php:283 actions/smssettings.php:308
 #: actions/smssettings.php:464
 msgid "Couldn't update user."


@@ -968,7 +1014,7 @@ msgstr "无法更新用户。"
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
 
 #. TRANS: Server error thrown on database error canceling e-mail address confirmation.
 #. TRANS: Server error thrown on database error canceling SMS phone number confirmation.

-#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/confirmaddress.php:128 actions/emailsettings.php:437

 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 #: actions/smssettings.php:422
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电子邮件确认。"


@@ -980,7 +1026,7 @@ msgstr "确认地址"
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 #: actions/confirmaddress.php:161
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."

-msgstr "地址 \"%s\" 已确认。"
+msgstr "你账户的地址 \"%s\" 已被确认。"

 
 #: actions/conversation.php:99
 msgid "Conversation"
 
 #: actions/conversation.php:99
 msgid "Conversation"


@@ -993,7 +1039,7 @@ msgstr "消息"
 
 #: actions/deleteapplication.php:63
 msgid "You must be logged in to delete an application."
 
 #: actions/deleteapplication.php:63
 msgid "You must be logged in to delete an application."

-msgstr "您必须登录才能删除应用。"
+msgstr "你必须登录后才能删除应用。"

 
 #: actions/deleteapplication.php:71
 msgid "Application not found."
 
 #: actions/deleteapplication.php:71
 msgid "Application not found."


@@ -1002,13 +1048,14 @@ msgstr "未找到应用。"
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 #: actions/deleteapplication.php:78 actions/editapplication.php:77
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."

-msgstr "您不是该应用的拥有者。"
+msgstr "你不是该应用的拥有者。"

 
 

+#. TRANS: Client error text when there is a problem with the session token.

 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118
 #: actions/deleteapplication.php:102 actions/editapplication.php:127
 #: actions/newapplication.php:110 actions/showapplication.php:118

-#: lib/action.php:1263
+#: lib/action.php:1353

 msgid "There was a problem with your session token."
 msgid "There was a problem with your session token."

-msgstr "您的 session token 出现了问题。"
+msgstr "你的 session token 出现了问题。"

 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
 msgid "Delete application"
 
 #: actions/deleteapplication.php:123 actions/deleteapplication.php:147
 msgid "Delete application"


@@ -1020,7 +1067,7 @@ msgid ""
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""
 "about the application from the database, including all existing user "
 "connections."
 msgstr ""

-"您确定要删除这个应用吗？这将从数据库中清除有关这个应用的所有数据，包括所有的"
+"你确定要删除这个应用吗？这将从数据库中清除有关这个应用的所有数据，包括所有的"

 "用户关联。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.
 "用户关联。"
 
 #. TRANS: Submit button title for 'No' when deleting an application.


@@ -1033,52 +1080,103 @@ msgstr "不删除该应用"
 msgid "Delete this application"
 msgstr "删除这个应用"
 
 msgid "Delete this application"
 msgstr "删除这个应用"
 

+#: actions/deletegroup.php:65
+#, fuzzy
+msgid "You must be logged in to delete a group."
+msgstr "你必须登录才能离开小组。"
+
+#: actions/deletegroup.php:93 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "没有昵称或 ID。"
+
+#: actions/deletegroup.php:104
+#, fuzzy
+msgid "You are not allowed to delete this group."
+msgstr "你不是该小组成员。"
+
+#: actions/deletegroup.php:146
+#, fuzzy, php-format
+msgid "Could not delete group %2$s."
+msgstr "无法更新小组"
+
+#: actions/deletegroup.php:153
+#, fuzzy, php-format
+msgid "Deleted group %2$s"
+msgstr "%1$s离开了%2$s小组。"
+
+#: actions/deletegroup.php:169 actions/deletegroup.php:194
+#, fuzzy
+msgid "Delete group"
+msgstr "删除用户"
+
+#: actions/deletegroup.php:197
+#, fuzzy
+msgid ""
+"Are you sure you want to delete this group? This will clear all data about "
+"the group from the database, without a backup. Public posts to this group "
+"will still appear in individual timelines."
+msgstr ""
+"你确定要删除这个用户吗？这将从数据库中清除有关这个用户的所有数据，没有备份。"
+
+#. TRANS: Submit button title for 'No' when deleting a group.
+#: actions/deletegroup.php:215
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "不要删除这个消息"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:222
+#, fuzzy
+msgid "Delete this group"
+msgstr "删除这个用户"
+

 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.

-#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62

 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
 #: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
 #: actions/tagother.php:33 actions/unsubscribe.php:52

-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64

 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "未登录。"
 
 #: lib/settingsaction.php:72
 msgid "Not logged in."
 msgstr "未登录。"
 

-#: actions/deletenotice.php:71
+#: actions/deletenotice.php:74

 msgid "Can't delete this notice."
 msgstr "无法删除这条消息。"
 
 msgid "Can't delete this notice."
 msgstr "无法删除这条消息。"
 

-#: actions/deletenotice.php:103
+#: actions/deletenotice.php:106

 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."

-msgstr "您即将永久删除一条消息。这样做是无法恢复的。"
+msgstr "你即将永久删除一条消息，此操作无法撤销。"

 
 

-#: actions/deletenotice.php:109 actions/deletenotice.php:141
+#: actions/deletenotice.php:112 actions/deletenotice.php:144

 msgid "Delete notice"
 msgstr "删除消息"
 
 msgid "Delete notice"
 msgstr "删除消息"
 

-#: actions/deletenotice.php:144
+#: actions/deletenotice.php:147

 msgid "Are you sure you want to delete this notice?"
 msgid "Are you sure you want to delete this notice?"

-msgstr "确定要删除这条消息吗？"
+msgstr "你确定要删除这条消息吗？"

 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

-#: actions/deletenotice.php:151
+#: actions/deletenotice.php:154

 msgid "Do not delete this notice"
 msgstr "不要删除这个消息"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.
 msgid "Do not delete this notice"
 msgstr "不要删除这个消息"
 
 #. TRANS: Submit button title for 'Yes' when deleting a notice.

-#: actions/deletenotice.php:158 lib/noticelist.php:657
+#: actions/deletenotice.php:161 lib/noticelist.php:667

 msgid "Delete this notice"
 msgid "Delete this notice"

-msgstr "删除这个消息"
+msgstr "删除"

 
 #: actions/deleteuser.php:67
 msgid "You cannot delete users."
 
 #: actions/deleteuser.php:67
 msgid "You cannot delete users."

-msgstr "您不能删除用户。"
+msgstr "你不能删除用户。"

 
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."
 
 #: actions/deleteuser.php:74
 msgid "You can only delete local users."

-msgstr "您只能删除本地用户。"
+msgstr "你只能删除本地用户。"

 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"
 
 #: actions/deleteuser.php:110 actions/deleteuser.php:133
 msgid "Delete user"


@@ -1089,7 +1187,7 @@ msgid ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""
 "Are you sure you want to delete this user? This will clear all data about "
 "the user from the database, without a backup."
 msgstr ""

-"您确定要删除这个用户吗？这将从数据库中清除有关这个用户的所有数据，没有备份。"
+"你确定要删除这个用户吗？这将从数据库中清除有关这个用户的所有数据，没有备份。"

 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77
 
 #. TRANS: Submit button title for 'Yes' when deleting a user.
 #: actions/deleteuser.php:163 lib/deleteuserform.php:77


@@ -1098,140 +1196,150 @@ msgstr "删除这个用户"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.

-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134

 msgid "Design"
 msgid "Design"

-msgstr "设计"
+msgstr "外观"

 
 #: actions/designadminpanel.php:74
 
 #: actions/designadminpanel.php:74

-msgid "Design settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的设计设置"
+msgid "Design settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的外观设置"

 
 

-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:332

 msgid "Invalid logo URL."
 msgstr "无效的 logo URL。"
 
 msgid "Invalid logo URL."
 msgstr "无效的 logo URL。"
 

-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:337
+#, fuzzy
+msgid "Invalid SSL logo URL."
+msgstr "无效的 logo URL。"
+
+#: actions/designadminpanel.php:341

 #, php-format
 msgid "Theme not available: %s."
 msgstr "主题不可用：%s。"
 
 #, php-format
 msgid "Theme not available: %s."
 msgstr "主题不可用：%s。"
 

-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:445

 msgid "Change logo"
 msgstr "更换 logo"
 
 msgid "Change logo"
 msgstr "更换 logo"
 

-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:450

 msgid "Site logo"
 msgstr "网站 logo"
 
 msgid "Site logo"
 msgstr "网站 logo"
 

-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:454
+#, fuzzy
+msgid "SSL logo"
+msgstr "网站 logo"
+
+#: actions/designadminpanel.php:466

 msgid "Change theme"
 msgstr "更换主题"
 
 msgid "Change theme"
 msgstr "更换主题"
 

-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:483

 msgid "Site theme"
 msgstr "网站主题"
 
 msgid "Site theme"
 msgstr "网站主题"
 

-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:484

 msgid "Theme for the site."
 msgstr "这个网站的主题。"
 
 msgid "Theme for the site."
 msgstr "这个网站的主题。"
 

-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:490

 msgid "Custom theme"
 msgstr "自定义主题"
 
 msgid "Custom theme"
 msgstr "自定义主题"
 

-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:494

 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."

-msgstr "您可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
+msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"

 
 

-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:509 lib/designsettings.php:101

 msgid "Change background image"
 msgstr "更换背景图像"
 
 msgid "Change background image"
 msgstr "更换背景图像"
 

-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:514 actions/designadminpanel.php:597

 #: lib/designsettings.php:178
 msgid "Background"
 msgstr "背景"
 
 #: lib/designsettings.php:178
 msgid "Background"
 msgstr "背景"
 

-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:519

 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."
 #, php-format
 msgid ""
 "You can upload a background image for the site. The maximum file size is %1"
 "$s."

-msgstr "您可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
+msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"

 
 #. TRANS: Used as radio button label to add a background image.
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139

 msgid "On"
 msgstr "打开"
 
 #. TRANS: Used as radio button label to not add a background image.
 msgid "On"
 msgstr "打开"
 
 #. TRANS: Used as radio button label to not add a background image.

-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155

 msgid "Off"
 msgstr "关闭"
 
 msgid "Off"
 msgstr "关闭"
 

-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:568 lib/designsettings.php:156

 msgid "Turn background image on or off."
 msgstr "打开或关闭背景图片"
 
 msgid "Turn background image on or off."
 msgstr "打开或关闭背景图片"
 

-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:573 lib/designsettings.php:161

 msgid "Tile background image"
 msgstr "平铺背景图片"
 
 msgid "Tile background image"
 msgstr "平铺背景图片"
 

-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170

 msgid "Change colours"
 msgstr "改变颜色"
 
 msgid "Change colours"
 msgstr "改变颜色"
 

-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:610 lib/designsettings.php:191

 msgid "Content"
 msgstr "内容"
 
 msgid "Content"
 msgstr "内容"
 

-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:623 lib/designsettings.php:204

 msgid "Sidebar"
 msgstr "边栏"
 
 msgid "Sidebar"
 msgstr "边栏"
 

-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:636 lib/designsettings.php:217

 msgid "Text"
 msgid "Text"

-msgstr "æ¶\88æ\81¯"
+msgstr "æ\96\87å­\97"

 
 

-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:649 lib/designsettings.php:230

 msgid "Links"
 msgstr "链接"
 
 msgid "Links"
 msgstr "链接"
 

-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:674

 msgid "Advanced"
 msgstr "高级"
 
 msgid "Advanced"
 msgstr "高级"
 

-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:678

 msgid "Custom CSS"
 msgstr "自定义CSS"
 
 msgid "Custom CSS"
 msgstr "自定义CSS"
 

-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:699 lib/designsettings.php:247

 msgid "Use defaults"
 msgstr "使用默认值"
 
 msgid "Use defaults"
 msgstr "使用默认值"
 

-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:700 lib/designsettings.php:248

 msgid "Restore default designs"
 msgid "Restore default designs"

-msgstr "恢复默认设计"
+msgstr "恢复默认外观"

 
 

-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:706 lib/designsettings.php:254

 msgid "Reset back to default"
 msgstr "重置到默认"
 
 msgid "Reset back to default"
 msgstr "重置到默认"
 

-#. TRANS: Submit button title
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202

 msgid "Save"
 msgstr "保存"
 
 msgid "Save"
 msgstr "保存"
 

-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:709 lib/designsettings.php:257

 msgid "Save design"
 msgid "Save design"

-msgstr "保存设计"
+msgstr "保存外观"

 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"
 
 #: actions/disfavor.php:81
 msgid "This notice is not a favorite!"


@@ -1252,7 +1360,7 @@ msgstr "编辑应用"
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."

-msgstr "您必须登录后才能编辑应用。"
+msgstr "你必须登录后才能编辑应用。"

 
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87
 
 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
 #: actions/showapplication.php:87


@@ -1261,7 +1369,7 @@ msgstr "没有这个应用。"
 
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."
 
 #: actions/editapplication.php:161
 msgid "Use this form to edit your application."

-msgstr "通过此表单来编辑您的应用。"
+msgstr "通过此表单来编辑你的应用。"

 
 #: actions/editapplication.php:177 actions/newapplication.php:159
 msgid "Name is required."
 
 #: actions/editapplication.php:177 actions/newapplication.php:159
 msgid "Name is required."


@@ -1277,7 +1385,7 @@ msgstr "名字已被使用，换一个吧。"
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."
 
 #: actions/editapplication.php:186 actions/newapplication.php:168
 msgid "Description is required."

-msgstr "必须有一个描述。"
+msgstr "必须填写描述。"

 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."
 
 #: actions/editapplication.php:194
 msgid "Source URL is too long."


@@ -1307,7 +1415,7 @@ msgstr "调回地址（callback）过长。"
 msgid "Callback URL is not valid."
 msgstr "调回地址（Callback URL）无效。"
 
 msgid "Callback URL is not valid."
 msgstr "调回地址（Callback URL）无效。"
 

-#: actions/editapplication.php:258
+#: actions/editapplication.php:261

 msgid "Could not update application."
 msgstr "无法更新应用。"
 
 msgid "Could not update application."
 msgstr "无法更新应用。"
 


@@ -1318,7 +1426,7 @@ msgstr "编辑 %s 小组"
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 
 #: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."

-msgstr "您必须登录才能创建小组。"
+msgstr "你必须登录才能创建小组。"

 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
 
 #: actions/editgroup.php:107 actions/editgroup.php:172
 #: actions/groupdesignsettings.php:107 actions/grouplogo.php:109


@@ -1337,14 +1445,14 @@ msgstr "描述过长(不能超过%d个字符)。"
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""
 #: actions/editgroup.php:228 actions/newgroup.php:168
 #, php-format
 msgid "Invalid alias: \"%s\""

-msgstr "无效的昵称：“%s”。"
+msgstr "无效的别名：“%s”。"

 
 #: actions/editgroup.php:258
 msgid "Could not update group."
 
 #: actions/editgroup.php:258
 msgid "Could not update group."

-msgstr "无法更新组"
+msgstr "无法更新小组"

 
 #. TRANS: Server exception thrown when creating group aliases failed.
 
 #. TRANS: Server exception thrown when creating group aliases failed.

-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:264 classes/User_group.php:513

 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 
 msgid "Could not create aliases."
 msgstr "无法创建别名。"
 


@@ -1362,25 +1470,25 @@ msgstr "Email 设置"
 #: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."
 #: actions/emailsettings.php:76
 #, php-format
 msgid "Manage how you get email from %%site.name%%."

-msgstr "设置 %%site.name%% 发送的邮件。"
+msgstr "设置你如何接受来自 %%site.name%% 的邮件。"

 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 #: actions/emailsettings.php:106 actions/emailsettings.php:132
 msgid "Email address"
 
 #. TRANS: Form legend for e-mail settings form.
 #. TRANS: Field label for e-mail address input in e-mail settings form.
 #: actions/emailsettings.php:106 actions/emailsettings.php:132
 msgid "Email address"

-msgstr "电子邮件地址"
+msgstr "电邮地址"

 
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."
 
 #. TRANS: Form note in e-mail settings form.
 #: actions/emailsettings.php:112
 msgid "Current confirmed email address."

-msgstr "å·²确认的电子邮件。"
+msgstr "å½\93å\89\8d确认的电子邮件。"

 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
 
 #. TRANS: Button label to remove a confirmed e-mail address.
 #. TRANS: Button label for removing a set sender e-mail address to post notices from.
 #. TRANS: Button label to remove a confirmed IM address.
 #. TRANS: Button label to remove a confirmed SMS address.
 #. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.

-#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/emailsettings.php:115 actions/emailsettings.php:162

 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"
 #: actions/imsettings.php:116 actions/smssettings.php:124
 #: actions/smssettings.php:180
 msgctxt "BUTTON"


@@ -1392,28 +1500,32 @@ msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgstr ""

-"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
-"指示。"
+"正等待确认此邮件。请查看你的收件箱(和垃圾箱)是否收到了邮件，里面包含了更多的"
+"说明。"

 
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 
 #. TRANS: Button label to cancel an e-mail address confirmation procedure.
 #. TRANS: Button label to cancel an IM address confirmation procedure.
 #. TRANS: Button label to cancel a SMS address confirmation procedure.

-#. TRANS: Button label
+#. TRANS: Button label in the "Edit application" form.

 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #: actions/emailsettings.php:127 actions/imsettings.php:131

-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:351

 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "取消"
 
 msgctxt "BUTTON"
 msgid "Cancel"
 msgstr "取消"
 

-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139

 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件，类似 \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件，类似 \"UserName@example.org\""
 
 #. TRANS: Button label for adding an e-mail address in e-mail settings form.
 #. TRANS: Button label for adding an IM address in IM settings form.
 #. TRANS: Button label for adding a SMS phone number in SMS settings form.

-#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/emailsettings.php:143 actions/imsettings.php:151

 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"
 #: actions/smssettings.php:162
 msgctxt "BUTTON"
 msgid "Add"


@@ -1421,164 +1533,164 @@ msgstr "添加"
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.
 
 #. TRANS: Form legend for incoming e-mail settings form.
 #. TRANS: Form legend for incoming SMS settings form.

-#: actions/emailsettings.php:147 actions/smssettings.php:171
+#: actions/emailsettings.php:151 actions/smssettings.php:171

 msgid "Incoming email"
 msgstr "接收用 email"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
 msgid "Incoming email"
 msgstr "接收用 email"
 
 #. TRANS: Form instructions for incoming e-mail form in e-mail settings.
 #. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.

-#: actions/emailsettings.php:155 actions/smssettings.php:178
+#: actions/emailsettings.php:159 actions/smssettings.php:178

 msgid "Send email to this address to post new notices."
 msgid "Send email to this address to post new notices."

-msgstr "向这个 email 地址发邮件来发布新的消息。"
+msgstr "通过发送电子邮件到这个地址来发布新的消息。"

 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.
 
 #. TRANS: Instructions for incoming e-mail address input form.
 #. TRANS: Instructions for incoming SMS e-mail address input form.

-#: actions/emailsettings.php:164 actions/smssettings.php:186
+#: actions/emailsettings.php:168 actions/smssettings.php:186

 msgid "Make a new email address for posting to; cancels the old one."
 msgid "Make a new email address for posting to; cancels the old one."

-msgstr "生成新的电子邮件地址用于发布信息；取消旧的。"
+msgstr "生成新的电子邮件地址用于发布消息；取消旧的。"

 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.
 
 #. TRANS: Button label for adding an e-mail address to send notices from.
 #. TRANS: Button label for adding an SMS e-mail address to send notices from.

-#: actions/emailsettings.php:168 actions/smssettings.php:189
+#: actions/emailsettings.php:172 actions/smssettings.php:189

 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.
 msgctxt "BUTTON"
 msgid "New"
 msgstr "新增"
 
 #. TRANS: Form legend for e-mail preferences form.

-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178

 msgid "Email preferences"
 msgstr "Email 偏好"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Email preferences"
 msgstr "Email 偏好"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184

 msgid "Send me notices of new subscriptions through email."
 msgstr "将新的关注通过电子邮件发送给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me notices of new subscriptions through email."
 msgstr "将新的关注通过电子邮件发送给我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190

 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "有人收藏我的消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "有人收藏我的消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197

 msgid "Send me email when someone sends me a private message."
 msgstr "有人给我发送私信时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me a private message."
 msgstr "有人给我发送私信时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203

 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "有人给我发送 @ 消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Send me email when someone sends me an \"@-reply\"."
 msgstr "有人给我发送 @ 消息时，发邮件通知我。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209

 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫我并给我发送邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫我并给我发送邮件。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216

 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #. TRANS: Checkbox label in e-mail preferences form.
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #. TRANS: Checkbox label in e-mail preferences form.

-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223

 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 #. TRANS: Confirmation message for successful e-mail preferences save.

-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338

 msgid "Email preferences saved."
 msgstr "Email 偏好已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.
 msgid "Email preferences saved."
 msgstr "Email 偏好已保存。"
 
 #. TRANS: Message given saving e-mail address without having provided one.

-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357

 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 #. TRANS: Message given saving e-mail address that cannot be normalised.

-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365

 msgid "Cannot normalize that email address"
 msgstr "无法识别此电子邮件"
 
 #. TRANS: Message given saving e-mail address that not valid.
 msgid "Cannot normalize that email address"
 msgstr "无法识别此电子邮件"
 
 #. TRANS: Message given saving e-mail address that not valid.

-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208

 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set.
 #: actions/siteadminpanel.php:144
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 #. TRANS: Message given saving e-mail address that is already set.

-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374

 msgid "That is already your email address."
 msgid "That is already your email address."

-msgstr "您已登记此电子邮件。"
+msgstr "你已登记此电子邮件。"

 
 #. TRANS: Message given saving e-mail address that is already set for another user.
 
 #. TRANS: Message given saving e-mail address that is already set for another user.

-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378

 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 #. TRANS: Server error thrown on database error adding e-mail confirmation code.
 #. TRANS: Server error thrown on database error adding IM confirmation code.
 #. TRANS: Server error thrown on database error adding SMS confirmation code.

-#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/emailsettings.php:395 actions/imsettings.php:351

 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."
 #: actions/smssettings.php:373
 msgid "Couldn't insert confirmation code."

-msgstr "无法插入验证码。"
+msgstr "无法插入确认码。"

 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.
 
 #. TRANS: Message given saving valid e-mail address that is to be confirmed.

-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402

 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""
 msgid ""
 "A confirmation code was sent to the email address you added. Check your "
 "inbox (and spam box!) for the code and instructions on how to use it."
 msgstr ""

-"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
-"使用它。"
+"确认码已被发送到你新增的电子邮件地址。请检查收件箱(和垃圾箱)，找到确认码和使"
+"用说明。"

 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.
 
 #. TRANS: Message given canceling e-mail address confirmation that is not pending.
 #. TRANS: Message given canceling IM address confirmation that is not pending.
 #. TRANS: Message given canceling SMS phone number confirmation that is not pending.

-#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/emailsettings.php:423 actions/imsettings.php:386

 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
 #: actions/smssettings.php:408
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.

-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428

 msgid "That is the wrong email address."
 msgstr "这是错误的电子邮件地址。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.
 msgid "That is the wrong email address."
 msgstr "这是错误的电子邮件地址。"
 
 #. TRANS: Message given after successfully canceling e-mail address confirmation.

-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442

 msgid "Email confirmation cancelled."
 msgid "Email confirmation cancelled."

-msgstr "Email 验证已取消。"
+msgstr "Email 确认已取消。"

 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.
 
 #. TRANS: Message given trying to remove an e-mail address that is not
 #. TRANS: registered for the active user.

-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462

 msgid "That is not your email address."
 msgid "That is not your email address."

-msgstr "这是他人的电子邮件。"
+msgstr "这个不是你的电子邮件地址。"

 
 #. TRANS: Message given after successfully removing a registered e-mail address.
 
 #. TRANS: Message given after successfully removing a registered e-mail address.

-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483

 msgid "The email address was removed."
 msgid "The email address was removed."

-msgstr "email 地址已移除。"
+msgstr "电子邮件地址已被删除。"

 
 

-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568

 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 #. TRANS: Server error thrown on database error removing incoming e-mail address.
 #. TRANS: Server error thrown on database error adding incoming e-mail address.

-#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/emailsettings.php:508 actions/emailsettings.php:532

 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.
 #: actions/smssettings.php:578 actions/smssettings.php:602
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
 #. TRANS: Message given after successfully removing an incoming e-mail address.

-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581

 msgid "Incoming email address removed."
 msgid "Incoming email address removed."

-msgstr "发布用的电子邮件被移除。"
+msgstr "发布用的电子邮件被删除。"

 
 #. TRANS: Message given after successfully adding an incoming e-mail address.
 
 #. TRANS: Message given after successfully adding an incoming e-mail address.

-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605

 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 


@@ -1586,23 +1698,23 @@ msgstr "已添加新的发布用的电子邮件地址。"
 msgid "This notice is already a favorite!"
 msgstr "已收藏过此消息！"
 
 msgid "This notice is already a favorite!"
 msgstr "已收藏过此消息！"
 

-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144

 msgid "Disfavor favorite"
 msgstr "取消收藏"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"
 msgid "Disfavor favorite"
 msgstr "取消收藏"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:91
 #: lib/publicgroupnav.php:93
 msgid "Popular notices"

-msgstr "æ\94¶è\97\8fæ\9c\80å¤\9a的消息"
+msgstr "æ\9c\80æ\96°è¢«æ\94¶è\97\8f的消息"

 
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"
 
 #: actions/favorited.php:67
 #, php-format
 msgid "Popular notices, page %d"

-msgstr "æ\94¶è\97\8fæ\9c\80å¤\9a的消息，第%d页"
+msgstr "æ\9c\80æ\96°è¢«æ\94¶è\97\8f的消息，第%d页"

 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."
 
 #: actions/favorited.php:79
 msgid "The most popular notices on the site right now."

-msgstr "目前网站上被收藏最多的消息。"
+msgstr "目前网站上最新被收藏的消息。"

 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."
 
 #: actions/favorited.php:150
 msgid "Favorite notices appear on this page but no one has favorited one yet."


@@ -1630,7 +1742,7 @@ msgstr "%s收藏的消息"
 #: actions/favoritesrss.php:115
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"
 #: actions/favoritesrss.php:115
 #, php-format
 msgid "Updates favored by %1$s on %2$s!"

-msgstr ""
+msgstr "%2$s 上被 %1$s 收藏的消息！"

 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89
 
 #: actions/featured.php:69 lib/featureduserssection.php:87
 #: lib/publicgroupnav.php:89


@@ -1673,15 +1785,15 @@ msgstr "要查看的用户不存在。"
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 
 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"

-msgstr "您可以使用本地关注！"
+msgstr "你可以使用本地关注！"

 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."
 
 #: actions/finishremotesubscribe.php:99
 msgid "That user has blocked you from subscribing."

-msgstr "该用户屏蔽了您对他/她的关注。"
+msgstr "该用户屏蔽了你，无法关注。"

 
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."
 
 #: actions/finishremotesubscribe.php:110
 msgid "You are not authorized."

-msgstr "您没有被授权。"
+msgstr "你没有被授权。"

 
 #: actions/finishremotesubscribe.php:113
 msgid "Could not convert request token to access token."
 
 #: actions/finishremotesubscribe.php:113
 msgid "Could not convert request token to access token."


@@ -1689,9 +1801,9 @@ msgstr "无法将 request token 转换为 access token。"
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."
 
 #: actions/finishremotesubscribe.php:118
 msgid "Remote service uses unknown version of OMB protocol."

-msgstr "远程服务使用了位置版本的 OMB 协议。"
+msgstr "远程服务使用了未知版本的 OMB 协议。"

 
 

-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317

 msgid "Error updating remote profile."
 msgstr "更新远程的个人信息时出错。"
 
 msgid "Error updating remote profile."
 msgstr "更新远程的个人信息时出错。"
 


@@ -1709,11 +1821,11 @@ msgstr "无效的权限。"
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."
 
 #: actions/grantrole.php:66 actions/revokerole.php:66
 msgid "This role is reserved and cannot be set."

-msgstr "此角色是保留的且不能被设置。"
+msgstr "此权限是保留的且不能被设置。"

 
 #: actions/grantrole.php:75
 msgid "You cannot grant user roles on this site."
 
 #: actions/grantrole.php:75
 msgid "You cannot grant user roles on this site."

-msgstr "您不能在这个网站授予用户权限。"
+msgstr "你不能在这个网站授予用户权限。"

 
 #: actions/grantrole.php:82
 msgid "User already has this role."
 
 #: actions/grantrole.php:82
 msgid "User already has this role."


@@ -1723,13 +1835,13 @@ msgstr "用户已有此权限。"
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
 msgid "No profile specified."
 #: actions/makeadmin.php:71 actions/subedit.php:46
 #: lib/profileformaction.php:79
 msgid "No profile specified."

-msgstr "没有指定的消息。"
+msgstr "没有指定的用户。"

 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."
 
 #: actions/groupblock.php:76 actions/groupunblock.php:76
 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
 #: actions/unsubscribe.php:84 lib/profileformaction.php:86
 msgid "No profile with that ID."

-msgstr "没æ\9c\89æ\89¾å\88°æ­¤IDç\9a\84个人信æ\81¯。"
+msgstr "æ­¤ ID 没æ\9c\89ç\94¨æ\88·。"

 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81
 
 #: actions/groupblock.php:81 actions/groupunblock.php:81
 #: actions/makeadmin.php:81


@@ -1748,7 +1860,7 @@ msgstr "用户已经被小组屏蔽。"
 msgid "User is not a member of group."
 msgstr "用户不是小组成员。"
 
 msgid "User is not a member of group."
 msgstr "用户不是小组成员。"
 

-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364

 msgid "Block user from group"
 msgstr "从小组中屏蔽用户"
 
 msgid "Block user from group"
 msgstr "从小组中屏蔽用户"
 


@@ -1759,7 +1871,7 @@ msgid ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""
 "will be removed from the group, unable to post, and unable to subscribe to "
 "the group in the future."
 msgstr ""

-"您确定要在“%2$s”小组中屏蔽用户“%1$s”么？他们将被从小组中删除，并且不能在小组"
+"你确定要在“%2$s”小组中屏蔽用户“%1$s”么？他们将被从小组中删除，并且不能在小组"

 "内发布消息或关注该小组。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.
 "内发布消息或关注该小组。"
 
 #. TRANS: Submit button title for 'No' when blocking a user from a group.


@@ -1782,26 +1894,26 @@ msgstr "没有 ID。"
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."
 
 #: actions/groupdesignsettings.php:68
 msgid "You must be logged in to edit a group."

-msgstr "您必须登录才能创建小组。"
+msgstr "你必须登录才能创建小组。"

 
 #: actions/groupdesignsettings.php:144
 msgid "Group design"
 
 #: actions/groupdesignsettings.php:144
 msgid "Group design"

-msgstr "小组页面设计。"
+msgstr "小组页面外观。"

 
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."
 
 #: actions/groupdesignsettings.php:155
 msgid ""
 "Customize the way your group looks with a background image and a colour "
 "palette of your choice."

-msgstr "通过背景图片和颜色板来自定义您的小组的外观。"
+msgstr "通过背景图片和颜色板来自定义你的小组的外观。"

 
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."
 
 #: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
 #: lib/designsettings.php:391 lib/designsettings.php:413
 msgid "Couldn't update your design."

-msgstr "无法更新你的设计。"
+msgstr "无法更新你的外观。"

 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 msgid "Design preferences saved."
 
 #: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
 msgid "Design preferences saved."

-msgstr "设计偏好已保存。"
+msgstr "外观偏好已保存。"

 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"
 
 #: actions/grouplogo.php:142 actions/grouplogo.php:195
 msgid "Group logo"


@@ -1811,7 +1923,7 @@ msgstr "小组logo"
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."
 #, php-format
 msgid ""
 "You can upload a logo image for your group. The maximum file size is %s."

-msgstr "您可以给您的小组上传一个 logo。文件最大限制为%s。"
+msgstr "你可以给你的小组上传一个 logo。文件最大限制为%s。"

 
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."
 
 #: actions/grouplogo.php:365
 msgid "Pick a square area of the image to be the logo."


@@ -1825,45 +1937,61 @@ msgstr "logo已更新。"
 msgid "Failed updating logo."
 msgstr "更新 logo 失败。"
 
 msgid "Failed updating logo."
 msgstr "更新 logo 失败。"
 

-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102

 #, php-format
 msgid "%s group members"
 #, php-format
 msgid "%s group members"

-msgstr "%s 小组成员"
+msgstr "%s 的小组成员"

 
 

-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107

 #, php-format
 msgid "%1$s group members, page %2$d"
 #, php-format
 msgid "%1$s group members, page %2$d"

-msgstr "%s 小组成员，第%2$d页"
+msgstr "%s 的小组成员，第%2$d页"

 
 

-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122

 msgid "A list of the users in this group."
 msgid "A list of the users in this group."

-msgstr "该ç»\84æ\88\90å\91\98å\88\97表ã\80\82"
+msgstr "该å°\8fç»\84ç\9a\84æ\88\90å\91\98å\88\97表ã\80\82"

 
 

-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186

 msgid "Admin"
 msgid "Admin"

-msgstr "管理员"
+msgstr "管理"

 
 

-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"

 msgid "Block"
 msgstr "屏蔽"
 
 msgid "Block"
 msgstr "屏蔽"
 

-#: actions/groupmembers.php:487
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr "屏蔽这个用户"
+
+#: actions/groupmembers.php:498

 msgid "Make user an admin of the group"
 msgstr "使用户成为小组的管理员"
 
 msgid "Make user an admin of the group"
 msgstr "使用户成为小组的管理员"
 

-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"

 msgid "Make Admin"
 msgstr "设置管理员"
 
 msgid "Make Admin"
 msgstr "设置管理员"
 

-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"

 msgid "Make this user an admin"
 msgid "Make this user an admin"

-msgstr "使这个用户成为管理员"
+msgstr "将这个用户设为管理员"

 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
 
 #. TRANS: Message is used as link title. %s is a user nickname.
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94

-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68

 #, php-format
 msgid "%s timeline"
 msgstr "%s的时间线"
 #, php-format
 msgid "%s timeline"
 msgstr "%s的时间线"


@@ -1872,7 +2000,7 @@ msgstr "%s的时间线"
 #: actions/grouprss.php:142
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"
 #: actions/grouprss.php:142
 #, php-format
 msgid "Updates from members of %1$s on %2$s!"

-msgstr "%2$s上%1$s的更新！"
+msgstr "在%2$s上%1$s小组组员的更新！"

 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
 
 #: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
 #: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98


@@ -1882,7 +2010,7 @@ msgstr "小组"
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"
 #: actions/groups.php:64
 #, php-format
 msgid "Groups, page %d"

-msgstr "个小组，第 %d 页"
+msgstr "小组，第 %d 页"

 
 #: actions/groups.php:90
 #, php-format
 
 #: actions/groups.php:90
 #, php-format


@@ -1893,7 +2021,7 @@ msgid ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""
 "for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
 "%%%%)"
 msgstr ""

-"%%%%site.name%%%%的小组可以让您找到有相同兴趣的朋友一起交流。当您加入到一个小"
+"%%%%site.name%%%%的小组可以让你找到有相同兴趣的朋友一起交流。当你加入到一个小"

 "组后可以可以通过使用“!小组名称”发布消息给所有其他的小组成员。找不到感兴趣的小"
 "组？试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
 "action.newgroup%%%%)！"
 "组后可以可以通过使用“!小组名称”发布消息给所有其他的小组成员。找不到感兴趣的小"
 "组？试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
 "action.newgroup%%%%)！"


@@ -1962,7 +2090,7 @@ msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 "doc.im%%). Configure your address and settings below."
 msgstr ""

-"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它"
+"你可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它"

 "们。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
 "们。"
 
 #. TRANS: Message given in the IM settings if XMPP is not enabled on the site.


@@ -1988,109 +2116,112 @@ msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 msgstr ""

-"正在等待验证这个地址。请查阅您的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
-"（您添加 %s 为您的好友了吗？）"
+"正在等待验证这个地址。请查阅你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
+"（你添加 %s 为到你的好友了吗？）"

 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.
 
 #. TRANS: IM address input field instructions in IM settings form.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143

 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 "Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 "add %s to your buddy list in your IM client or on GTalk."
 msgstr ""
 "Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"

-"或GTalk中将 %s 加为好友。"
+"或 GTalk 中将 %s 加为好友。"

 
 #. TRANS: Form legend for IM preferences form.
 
 #. TRANS: Form legend for IM preferences form.

-#: actions/imsettings.php:155
+#: actions/imsettings.php:158

 msgid "IM preferences"
 msgstr "IM 首选项已保存。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "IM preferences"
 msgstr "IM 首选项已保存。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:160
+#: actions/imsettings.php:163

 msgid "Send me notices through Jabber/GTalk."
 msgid "Send me notices through Jabber/GTalk."

-msgstr "通过Jabber/GTalk发送通告。"
+msgstr "通过 Jabber/GTalk 发送通告。"

 
 #. TRANS: Checkbox label in IM preferences form.
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:166
+#: actions/imsettings.php:169

 msgid "Post a notice when my Jabber/GTalk status changes."
 msgid "Post a notice when my Jabber/GTalk status changes."

-msgstr "当我的Jabber/GTalk状态改变时自动发布消息。"
+msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"

 
 #. TRANS: Checkbox label in IM preferences form.
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:172
+#: actions/imsettings.php:175

 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
 
 #. TRANS: Checkbox label in IM preferences form.
 msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
 msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
 
 #. TRANS: Checkbox label in IM preferences form.

-#: actions/imsettings.php:179
+#: actions/imsettings.php:182

 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgid "Publish a MicroID for my Jabber/GTalk address."

-msgstr "公开Jabber/GTalk帐号的 MicroID。"
+msgstr "公开 Jabber/GTalk 帐号的 MicroID。"

 
 #. TRANS: Confirmation message for successful IM preferences save.
 
 #. TRANS: Confirmation message for successful IM preferences save.

-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180

 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #. TRANS: Message given saving IM address without having provided one.
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #. TRANS: Message given saving IM address without having provided one.

-#: actions/imsettings.php:309
+#: actions/imsettings.php:312

 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.
 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #. TRANS: Message given saving IM address that cannot be normalised.

-#: actions/imsettings.php:317
+#: actions/imsettings.php:320

 msgid "Cannot normalize that Jabber ID"
 msgid "Cannot normalize that Jabber ID"

-msgstr "无法识别此Jabber ID"
+msgstr "无法识别此 Jabber ID"

 
 #. TRANS: Message given saving IM address that not valid.
 
 #. TRANS: Message given saving IM address that not valid.

-#: actions/imsettings.php:322
+#: actions/imsettings.php:325

 msgid "Not a valid Jabber ID"
 msgstr "不是有效的 Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.
 msgid "Not a valid Jabber ID"
 msgstr "不是有效的 Jabber ID"
 
 #. TRANS: Message given saving IM address that is already set.

-#: actions/imsettings.php:326
+#: actions/imsettings.php:329

 msgid "That is already your Jabber ID."
 msgid "That is already your Jabber ID."

-msgstr "您已登记此Jabber帐号。"
+msgstr "这个已经是你的 Jabber 帐号了。"

 
 #. TRANS: Message given saving IM address that is already set for another user.
 
 #. TRANS: Message given saving IM address that is already set for another user.

-#: actions/imsettings.php:330
+#: actions/imsettings.php:333

 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #. TRANS: Message given saving valid IM address that is to be confirmed.
 #. TRANS: %s is the IM address set for the site.

-#: actions/imsettings.php:358
+#: actions/imsettings.php:361

 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 "s for sending messages to you."

-msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
+msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"

 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.
 
 #. TRANS: Message given canceling IM address confirmation for the wrong IM address.

-#: actions/imsettings.php:388
+#: actions/imsettings.php:391

 msgid "That is the wrong IM address."
 msgid "That is the wrong IM address."

-msgstr "即时通讯帐号错误。"
+msgstr "IM 地址错误。"

 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.
 
 #. TRANS: Server error thrown on database error canceling IM address confirmation.

-#: actions/imsettings.php:397
+#: actions/imsettings.php:400

 msgid "Couldn't delete IM confirmation."
 msgstr "无法删除 IM 确认。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.
 msgid "Couldn't delete IM confirmation."
 msgstr "无法删除 IM 确认。"
 
 #. TRANS: Message given after successfully canceling IM address confirmation.

-#: actions/imsettings.php:402
+#: actions/imsettings.php:405

 msgid "IM confirmation cancelled."
 msgid "IM confirmation cancelled."

-msgstr "IM 验证已取消。"
+msgstr "IM 确认已取消。"

 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.
 
 #. TRANS: Message given trying to remove an IM address that is not
 #. TRANS: registered for the active user.

-#: actions/imsettings.php:424
+#: actions/imsettings.php:427

 msgid "That is not your Jabber ID."
 msgid "That is not your Jabber ID."

-msgstr "这不是您的Jabber帐号。"
+msgstr "这不是你的 Jabber ID。"

 
 #. TRANS: Message given after successfully removing a registered IM address.
 
 #. TRANS: Message given after successfully removing a registered IM address.

-#: actions/imsettings.php:447
+#: actions/imsettings.php:450

 msgid "The IM address was removed."
 msgid "The IM address was removed."

-msgstr "IM 地址已移除。"
+msgstr "IM 地址已删除。"

 
 #: actions/inbox.php:59
 #, php-format
 
 #: actions/inbox.php:59
 #, php-format


@@ -2104,7 +2235,7 @@ msgstr "%s 的收件箱"
 
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."
 
 #: actions/inbox.php:115
 msgid "This is your inbox, which lists your incoming private messages."

-msgstr "这是您的收件箱，包含发给您的私人消息。"
+msgstr "这是你的收件箱，包含发给你的私信。"

 
 #: actions/invite.php:39
 msgid "Invites have been disabled."
 
 #: actions/invite.php:39
 msgid "Invites have been disabled."


@@ -2113,12 +2244,12 @@ msgstr "邀请已被禁用。"
 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 #: actions/invite.php:41
 #, php-format
 msgid "You must be logged in to invite other users to use %s."

-msgstr "您必须登录才能邀请他人使用%s。"
+msgstr "你必须登录才能邀请他人使用%s。"

 
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 
 #: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"

-msgstr "电子邮件地址 %s 不正确"
+msgstr "无效的电子邮件地址：%s"

 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"
 
 #: actions/invite.php:110
 msgid "Invitation(s) sent"


@@ -2130,11 +2261,11 @@ msgstr "邀请新用户"
 
 #: actions/invite.php:128
 msgid "You are already subscribed to these users:"
 
 #: actions/invite.php:128
 msgid "You are already subscribed to these users:"

-msgstr "您已关注了这些用户："
+msgstr "你已经关注了这些用户："

 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
 
 #. TRANS: Whois output.
 #. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.

-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426

 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"


@@ -2142,7 +2273,7 @@ msgstr "%1$s (%2$s)"
 #: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 #: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"

-msgstr "这些好友已注册，您已自动关注了这些用户："
+msgstr "这些好友已注册，你已自动关注了这些用户："

 
 #: actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 
 #: actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"


@@ -2152,7 +2283,7 @@ msgstr "已发送邀请给这些人："
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"

-msgstr "如果其他人接受邀请并注册，您将得到通知。谢谢您推动了社区发展壮大！"
+msgstr "如果其他人接受邀请并注册，你将得到通知。谢谢你推动了社区发展壮大！"

 
 #: actions/invite.php:162
 msgid ""
 
 #: actions/invite.php:162
 msgid ""


@@ -2161,7 +2292,7 @@ msgstr "使用这个表单来邀请好友和同事加入。"
 
 #: actions/invite.php:187
 msgid "Email addresses"
 
 #: actions/invite.php:187
 msgid "Email addresses"

-msgstr "电子邮件地址"
+msgstr "电邮地址"

 
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 
 #: actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"


@@ -2185,7 +2316,7 @@ msgstr "发布"
 #: actions/invite.php:228
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 #: actions/invite.php:228
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"

-msgstr "%1$s 邀请您加入 %2$s"
+msgstr "%1$s 邀请你加入 %2$s"

 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231
 
 #. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
 #: actions/invite.php:231


@@ -2218,36 +2349,32 @@ msgid ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""
 "\n"
 "Sincerely, %2$s\n"
 msgstr ""

-"%1$s 邀请您加入 %2$s (%3$s)。\n"
+"%1$s 邀请你加入 %2$s (%3$s)。\n"

 "\n"
 "\n"

-"%2$s 是一个能让您和您认识的或感兴趣的人保持联系的微博客服务。 \n"
+"%2$s 是一个能让你和你认识的或感兴趣的人保持联系的微博客服务。 \n"

 "\n"
 "\n"

-"您可以和您认识的人分享您的近况、想法或者您的网络生活。您也可以结交有共同兴趣"
+"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣"

 "的新朋友。\n"
 "\n"
 "%1$s 说：\n"
 "\n"
 "%4$s\n"
 "\n"
 "的新朋友。\n"
 "\n"
 "%1$s 说：\n"
 "\n"
 "%4$s\n"
 "\n"

-"您可以在这里查阅%1$s在%2$s的资料页：\n"
+"你可以在这里查看%1$s在%2$s的资料页：\n"

 "\n"
 "%5$s\n"
 "\n"
 "\n"
 "%5$s\n"
 "\n"

-"如果您想试试这个服务，请点击下面的链接接受邀请。\n"
+"如果你想试试这个服务，请点击下面的链接接受邀请。\n"

 "\n"
 "%6$s\n"
 "\n"
 "\n"
 "%6$s\n"
 "\n"

-"如果您目前不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
+"如果你目前不愿意，请跳过这条信息。感谢你的耐心和时间。\n"

 "\n"
 "诚挚的感谢, %2$s\n"
 
 #: actions/joingroup.php:60
 msgid "You must be logged in to join a group."
 "\n"
 "诚挚的感谢, %2$s\n"
 
 #: actions/joingroup.php:60
 msgid "You must be logged in to join a group."

-msgstr "您必须登录才能加入小组。"
-
-#: actions/joingroup.php:88 actions/leavegroup.php:88
-msgid "No nickname or ID."
-msgstr "没有昵称或 ID。"
+msgstr "你必须登录才能加入小组。"

 
 #: actions/joingroup.php:141
 #, php-format
 
 #: actions/joingroup.php:141
 #, php-format


@@ -2256,18 +2383,122 @@ msgstr "%1$s加入了%2$s小组"
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."
 
 #: actions/leavegroup.php:60
 msgid "You must be logged in to leave a group."

-msgstr "您必须登录才能离开小组。"
+msgstr "你必须登录才能离开小组。"

 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

-#: actions/leavegroup.php:100 lib/command.php:389
+#: actions/leavegroup.php:100 lib/command.php:386

 msgid "You are not a member of that group."
 msgid "You are not a member of that group."

-msgstr "您不是该群小组成员。"
+msgstr "你不是该群小组成员。"

 
 #: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s离开了%2$s小组。"
 
 
 #: actions/leavegroup.php:137
 #, php-format
 msgid "%1$s left group %2$s"
 msgstr "%1$s离开了%2$s小组。"
 

+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr "许可协议"
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr "这个 StatusNet 网站的许可协议"
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr "无效的许可协议选择。"
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr "当使用版权所有的许可协议时，你必须指定内容的所有者。"
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr "无效的许可协议标题。最大长度255个字符。"
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr "无效的许可协议 URL。"
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr "无效的许可协议图片 URL。"
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr "许可协议 URL 必须是个有效的 URL 或者为空。"
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr "许可协议图片 URL 必须是个有效的 URL 或者为空。"
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr "许可协议选择"
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "私有"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr "版权所有"
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr "创作共用"
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr "类型"
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr "选择许可协议"
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr "许可协议细节"
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr "所有者"
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "这个网站内容的所有者姓名（如果适用）。"
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr "许可协议标题"
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr "许可协议的标题。"
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr "许可协议 URL"
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr "更多许可协议信息的 URL。"
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr "许可协议图片 URL。"
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr "与许可协议一起出现的图片 URL。"
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr "保存许可协议设置"
+

 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "已登录。"
 #: actions/login.php:102 actions/otp.php:62 actions/register.php:144
 msgid "Already logged in."
 msgstr "已登录。"


@@ -2278,7 +2509,7 @@ msgstr "用户名或密码不正确。"
 
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."
 
 #: actions/login.php:154 actions/otp.php:120
 msgid "Error setting user. You are probably not authorized."

-msgstr "设置用户时出错。您可能没有被认证。"
+msgstr "设置用户时出错。你可能没有被认证。"

 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"
 
 #: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
 msgid "Login"


@@ -2308,13 +2539,13 @@ msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
 #: actions/login.php:292
 msgid "Login with your username and password."
 
 #: actions/login.php:292
 msgid "Login with your username and password."

-msgstr "用用户名和密码登录。"
+msgstr "使用用户名和密码登录。"

 
 #: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."
 
 #: actions/login.php:295
 #, php-format
 msgid ""
 "Don't have a username yet? [Register](%%action.register%%) a new account."

-msgstr "没有è´¦æ\88·ï¼\9f[注å\86\8c](%%action.register%%) ä¸\80个æ\96°å¸\90å\8f·ã\80\82"
+msgstr "没有å¸\90å\8f·ï¼\9f[注å\86\8c](%%action.register%%) ä¸\80个æ\96°å¸\90å\8f·ã\80\82"

 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."
 
 #: actions/makeadmin.php:92
 msgid "Only an admin can make another user an admin."


@@ -2337,7 +2568,7 @@ msgstr "无法让%1$s成为%2$s小组的管理员。"
 
 #: actions/microsummary.php:69
 msgid "No current status."
 
 #: actions/microsummary.php:69
 msgid "No current status."

-msgstr "没有当前状态。"
+msgstr "没有当前消息。"

 
 #: actions/newapplication.php:52
 msgid "New Application"
 
 #: actions/newapplication.php:52
 msgid "New Application"


@@ -2372,23 +2603,28 @@ msgid "New message"
 msgstr "新消息"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
 msgstr "新消息"
 
 #. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).

-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499

 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #. TRANS: Command exception text shown when trying to send a direct message to another user without content.
 #. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.

-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
+#: lib/command.php:579

 msgid "No content!"
 msgstr "没有内容！"
 
 msgid "No content!"
 msgstr "没有内容！"
 

+#: actions/newmessage.php:150
+#, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "太长了。最长的信息长度是%d个字符。"
+

 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.
 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #. TRANS: Error text shown when trying to send a direct message to self.

-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:164 lib/command.php:503

 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息；跟自己悄悄说就得了。"


@@ -2399,12 +2635,12 @@ msgstr "消息已发送"
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.
 
 #. TRANS: Message given have sent a direct message to another user.
 #. TRANS: %s is the name of the other user.

-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:185 lib/command.php:511

 #, php-format
 msgid "Direct message to %s sent."
 msgstr "向%s发送私信成功。"
 
 #, php-format
 msgid "Direct message to %s sent."
 msgstr "向%s发送私信成功。"
 

-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261

 msgid "Ajax Error"
 msgstr "Ajax错误"
 
 msgid "Ajax Error"
 msgstr "Ajax错误"
 


@@ -2477,7 +2713,7 @@ msgstr "呼叫已发出！"
 
 #: actions/oauthappssettings.php:59
 msgid "You must be logged in to list your applications."
 
 #: actions/oauthappssettings.php:59
 msgid "You must be logged in to list your applications."

-msgstr "必须登录才能查看您的程序列表。"
+msgstr "必须登录才能查看你的应用列表。"

 
 #: actions/oauthappssettings.php:74
 msgid "OAuth applications"
 
 #: actions/oauthappssettings.php:74
 msgid "OAuth applications"


@@ -2485,24 +2721,24 @@ msgstr "OAuth 应用"
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"
 
 #: actions/oauthappssettings.php:85
 msgid "Applications you have registered"

-msgstr "您已经登记的程序。"
+msgstr "你已经登记的程序。"

 
 #: actions/oauthappssettings.php:135
 #, php-format
 msgid "You have not registered any applications yet."
 
 #: actions/oauthappssettings.php:135
 #, php-format
 msgid "You have not registered any applications yet."

-msgstr "您还没登记任何程序。"
+msgstr "你还没登记任何程序。"

 
 #: actions/oauthconnectionssettings.php:72
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #: actions/oauthconnectionssettings.php:83
 
 #: actions/oauthconnectionssettings.php:72
 msgid "Connected applications"
 msgstr "关联的应用"
 
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access you account."
-msgstr "æ\82¨å·²å\85\81许以ä¸\8bç¨\8båº\8f访é\97®ä½ ç\9a\84è´¦æ\88·ã\80\82"
+msgid "You have allowed the following applications to access your account."
+msgstr "ä½ å·²å\85\81许以ä¸\8bç¨\8båº\8f访é\97®ä½ ç\9a\84å¸\90å\8f·ã\80\82"

 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."
 
 #: actions/oauthconnectionssettings.php:175
 msgid "You are not a user of that application."

-msgstr "您不是那个应用的用户。"
+msgstr "你不是那个应用的用户。"

 
 #: actions/oauthconnectionssettings.php:186
 #, php-format
 
 #: actions/oauthconnectionssettings.php:186
 #, php-format


@@ -2511,7 +2747,7 @@ msgstr "不能取消%s程序的访问。"
 
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."
 
 #: actions/oauthconnectionssettings.php:198
 msgid "You have not authorized any applications to use your account."

-msgstr "您还没允许任何程序使用您的账户。"
+msgstr "你还没允许任何程序使用你的账户。"

 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "
 
 #: actions/oauthconnectionssettings.php:211
 msgid "Developers can edit the registration settings for their applications "


@@ -2521,16 +2757,16 @@ msgstr "开发者可以修改他们程序的登记设置 "
 msgid "Notice has no profile."
 msgstr "消息没有对应用户。"
 
 msgid "Notice has no profile."
 msgstr "消息没有对应用户。"
 

-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176

 #, php-format
 msgid "%1$s's status on %2$s"
 #, php-format
 msgid "%1$s's status on %2$s"

-msgstr "%1$s 的 %2$s 状态"
+msgstr "%1$s在%2$s时发的消息"

 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
 #, php-format
 msgid "Content type %s not supported."
 
 #. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
 #: actions/oembed.php:159
 #, php-format
 msgid "Content type %s not supported."

-msgstr "%s文件类型不被支持。"
+msgstr "%s内容类型不被支持。"

 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163
 
 #. TRANS: Error message displaying attachments. %s is the site's base URL.
 #: actions/oembed.php:163


@@ -2539,8 +2775,8 @@ msgid "Only %s URLs over plain HTTP please."
 msgstr "请只用HTTP明文的%sURLs的地址。"
 
 #. TRANS: Client error on an API request with an unsupported data format.
 msgstr "请只用HTTP明文的%sURLs的地址。"
 
 #. TRANS: Client error on an API request with an unsupported data format.

-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1209
-#: lib/apiaction.php:1237 lib/apiaction.php:1360
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1356

 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 


@@ -2570,15 +2806,15 @@ msgstr "缩短 URL 使用"
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."
 
 #: actions/othersettings.php:117
 msgid "Automatic shortening service to use."

-msgstr "è¦\81使ç\94¨ç\9a\84è\87ªå\8a¨ç¼©ç\9f­服务。"
+msgstr "è¦\81使ç\94¨ç\9a\84è\87ªå\8a¨ç\9f­ç½\91å\9d\80服务。"

 
 #: actions/othersettings.php:122
 msgid "View profile designs"
 
 #: actions/othersettings.php:122
 msgid "View profile designs"

-msgstr "查看个人页面设计"
+msgstr "查看个人页面外观"

 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."
 
 #: actions/othersettings.php:123
 msgid "Show or hide profile designs."

-msgstr "显示或隐藏个人页面设计。"
+msgstr "显示或隐藏个人页面外观。"

 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."
 
 #: actions/othersettings.php:153
 msgid "URL shortening service is too long (max 50 chars)."


@@ -2586,23 +2822,23 @@ msgstr "短网址服务过长(不能超过50个字符)。"
 
 #: actions/otp.php:69
 msgid "No user ID specified."
 
 #: actions/otp.php:69
 msgid "No user ID specified."

-msgstr "æ­¤ID没æ\9c\89ç\9b¸åº\94ç\94¨æ\88·。"
+msgstr "没ç\94¨æ\8c\87å®\9aç\94¨æ\88· ID。"

 
 #: actions/otp.php:83
 msgid "No login token specified."
 
 #: actions/otp.php:83
 msgid "No login token specified."

-msgstr "æ\8c\87å®\9aç\9a\84ç\99»å½\95令ç\89\8cæ\97 æ\95\88。"
+msgstr "没æ\9c\89æ\8c\87å®\9aç\99»å½\95 token。"

 
 #: actions/otp.php:90
 msgid "No login token requested."
 
 #: actions/otp.php:90
 msgid "No login token requested."

-msgstr "没æ\9c\89请æ±\82ç\99»å½\95令ç\89\8c。"
+msgstr "没æ\9c\89请æ±\82ç\9a\84ç\99»å½\95 token。"

 
 #: actions/otp.php:95
 msgid "Invalid login token specified."
 
 #: actions/otp.php:95
 msgid "Invalid login token specified."

-msgstr "指定的登录令牌无效。"
+msgstr "指定的登录 token 无效。"

 
 #: actions/otp.php:104
 msgid "Login token expired."
 
 #: actions/otp.php:104
 msgid "Login token expired."

-msgstr "登录令牌已过期。"
+msgstr "登录 token 已过期。"

 
 #: actions/outbox.php:58
 #, php-format
 
 #: actions/outbox.php:58
 #, php-format


@@ -2616,7 +2852,7 @@ msgstr "%s 的发件箱"
 
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."
 
 #: actions/outbox.php:116
 msgid "This is your outbox, which lists private messages you have sent."

-msgstr "这是您的发件箱，包含您发送的私人消息。"
+msgstr "这是你的发件箱，包含你发送的私信。"

 
 #: actions/passwordsettings.php:58
 msgid "Change password"
 
 #: actions/passwordsettings.php:58
 msgid "Change password"


@@ -2624,7 +2860,7 @@ msgstr "修改密码"
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."
 
 #: actions/passwordsettings.php:69
 msgid "Change your password."

-msgstr "修改您的密码"
+msgstr "修改你的密码"

 
 #: actions/passwordsettings.php:96 actions/recoverpassword.php:231
 msgid "Password change"
 
 #: actions/passwordsettings.php:96 actions/recoverpassword.php:231
 msgid "Password change"


@@ -2649,7 +2885,7 @@ msgstr "密码确认"
 
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"
 
 #: actions/passwordsettings.php:113 actions/recoverpassword.php:240
 msgid "Same as password above"

-msgstr "相同的密码"
+msgstr "与上面相同的密码"

 
 #: actions/passwordsettings.php:117
 msgid "Change"
 
 #: actions/passwordsettings.php:117
 msgid "Change"


@@ -2669,7 +2905,7 @@ msgstr "旧密码不正确"
 
 #: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."
 
 #: actions/passwordsettings.php:181
 msgid "Error saving user; invalid."

-msgstr "保存用户时出错；不正确。"
+msgstr "保存用户时出错；无效。"

 
 #: actions/passwordsettings.php:186 actions/recoverpassword.php:381
 msgid "Can't save new password."
 
 #: actions/passwordsettings.php:186 actions/recoverpassword.php:381
 msgid "Can't save new password."


@@ -2680,155 +2916,174 @@ msgid "Password saved."
 msgstr "密码已保存。"
 
 #. TRANS: Menu item for site administration
 msgstr "密码已保存。"
 
 #. TRANS: Menu item for site administration

-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371

 msgid "Paths"
 msgstr "路径"
 
 #: actions/pathsadminpanel.php:70
 msgid "Paths"
 msgstr "路径"
 
 #: actions/pathsadminpanel.php:70

-msgid "Path and server settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的路径和服务器设置"
+msgid "Path and server settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的路径和服务器设置。"

 
 

-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158

 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "主题目录无法读取：%s。"
 
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "主题目录无法读取：%s。"
 

-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164

 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 

-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170

 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "背景目录无法写入：%s。"
 
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "背景目录无法写入：%s。"
 

-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178

 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "本地化目录无法读取：%s。"
 
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "本地化目录无法读取：%s。"
 

-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "无效的 SSL 服务器。最大长度255个字符。"
 
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "无效的 SSL 服务器。最大长度255个字符。"
 

-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58

 msgid "Site"
 msgstr "网站"
 
 msgid "Site"
 msgstr "网站"
 

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343

 msgid "Server"
 msgstr "服务器"
 
 msgid "Server"
 msgstr "服务器"
 

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239

 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 
 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 

-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347

 msgid "Path"
 msgstr "路径"
 
 msgid "Path"
 msgstr "路径"
 

-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243

 msgid "Site path"
 msgstr "网站路径"
 
 msgid "Site path"
 msgstr "网站路径"
 

-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "本地化文件路径"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "主题目录"

 
 

-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247

 msgid "Directory path to locales"
 msgstr "本地化文件的目录路径"
 
 msgid "Directory path to locales"
 msgstr "本地化文件的目录路径"
 

-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251

 msgid "Fancy URLs"
 msgstr "优化 URLs"
 
 msgid "Fancy URLs"
 msgstr "优化 URLs"
 

-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253

 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 

-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260

 msgid "Theme"
 msgstr "主题"
 
 msgid "Theme"
 msgstr "主题"
 

-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "主题服务器"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "这个网站的主题。"
+
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""
+
+#: actions/pathsadminpanel.php:273 actions/pathsadminpanel.php:322
+#: actions/pathsadminpanel.php:351 actions/pathsadminpanel.php:380
+msgid "SSL server"
+msgstr "SSL 服务器"
+
+#: actions/pathsadminpanel.php:273
+msgid "SSL server for themes (default: SSL server)"
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "主题路径"
+#: actions/pathsadminpanel.php:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "网站路径"

 
 

-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: actions/pathsadminpanel.php:277
+msgid "SSL path to themes (default: /theme/)"
+msgstr ""
+
+#: actions/pathsadminpanel.php:281 actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:359
+#, fuzzy
+msgid "Directory"

 msgstr "主题目录"
 
 msgstr "主题目录"
 

-#: actions/pathsadminpanel.php:279
+#: actions/pathsadminpanel.php:281
+#, fuzzy
+msgid "Directory where themes are located"
+msgstr "本地化文件的目录路径"
+
+#: actions/pathsadminpanel.php:288

 msgid "Avatars"
 msgstr "头像"
 
 msgid "Avatars"
 msgstr "头像"
 

-#: actions/pathsadminpanel.php:284
+#: actions/pathsadminpanel.php:293

 msgid "Avatar server"
 msgstr "头像服务器"
 
 msgid "Avatar server"
 msgstr "头像服务器"
 

-#: actions/pathsadminpanel.php:288
+#: actions/pathsadminpanel.php:297

 msgid "Avatar path"
 msgstr "头像路径"
 
 msgid "Avatar path"
 msgstr "头像路径"
 

-#: actions/pathsadminpanel.php:292
+#: actions/pathsadminpanel.php:301

 msgid "Avatar directory"
 msgstr "头像目录"
 
 msgid "Avatar directory"
 msgstr "头像目录"
 

-#: actions/pathsadminpanel.php:301
+#: actions/pathsadminpanel.php:310

 msgid "Backgrounds"
 msgstr "背景"
 
 msgid "Backgrounds"
 msgstr "背景"
 

-#: actions/pathsadminpanel.php:305
-msgid "Background server"
-msgstr "背景服务器"
-
-#: actions/pathsadminpanel.php:309
-msgid "Background path"
-msgstr "背景图路径"
-
-#: actions/pathsadminpanel.php:313
-msgid "Background directory"
-msgstr "背景图目录"
+#. TRANS: DT element label in attachment list.
+#: actions/pathsadminpanel.php:339 lib/attachmentlist.php:85
+msgid "Attachments"
+msgstr "附件"

 
 

-#: actions/pathsadminpanel.php:320
+#: actions/pathsadminpanel.php:366

 msgid "SSL"
 msgstr "SSL"
 
 msgid "SSL"
 msgstr "SSL"
 

-#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
+#: actions/pathsadminpanel.php:370 actions/snapshotadminpanel.php:202

 msgid "Never"
 msgstr "从不"
 
 msgid "Never"
 msgstr "从不"
 

-#: actions/pathsadminpanel.php:324
+#: actions/pathsadminpanel.php:371

 msgid "Sometimes"
 msgstr "有时"
 
 msgid "Sometimes"
 msgstr "有时"
 

-#: actions/pathsadminpanel.php:325
+#: actions/pathsadminpanel.php:372

 msgid "Always"
 msgstr "总是"
 
 msgid "Always"
 msgstr "总是"
 

-#: actions/pathsadminpanel.php:329
+#: actions/pathsadminpanel.php:374

 msgid "Use SSL"
 msgstr "使用 SSL"
 
 msgid "Use SSL"
 msgstr "使用 SSL"
 

-#: actions/pathsadminpanel.php:330
+#: actions/pathsadminpanel.php:375

 msgid "When to use SSL"
 msgid "When to use SSL"

-msgstr "使ç\94¨ SSL ç\9a\84æ\97¶æ\9cº"
+msgstr "ä»\80ä¹\88æ\97¶å\80\99使ç\94¨ SSL"

 
 

-#: actions/pathsadminpanel.php:335
-msgid "SSL server"
-msgstr "SSL 服务器"
-
-#: actions/pathsadminpanel.php:336
+#: actions/pathsadminpanel.php:381

 msgid "Server to direct SSL requests to"
 msgstr "直接SSL请求访问的服务器"
 
 msgid "Server to direct SSL requests to"
 msgstr "直接SSL请求访问的服务器"
 

-#: actions/pathsadminpanel.php:352
+#: actions/pathsadminpanel.php:397

 msgid "Save paths"
 msgstr "保存路径"
 
 msgid "Save paths"
 msgstr "保存路径"
 


@@ -2871,7 +3126,7 @@ msgstr "个人设置"
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 #: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."

-msgstr "在这里更新个人信息，让大家对您了解得更多。"
+msgstr "在这里更新个人信息，让大家对你了解得更多。"

 
 #: actions/profilesettings.php:99
 msgid "Profile information"
 
 #: actions/profilesettings.php:99
 msgid "Profile information"


@@ -2879,7 +3134,7 @@ msgstr "个人信息"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 
 #: actions/profilesettings.php:108 lib/groupeditform.php:154
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"

-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
+msgstr "1 到 64 个小写字母或数字，不包含标点或空格"

 
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104
 
 #: actions/profilesettings.php:111 actions/register.php:455
 #: actions/showgroup.php:256 actions/tagother.php:104


@@ -2889,22 +3144,22 @@ msgstr "全名"
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460
 
 #. TRANS: Form input field label.
 #: actions/profilesettings.php:115 actions/register.php:460

-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

 msgid "Homepage"
 msgstr "主页"
 
 #: actions/profilesettings.php:117 actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"
 msgid "Homepage"
 msgstr "主页"
 
 #: actions/profilesettings.php:117 actions/register.php:462
 msgid "URL of your homepage, blog, or profile on another site"

-msgstr "您的主页、博客或在其他网站的URL"
+msgstr "你的主页、博客或在其他网站的URL"

 
 #: actions/profilesettings.php:122 actions/register.php:468
 #, php-format
 msgid "Describe yourself and your interests in %d chars"
 
 #: actions/profilesettings.php:122 actions/register.php:468
 #, php-format
 msgid "Describe yourself and your interests in %d chars"

-msgstr "用不超过%d个字符描述您自己和您的爱好"
+msgstr "用不超过%d个字符描述你自己和你的兴趣"

 
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"
 
 #: actions/profilesettings.php:125 actions/register.php:471
 msgid "Describe yourself and your interests"

-msgstr "描述您自己和您的爱好"
+msgstr "描述你自己和你的兴趣"

 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"
 
 #: actions/profilesettings.php:127 actions/register.php:473
 msgid "Bio"


@@ -2919,7 +3174,7 @@ msgstr "位置"
 
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""
 
 #: actions/profilesettings.php:134 actions/register.php:480
 msgid "Where you are, like \"City, State (or Region), Country\""

-msgstr "您的地理位置，格式类似\"城市，省份，国家\""
+msgstr "你的地理位置，格式类似\"城市，省份，国家\""

 
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"
 
 #: actions/profilesettings.php:138
 msgid "Share my current location when posting notices"


@@ -2934,7 +3189,7 @@ msgstr "标签"
 #: actions/profilesettings.php:147
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 #: actions/profilesettings.php:147
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"

-msgstr "您的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
+msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"

 
 #: actions/profilesettings.php:151
 msgid "Language"
 
 #: actions/profilesettings.php:151
 msgid "Language"


@@ -2950,7 +3205,7 @@ msgstr "时区"
 
 #: actions/profilesettings.php:162
 msgid "What timezone are you normally in?"
 
 #: actions/profilesettings.php:162
 msgid "What timezone are you normally in?"

-msgstr "您一般处于哪个时区？"
+msgstr "你一般处于哪个时区？"

 
 #: actions/profilesettings.php:167
 msgid ""
 
 #: actions/profilesettings.php:167
 msgid ""


@@ -2992,7 +3247,7 @@ msgid "Couldn't save tags."
 msgstr "无法保存标签。"
 
 #. TRANS: Message after successful saving of administrative settings.
 msgstr "无法保存标签。"
 
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr "设置已保存。"
 
 msgid "Settings saved."
 msgstr "设置已保存。"
 


@@ -3097,7 +3352,7 @@ msgstr "标签云"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"
 
 #: actions/recoverpassword.php:36
 msgid "You are already logged in!"

-msgstr "您已经登录了！"
+msgstr "你已经登录了！"

 
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."
 
 #: actions/recoverpassword.php:62
 msgid "No such recovery code."


@@ -3127,11 +3382,11 @@ msgstr "无法更新已确认的电子邮件。"
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."
 msgid ""
 "If you have forgotten or lost your password, you can get a new one sent to "
 "the email address you have stored in your account."

-msgstr "如果您忘记或丢失了密码，您可以发送一个新的密码到您之前设置的邮箱中。"
+msgstr "如果你忘记或丢失了密码，你可以发送一个新的密码到你之前设置的邮箱中。"

 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "
 
 #: actions/recoverpassword.php:158
 msgid "You have been identified. Enter a new password below. "

-msgstr "您的身份已被验证，请在下面输入新的密码。 "
+msgstr "你的身份已被验证，请在下面输入新的密码。 "

 
 #: actions/recoverpassword.php:188
 msgid "Password recovery"
 
 #: actions/recoverpassword.php:188
 msgid "Password recovery"


@@ -3143,7 +3398,7 @@ msgstr "昵称或电子邮件"
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 
 #: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."

-msgstr "您在此服务器的昵称，或注册邮箱。"
+msgstr "你在此服务器的昵称，或登记的邮箱。"

 
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 
 #: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"


@@ -3193,7 +3448,7 @@ msgstr "保存地址确认时出错。"
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."

-msgstr "恢复密码的说明已被发送到您登记的电子邮箱中。"
+msgstr "恢复密码的说明已被发送到你登记的电子邮箱中。"

 
 #: actions/recoverpassword.php:357
 msgid "Unexpected password reset."
 
 #: actions/recoverpassword.php:357
 msgid "Unexpected password reset."


@@ -3213,7 +3468,7 @@ msgstr "保存用户设置时出错。"
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."
 
 #: actions/recoverpassword.php:395
 msgid "New password successfully saved. You are now logged in."

-msgstr "新密码已保存，您现在已登录。"
+msgstr "新密码已保存，你现在已登录。"

 
 #: actions/register.php:92 actions/register.php:196 actions/register.php:412
 msgid "Sorry, only invited people can register."
 
 #: actions/register.php:92 actions/register.php:196 actions/register.php:412
 msgid "Sorry, only invited people can register."


@@ -3237,7 +3492,7 @@ msgstr "不允许注册。"
 
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."
 
 #: actions/register.php:205
 msgid "You can't register if you don't agree to the license."

-msgstr "您必须同意许可协议才能注册。"
+msgstr "你必须同意许可协议才能注册。"

 
 #: actions/register.php:219
 msgid "Email address already exists."
 
 #: actions/register.php:219
 msgid "Email address already exists."


@@ -3252,7 +3507,7 @@ msgid ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""
 "With this form you can create a new account. You can then post notices and "
 "link up to friends and colleagues. "
 msgstr ""

-"您可以通过此表单建立一个新的账户。然后您就可以发布消息并与朋友和同事们保持联"
+"你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"

 "系。 "
 
 #: actions/register.php:432
 "系。 "
 
 #: actions/register.php:432


@@ -3269,7 +3524,7 @@ msgstr "与上面输入相同的密码。此项必填。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449

-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127

 msgid "Email"
 msgstr "电子邮件"
 
 msgid "Email"
 msgstr "电子邮件"
 


@@ -3309,8 +3564,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""

-"我的文字和文件在%s下提供，除了隐私内容：密码、电子邮件地址、IM 地址和电话号"
-"码。"
+"我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
+"号码。"

 
 #: actions/register.php:583
 #, php-format
 
 #: actions/register.php:583
 #, php-format


@@ -3330,23 +3585,23 @@ msgid ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
 "\n"
 "Thanks for signing up and we hope you enjoy using this service."
 msgstr ""

-"恭喜，%s！欢迎来到%%%%site.name%%%%。您可能想要……\n"
+"恭喜，%s！欢迎来到%%%%site.name%%%%。你可能想要……\n"

 "\n"
 "\n"

-"* 查看您的[资料页](%2$s) 并发布您的第一条消息.\n"
+"* 查看你的[资料页](%2$s) 并发布你的第一条消息.\n"

 "* 添加 [Jabber/GTalk 地址](%%%%action.imsettings%%%%) 然后通过 IM 发布信"
 "息。\n"
 "* 添加 [Jabber/GTalk 地址](%%%%action.imsettings%%%%) 然后通过 IM 发布信"
 "息。\n"

-"* [搜索](%%%%action.peoplesearch%%%%) 您认识的或和您有共同兴趣的朋友。 \n"
-"* 更新您的 [资料页设置](%%%%action.profilesettings%%%%) 告诉大家更多关于您的"
+"* [搜索](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的朋友。 \n"
+"* 更新你的 [资料页设置](%%%%action.profilesettings%%%%) 告诉大家更多关于你的"

 "情况。 \n"
 "情况。 \n"

-"* 阅读 [在线文档](%%%%doc.help%%%%) 有的功能也许您还不熟悉。\n"
+"* 阅读 [在线文档](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"

 "\n"
 "\n"

-"感谢您的注册，希望您喜欢这个服务。"
+"感谢你的注册，希望你喜欢这个服务。"

 
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 
 #: actions/register.php:607
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"

-msgstr "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
+msgstr "(你将收到一封邮件，包含了如何确认邮件地址的说明。)"

 
 #: actions/remotesubscribe.php:98
 #, php-format
 
 #: actions/remotesubscribe.php:98
 #, php-format


@@ -3355,9 +3610,9 @@ msgid ""
 "register%%) a new  account. If you already have an account  on a [compatible "
 "microblogging site](%%doc.openmublog%%),  enter your profile URL below."
 msgstr ""
 "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。"
+"要关注用户或小组，你需要[登录](%%action.login%%)，或[注册](%%action.register%"
+"%) 一个新账户。如果你已经在另一个[兼容的微博客](%%doc.openmublog%%)有账户，请"
+"填入你的资料页 URL。"

 
 #: actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 
 #: actions/remotesubscribe.php:112
 msgid "Remote subscribe"


@@ -3381,7 +3636,7 @@ msgstr "资料页 URL"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 
 #: actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"

-msgstr "您在其他兼容的微博客服务的资料页 URL"
+msgstr "你在其他兼容的微博客服务的资料页 URL"

 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406
 
 #: actions/remotesubscribe.php:137 lib/subscribeform.php:139
 #: lib/userprofile.php:406


@@ -3398,7 +3653,7 @@ msgstr "不是有效的资料页 URL (没有YADIS 文档或定义了无效的 XR
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."
 
 #: actions/remotesubscribe.php:176
 msgid "That’s a local profile! Login to subscribe."

-msgstr "这是一个本地用户！需要登录才能关注。"
+msgstr "这是一个本地用户！登录才能关注。"

 
 #: actions/remotesubscribe.php:183
 msgid "Couldn’t get a request token."
 
 #: actions/remotesubscribe.php:183
 msgid "Couldn’t get a request token."


@@ -3418,9 +3673,9 @@ msgstr "你不能重复自己的消息。"
 
 #: actions/repeat.php:90
 msgid "You already repeated that notice."
 
 #: actions/repeat.php:90
 msgid "You already repeated that notice."

-msgstr "您已转发过了那个消息。"
+msgstr "你已转发过了那个消息。"

 
 

-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:114 lib/noticelist.php:686

 msgid "Repeated"
 msgstr "已转发"
 
 msgid "Repeated"
 msgstr "已转发"
 


@@ -3432,7 +3687,7 @@ msgstr "已转发！"
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"
 #: lib/personalgroupnav.php:105
 #, php-format
 msgid "Replies to %s"

-msgstr "%s 的回复"
+msgstr "对 %s 的回复"

 
 #: actions/replies.php:128
 #, php-format
 
 #: actions/replies.php:128
 #, php-format


@@ -3467,7 +3722,7 @@ msgid ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""
 "You can engage other users in a conversation, subscribe to more people or "
 "[join groups](%%action.groups%%)."
 msgstr ""

-"您可以让其他用户参与对话，关注更多的人或者 [加入小组](%%action.groups%%)。"
+"你可以让其他用户参与对话，关注更多的人或者 [加入小组](%%action.groups%%)。"

 
 #: actions/replies.php:206
 #, php-format
 
 #: actions/replies.php:206
 #, php-format


@@ -3475,21 +3730,21 @@ msgid ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""
 "You can try to [nudge %1$s](../%2$s) or [post something to them](%%%%action."
 "newnotice%%%%?status_textarea=%3$s)."
 msgstr ""

-"您可以试着 [呼叫%1$s](../%2$s) 或者给他们 [发一些消息](%%%%action.newnotice%%"
+"你可以试着 [呼叫%1$s](../%2$s) 或者给他们 [发一些消息](%%%%action.newnotice%%"

 "%%?status_textarea=%3$s)。"
 
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"
 "%%?status_textarea=%3$s)。"
 
 #: actions/repliesrss.php:72
 #, php-format
 msgid "Replies to %1$s on %2$s!"

-msgstr "对%sç\9a\84å\9b\9eå¤\8dï¼\8c第%2$d页"
+msgstr "å\9c¨%2$sä¸\8a对%1$sç\9a\84å\9b\9eå¤\8d!"

 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."
 
 #: actions/revokerole.php:75
 msgid "You cannot revoke user roles on this site."

-msgstr "您不能在这个网站移除用户角色。"
+msgstr "你不能在这个网站移除用户角色。"

 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."
 
 #: actions/revokerole.php:82
 msgid "User doesn't have this role."

-msgstr "用户没有角色。"
+msgstr "用户没有此权限。"

 
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"
 
 #: actions/rsd.php:146 actions/version.php:159
 msgid "StatusNet"


@@ -3497,7 +3752,7 @@ msgstr "StatusNet"
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."
 
 #: actions/sandbox.php:65 actions/unsandbox.php:65
 msgid "You cannot sandbox users on this site."

-msgstr "您不能在这个网站授予用户角色。"
+msgstr "你不能在这个网站授予用户权限。"

 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."
 
 #: actions/sandbox.php:72
 msgid "User is already sandboxed."


@@ -3505,17 +3760,17 @@ msgstr "用于已经在沙盒中了。"
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
 
 #. TRANS: Menu item for site administration
 #: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170

-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379

 msgid "Sessions"
 msgid "Sessions"

-msgstr "会话"
+msgstr "Sessions"

 
 #: actions/sessionsadminpanel.php:65
 
 #: actions/sessionsadminpanel.php:65

-msgid "Session settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的设计设置"
+msgid "Session settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的 session 设置"

 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"

-msgstr "管理会话"
+msgstr "管理 sessions"

 
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."
 
 #: actions/sessionsadminpanel.php:177
 msgid "Whether to handle sessions ourselves."


@@ -3523,48 +3778,47 @@ msgstr "是否自己处理sessions。"
 
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"
 
 #: actions/sessionsadminpanel.php:181
 msgid "Session debugging"

-msgstr "会话调试"
+msgstr "Session 调试"

 
 #: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."
 
 #: actions/sessionsadminpanel.php:183
 msgid "Turn on debugging output for sessions."

-msgstr "打开会话的调试输出。"
+msgstr "打开 sessions 的调试输出。"

 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/useradminpanel.php:294

 msgid "Save site settings"
 msgstr "保存访问设置"
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."
 msgid "Save site settings"
 msgstr "保存访问设置"
 
 #: actions/showapplication.php:82
 msgid "You must be logged in to view an application."

-msgstr "您必须登录才能创建小组。"
+msgstr "你必须登录才能创建小组。"

 
 #: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "未找到应用。"
 
 #. TRANS: Form input field label for application icon.
 
 #: actions/showapplication.php:157
 msgid "Application profile"
 msgstr "未找到应用。"
 
 #. TRANS: Form input field label for application icon.

-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173

 msgid "Icon"
 msgstr "图标"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197
 msgid "Icon"
 msgstr "图标"
 
 #. TRANS: Form input field label for application name.
 #: actions/showapplication.php:169 actions/version.php:197

-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190

 msgid "Name"
 msgstr "名称"
 
 #. TRANS: Form input field label.
 msgid "Name"
 msgstr "名称"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:227

 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172

 msgid "Description"
 msgstr "描述"
 
 msgid "Description"
 msgstr "描述"
 

-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "统计"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "统计"


@@ -3614,7 +3868,7 @@ msgstr "提示：我们支持HMAC-SHA1签名。我们不支持明文的签名方
 
 #: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"
 
 #: actions/showapplication.php:309
 msgid "Are you sure you want to reset your consumer key and secret?"

-msgstr "您确定要重置你的consumer key和secret吗？"
+msgstr "你确定要重置你的consumer key和secret吗？"

 
 #: actions/showfavorites.php:79
 #, php-format
 
 #: actions/showfavorites.php:79
 #, php-format


@@ -3645,7 +3899,7 @@ msgid ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""
 "You haven't chosen any favorite notices yet. Click the fave button on "
 "notices you like to bookmark them for later or shed a spotlight on them."
 msgstr ""

-"您还没收藏任何消息呢。点击消息上的添加收藏按钮就可以添加到收藏夹以后查看或者"
+"你还没收藏任何消息呢。点击消息上的添加收藏按钮就可以添加到收藏夹以后查看或者"

 "收藏一堆有趣的消息。"
 
 #: actions/showfavorites.php:208
 "收藏一堆有趣的消息。"
 
 #: actions/showfavorites.php:208


@@ -3669,7 +3923,7 @@ msgstr ""
 msgid "This is a way to share what you like."
 msgstr "这是一种分享你喜欢的内容的方式。"
 
 msgid "This is a way to share what you like."
 msgstr "这是一种分享你喜欢的内容的方式。"
 

-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82

 #, php-format
 msgid "%s group"
 msgstr "%s 小组"
 #, php-format
 msgid "%s group"
 msgstr "%s 小组"


@@ -3701,45 +3955,45 @@ msgstr "别名"
 msgid "Group actions"
 msgstr "小组动作"
 
 msgid "Group actions"
 msgstr "小组动作"
 

-#: actions/showgroup.php:338
+#: actions/showgroup.php:344

 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s小组的消息聚合 (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 1.0)"
 msgstr "%s小组的消息聚合 (RSS 1.0)"
 

-#: actions/showgroup.php:344
+#: actions/showgroup.php:350

 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s小组的消息聚合 (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s group (RSS 2.0)"
 msgstr "%s小组的消息聚合 (RSS 2.0)"
 

-#: actions/showgroup.php:350
+#: actions/showgroup.php:356

 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s小组的消息聚合 (Atom)"
 
 #, php-format
 msgid "Notice feed for %s group (Atom)"
 msgstr "%s小组的消息聚合 (Atom)"
 

-#: actions/showgroup.php:355
+#: actions/showgroup.php:361

 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 
 #, php-format
 msgid "FOAF for %s group"
 msgstr "%s 的发件箱"
 

-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:399 actions/showgroup.php:451

 msgid "Members"
 msgid "Members"

-msgstr "成员"
+msgstr "小组成员"

 
 

-#: actions/showgroup.php:398 lib/profileaction.php:117
+#: actions/showgroup.php:404 lib/profileaction.php:117

 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（无）"
 
 #: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
 #: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
 msgid "(None)"
 msgstr "（无）"
 

-#: actions/showgroup.php:404
+#: actions/showgroup.php:410

 msgid "All members"
 msgstr "所有成员"
 
 msgid "All members"
 msgstr "所有成员"
 

-#: actions/showgroup.php:439
+#: actions/showgroup.php:445

 msgid "Created"
 msgstr "建立"
 
 msgid "Created"
 msgstr "建立"
 

-#: actions/showgroup.php:455
+#: actions/showgroup.php:461

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3754,7 +4008,7 @@ msgstr ""
 "入](%%%%action.register%%%%)成为该小组的一员并享受更多的欢乐！（[阅读更多](%%"
 "%%doc.help%%%%)）"
 
 "入](%%%%action.register%%%%)成为该小组的一员并享受更多的欢乐！（[阅读更多](%%"
 "%%doc.help%%%%)）"
 

-#: actions/showgroup.php:461
+#: actions/showgroup.php:467

 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3767,7 +4021,7 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和各种兴"
 "趣的消息。"
 
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。%%%%site.name%%%%的用户分享关于他们生活和各种兴"
 "趣的消息。"
 

-#: actions/showgroup.php:489
+#: actions/showgroup.php:495

 msgid "Admins"
 msgstr "管理员"
 
 msgid "Admins"
 msgstr "管理员"
 


@@ -3837,7 +4091,7 @@ msgstr "这是%1$s的时间线，但是%2$s还没有发布任何内容。"
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"

-msgstr "最近看到了什么有趣的消息了么？您还没有发布消息呢，现在开始吧 :)"
+msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢，现在开始吧 :)"

 
 #: actions/showstream.php:207
 #, php-format
 
 #: actions/showstream.php:207
 #, php-format


@@ -3845,10 +4099,10 @@ msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 "%?status_textarea=%2$s)."
 msgstr ""

-"您可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"
+"你可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"

 "status_textarea=%2$s)。"
 
 "status_textarea=%2$s)。"
 

-#: actions/showstream.php:243
+#: actions/showstream.php:246

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3861,7 +4115,7 @@ msgstr ""
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)服务。[现在加入](%%%%action.register%%%%)并关注**%"
 "s**的消息和享受更多乐趣! （[阅读更多](%%%%doc.help%%%%)）"
 
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)服务。[现在加入](%%%%action.register%%%%)并关注**%"
 "s**的消息和享受更多乐趣! （[阅读更多](%%%%doc.help%%%%)）"
 

-#: actions/showstream.php:248
+#: actions/showstream.php:251

 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 #, php-format
 msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."


@@ -3872,18 +4126,18 @@ msgstr ""
 "[StatusNet](http://status.net/)的[微博客](http://zh.wikipedia.org/zh-hans/%"
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 
 "[StatusNet](http://status.net/)的[微博客](http://zh.wikipedia.org/zh-hans/%"
 "E5%BE%AE%E5%8D%9A%E5%AE%A2)。"
 

-#: actions/showstream.php:305
+#: actions/showstream.php:308

 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
 
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
 
 #: actions/silence.php:65 actions/unsilence.php:65
 msgid "You cannot silence users on this site."

-msgstr "您不能在这个站点移除用户角色。"
+msgstr "你不能在这个站点上将用户禁言。"

 
 #: actions/silence.php:72
 msgid "User is already silenced."
 
 #: actions/silence.php:72
 msgid "User is already silenced."

-msgstr "用户已经静默。"
+msgstr "用户已经被禁言。"

 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"
 
 #: actions/siteadminpanel.php:69
 msgid "Basic settings for this StatusNet site"


@@ -3895,7 +4149,7 @@ msgstr "网站名称长度必须大于零。"
 
 #: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."
 
 #: actions/siteadminpanel.php:141
 msgid "You must have a valid contact email address."

-msgstr "您必须有一个有效的 email 地址。"
+msgstr "你必须有一个有效的 email 地址。"

 
 #: actions/siteadminpanel.php:159
 #, php-format
 
 #: actions/siteadminpanel.php:159
 #, php-format


@@ -3920,7 +4174,7 @@ msgstr "网站名称"
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""
 
 #: actions/siteadminpanel.php:225
 msgid "The name of your site, like \"Yourcompany Microblog\""

-msgstr "您的网站名称，例如\\\"您公司网站的微博\\\""
+msgstr "你的网站名称，例如\\\"你公司网站的微博\\\""

 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"
 
 #: actions/siteadminpanel.php:229
 msgid "Brought by"


@@ -3944,7 +4198,7 @@ msgstr "网站的联系我们电子邮件地址"
 
 #: actions/siteadminpanel.php:245
 msgid "Local"
 
 #: actions/siteadminpanel.php:245
 msgid "Local"

-msgstr "本地化"
+msgstr "本地"

 
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"
 
 #: actions/siteadminpanel.php:256
 msgid "Default timezone"


@@ -3984,31 +4238,31 @@ msgstr "用户再次发布相同内容时需要等待的时间（秒）。"
 
 #: actions/sitenoticeadminpanel.php:56
 msgid "Site Notice"
 
 #: actions/sitenoticeadminpanel.php:56
 msgid "Site Notice"

-msgstr "网站消息"
+msgstr "网站公告"

 
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"
 
 #: actions/sitenoticeadminpanel.php:67
 msgid "Edit site-wide message"

-msgstr "编辑整个网站的消息"
+msgstr "编辑整个网站的公告"

 
 #: actions/sitenoticeadminpanel.php:103
 msgid "Unable to save site notice."
 
 #: actions/sitenoticeadminpanel.php:103
 msgid "Unable to save site notice."

-msgstr "保存网站消息"
+msgstr "无法保存网站公告。"

 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."
 
 #: actions/sitenoticeadminpanel.php:113
 msgid "Max length for the site-wide notice is 255 chars."

-msgstr "整个网站最长的消息限制为255字符。"
+msgstr "整个网站的公告最长限制为255字符。"

 
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"
 
 #: actions/sitenoticeadminpanel.php:176
 msgid "Site notice text"

-msgstr "网站消息文字"
+msgstr "网站公告文字"

 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"
 
 #: actions/sitenoticeadminpanel.php:178
 msgid "Site-wide notice text (255 chars max; HTML okay)"

-msgstr "整个网站的消息文字（最长255字符；可使用HTML）"
+msgstr "整个网站的公告文字（最长255字符；可使用HTML）"

 
 #: actions/sitenoticeadminpanel.php:198
 msgid "Save site notice"
 
 #: actions/sitenoticeadminpanel.php:198
 msgid "Save site notice"

-msgstr "保存网站消息"
+msgstr "保存网站公告"

 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59
 
 #. TRANS: Title for SMS settings.
 #: actions/smssettings.php:59


@@ -4020,7 +4274,7 @@ msgstr "SMS 设置"
 #: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."
 #: actions/smssettings.php:74
 #, php-format
 msgid "You can receive SMS messages through email from %%site.name%%."

-msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
+msgstr "你可以通过 %%site.name%% 的电子邮件接收SMS短信。"

 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97
 
 #. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
 #: actions/smssettings.php:97


@@ -4098,7 +4352,7 @@ msgstr "未选择运营商。"
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."
 #. TRANS: Message given saving SMS phone number that is already set.
 #: actions/smssettings.php:352
 msgid "That is already your phone number."

-msgstr "您已登记此电话号码。"
+msgstr "你已登记此电话号码。"

 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:356
 
 #. TRANS: Message given saving SMS phone number that is already set for another user.
 #: actions/smssettings.php:356


@@ -4111,7 +4365,7 @@ msgid ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""
 "A confirmation code was sent to the phone number you added. Check your phone "
 "for the code and instructions on how to use it."
 msgstr ""

-"验证码已被发送到您新增的电话号码。请检查您的电话，找到验证码并按要求使用它。"
+"验证码已被发送到你新增的电话号码。请检查你的电话，找到验证码并按要求使用它。"

 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413
 
 #. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
 #: actions/smssettings.php:413


@@ -4152,7 +4406,7 @@ msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 "email but isn't listed here, send email to let us know at %s."
 msgstr ""

-"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"
+"电话的服务商。如果你的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"

 "系 %s 以告知。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.
 "系 %s 以告知。"
 
 #. TRANS: Message given saving SMS phone number confirmation code without having provided one.


@@ -4162,7 +4416,7 @@ msgstr "没有输入验证码"
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
 
 #. TRANS: Menu item for site administration
 #: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196

-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395

 msgid "Snapshots"
 msgstr "快照"
 
 msgid "Snapshots"
 msgstr "快照"
 


@@ -4220,7 +4474,7 @@ msgstr "保存访问设置"
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."
 
 #: actions/subedit.php:70
 msgid "You are not subscribed to that profile."

-msgstr "您没有关注这个用户"
+msgstr "你没有关注这个用户"

 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136
 
 #. TRANS: Exception thrown when a subscription could not be stored on the server.
 #: actions/subedit.php:83 classes/Subscription.php:136


@@ -4237,7 +4491,7 @@ msgstr "没有这个文件。"
 
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
 
 #: actions/subscribe.php:117
 msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."

-msgstr "您不能用这个操作关注一个 OMB 0.1 远程用户。"
+msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"

 
 #: actions/subscribe.php:145
 msgid "Subscribed"
 
 #: actions/subscribe.php:145
 msgid "Subscribed"


@@ -4246,16 +4500,16 @@ msgstr "已关注"
 #: actions/subscribers.php:50
 #, php-format
 msgid "%s subscribers"
 #: actions/subscribers.php:50
 #, php-format
 msgid "%s subscribers"

-msgstr "%s个关注者"
+msgstr "%s的关注者"

 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 
 #: actions/subscribers.php:52
 #, php-format
 msgid "%1$s subscribers, page %2$d"

-msgstr "%1$s个关注者，第%2$d页"
+msgstr "%1$s的关注者，第%2$d页"

 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 
 #: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."

-msgstr "这些用户关注了您的消息。"
+msgstr "这些用户关注了你的消息。"

 
 #: actions/subscribers.php:67
 #, php-format
 
 #: actions/subscribers.php:67
 #, php-format


@@ -4266,7 +4520,7 @@ msgstr "这些用户关注了%s的消息。"
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 "return the favor"

-msgstr "还没有人关注您，尝试关注一些您认识的用户，他们或许会关注您"
+msgstr "还没有人关注你，尝试关注一些你认识的用户，他们或许会关注你"

 
 #: actions/subscribers.php:110
 #, php-format
 
 #: actions/subscribers.php:110
 #, php-format


@@ -4285,16 +4539,16 @@ msgstr ""
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"
 #: actions/subscriptions.php:52
 #, php-format
 msgid "%s subscriptions"

-msgstr "%s的关注"
+msgstr "%s 关注的用户"

 
 #: actions/subscriptions.php:54
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 
 #: actions/subscriptions.php:54
 #, php-format
 msgid "%1$s subscriptions, page %2$d"

-msgstr "%1$s的关注，第%2$d页"
+msgstr "%1$s 关注的用户，第%2$d页"

 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 
 #: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."

-msgstr "这是您关注的用户。"
+msgstr "这是你关注的用户。"

 
 #: actions/subscriptions.php:69
 #, php-format
 
 #: actions/subscriptions.php:69
 #, php-format


@@ -4310,10 +4564,10 @@ msgid ""
 "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
 "automatically subscribe to people you already follow there."
 msgstr ""
 "featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
 "automatically subscribe to people you already follow there."
 msgstr ""

-"您现在还看不到其他人的消息，试着去关注一些您认识的人。试一下 [用户搜索](%%"
-"action.peoplesearch%%)，在我们的 [推荐用户](%%action.featured%%) 中找一些您感"
-"兴趣的小组的用户。如果您是  [Twitter用户](%%action.twittersettings%%)，您可以"
-"自动关注您已经关注的用户。"
+"你现在还看不到其他人的消息，试着去关注一些你认识的人。试一下 [用户搜索](%%"
+"action.peoplesearch%%)，在我们的 [推荐用户](%%action.featured%%) 中找一些你感"
+"兴趣的小组的用户。如果你是  [Twitter用户](%%action.twittersettings%%)，你可以"
+"自动关注你已经关注的用户。"

 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
 #, php-format
 
 #: actions/subscriptions.php:128 actions/subscriptions.php:132
 #, php-format


@@ -4324,7 +4578,7 @@ msgstr "%s没有关注任何人。"
 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -4380,7 +4634,7 @@ msgstr ""
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 #: actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."

-msgstr "您只能给您关注或关注您的人添加标签。"
+msgstr "你只能给你关注或关注你的人添加标签。"

 
 #: actions/tagother.php:200
 msgid "Could not save tags."
 
 #: actions/tagother.php:200
 msgid "Could not save tags."


@@ -4388,7 +4642,7 @@ msgstr "无法保存标签。"
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 
 #: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."

-msgstr "使用这个表单给您的关注者或您关注的用户添加标签。"
+msgstr "使用这个表单给你的关注者或你关注的用户添加标签。"

 
 #: actions/tagrss.php:35
 msgid "No such tag."
 
 #: actions/tagrss.php:35
 msgid "No such tag."


@@ -4396,15 +4650,15 @@ msgstr "没有此标签。"
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."
 
 #: actions/unblock.php:59
 msgid "You haven't blocked that user."

-msgstr "您未屏蔽该用户。"
+msgstr "你未屏蔽该用户。"

 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."
 
 #: actions/unsandbox.php:72
 msgid "User is not sandboxed."

-msgstr "用户还没在沙盒中。"
+msgstr "用户不在沙盒中。"

 
 #: actions/unsilence.php:72
 msgid "User is not silenced."
 
 #: actions/unsilence.php:72
 msgid "User is not silenced."

-msgstr "用户已经静默。"
+msgstr "用户未被禁言。"

 
 #: actions/unsubscribe.php:77
 msgid "No profile ID in request."
 
 #: actions/unsubscribe.php:77
 msgid "No profile ID in request."


@@ -4421,74 +4675,78 @@ msgid ""
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
 #. TRANS: User admin panel title
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
 #. TRANS: User admin panel title

-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60

 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 
 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 

-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"

 msgstr "这个 StatusNet 网站的用户设置"
 
 msgstr "这个 StatusNet 网站的用户设置"
 

-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150

 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 

-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156

 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 

-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166

 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106

 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "个人信息"
 
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "个人信息"
 

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223

 msgid "Bio Limit"
 msgstr "自述限制"
 
 msgid "Bio Limit"
 msgstr "自述限制"
 

-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224

 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 
 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 

-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232

 msgid "New users"
 msgstr "新用户"
 
 msgid "New users"
 msgstr "新用户"
 

-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236

 msgid "New user welcome"
 msgstr "新用户欢迎"
 
 msgid "New user welcome"
 msgstr "新用户欢迎"
 

-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237

 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 

-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242

 msgid "Default subscription"
 msgstr "默认关注"
 
 msgid "Default subscription"
 msgstr "默认关注"
 

-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243

 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 
 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 

-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252

 msgid "Invitations"
 msgstr "邀请"
 
 msgid "Invitations"
 msgstr "邀请"
 

-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257

 msgid "Invitations enabled"
 msgstr "邀请已启用"
 
 msgid "Invitations enabled"
 msgstr "邀请已启用"
 

-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259

 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 
 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 

+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr "保存用户设置"
+

 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "授权关注"
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "授权关注"


@@ -4499,10 +4757,12 @@ msgid ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""
 "user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
 "click “Reject”."
 msgstr ""

-"请检查这些详细信息，确认希望关注此用户的消息。如果您不想关注，请点击\\\"拒绝"
+"请检查这些详细信息，确认希望关注此用户的消息。如果你不想关注，请点击\\\"拒绝"

 "\\\"。"
 
 "\\\"。"
 

+#. TRANS: Menu item for site administration

 #: actions/userauthorization.php:196 actions/version.php:167
 #: actions/userauthorization.php:196 actions/version.php:167

+#: lib/adminpanelaction.php:403

 msgid "License"
 msgstr "许可协议"
 
 msgid "License"
 msgstr "许可协议"
 


@@ -4537,7 +4797,7 @@ msgid ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""
 "with the site’s instructions for details on how to authorize the "
 "subscription. Your subscription token is:"
 msgstr ""

-"已授权关注，但是没有回传 URL。请到网站查看如何授权关注。您的 subscription "
+"已授权关注，但是没有回传 URL。请到网站查看如何授权关注。你的 subscription "

 "token 是："
 
 #: actions/userauthorization.php:266
 "token 是："
 
 #: actions/userauthorization.php:266


@@ -4588,23 +4848,23 @@ msgstr "头像 URL ‘%s’ 图像格式错误。"
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"
 
 #: actions/userdesignsettings.php:76 lib/designsettings.php:65
 msgid "Profile design"

-msgstr "查看个人页面设计"
+msgstr "个人页面外观"

 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."
 
 #: actions/userdesignsettings.php:87 lib/designsettings.php:76
 msgid ""
 "Customize the way your profile looks with a background image and a colour "
 "palette of your choice."

-msgstr "通过背景图片和调色板自定义您的页面外观。"
+msgstr "通过背景图片和调色板自定义你的页面外观。"

 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"
 
 #: actions/userdesignsettings.php:282
 msgid "Enjoy your hotdog!"

-msgstr "享受您的成果吧！"
+msgstr "享受你的成果吧！"

 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"
 
 #. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
 #: actions/usergroups.php:66
 #, php-format
 msgid "%1$s groups, page %2$d"

-msgstr "%1$s个小组，第%2$d页"
+msgstr "%1$s的小组，第%2$d页"

 
 #: actions/usergroups.php:132
 msgid "Search for more groups"
 
 #: actions/usergroups.php:132
 msgid "Search for more groups"


@@ -4626,7 +4886,7 @@ msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70

-#: lib/atomusernoticefeed.php:76
+#: lib/atomusernoticefeed.php:75

 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"


@@ -4655,7 +4915,7 @@ msgid ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""
 "Software Foundation, either version 3 of the License, or (at your option) "
 "any later version. "
 msgstr ""

-"StatusNet 是一个免费软件，您可以在遵守自由软件基金会发布的 GNU Affero GPL 或"
+"StatusNet 是一个免费软件，你可以在遵守自由软件基金会发布的 GNU Affero GPL 或"

 "第三版或以后的版本的情况下重新部署或者修改它，"
 
 #: actions/version.php:176
 "第三版或以后的版本的情况下重新部署或者修改它，"
 
 #: actions/version.php:176


@@ -4673,14 +4933,14 @@ msgstr ""
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."
 msgid ""
 "You should have received a copy of the GNU Affero General Public License "
 "along with this program.  If not, see %s."

-msgstr "您应该在本程序中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"
+msgstr "你应该在本程序中收到了一份 GNU Affero GPL 的副本，如果没有收到请看%s。"

 
 #: actions/version.php:191
 msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 
 #: actions/version.php:191
 msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:198 lib/action.php:789
+#: actions/version.php:198 lib/action.php:830

 msgid "Version"
 msgstr "版本"
 
 msgid "Version"
 msgstr "版本"
 


@@ -4688,43 +4948,55 @@ msgstr "版本"
 msgid "Author(s)"
 msgstr "作者"
 
 msgid "Author(s)"
 msgstr "作者"
 

+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "收藏"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
+#, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%1$s 将消息 %2$s 标记了收藏。"
+

 #. TRANS: Server exception thrown when a URL cannot be processed.
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:143
+#: classes/File.php:142

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "不能处理 URL “%s”"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "不能处理 URL “%s”"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

-#: classes/File.php:175
+#: classes/File.php:174

 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.
 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.

-#: classes/File.php:190
+#: classes/File.php:189

 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""
 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 "Try to upload a smaller version."
 msgstr ""

-"不能有文件大于%1$d字节，您上传的文件是%2$d字节。换一个小点的版本试一下。"
+"不能有文件大于%1$d字节，你上传的文件是%2$d字节。换一个小点的版本试一下。"

 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.

-#: classes/File.php:202
+#: classes/File.php:201

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."

-msgstr "这么大的文件会超过您%d字节的用户配额。"
+msgstr "这么大的文件会超过你%d字节的用户配额。"

 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.

-#: classes/File.php:211
+#: classes/File.php:210

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."

-msgstr "这么大的文件会超过您%d字节的每月配额。"
+msgstr "这么大的文件会超过你%d字节的每月配额。"

 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:248 classes/File.php:263
+#: classes/File.php:247 classes/File.php:262

 msgid "Invalid filename."
 msgstr "无效的文件名。"
 
 msgid "Invalid filename."
 msgstr "无效的文件名。"
 


@@ -4743,6 +5015,32 @@ msgstr "不是小组成员。"
 msgid "Group leave failed."
 msgstr "离开小组失败。"
 
 msgid "Group leave failed."
 msgstr "离开小组失败。"
 

+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr "无效的用户 ID %s。"
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr "小组 ID %s 无效。"
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "加入"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s加入了%2$s小组。"
+

 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."


@@ -4761,17 +5059,17 @@ msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 msgstr "没有找到数据库名称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.

-#: classes/Message.php:46
+#: classes/Message.php:45

 msgid "You are banned from sending direct messages."
 msgid "You are banned from sending direct messages."

-msgstr "您被禁止发送私信。"
+msgstr "你被禁止发送私信。"

 
 #. TRANS: Message given when a message could not be stored on the server.
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:63
+#: classes/Message.php:62

 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 #. TRANS: Message given when a message could not be updated on the server.
 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:74
+#: classes/Message.php:73

 msgid "Could not update message with new URI."
 msgstr "无法通过新的 URI 更新消息。"
 
 msgid "Could not update message with new URI."
 msgstr "无法通过新的 URI 更新消息。"
 


@@ -4802,19 +5100,19 @@ msgstr "保存消息时出错。未知用户。"
 #: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 #: classes/Notice.php:276
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."

-msgstr "您在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
+msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"

 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 #: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."
 
 #. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
 #: classes/Notice.php:283
 msgid ""
 "Too many duplicate messages too quickly; take a breather and post again in a "
 "few minutes."

-msgstr "您在短时间里发布了过多的重复消息，请深呼吸，过几分钟再发消息。"
+msgstr "你在短时间里发布了过多的重复消息，请深呼吸，过几分钟再发消息。"

 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 #: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."
 
 #. TRANS: Client exception thrown when a user tries to post while being banned.
 #: classes/Notice.php:291
 msgid "You are banned from posting notices on this site."

-msgstr "在这个网站您被禁止发布消息。"
+msgstr "在这个网站你被禁止发布消息。"

 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.
 
 #. TRANS: Server exception thrown when a notice cannot be saved.
 #. TRANS: Server exception thrown when a notice cannot be updated.


@@ -4823,32 +5121,39 @@ msgid "Problem saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:897
+#: classes/Notice.php:907

 msgid "Bad type provided to saveKnownGroups"
 msgstr "对 saveKnownGroups 提供的类型无效"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups"
 msgstr "对 saveKnownGroups 提供的类型无效"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:996
+#: classes/Notice.php:1006

 msgid "Problem saving group inbox."
 msgstr "保存小组收件箱时出错。"
 
 msgid "Problem saving group inbox."
 msgstr "保存小组收件箱时出错。"
 

+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1120
+#, php-format
+msgid "Could not save reply for %1$d, %2$d."
+msgstr "无法保存回复，%1$d 对 %2$d。"
+

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1751
+#: classes/Notice.php:1822

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:737
+#: classes/Profile.php:785

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:746
+#: classes/Profile.php:794

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"


@@ -4859,14 +5164,14 @@ msgid "Missing profile."
 msgstr "丢失的个人信息。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgstr "丢失的个人信息。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.

-#: classes/Status_network.php:346
+#: classes/Status_network.php:338

 msgid "Unable to save tag."
 msgstr "无法保存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgid "Unable to save tag."
 msgstr "无法保存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:482

 msgid "You have been banned from subscribing."
 msgid "You have been banned from subscribing."

-msgstr "您被禁止添加关注。"
+msgstr "你被禁止添加关注。"

 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80
 
 #. TRANS: Exception thrown when trying to subscribe while already subscribed.
 #: classes/Subscription.php:80


@@ -4898,262 +5203,279 @@ msgstr "无法删除关注 OMB token。"
 msgid "Could not delete subscription."
 msgstr "无法取消关注。"
 
 msgid "Could not delete subscription."
 msgstr "无法取消关注。"
 

+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr "关注"
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
+#, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s 现在开始关注了 %2$s。"
+

 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:365
+#: classes/User.php:384

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception thrown when creating a group failed.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:496
+#: classes/User_group.php:495

 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:506
+#: classes/User_group.php:505

 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:529
+#: classes/User_group.php:528

 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:544
+#: classes/User_group.php:543

 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104

 msgid "Change your profile settings"
 msgid "Change your profile settings"

-msgstr "修改您的个人信息"
+msgstr "修改你的个人信息"

 
 #. TRANS: Link title attribute in user account settings menu.
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111

 msgid "Upload an avatar"
 msgstr "上传一个头像。"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Upload an avatar"
 msgstr "上传一个头像。"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:118

 msgid "Change your password"
 msgstr "修改密码"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your password"
 msgstr "修改密码"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125

 msgid "Change email handling"
 msgstr "修改电子邮件"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132

 msgid "Design your profile"
 msgid "Design your profile"

-msgstr "页面设计"
+msgstr "设计你的个人页面外观"

 
 #. TRANS: Link title attribute in user account settings menu.
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139

 msgid "Other options"
 msgstr "其他选项"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Other options"
 msgstr "其他选项"
 
 #. TRANS: Link description in user account settings menu.

-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141

 msgid "Other"
 msgstr "其他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.
 msgid "Other"
 msgstr "其他"
 
 #. TRANS: Page title. %1$s is the title, %2$s is the site name.

-#: lib/action.php:145
+#: lib/action.php:148

 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.
 #, php-format
 msgid "%1$s - %2$s"
 msgstr "%1$s - %2$s"
 
 #. TRANS: Page title for a page without a title set.

-#: lib/action.php:161
+#: lib/action.php:164

 msgid "Untitled page"
 msgstr "无标题页"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgid "Untitled page"
 msgstr "无标题页"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:436
+#: lib/action.php:476

 msgid "Primary site navigation"
 msgstr "主站导航"
 
 #. TRANS: Tooltip for main menu option "Personal"
 msgid "Primary site navigation"
 msgstr "主站导航"
 
 #. TRANS: Tooltip for main menu option "Personal"

-#: lib/action.php:442
+#: lib/action.php:482

 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友的时间线"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline
 msgctxt "TOOLTIP"
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友的时间线"
 
 #. TRANS: Main menu option when logged in for access to personal profile and friends timeline

-#: lib/action.php:445
+#: lib/action.php:485

 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
 #. TRANS: Tooltip for main menu option "Account"
 msgctxt "MENU"
 msgid "Personal"
 msgstr "个人"
 
 #. TRANS: Tooltip for main menu option "Account"

-#: lib/action.php:447
+#: lib/action.php:487

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"

-msgstr "修改您的 email 地址、头像、密码、资料"
+msgstr "修改你的 email 地址、头像、密码、资料"

 
 #. TRANS: Tooltip for main menu option "Services"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:452
+#: lib/action.php:492

 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "关联的服务"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
 msgctxt "TOOLTIP"
 msgid "Connect to services"
 msgstr "关联的服务"
 
 #. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services

-#: lib/action.php:455
+#: lib/action.php:495

 msgid "Connect"
 msgstr "关联"
 
 #. TRANS: Tooltip for menu option "Admin"
 msgid "Connect"
 msgstr "关联"
 
 #. TRANS: Tooltip for menu option "Admin"

-#: lib/action.php:458
+#: lib/action.php:498

 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration

-#: lib/action.php:461
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:501 lib/groupnav.php:117

 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Tooltip for main menu option "Invite"
 msgctxt "MENU"
 msgid "Admin"
 msgstr "管理"
 
 #. TRANS: Tooltip for main menu option "Invite"

-#: lib/action.php:465
+#: lib/action.php:505

 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请好友和同事加入%s。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
 #, php-format
 msgctxt "TOOLTIP"
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "邀请好友和同事加入%s。"
 
 #. TRANS: Main menu option when logged in and invitations are allowed for inviting new users

-#: lib/action.php:468
+#: lib/action.php:508

 msgctxt "MENU"
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANS: Tooltip for main menu option "Logout"
 msgctxt "MENU"
 msgid "Invite"
 msgstr "邀请"
 
 #. TRANS: Tooltip for main menu option "Logout"

-#: lib/action.php:474
+#: lib/action.php:514

 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "从网站登出"
 
 #. TRANS: Main menu option when logged in to log out the current user
 msgctxt "TOOLTIP"
 msgid "Logout from the site"
 msgstr "从网站登出"
 
 #. TRANS: Main menu option when logged in to log out the current user

-#: lib/action.php:477
+#: lib/action.php:517

 msgctxt "MENU"
 msgid "Logout"
 msgstr "登出"
 
 #. TRANS: Tooltip for main menu option "Register"
 msgctxt "MENU"
 msgid "Logout"
 msgstr "登出"
 
 #. TRANS: Tooltip for main menu option "Register"

-#: lib/action.php:482
+#: lib/action.php:522

 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "创建一个账户"
 
 #. TRANS: Main menu option when not logged in to register a new account
 msgctxt "TOOLTIP"
 msgid "Create an account"
 msgstr "创建一个账户"
 
 #. TRANS: Main menu option when not logged in to register a new account

-#: lib/action.php:485
+#: lib/action.php:525

 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Tooltip for main menu option "Login"
 msgctxt "MENU"
 msgid "Register"
 msgstr "注册"
 
 #. TRANS: Tooltip for main menu option "Login"

-#: lib/action.php:488
+#: lib/action.php:528

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 

-#: lib/action.php:491
+#: lib/action.php:531

 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Tooltip for main menu option "Help"
 msgctxt "MENU"
 msgid "Login"
 msgstr "登录"
 
 #. TRANS: Tooltip for main menu option "Help"

-#: lib/action.php:494
+#: lib/action.php:534

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 

-#: lib/action.php:497
+#: lib/action.php:537

 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Tooltip for main menu option "Search"
 msgctxt "MENU"
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Tooltip for main menu option "Search"

-#: lib/action.php:500
+#: lib/action.php:540

 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "搜索人或文字"
 
 msgctxt "TOOLTIP"
 msgid "Search for people or text"
 msgstr "搜索人或文字"
 

-#: lib/action.php:503
+#: lib/action.php:543

 msgctxt "MENU"
 msgid "Search"
 msgstr "搜索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration
 msgctxt "MENU"
 msgid "Search"
 msgstr "搜索"
 
 #. TRANS: DT element for site notice. String is hidden in default CSS.
 #. TRANS: Menu item for site administration

-#: lib/action.php:525 lib/adminpanelaction.php:400
+#: lib/action.php:565 lib/adminpanelaction.php:387

 msgid "Site notice"
 msgstr "网站消息"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.
 msgid "Site notice"
 msgstr "网站消息"
 
 #. TRANS: DT element for local views block. String is hidden in default CSS.

-#: lib/action.php:592
+#: lib/action.php:632

 msgid "Local views"
 msgstr "本地显示"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.
 msgid "Local views"
 msgstr "本地显示"
 
 #. TRANS: DT element for page notice. String is hidden in default CSS.

-#: lib/action.php:659
+#: lib/action.php:702

 msgid "Page notice"
 msgstr "页面消息"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
 msgid "Page notice"
 msgstr "页面消息"
 
 #. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.

-#: lib/action.php:762
+#: lib/action.php:803

 msgid "Secondary site navigation"
 msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.
 msgid "Secondary site navigation"
 msgstr "副站导航"
 
 #. TRANS: Secondary navigation menu option leading to help on StatusNet.

-#: lib/action.php:768
+#: lib/action.php:809

 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.
 msgid "Help"
 msgstr "帮助"
 
 #. TRANS: Secondary navigation menu option leading to text about StatusNet site.

-#: lib/action.php:771
+#: lib/action.php:812

 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
 msgid "About"
 msgstr "关于"
 
 #. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.

-#: lib/action.php:774
+#: lib/action.php:815

 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.
 msgid "FAQ"
 msgstr "FAQ"
 
 #. TRANS: Secondary navigation menu option leading to Terms of Service.

-#: lib/action.php:779
+#: lib/action.php:820

 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.
 msgid "TOS"
 msgstr "条款"
 
 #. TRANS: Secondary navigation menu option leading to privacy policy.

-#: lib/action.php:783
+#: lib/action.php:824

 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option.
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option.

-#: lib/action.php:786
+#: lib/action.php:827

 msgid "Source"
 msgstr "源码"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
 msgid "Source"
 msgstr "源码"
 
 #. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.

-#: lib/action.php:792
+#: lib/action.php:833

 msgid "Contact"
 msgstr "联系"
 
 msgid "Contact"
 msgstr "联系"
 

-#: lib/action.php:794
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:836

 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:823
+#: lib/action.php:865

 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.

-#: lib/action.php:827
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:872

 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."


@@ -5163,13 +5485,16 @@ msgstr ""
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
 "broughtbyurl%%)。"
 
 #. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.

-#: lib/action.php:830
+#: lib/action.php:875

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
 
 #. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.

-#: lib/action.php:834
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:882

 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"


@@ -5180,318 +5505,404 @@ msgstr ""
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
 #. TRANS: DT element for StatusNet site content license.
 "(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
 
 #. TRANS: DT element for StatusNet site content license.

-#: lib/action.php:850
+#: lib/action.php:898

 msgid "Site content license"
 msgstr "网站内容许可协议"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.
 msgid "Site content license"
 msgstr "网站内容许可协议"
 
 #. TRANS: Content license displayed when license is set to 'private'.
 #. TRANS: %1$s is the site name.

-#: lib/action.php:857
+#: lib/action.php:905

 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.
 #, php-format
 msgid "Content and data of %1$s are private and confidential."
 msgstr "%1$s的内容和数据是私人且保密的。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved'.
 #. TRANS: %1$s is the copyright owner.

-#: lib/action.php:864
+#: lib/action.php:912

 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
 #, php-format
 msgid "Content and data copyright by %1$s. All rights reserved."
 msgstr "内容和数据%1$s版权所有并保留所有权利。"
 
 #. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.

-#: lib/action.php:868
+#: lib/action.php:916

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 

-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:881
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:948

 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
 #. TRANS: DT element for pagination (previous/next, etc.).
 #, php-format
 msgid "All %1$s content and data are available under the %2$s license."
 msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
 
 #. TRANS: DT element for pagination (previous/next, etc.).

-#: lib/action.php:1192
+#: lib/action.php:1284

 msgid "Pagination"
 msgstr "分页"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.
 msgid "Pagination"
 msgstr "分页"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: present than the currently displayed information.

-#: lib/action.php:1203
+#: lib/action.php:1295

 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.
 msgid "After"
 msgstr "之后"
 
 #. TRANS: Pagination message to go to a page displaying information more in the
 #. TRANS: past than the currently displayed information.

-#: lib/action.php:1213
+#: lib/action.php:1305

 msgid "Before"
 msgstr "之前"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "之前"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:122
+#: lib/activity.php:120

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 

-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr "还不能处理远程内容。"
 
 msgid "Can't handle remote content yet."
 msgstr "还不能处理远程内容。"
 

-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr "还不能处理嵌入式 XML 内容。"
 
 msgid "Can't handle embedded XML content yet."
 msgstr "还不能处理嵌入式 XML 内容。"
 

-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:242

 msgid "Can't handle embedded Base64 content yet."
 msgstr "还不能处理嵌入式 Base64 内容。"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
 msgid "Can't handle embedded Base64 content yet."
 msgstr "还不能处理嵌入式 Base64 内容。"
 
 #. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.

-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96

 msgid "You cannot make changes to this site."
 msgid "You cannot make changes to this site."

-msgstr "您不能在这个站点授予用户角色。"
+msgstr "你不能在这个站点上修改。"

 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.
 
 #. TRANS: Client error message throw when a certain panel's settings cannot be changed.

-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108

 msgid "Changes to that panel are not allowed."
 msgstr "不允许对该面板进行修改。"
 
 #. TRANS: Client error message.
 msgid "Changes to that panel are not allowed."
 msgstr "不允许对该面板进行修改。"
 
 #. TRANS: Client error message.

-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222

 msgid "showForm() not implemented."
 msgstr "showForm() 尚未实现。"
 
 #. TRANS: Client error message
 msgid "showForm() not implemented."
 msgstr "showForm() 尚未实现。"
 
 #. TRANS: Client error message

-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250

 msgid "saveSettings() not implemented."
 msgstr "saveSettings() 尚未实现。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.
 msgid "saveSettings() not implemented."
 msgstr "saveSettings() 尚未实现。"
 
 #. TRANS: Client error message thrown if design settings could not be deleted in
 #. TRANS: the admin panel Design.

-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274

 msgid "Unable to delete design setting."
 msgid "Unable to delete design setting."

-msgstr "无法删除设计设置。"
+msgstr "无法删除外观设置。"

 
 #. TRANS: Menu item title/tooltip
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337

 msgid "Basic site configuration"
 msgstr "基本网站配置"
 
 #. TRANS: Menu item for site administration
 msgid "Basic site configuration"
 msgstr "基本网站配置"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339

 msgctxt "MENU"
 msgid "Site"
 msgstr "网站"
 
 #. TRANS: Menu item title/tooltip
 msgctxt "MENU"
 msgid "Site"
 msgstr "网站"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345

 msgid "Design configuration"
 msgid "Design configuration"

-msgstr "设计配置"
+msgstr "外观配置"

 
 #. TRANS: Menu item for site administration
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135

 msgctxt "MENU"
 msgid "Design"
 msgctxt "MENU"
 msgid "Design"

-msgstr "设计"
+msgstr "外观"

 
 #. TRANS: Menu item title/tooltip
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353

 msgid "User configuration"
 msgstr "用户配置"
 
 #. TRANS: Menu item for site administration
 msgid "User configuration"
 msgstr "用户配置"
 
 #. TRANS: Menu item for site administration

-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115

 msgid "User"
 msgstr "用户"
 
 #. TRANS: Menu item title/tooltip
 msgid "User"
 msgstr "用户"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361

 msgid "Access configuration"
 msgstr "访问配置"
 
 #. TRANS: Menu item title/tooltip
 msgid "Access configuration"
 msgstr "访问配置"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369

 msgid "Paths configuration"
 msgstr "路径配置"
 
 #. TRANS: Menu item title/tooltip
 msgid "Paths configuration"
 msgstr "路径配置"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377

 msgid "Sessions configuration"
 msgstr "会话配置"
 
 #. TRANS: Menu item title/tooltip
 msgid "Sessions configuration"
 msgstr "会话配置"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385

 msgid "Edit site notice"
 msgstr "编辑网站消息"
 
 #. TRANS: Menu item title/tooltip
 msgid "Edit site notice"
 msgstr "编辑网站消息"
 
 #. TRANS: Menu item title/tooltip

-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393

 msgid "Snapshots configuration"
 msgstr "更改站点配置"
 
 msgid "Snapshots configuration"
 msgstr "更改站点配置"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr "设置网站许可协议"
+

 #. TRANS: Client error 401.
 #. TRANS: Client error 401.

-#: lib/apiauth.php:113
+#: lib/apiauth.php:111

 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API 资源需要读写的访问权限，但是你只有只读的权限。"
 
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API 资源需要读写的访问权限，但是你只有只读的权限。"
 

+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr "没有应用使用这个 consumer key。"
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr "无效的 access token。"
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr "没有用户使用这个 token。"
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr "无法验证你。"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:184
+msgid "Tried to revoke unknown token."
+msgstr "尝试了取消未知的 token。"
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:189
+msgid "Failed to delete revoked token."
+msgstr "删除取消的 token 失败。"
+

 #. TRANS: Form legend.
 #. TRANS: Form legend.

-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129

 msgid "Edit application"
 msgstr "编辑应用"
 
 #. TRANS: Form guide.
 msgid "Edit application"
 msgstr "编辑应用"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178

 msgid "Icon for this application"
 msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.
 msgid "Icon for this application"
 msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:209
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201

 #, php-format
 #, php-format

-msgid "Describe your application in %d characters"
-msgstr "用不超过%d个字符描述您的应用"
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "用不超过%d个字符描述你的应用"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:205

 msgid "Describe your application"
 msgid "Describe your application"

-msgstr "描述您的应用"
+msgstr "描述你的应用"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:216

 msgid "URL of the homepage of this application"
 msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.
 msgid "URL of the homepage of this application"
 msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.

-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:218

 msgid "Source URL"
 msgstr "来源网址"
 
 #. TRANS: Form input field instructions.
 msgid "Source URL"
 msgstr "来源网址"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:225

 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
 #. TRANS: Form input field instructions.
 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:234

 msgid "URL for the homepage of the organization"
 msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.
 msgid "URL for the homepage of the organization"
 msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:243

 msgid "URL to redirect to after authentication"
 msgstr "通过授权后转向的 URL"
 
 #. TRANS: Radio button label for application type
 msgid "URL to redirect to after authentication"
 msgstr "通过授权后转向的 URL"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:271

 msgid "Browser"
 msgstr "浏览器"
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
 msgstr "浏览器"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr "桌面"
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr "桌面"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:290

 msgid "Type of application, browser or desktop"
 msgstr "应用的类型，浏览器或桌面"
 
 #. TRANS: Radio button label for access type.
 msgid "Type of application, browser or desktop"
 msgstr "应用的类型，浏览器或桌面"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:314

 msgid "Read-only"
 msgstr "只读"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
 msgstr "只读"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr "读写"
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr "读写"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:336

 msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 

-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
-msgid "Cancel"
-msgstr "取消"
-

 #. TRANS: Application access type
 #. TRANS: Application access type

-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:134

 msgid "read-write"
 msgstr "读写"
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr "读写"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:136

 msgid "read-only"
 msgstr "只读"
 
 msgid "read-only"
 msgstr "只读"
 

-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:144
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "通过了%1$s - \"%2$s\"的访问权限。"
 
 #. TRANS: Button label
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "通过了%1$s - \"%2$s\"的访问权限。"
 
 #. TRANS: Button label

-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:157

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 

-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr "附件"
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr "作者元素必须包含一个名称元素。"

 
 #. TRANS: DT element label in attachment list item.
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256

 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270

 msgid "Provider"
 msgstr "提供者"
 
 msgid "Provider"
 msgstr "提供者"
 

+#. TRANS: Title.

 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "出现这个附件的消息"
 
 #: lib/attachmentnoticesection.php:67
 msgid "Notices where this attachment appears"
 msgstr "出现这个附件的消息"
 

+#. TRANS: Title.

 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "此附件的标签"
 
 #: lib/attachmenttagcloudsection.php:48
 msgid "Tags for this attachment"
 msgstr "此附件的标签"
 

-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
-msgstr "不允许更改密码"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+msgid "Password changing failed."
+msgstr "修改密码失败。"
+
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+msgid "Password changing is not allowed."
+msgstr "不允许更改密码。"

 
 

-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
-msgstr "不允许更改密码"
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+msgid "Block"
+msgstr "屏蔽"

 
 

-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181

 msgid "Command results"
 msgstr "执行结果"
 
 msgid "Command results"
 msgstr "执行结果"
 

-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr "AJAX 错误"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "执行完毕"
 
 msgid "Command complete"
 msgstr "执行完毕"
 

-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244

 msgid "Command failed"
 msgstr "执行失败"
 
 msgid "Command failed"
 msgstr "执行失败"
 

+#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
+#: lib/command.php:82 lib/command.php:106
+msgid "Notice with that id does not exist."
+msgstr "没有此 id 的消息。"
+
+#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
+#. TRANS: Error text shown when a last user notice is requested and it does not exist.
+#: lib/command.php:99 lib/command.php:626
+msgid "User has no last notice."
+msgstr "用户没有最后一条的消息。"
+
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:128
+#, php-format
+msgid "Could not find a user with nickname %s."
+msgstr "无法找到昵称为 %s 的用户。"
+
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:148
+#, php-format
+msgid "Could not find a local user with nickname %s."
+msgstr "无法在本地找到昵称为%s的用户。"
+

 #. TRANS: Error text shown when an unimplemented command is given.
 #. TRANS: Error text shown when an unimplemented command is given.

-#: lib/command.php:185
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起，这个命令还没有实现。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起，这个命令还没有实现。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.

-#: lib/command.php:231
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "呼叫自己不太符合逻辑吧。"
 
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "呼叫自己不太符合逻辑吧。"
 

+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:238
+#, php-format
+msgid "Nudge sent to %s."
+msgstr "呼叫已发给 %s。"
+

 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
 #. TRANS: User statistics text.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.

-#: lib/command.php:270
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -5503,139 +5914,220 @@ msgstr ""
 "消息数： %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 "消息数： %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.

-#: lib/command.php:314
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr "消息被标记为收藏。"
 
 msgid "Notice marked as fave."
 msgstr "消息被标记为收藏。"
 

+#. TRANS: Message given having added a user to a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:357
+#, php-format
+msgid "%1$s joined group %2$s."
+msgstr "%1$s加入了%2$s小组。"
+
+#. TRANS: Message given having removed a user from a group.
+#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
+#: lib/command.php:405
+#, php-format
+msgid "%1$s left group %2$s."
+msgstr "%1$s离开了%2$s小组。"
+

 #. TRANS: Whois output. %s is the full name of the queried user.
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:434
+#: lib/command.php:430

 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:438 lib/mail.php:268
+#: lib/command.php:434 lib/mail.php:268

 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #. TRANS: Profile info line in new-subscriber notification e-mail

-#: lib/command.php:442 lib/mail.php:271
+#: lib/command.php:438 lib/mail.php:271

 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:446
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).

-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 "same server."

-msgstr "%s是一个远程的用户；您只能给同一个服务器上的用户发送私信。"
+msgstr "%s是一个远程的用户；你只能给同一个服务器上的用户发送私信。"

 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488 lib/xmppmanager.php:403

 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:517
+#: lib/command.php:514

 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 

+#. TRANS: Message given having repeated a notice from another user.
+#. TRANS: %s is the name of the user for which the notice was repeated.
+#: lib/command.php:551
+#, php-format
+msgid "Notice from %s repeated."
+msgstr "来自 %s 的消息已转发。"
+

 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.

-#: lib/command.php:557
+#: lib/command.php:554

 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 

+#. TRANS: Message given if content of a notice for a reply is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:589
+#, php-format
+msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
+msgstr "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
+
+#. TRANS: Text shown having sent a reply to a notice successfully.
+#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
+#: lib/command.php:600
+#, php-format
+msgid "Reply to %s sent."
+msgstr "给 %s 的回复已发送。"
+

 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:606
+#: lib/command.php:603

 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 

+#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
+#: lib/command.php:650
+msgid "Specify the name of the user to subscribe to."
+msgstr "指定要关注的用户名。"
+

 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:664
+#: lib/command.php:659

 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 

+#. TRANS: Text shown after having subscribed to another user successfully.
+#. TRANS: %s is the name of the user the subscription was requested for.
+#: lib/command.php:667
+#, php-format
+msgid "Subscribed to %s."
+msgstr "已关注%s。"
+
+#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
+#. TRANS: Error text shown when no username was provided when issuing the command.
+#: lib/command.php:688 lib/command.php:799
+msgid "Specify the name of the user to unsubscribe from."
+msgstr "指定要取消关注的用户名。"
+
+#. TRANS: Text shown after having unsubscribed from another user successfully.
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:699
+#, php-format
+msgid "Unsubscribed from %s."
+msgstr "取消关注%s。"
+

 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:719 lib/command.php:745

 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:728
+#: lib/command.php:723

 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:731
+#: lib/command.php:726

 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:754
+#: lib/command.php:749

 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:757
+#: lib/command.php:752

 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 

+#. TRANS: Error text shown when issuing the login command while login is disabled.
+#: lib/command.php:766
+msgid "Login command is disabled."
+msgstr "登录命令被禁用。"
+
+#. TRANS: Text shown after issuing the login command successfully.
+#. TRANS: %s is a logon link..
+#: lib/command.php:779
+#, php-format
+msgid "This link is useable only once and is valid for only 2 minutes: %s."
+msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
+
+#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
+#. TRANS: %s is the name of the user the unsubscription was requested for.
+#: lib/command.php:808
+#, php-format
+msgid "Unsubscribed %s."
+msgstr "已取消关注%s。"
+

 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:831
+#: lib/command.php:826

 msgid "You are not subscribed to anyone."
 msgid "You are not subscribed to anyone."

-msgstr "您没有关注任何人。"
+msgstr "你没有关注任何人。"

 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribed users.
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:836
+#: lib/command.php:831

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"

-msgstr[0] "您已关注了这个用户："
+msgstr[0] "你已关注了这个用户："

 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:858
+#: lib/command.php:853

 msgid "No one is subscribed to you."
 msgid "No one is subscribed to you."

-msgstr "没有人关注您。"
+msgstr "没有人关注你。"

 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribing users.
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:863
+#: lib/command.php:858

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"

-msgstr[0] "这个用户正在关注您："
+msgstr[0] "这个用户正在关注你："

 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:885
+#: lib/command.php:880

 msgid "You are not a member of any groups."
 msgid "You are not a member of any groups."

-msgstr "æ\82¨ä¸\8dæ\98¯è¯¥å°\8fç»\84æ\88\90å\91\98ã\80\82"
+msgstr "ä½ è¿\98æ\9cªæ\88\90为任ä½\95ä¸\80个å°\8fç»\84ç\9a\84æ\88\90å\91\98ã\80\82"

 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.

-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a

 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:890
+#: lib/command.php:885

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"

-msgstr[0] "您是该小组成员："
+msgstr[0] "你是该小组成员："

 
 

-#: lib/command.php:905
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:900

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5681,24 +6173,24 @@ msgstr ""
 "off - 关闭提醒\n"
 "help - 显示此帮助\n"
 "follow <昵称> - 关注该用户\n"
 "off - 关闭提醒\n"
 "help - 显示此帮助\n"
 "follow <昵称> - 关注该用户\n"

-"groups - 列出您加入的小组\n"
-"subscriptions - 列出您关注的用户\n"
-"subscribers - 列出您的关注者\n"
+"groups - 列出你加入的小组\n"
+"subscriptions - 列出你关注的用户\n"
+"subscribers - 列出你的关注者\n"

 "leave <昵称> - 取消关注该用户\n"
 "d <昵称> <文字> - 给该用户发送私信\n"
 "get <昵称> - 获取该用户的最后一条消息\n"
 "whois <昵称> - 获取该用户的个人信息\n"
 "leave <昵称> - 取消关注该用户\n"
 "d <昵称> <文字> - 给该用户发送私信\n"
 "get <昵称> - 获取该用户的最后一条消息\n"
 "whois <昵称> - 获取该用户的个人信息\n"

-"lose <昵称> - 强行取消该用户对您的关注\n"
+"lose <昵称> - 强行取消该用户对你的关注\n"

 "fav <昵称> - 将该用户最后一条消息加为'收藏'\n"
 "fav #<消息id> - 将该id的消息加为'收藏'\n"
 "repeat #<消息id> - 转发该id的消息\n"
 "repeat <昵称> - 转发该用户的最后一条消息\n"
 "fav <昵称> - 将该用户最后一条消息加为'收藏'\n"
 "fav #<消息id> - 将该id的消息加为'收藏'\n"
 "repeat #<消息id> - 转发该id的消息\n"
 "repeat <昵称> - 转发该用户的最后一条消息\n"

-"reply #<notice_id> - 对该id消息回复\n"
-"reply <昵称> - 对该用户的最后一条小心回复\n"
+"reply #<消息id> - 对该id消息回复\n"
+"reply <昵称> - 对该用户的最后一条消息回复\n"

 "join <小组> - 加入小组\n"
 "login - 获取网页登录的地址\n"
 "drop <小组> - 离开小组\n"
 "join <小组> - 加入小组\n"
 "login - 获取网页登录的地址\n"
 "drop <小组> - 离开小组\n"

-"stats - 获取您的统计\n"
+"stats - 获取你的统计\n"

 "stop - 和'off'相同\n"
 "quit - 和'off'相同\n"
 "sub <昵称> - 和'follow'相同\n"
 "stop - 和'off'相同\n"
 "quit - 和'off'相同\n"
 "sub <昵称> - 和'follow'相同\n"


@@ -5715,39 +6207,58 @@ msgstr ""
 "tracks - 尚未实现。\n"
 "tracking - 尚未实现。\n"
 
 "tracks - 尚未实现。\n"
 "tracking - 尚未实现。\n"
 

-#: lib/common.php:135
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136

 msgid "No configuration file found. "
 msgstr "没有找到配置文件。 "
 
 msgid "No configuration file found. "
 msgstr "没有找到配置文件。 "
 

-#: lib/common.php:136
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:139

 msgid "I looked for configuration files in the following places: "
 msgstr "我在以下位置查找了配置文件："
 
 msgid "I looked for configuration files in the following places: "
 msgstr "我在以下位置查找了配置文件："
 

-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142

 msgid "You may wish to run the installer to fix this."
 msgid "You may wish to run the installer to fix this."

-msgstr "或许您想运行安装程序来解决这个问题。"
+msgstr "或许你想运行安装程序来解决这个问题。"

 
 

-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146

 msgid "Go to the installer."
 msgstr "去安装程序。"
 
 msgid "Go to the installer."
 msgstr "去安装程序。"
 

-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"

 msgid "IM"
 msgstr "即时通讯IM"
 
 msgid "IM"
 msgstr "即时通讯IM"
 

-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108

 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 

-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115

 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 
 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 

+#. TRANS: Menu item for OuAth connection settings.

 #: lib/connectsettingsaction.php:120
 #: lib/connectsettingsaction.php:120

+msgctxt "MENU"

 msgid "Connections"
 msgstr "关联"
 
 msgid "Connections"
 msgstr "关联"
 

-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
+#: lib/connectsettingsaction.php:122

 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 


@@ -5762,22 +6273,18 @@ msgstr "上传文件"
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."
 #: lib/designsettings.php:109
 msgid ""
 "You can upload your personal background image. The maximum file size is 2MB."

-msgstr "您可以上传您的个人页面背景。文件最大 2MB。"
+msgstr "你可以上传你的个人页面背景。文件最大 2MB。"

 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."
 
 #: lib/designsettings.php:418
 msgid "Design defaults restored."

-msgstr "默认设计已恢复。"
+msgstr "默认外观已恢复。"

 
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144

 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 
 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 

-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143

 msgid "Favor this notice"
 msgid "Favor this notice"

-msgstr "收藏这个消息"
-
-#: lib/favorform.php:140
-msgid "Favor"

 msgstr "收藏"
 
 #: lib/feed.php:85
 msgstr "收藏"
 
 #: lib/feed.php:85


@@ -5796,9 +6303,9 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
 msgid "FOAF"
 msgstr "FOAF"
 

-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "RSS 订阅"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr "Feeds"

 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"


@@ -5852,37 +6359,77 @@ msgstr "小组的地理位置，例如“国家、省份、城市”"
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "该小组额外的昵称，用逗号或者空格分隔开，最长%d"
 
 msgid "Extra nicknames for the group, comma- or space- separated, max %d"
 msgstr "该小组额外的昵称，用逗号或者空格分隔开，最长%d"
 

-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"

 msgid "Group"
 msgstr "小组"
 
 msgid "Group"
 msgstr "小组"
 

-#: lib/groupnav.php:101
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr "%s小组"
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr "组员"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr "%s 小组成员"
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"

 msgid "Blocked"
 msgid "Blocked"

-msgstr "被屏蔽"
+msgstr "屏蔽的用户"

 
 

-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "%s blocked users"
 msgid "%s blocked users"

-msgstr "%s屏蔽的用户"
+msgstr "%s 屏蔽的用户"

 
 

-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Edit %s group properties"
 msgid "Edit %s group properties"

-msgstr "编辑 %s群选项"
+msgstr "编辑 %s 小组设置"

 
 

-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"

 msgid "Logo"
 msgstr "Logo"
 
 msgid "Logo"
 msgstr "Logo"
 

-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s logo"
 msgid "Add or edit %s logo"

-msgstr "添加或编辑 %s 图标"
+msgstr "添加或编辑 %s logo"

 
 

-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138

 #, php-format
 #, php-format

+msgctxt "TOOLTIP"

 msgid "Add or edit %s design"
 msgid "Add or edit %s design"

-msgstr "添加或编辑%s设计"
+msgstr "添加或编辑 %s 外观"

 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"


@@ -5900,7 +6447,7 @@ msgstr "这个组所发布的消息的标签"
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 #. TRANS: Client exception 406
 #: lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"

-msgstr "这个页面不提供您想要的媒体类型"
+msgstr "这个页面不提供你想要的媒体类型"

 
 #: lib/imagefile.php:72
 msgid "Unsupported image file format."
 
 #: lib/imagefile.php:72
 msgid "Unsupported image file format."


@@ -5915,7 +6462,8 @@ msgstr "文件太大。文件大小限制在%s以下。"
 msgid "Partial upload."
 msgstr "部分上传。"
 
 msgid "Partial upload."
 msgstr "部分上传。"
 

-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179

 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 


@@ -5949,10 +6497,6 @@ msgstr "[%s]"
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 

-#: lib/joinform.php:114
-msgid "Join"
-msgstr "加入"
-

 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"


@@ -5989,22 +6533,22 @@ msgid ""
 msgstr ""
 "嗨， %s。\n"
 "\n"
 msgstr ""
 "嗨， %s。\n"
 "\n"

-"刚刚有人在%s填写了您的电子邮件地址。\n"
+"刚刚有人在%s填写了你的电子邮件地址。\n"

 "\n"
 "\n"

-"如果是您的操作并且您想完成您的确认，请使用下面的URL：\n"
+"如果是你的操作并且你想完成你的确认，请使用下面的URL：\n"

 "\n"
 "%s\n"
 "\n"
 "\n"
 "%s\n"
 "\n"

-"如果您不知道这封邮件是怎么回事，忽略掉这封邮件就好。\n"
+"如果你不知道这封邮件是怎么回事，忽略掉这封邮件就好。\n"

 "\n"
 "\n"

-"谢谢您的宝贵时间，\n"
+"谢谢你的宝贵时间，\n"

 "%s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 "%s\n"
 
 #. TRANS: Subject of new-subscriber notification e-mail
 #: lib/mail.php:243
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."

-msgstr "%1$s 开始关注您的 %2$s 信息。"
+msgstr "%1$s 开始关注你在 %2$s 的消息。"

 
 #: lib/mail.php:248
 #, php-format
 
 #: lib/mail.php:248
 #, php-format


@@ -6012,7 +6556,7 @@ msgid ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""
 "If you believe this account is being used abusively, you can block them from "
 "your subscribers list and report as spam to site administrators at %s"
 msgstr ""

-"如果您认为此帐户正被人恶意使用，您可以将其从您的关注者中屏蔽掉并到 %s 报告给"
+"如果你认为此帐户正被人恶意使用，你可以将其从你的关注者中屏蔽掉并到 %s 报告给"

 "网站的管理员为他们在发垃圾信息。"
 
 #. TRANS: Main body of new-subscriber notification e-mail
 "网站的管理员为他们在发垃圾信息。"
 
 #. TRANS: Main body of new-subscriber notification e-mail


@@ -6030,7 +6574,7 @@ msgid ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""
 "----\n"
 "Change your email address or notification options at %8$s\n"
 msgstr ""

-"%1$s开始关注您在%2$s的消息。\n"
+"%1$s开始关注你在%2$s的消息。\n"

 "\n"
 "\t%3$s\n"
 "\n"
 "\n"
 "\t%3$s\n"
 "\n"


@@ -6039,7 +6583,7 @@ msgstr ""
 "%7$s.\n"
 "\n"
 "----\n"
 "%7$s.\n"
 "\n"
 "----\n"

-"在%8$s更改您的 email 地址或通知选项\n"
+"在%8$s更改你的 email 地址或通知选项\n"

 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274
 
 #. TRANS: Profile info line in new-subscriber notification e-mail
 #: lib/mail.php:274


@@ -6066,7 +6610,7 @@ msgid ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""
 "Faithfully yours,\n"
 "%4$s"
 msgstr ""

-"您的 %1$s 发布用地址已更新。\n"
+"你的 %1$s 发布用地址已更新。\n"

 "\n"
 "发送邮件到 %2$s 来发布新消息。\n"
 "\n"
 "\n"
 "发送邮件到 %2$s 来发布新消息。\n"
 "\n"


@@ -6091,13 +6635,13 @@ msgstr "SMS 验证"
 #: lib/mail.php:463
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 #: lib/mail.php:463
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"

-msgstr "%s：通过此代码证明这是您的手机："
+msgstr "%s：通过此代码证明这是你的手机："

 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
 msgid "You've been nudged by %s"
 
 #. TRANS: Subject for 'nudge' notification email
 #: lib/mail.php:484
 #, php-format
 msgid "You've been nudged by %s"

-msgstr "%s呼叫您"
+msgstr "你被%s呼叫了"

 
 #. TRANS: Body for 'nudge' notification email
 #: lib/mail.php:489
 
 #. TRANS: Body for 'nudge' notification email
 #: lib/mail.php:489


@@ -6115,9 +6659,9 @@ msgid ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""
 "With kind regards,\n"
 "%4$s\n"
 msgstr ""

-"%1$s (%2$s) 想知道您这几天在做什么并邀请您来发布一些消息。\n"
+"%1$s (%2$s) 想知道你这几天在做什么并邀请你来发布一些消息。\n"

 "\n"
 "\n"

-"那就让他/她知道您的动态吧 :)\n"
+"那就让他/她知道你的动态吧 :)\n"

 "\n"
 "%3$s\n"
 "\n"
 "\n"
 "%3$s\n"
 "\n"


@@ -6151,13 +6695,13 @@ msgid ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""
 "With kind regards,\n"
 "%5$s\n"
 msgstr ""

-"%1$s (%2$s) 给您发了一条私信“：\n"
+"%1$s (%2$s) 给你发了一条私信“：\n"

 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
 "------------------------------------------------------\n"
 "\n"
 "\n"
 "------------------------------------------------------\n"
 "%3$s\n"
 "------------------------------------------------------\n"
 "\n"

-"您可以到这里回复这条私信：\n"
+"你可以到这里回复这条私信：\n"

 "\n"
 "%4$s\n"
 "\n"
 "\n"
 "%4$s\n"
 "\n"


@@ -6170,7 +6714,7 @@ msgstr ""
 #: lib/mail.php:589
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"
 #: lib/mail.php:589
 #, php-format
 msgid "%s (@%s) added your notice as a favorite"

-msgstr "%s (@%s) 收藏了您的消息"
+msgstr "%s (@%s) 收藏了你的消息"

 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592
 
 #. TRANS: Body for favorite notification email
 #: lib/mail.php:592


@@ -6193,17 +6737,17 @@ msgid ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""
 "Faithfully yours,\n"
 "%6$s\n"
 msgstr ""

-"%1$s (@%7$s) 刚刚在 %2$s 收藏了一条您的消息。\n"
+"%1$s (@%7$s) 刚刚在 %2$s 收藏了一条你的消息。\n"

 "\n"
 "\n"

-"您的这条消息的URL：\n"
+"你的这条消息的URL：\n"

 "\n"
 "%3$s\n"
 "\n"
 "\n"
 "%3$s\n"
 "\n"

-"您的这条消息的内容是：\n"
+"你的这条消息的内容是：\n"

 "\n"
 "%4$s\n"
 "\n"
 "\n"
 "%4$s\n"
 "\n"

-"您可以到这里查看所有 %1$s 收藏的消息：\n"
+"你可以到这里查看所有 %1$s 收藏的消息：\n"

 "\n"
 "%5$s\n"
 "\n"
 "\n"
 "%5$s\n"
 "\n"


@@ -6225,7 +6769,7 @@ msgstr ""
 #: lib/mail.php:657
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"
 #: lib/mail.php:657
 #, php-format
 msgid "%s (@%s) sent a notice to your attention"

-msgstr "%s (@%s) 给您发送了一条消息"
+msgstr "%s (@%s) 给你发送了一条消息"

 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660
 
 #. TRANS: Body of @-reply notification e-mail.
 #: lib/mail.php:660


@@ -6254,7 +6798,7 @@ msgid ""
 "\n"
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""
 "\n"
 "P.S. You can turn off these email notifications here: %8$s\n"
 msgstr ""

-"%1$s (@%9$s) 刚刚在%2$s通过（@回复）发送了一条消息给您。\n"
+"%1$s (@%9$s) 刚刚在%2$s通过（@回复）发送了一条消息给你。\n"

 "\n"
 "消息的地址是：\n"
 "\n"
 "\n"
 "消息的地址是：\n"
 "\n"


@@ -6264,18 +6808,18 @@ msgstr ""
 "\n"
 "\t%4$s\n"
 "\n"
 "\n"
 "\t%4$s\n"
 "\n"

-"%5$s您可以到这里回复：\n"
+"%5$s你可以到这里回复：\n"

 "\n"
 "\t%6$s\n"
 "\n"
 "\n"
 "\t%6$s\n"
 "\n"

-"所有给您的 @回复 消息：\n"
+"所有给你的 @回复 消息：\n"

 "\n"
 "%7$s\n"
 "\n"
 "真切的问候，\n"
 "%2$s\n"
 "\n"
 "\n"
 "%7$s\n"
 "\n"
 "真切的问候，\n"
 "%2$s\n"
 "\n"

-"P.S. 您可以到这里关掉这些邮件提醒：%8$s\n"
+"P.S. 你可以到这里关掉这些邮件提醒：%8$s\n"

 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."
 
 #: lib/mailbox.php:89
 msgid "Only the user can read their own mailboxes."


@@ -6286,12 +6830,12 @@ msgid ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""
 "You have no private messages. You can send private message to engage other "
 "users in conversation. People can send you messages for your eyes only."
 msgstr ""

-"您没有任何私信。您可以试着发送私信给其他用户鼓励他们用私信和您交流。其他用户"
-"发给你您私信只有您看得到。"
+"你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
+"发给你你私信只有你看得到。"

 
 

-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:516

 msgid "from"
 msgid "from"

-msgstr "来自"
+msgstr "通过"

 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."
 
 #: lib/mailhandler.php:37
 msgid "Could not parse message."


@@ -6303,7 +6847,7 @@ msgstr "不是已注册用户。"
 
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."
 
 #: lib/mailhandler.php:46
 msgid "Sorry, that is not your incoming email address."

-msgstr "抱歉，这个不是您的收信电子邮件地址。"
+msgstr "抱歉，这个不是你的收信电子邮件地址。"

 
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."
 
 #: lib/mailhandler.php:50
 msgid "Sorry, no incoming email allowed."


@@ -6314,57 +6858,76 @@ msgstr "抱歉，现在不允许电子邮件发布。"
 msgid "Unsupported message type: %s"
 msgstr "不支持的信息格式：%s"
 
 msgid "Unsupported message type: %s"
 msgstr "不支持的信息格式：%s"
 

-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125

 msgid "There was a database error while saving your file. Please try again."
 msgid "There was a database error while saving your file. Please try again."

-msgstr "保存您的文件时数据库出现了一个错误。请重试。"
+msgstr "保存你的文件时数据库出现了一个错误。请重试。"

 
 

-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145

 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
 
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
 msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
 

-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151

 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
 
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
 

-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157

 msgid "The uploaded file was only partially uploaded."
 msgstr "上传的文件只有部分被上传。"
 
 msgid "The uploaded file was only partially uploaded."
 msgstr "上传的文件只有部分被上传。"
 

-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165

 msgid "Missing a temporary folder."
 msgstr "缺少一个临时文件夹。"
 
 msgid "Missing a temporary folder."
 msgstr "缺少一个临时文件夹。"
 

-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169

 msgid "Failed to write file to disk."
 msgstr "写入磁盘失败。"
 
 msgid "Failed to write file to disk."
 msgstr "写入磁盘失败。"
 

-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173

 msgid "File upload stopped by extension."
 msgstr "文件上传被扩展停止了。"
 
 msgid "File upload stopped by extension."
 msgstr "文件上传被扩展停止了。"
 

-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232

 msgid "File exceeds user's quota."
 msgstr "文件超过了用户的配额。"
 
 msgid "File exceeds user's quota."
 msgstr "文件超过了用户的配额。"
 

-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251

 msgid "File could not be moved to destination directory."
 msgstr "文件不能被移动到目标目录。"
 
 msgid "File could not be moved to destination directory."
 msgstr "文件不能被移动到目标目录。"
 

-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257

 msgid "Could not determine file's MIME type."
 msgstr "无法判断文件的 MIME 类型。"
 
 msgid "Could not determine file's MIME type."
 msgstr "无法判断文件的 MIME 类型。"
 

-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340

 #, php-format
 #, php-format

-msgid " Try using another %s format."
-msgstr "试一下其他的%s格式。"
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr "此服务器不支持 “%1$s” 的文件格式，试下使用其他的 %2$s 格式。"

 
 

-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345

 #, php-format
 #, php-format

-msgid "%s is not a supported file type on this server."
-msgstr "这个服务器不支持%s的文件格式。"
+msgid "\"%s\" is not a supported file type on this server."
+msgstr "这个服务器不支持 %s 的文件格式。"

 
 #: lib/messageform.php:120
 msgid "Send a direct notice"
 
 #: lib/messageform.php:120
 msgid "Send a direct notice"


@@ -6385,7 +6948,7 @@ msgstr "发布"
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 
 #: lib/noticeform.php:160
 msgid "Send a notice"

-msgstr "发送一个消息"
+msgstr "发送一个通知"

 
 #: lib/noticeform.php:174
 #, php-format
 
 #: lib/noticeform.php:174
 #, php-format


@@ -6412,64 +6975,64 @@ msgstr "不要分享我的地理位置。"
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"
 msgid ""
 "Sorry, retrieving your geo location is taking longer than expected, please "
 "try again later"

-msgstr "抱歉，获取您的地理位置时间过长，请稍候重试"
+msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"

 
 #. TRANS: Used in coordinates as abbreviation of north
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:436
+#: lib/noticelist.php:446

 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:438
+#: lib/noticelist.php:448

 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:440
+#: lib/noticelist.php:450

 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:442
+#: lib/noticelist.php:452

 msgid "W"
 msgstr "W"
 
 msgid "W"
 msgstr "W"
 

-#: lib/noticelist.php:444
+#: lib/noticelist.php:454

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 

-#: lib/noticelist.php:453
+#: lib/noticelist.php:463

 msgid "at"
 msgstr "位于"
 
 msgid "at"
 msgstr "位于"
 

-#: lib/noticelist.php:502
+#: lib/noticelist.php:512

 msgid "web"
 msgstr "网页"
 
 msgid "web"
 msgstr "网页"
 

-#: lib/noticelist.php:568
+#: lib/noticelist.php:578

 msgid "in context"
 msgstr "查看对话"
 
 msgid "in context"
 msgstr "查看对话"
 

-#: lib/noticelist.php:603
+#: lib/noticelist.php:613

 msgid "Repeated by"
 msgid "Repeated by"

-msgstr "被转å\8f\91"
+msgstr "转å\8f\91æ\9d¥è\87ª"

 
 

-#: lib/noticelist.php:630
+#: lib/noticelist.php:640

 msgid "Reply to this notice"
 msgid "Reply to this notice"

-msgstr "回复这个消息"
+msgstr "回复"

 
 

-#: lib/noticelist.php:631
+#: lib/noticelist.php:641

 msgid "Reply"
 msgstr "回复"
 
 msgid "Reply"
 msgstr "回复"
 

-#: lib/noticelist.php:675
+#: lib/noticelist.php:685

 msgid "Notice repeated"
 msgstr "消息已转发"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgid "Notice repeated"
 msgstr "消息已转发"
 
 #: lib/nudgeform.php:116
 msgid "Nudge this user"

-msgstr "呼叫这个用户"
+msgstr "呼叫用户"

 
 #: lib/nudgeform.php:128
 msgid "Nudge"
 
 #: lib/nudgeform.php:128
 msgid "Nudge"


@@ -6479,27 +7042,24 @@ msgstr "呼叫"
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 

-#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "添加个人信息出错"
-
-#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "添加头像出错"
+#: lib/oauthstore.php:294
+msgid "Error inserting new profile."
+msgstr "添加新个人信息出错。"

 
 

-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "æ\9b´æ\96°è¿\9cç¨\8bç\9a\84个人信æ\81¯æ\97¶å\87ºé\94\99"
+#: lib/oauthstore.php:302
+msgid "Error inserting avatar."
+msgstr "æ·»å\8a 头å\83\8få\87ºé\94\99ã\80\82"

 
 

-#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "添加远程的个人信息出错"
+#: lib/oauthstore.php:322
+msgid "Error inserting remote profile."
+msgstr "添加远程个人信息时出错。"

 
 

-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "转发消息"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:362
+msgid "Duplicate notice."
+msgstr "复制消息。"

 
 

-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:507

 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 


@@ -6521,7 +7081,7 @@ msgstr "收件箱"
 
 #: lib/personalgroupnav.php:126
 msgid "Your incoming messages"
 
 #: lib/personalgroupnav.php:126
 msgid "Your incoming messages"

-msgstr "您收到的私信"
+msgstr "你收到的私信"

 
 #: lib/personalgroupnav.php:130
 msgid "Outbox"
 
 #: lib/personalgroupnav.php:130
 msgid "Outbox"


@@ -6529,14 +7089,15 @@ msgstr "发件箱"
 
 #: lib/personalgroupnav.php:131
 msgid "Your sent messages"
 
 #: lib/personalgroupnav.php:131
 msgid "Your sent messages"

-msgstr "您发送的私信"
+msgstr "你发送的私信"

 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s的消息中的标签"
 
 
 #: lib/personaltagcloudsection.php:56
 #, php-format
 msgid "Tags in %s's notices"
 msgstr "%s的消息中的标签"
 

-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121

 msgid "Unknown"
 msgstr "未知的"
 
 msgid "Unknown"
 msgstr "未知的"
 


@@ -6611,14 +7172,14 @@ msgstr "是"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"
 
 #: lib/repeatform.php:132
 msgid "Repeat this notice"

-msgstr "转发这个消息"
+msgstr "转发"

 
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 
 
 #: lib/revokeroleform.php:91
 #, php-format
 msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 

-#: lib/router.php:709
+#: lib/router.php:711

 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 
 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 


@@ -6630,19 +7191,24 @@ msgstr "沙盒"
 msgid "Sandbox this user"
 msgstr "将这个用户放入沙盒。"
 
 msgid "Sandbox this user"
 msgstr "将这个用户放入沙盒。"
 

-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121

 msgid "Search site"
 msgstr "搜索帮助"
 
 msgid "Search site"
 msgstr "搜索帮助"
 

-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129

 msgid "Keyword(s)"
 msgstr "关键词"
 
 msgid "Keyword(s)"
 msgstr "关键词"
 

-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"

 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 

-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170

 msgid "Search help"
 msgstr "搜索帮助"
 
 msgid "Search help"
 msgstr "搜索帮助"
 


@@ -6705,12 +7271,12 @@ msgstr "邀请朋友和同事来%s一起和你交流"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"
 #: lib/subscriberspeopleselftagcloudsection.php:48
 #: lib/subscriptionspeopleselftagcloudsection.php:48
 msgid "People Tagcloud as self-tagged"

-msgstr "用户自我标签的用户标签云"
+msgstr "自己添加标签的用户标签云"

 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"
 
 #: lib/subscriberspeopletagcloudsection.php:48
 #: lib/subscriptionspeopletagcloudsection.php:48
 msgid "People Tagcloud as tagged"

-msgstr "被标签的用户标签云"
+msgstr "被添å\8a æ \87ç­¾ç\9a\84ç\94¨æ\88·æ \87ç­¾äº\91"

 
 #: lib/tagcloudsection.php:56
 msgid "None"
 
 #: lib/tagcloudsection.php:56
 msgid "None"


@@ -6725,12 +7291,12 @@ msgid "The theme file is missing or the upload failed."
 msgstr "主题文件丢失或上传失败。"
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102
 msgstr "主题文件丢失或上传失败。"
 
 #: lib/themeuploader.php:91 lib/themeuploader.php:102

-#: lib/themeuploader.php:253 lib/themeuploader.php:257
-#: lib/themeuploader.php:265 lib/themeuploader.php:272
+#: lib/themeuploader.php:278 lib/themeuploader.php:282
+#: lib/themeuploader.php:290 lib/themeuploader.php:297

 msgid "Failed saving theme."
 msgstr "保存主题失败"
 
 msgid "Failed saving theme."
 msgstr "保存主题失败"
 

-#: lib/themeuploader.php:139
+#: lib/themeuploader.php:147

 msgid "Invalid theme: bad directory structure."
 msgstr "无效的主题：目录结构损坏。"
 
 msgid "Invalid theme: bad directory structure."
 msgstr "无效的主题：目录结构损坏。"
 


@@ -6743,19 +7309,23 @@ msgstr "上传的主题过大，解压后必须小于%d字节。"
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "无效的主题存档：css/display.css 文件丢失"
 
 msgid "Invalid theme archive: missing file css/display.css"
 msgstr "无效的主题存档：css/display.css 文件丢失"
 

-#: lib/themeuploader.php:205
+#: lib/themeuploader.php:218

 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 "主题包含无效的文件或文件夹的名称。请只使用 ASCII 字母，数字，下划线和减号。"
 
 msgid ""
 "Theme contains invalid file or folder name. Stick with ASCII letters, "
 "digits, underscore, and minus sign."
 msgstr ""
 "主题包含无效的文件或文件夹的名称。请只使用 ASCII 字母，数字，下划线和减号。"
 

-#: lib/themeuploader.php:216
+#: lib/themeuploader.php:224
+msgid "Theme contains unsafe file extension names; may be unsafe."
+msgstr "主题包含不安全的文件扩展名，可能有危险。"
+
+#: lib/themeuploader.php:241

 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "主题包含不允许的”.%s“格式文件。"
 
 #, php-format
 msgid "Theme contains file of type '.%s', which is not allowed."
 msgstr "主题包含不允许的”.%s“格式文件。"
 

-#: lib/themeuploader.php:234
+#: lib/themeuploader.php:259

 msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 
 msgid "Error opening theme archive."
 msgstr "打开主题文件时出错。"
 


@@ -6787,6 +7357,13 @@ msgstr "取消关注这个用户"
 msgid "Unsubscribe"
 msgstr "取消关注"
 
 msgid "Unsubscribe"
 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).
+#: lib/usernoprofileexception.php:60
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
+

 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "编辑头像"
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "编辑头像"


@@ -6813,7 +7390,7 @@ msgstr "给该用户发送私信"
 
 #: lib/userprofile.php:288
 msgid "Message"
 
 #: lib/userprofile.php:288
 msgid "Message"

-msgstr "消息"
+msgstr "私信"

 
 #: lib/userprofile.php:326
 msgid "Moderate"
 
 #: lib/userprofile.php:326
 msgid "Moderate"


@@ -6834,56 +7411,60 @@ msgid "Moderator"
 msgstr "审核员"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr "审核员"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1103
+#: lib/util.php:1163

 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1106
+#: lib/util.php:1166

 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1110
+#: lib/util.php:1170

 #, php-format
 #, php-format

-msgid "about %d minutes ago"
-msgstr "约%d分钟前"
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] "约1分钟前"

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1113
+#: lib/util.php:1173

 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1117
+#: lib/util.php:1177

 #, php-format
 #, php-format

-msgid "about %d hours ago"
-msgstr "约%d小时前"
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] "约一小时前"

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1120
+#: lib/util.php:1180

 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1124
+#: lib/util.php:1184

 #, php-format
 #, php-format

-msgid "about %d days ago"
-msgstr "约%d天前"
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] "约1天前"

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1127
+#: lib/util.php:1187

 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1131
+#: lib/util.php:1191

 #, php-format
 #, php-format

-msgid "about %d months ago"
-msgstr "约%d个月前"
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] "约1个月前"

 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1134
+#: lib/util.php:1194

 msgid "about a year ago"
 msgstr "约1年前"
 
 msgid "about a year ago"
 msgstr "约1年前"
 


@@ -6896,3 +7477,43 @@ msgstr "%s不是有效的颜色！"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
 #, php-format
 msgid "%s is not a valid color! Use 3 or 6 hex chars."
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"

+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)"
+msgstr "用户 %s (%s) 的备份文件"
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user."
+msgstr "没有用户被指定；使用备份用户。"
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr "备份中有 %d 个条目。"
+
+#~ msgid ""
+#~ "The request token %s has been authorized. Please exchange it for an "
+#~ "access token."
+#~ msgstr "Request token 已被批准。请为它换一个 access token。"
+
+#~ msgid "Deny"
+#~ msgstr "阻止"
+
+#~ msgid "Path to locales"
+#~ msgstr "本地化文件路径"
+
+#~ msgid "Theme server"
+#~ msgstr "主题服务器"
+
+#~ msgid "Theme path"
+#~ msgstr "主题路径"
+
+#~ msgid "Background server"
+#~ msgstr "背景服务器"
+
+#~ msgid "Background path"
+#~ msgstr "背景图路径"
+
+#~ msgid "Background directory"
+#~ msgstr "背景图目录"