Localisation updates from http://translatewiki.net.

[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 a9600d1bba4a3887eb71c263746ab7cc48af8ccf..06f822d1860a871c94900e8e4716e447b7d09f8d 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -14,18 +14,18 @@ msgid ""
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"
 msgstr ""
 "Project-Id-Version: StatusNet - Core\n"
 "Report-Msgid-Bugs-To: \n"

-"POT-Creation-Date: 2010-10-09 14:04+0000\n"
-"PO-Revision-Date: 2010-10-09 14:07:10+0000\n"
+"POT-Creation-Date: 2010-10-19 23:00+0000\n"
+"PO-Revision-Date: 2010-10-19 23:02:50+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"
 "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"

-"X-Generator: MediaWiki 1.17alpha (r74529); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.17alpha (r75030); Translate extension (2010-09-17)\n"

 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
 "X-Language-Code: zh-hans\n"
 "X-Message-Group: #out-statusnet-core\n"
 "Plural-Forms: nplurals=1; plural=0;\n"

-"X-POT-Import-Date: 2010-10-04 23:06:40+0000\n"
+"X-POT-Import-Date: 2010-10-18 21:13:08+0000\n"

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


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

+#. TRANS: Button to save input in profile settings.

 #. TRANS: Button label to save SMS preferences.
 #. TRANS: Button label to save SMS preferences.

+#. TRANS: Save button for settings for a profile in a subscriptions list.

 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:203 actions/emailsettings.php:228
 #. TRANS: Button label in the "Edit application" form.
 #: actions/accessadminpanel.php:203 actions/emailsettings.php:228

-#: actions/imsettings.php:187 actions/smssettings.php:209
+#: actions/imsettings.php:187 actions/profilesettings.php:201
+#: actions/smssettings.php:209 actions/subscriptions.php:246

 #: lib/applicationeditform.php:355
 msgctxt "BUTTON"
 msgid "Save"
 #: lib/applicationeditform.php:355
 msgctxt "BUTTON"
 msgid "Save"


@@ -96,14 +99,15 @@ msgstr "保存"
 msgid "No such page."
 msgstr "没有这个页面。"
 
 msgid "No such page."
 msgstr "没有这个页面。"
 

+#. 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
 #: actions/apiaccountupdatedeliverydevice.php:115
 #: actions/apiaccountupdateprofile.php:106
 #: actions/apiaccountupdateprofilebackgroundimage.php:117
 #: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
 #. 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:115
 #: actions/apiaccountupdateprofile.php:106
 #: actions/apiaccountupdateprofilebackgroundimage.php:117
 #: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98

-#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: 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/apigroupismember.php:91 actions/apigroupjoin.php:101
 #: actions/apigroupleave.php:101 actions/apigrouplist.php:73
 #: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87


@@ -180,7 +184,7 @@ msgstr ""
 "你可以试着到他们的资料页 [呼叫%1$s](../%2$s) 他们或者 [给他们发消息](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)。"
 
 "你可以试着到他们的资料页 [呼叫%1$s](../%2$s) 他们或者 [给他们发消息](%%%%"
 "action.newnotice%%%%?status_textarea=%3$s)。"
 

-#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:211
+#: actions/all.php:149 actions/replies.php:210 actions/showstream.php:208

 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
 #, php-format
 msgid ""
 "Why not [register an account](%%%%action.register%%%%) and then nudge %s or "


@@ -201,12 +205,13 @@ 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/apiaccountupdatedeliverydevice.php:95
 #: actions/apiaccountupdateprofile.php:98
 #: actions/apiaccountupdateprofilebackgroundimage.php:95
 #: actions/apiaccountupdateprofilecolors.php:119
 #: actions/apiaccountratelimitstatus.php:72
 #: actions/apiaccountupdatedeliverydevice.php:95
 #: actions/apiaccountupdateprofile.php:98
 #: actions/apiaccountupdateprofilebackgroundimage.php:95
 #: actions/apiaccountupdateprofilecolors.php:119

-#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: 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/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
 #: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
 #: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140


@@ -233,7 +238,7 @@ msgstr "API方法没有找到。"
 #: actions/apiaccountupdateprofilebackgroundimage.php:87
 #: actions/apiaccountupdateprofilecolors.php:111
 #: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.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:110
+#: 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/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
 #: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
 #: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93


@@ -267,10 +272,11 @@ msgstr "用户没有个人信息。"
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 
 msgid "Could not save profile."
 msgstr "无法保存个人信息。"
 

+#. TRANS: Client exception. %s is CONTENT_LENGTH (in bytes).

 #: actions/apiaccountupdateprofilebackgroundimage.php:109
 #: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
 #: actions/apistatusesupdate.php:213 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/designadminpanel.php:123 actions/editapplication.php:120

 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format
 #: actions/newapplication.php:101 actions/newnotice.php:94
 #: lib/designsettings.php:283
 #, php-format


@@ -306,43 +312,58 @@ msgstr "屏蔽用户失败。"
 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:119
+#. TRANS: Client error (406).
+#: actions/apidirectmessagenew.php:117

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

-#: actions/apidirectmessagenew.php:128 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个字符。"

 
 

+#. TRANS: Client error displayed if a recipient user could not be found (403).

 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #: actions/apidirectmessagenew.php:139
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 

-#: actions/apidirectmessagenew.php:143
+#. 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 "不能给未成为好友的用户发送私信。"
 

+#. 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."
 #: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
 #: actions/apistatusesdestroy.php:121
 msgid "No status found with that ID."


@@ -394,46 +415,48 @@ msgstr "无法确定源用户。"
 msgid "Could not find target user."
 msgstr "无法找到目标用户。"
 
 msgid "Could not find target user."
 msgstr "无法找到目标用户。"
 

+#. TRANS: Validation error in form for profile settings.

 #: actions/apigroupcreate.php:168 actions/editgroup.php:186
 #: actions/apigroupcreate.php:168 actions/editgroup.php:186

-#: actions/newgroup.php:126 actions/profilesettings.php:215
+#: actions/newgroup.php:126 actions/profilesettings.php:243

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

+#. TRANS: Validation error in form for profile settings.

 #: actions/apigroupcreate.php:177 actions/editgroup.php:190
 #: actions/apigroupcreate.php:177 actions/editgroup.php:190

-#: actions/newgroup.php:130 actions/profilesettings.php:238
+#: actions/newgroup.php:130 actions/profilesettings.php:277

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

+#. TRANS: Validation error in form for profile settings.

 #: actions/apigroupcreate.php:184 actions/editgroup.php:193
 #: actions/apigroupcreate.php:184 actions/editgroup.php:193

-#: actions/newgroup.php:133 actions/profilesettings.php:218
+#: actions/newgroup.php:133 actions/profilesettings.php:247

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

-#: actions/apigroupcreate.php:200 actions/editapplication.php:215
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
+#. TRANS: Validation error in form for profile settings.
+#: actions/apigroupcreate.php:200 actions/editapplication.php:231

 #: actions/editgroup.php:199 actions/newapplication.php:203
 #: actions/editgroup.php:199 actions/newapplication.php:203

-#: actions/newgroup.php:139 actions/profilesettings.php:222
+#: actions/newgroup.php:139 actions/profilesettings.php:252

 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: actions/apigroupcreate.php:209 actions/editgroup.php:202
 #: actions/register.php:224
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: actions/apigroupcreate.php:209 actions/editgroup.php:202

-#: actions/newgroup.php:142 actions/profilesettings.php:225
-#: actions/register.php:227
+#: actions/newgroup.php:142 actions/register.php:227

 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 

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

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

-#: actions/newgroup.php:148 actions/profilesettings.php:232
-#: actions/register.php:234
+#: actions/newgroup.php:148 actions/register.php:234

 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 


@@ -522,24 +545,31 @@ msgstr "在%s上的小组"
 msgid "Upload failed."
 msgstr "上传失败"
 
 msgid "Upload failed."
 msgstr "上传失败"
 

-#: actions/apioauthauthorize.php:101
+#: actions/apioauthaccesstoken.php:103
+#, 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:116 actions/apioauthauthorize.php:121
+#: actions/apioauthauthorize.php:128
+#, fuzzy
+msgid "Invalid request token."

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

-#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:145 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/groupunblock.php:66 actions/imsettings.php:230
 #: 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/groupunblock.php:66 actions/imsettings.php:230

-#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
+#: actions/invite.php:59 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/othersettings.php:145 actions/passwordsettings.php:138
 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
 #: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
 #: actions/othersettings.php:145 actions/passwordsettings.php:138

-#: actions/profilesettings.php:194 actions/recoverpassword.php:350
+#: actions/profilesettings.php:221 actions/recoverpassword.php:350

 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166
 #: actions/register.php:172 actions/remotesubscribe.php:77
 #: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
 #: actions/subscribe.php:86 actions/tagother.php:166


@@ -548,35 +578,24 @@ msgstr "无效的 token。"
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr "你的 session 出现了一个问题，请重试。"
 

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

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

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

 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:216

 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: Client error displayed submitting invalid form data for edit application.

 #. 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/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/apioauthauthorize.php:279 actions/avatarsettings.php:281
+#: actions/designadminpanel.php:104 actions/editapplication.php:142

 #: 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/emailsettings.php:290 actions/grouplogo.php:322
 #: actions/imsettings.php:245 actions/newapplication.php:121
 #: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44


@@ -584,15 +603,15 @@ msgstr "%s的 request token 被拒绝并被取消。"
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 

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

 msgid "An application would like to connect to your account"
 msgstr "一个应用想连接到你的账号"
 
 msgid "An application would like to connect to your account"
 msgstr "一个应用想连接到你的账号"
 

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

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

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

 #, 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 "


@@ -603,12 +622,13 @@ msgstr ""
 "strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"
 
 #. TRANS: Main menu option when logged in for access to user settings
 "strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"
 
 #. TRANS: Main menu option when logged in for access to user settings

-#: actions/apioauthauthorize.php:310 lib/action.php:462
+#: actions/apioauthauthorize.php:356 lib/action.php:490

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

-#: actions/apioauthauthorize.php:313 actions/login.php:252
-#: actions/profilesettings.php:106 actions/register.php:431
+#. TRANS: Field label in form for profile settings.
+#: actions/apioauthauthorize.php:359 actions/login.php:252
+#: actions/profilesettings.php:110 actions/register.php:431

 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132
 #: actions/showgroup.php:245 actions/tagother.php:94
 #: actions/userauthorization.php:145 lib/groupeditform.php:152
 #: lib/userprofile.php:132


@@ -616,23 +636,47 @@ 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/apioauthauthorize.php:362 actions/login.php:255

 #: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "密码"
 
 #: actions/register.php:436 lib/accountsettingsaction.php:120
 msgid "Password"
 msgstr "密码"
 

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

 
 

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

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

-#: actions/apioauthauthorize.php:351
-msgid "Allow or deny access to your account information."
+#: actions/apioauthauthorize.php:397
+#, fuzzy
+msgid "Authorize access to your account information."

 msgstr "允许或阻止对你账户信息的访问。"
 
 msgstr "允许或阻止对你账户信息的访问。"
 

+#: actions/apioauthauthorize.php:447
+#, fuzzy
+msgid "Authorization canceled."
+msgstr "IM 确认已取消。"
+
+#: actions/apioauthauthorize.php:449
+#, fuzzy, php-format
+msgid "The request token %s has been revoked."
+msgstr "%s的 request token 被拒绝并被取消。"
+
+#: actions/apioauthauthorize.php:467
+#, fuzzy, php-format
+msgid "You have successfully authorized %s."
+msgstr "你没有被授权。"
+
+#: actions/apioauthauthorize.php:472
+#, 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."
 msgstr "此方法接受POST或DELETE请求。"
 #: actions/apistatusesdestroy.php:112
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"


@@ -793,7 +837,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:667
+#: lib/deletegroupform.php:121 lib/deleteuserform.php:66
+#: lib/noticelist.php:667

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


@@ -848,12 +893,13 @@ 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:150 actions/deleteuser.php:152
-#: actions/groupblock.php:178
+#: actions/deletegroup.php:220 actions/deletenotice.php:150
+#: actions/deleteuser.php:152 actions/groupblock.php:178

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


@@ -866,12 +912,13 @@ 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:157 actions/deleteuser.php:159
-#: actions/groupblock.php:185
+#: actions/deletegroup.php:227 actions/deletenotice.php:157
+#: actions/deleteuser.php:159 actions/groupblock.php:185

 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"


@@ -886,9 +933,12 @@ msgstr "屏蔽这个用户"
 msgid "Failed to save block information."
 msgstr "保存屏蔽信息失败。"
 
 msgid "Failed to save block information."
 msgstr "保存屏蔽信息失败。"
 

+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.

 #. 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:100

 #: 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


@@ -963,12 +1013,13 @@ msgstr "此地址已被确认过了。"
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.
 #. TRANS: Server error thrown on database error removing a registered e-mail address.
 #. TRANS: Server error thrown on database error updating IM preferences.
 #. TRANS: Server error thrown on database error removing a registered IM address.

+#. TRANS: Server error thrown when user profile settings could not be updated.

 #. 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:331
 #: actions/emailsettings.php:477 actions/imsettings.php:283
 #: actions/imsettings.php:442 actions/othersettings.php:174
 #. 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: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/profilesettings.php:326 actions/smssettings.php:308

 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 #: actions/smssettings.php:464
 msgid "Couldn't update user."
 msgstr "无法更新用户。"


@@ -1006,15 +1057,16 @@ msgstr "你必须登录后才能删除应用。"
 msgid "Application not found."
 msgstr "未找到应用。"
 
 msgid "Application not found."
 msgstr "未找到应用。"
 

-#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#. TRANS: Client error displayed trying to edit an application while not being its owner.
+#: actions/deleteapplication.php:78 actions/editapplication.php:78

 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
 
 #. TRANS: Client error text when there is a problem with the session token.
 #: actions/showapplication.php:94
 msgid "You are not the owner of this application."
 msgstr "你不是该应用的拥有者。"
 
 #. TRANS: Client error text when there is a problem with the session token.

-#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/deleteapplication.php:102 actions/editapplication.php:129

 #: actions/newapplication.php:110 actions/showapplication.php:118
 #: actions/newapplication.php:110 actions/showapplication.php:118

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

 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 
 msgid "There was a problem with your session token."
 msgstr "你的 session token 出现了问题。"
 


@@ -1041,6 +1093,66 @@ msgstr "不删除该应用"
 msgid "Delete this application"
 msgstr "删除这个应用"
 
 msgid "Delete this application"
 msgstr "删除这个应用"
 

+#. TRANS: Client error when trying to delete group while not logged in.
+#: actions/deletegroup.php:64
+#, fuzzy
+msgid "You must be logged in to delete a group."
+msgstr "你必须登录才能离开小组。"
+
+#. TRANS: Client error when trying to delete a group without providing a nickname or ID for the group.
+#: actions/deletegroup.php:94 actions/joingroup.php:88
+#: actions/leavegroup.php:88
+msgid "No nickname or ID."
+msgstr "没有昵称或 ID。"
+
+#. TRANS: Client error when trying to delete a group without having the rights to delete it.
+#: actions/deletegroup.php:107
+#, fuzzy
+msgid "You are not allowed to delete this group."
+msgstr "你不是该小组成员。"
+
+#. TRANS: Server error displayed if a group could not be deleted.
+#. TRANS: %s is the name of the group that could not be deleted.
+#: actions/deletegroup.php:150
+#, fuzzy, php-format
+msgid "Could not delete group %s."
+msgstr "无法更新小组"
+
+#. TRANS: Message given after deleting a group.
+#. TRANS: %s is the deleted group's name.
+#: actions/deletegroup.php:159
+#, fuzzy, php-format
+msgid "Deleted group %s"
+msgstr "%1$s离开了%2$s小组。"
+
+#. TRANS: Title.
+#. TRANS: Form legend for deleting a group.
+#: actions/deletegroup.php:176 actions/deletegroup.php:202
+#, fuzzy
+msgid "Delete group"
+msgstr "删除用户"
+
+#: actions/deletegroup.php:206
+#, 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:224
+#, fuzzy
+msgid "Do not delete this group"
+msgstr "不要删除这个消息"
+
+#. TRANS: Submit button title for 'Yes' when deleting a group.
+#: actions/deletegroup.php:231
+#, fuzzy
+msgid "Delete this group"
+msgstr "删除这个用户"
+

 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
 #: actions/deletenotice.php:50 actions/disfavor.php:61 actions/favor.php:62
 #: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69


@@ -1114,53 +1226,63 @@ msgstr "外观"
 msgid "Design settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的外观设置"
 
 msgid "Design settings for this StatusNet site"
 msgstr "这个 StatusNet 网站的外观设置"
 

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

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

-#: actions/designadminpanel.php:335
+#: 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:439
+#: actions/designadminpanel.php:445

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

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

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

-#: actions/designadminpanel.php:456
+#: 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:473
+#: actions/designadminpanel.php:483

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

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

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

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

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

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

 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
 
 msgid "You can upload a custom StatusNet theme as a .ZIP archive."
 msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
 

-#: actions/designadminpanel.php:499 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:504 actions/designadminpanel.php:587
+#: 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:509
+#: actions/designadminpanel.php:519

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


@@ -1168,76 +1290,75 @@ msgid ""
 msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
 
 #. TRANS: Used as radio button label to add a background image.
 msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
 
 #. TRANS: Used as radio button label to add a background image.

-#: actions/designadminpanel.php:540 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:557 lib/designsettings.php:155
+#: actions/designadminpanel.php:567 lib/designsettings.php:155

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

-#: actions/designadminpanel.php:558 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:563 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:577 lib/designsettings.php:170
+#: actions/designadminpanel.php:587 lib/designsettings.php:170

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

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

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

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

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

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

 msgid "Text"
 msgstr "文字"
 
 msgid "Text"
 msgstr "文字"
 

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

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

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

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

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

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

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

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

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

 msgid "Restore default designs"
 msgstr "恢复默认外观"
 
 msgid "Restore default designs"
 msgstr "恢复默认外观"
 

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

 msgid "Reset back to default"
 msgstr "重置到默认"
 
 #. TRANS: Submit button title.
 msgid "Reset back to default"
 msgstr "重置到默认"
 
 #. TRANS: Submit button title.

-#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
-#: 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/designadminpanel.php:708 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:396
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245

 #: actions/tagother.php:154 actions/useradminpanel.php:295
 #: lib/applicationeditform.php:357 lib/designsettings.php:256
 #: lib/groupeditform.php:202
 msgid "Save"
 msgstr "保存"
 
 #: actions/tagother.php:154 actions/useradminpanel.php:295
 #: lib/applicationeditform.php:357 lib/designsettings.php:256
 #: lib/groupeditform.php:202
 msgid "Save"
 msgstr "保存"
 

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

 msgid "Save design"
 msgstr "保存外观"
 
 msgid "Save design"
 msgstr "保存外观"
 


@@ -1254,68 +1375,93 @@ msgstr "加入收藏"
 msgid "No such document \"%s\""
 msgstr "没有这个文件“%s”。"
 
 msgid "No such document \"%s\""
 msgstr "没有这个文件“%s”。"
 

-#: actions/editapplication.php:54
-msgid "Edit Application"
+#. TRANS: Title for "Edit application" form.
+#. TRANS: Form legend.
+#: actions/editapplication.php:54 lib/applicationeditform.php:129
+msgid "Edit application"

 msgstr "编辑应用"
 
 msgstr "编辑应用"
 

+#. TRANS: Client error displayed trying to edit an application while not logged in.

 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "你必须登录后才能编辑应用。"
 
 #: actions/editapplication.php:66
 msgid "You must be logged in to edit an application."
 msgstr "你必须登录后才能编辑应用。"
 

-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
+#. TRANS: Client error displayed trying to edit an application that does not exist.
+#: actions/editapplication.php:83 actions/oauthconnectionssettings.php:166

 #: actions/showapplication.php:87
 msgid "No such application."
 msgstr "没有这个应用。"
 
 #: actions/showapplication.php:87
 msgid "No such application."
 msgstr "没有这个应用。"
 

-#: actions/editapplication.php:161
+#. TRANS: Instructions for "Edit application" form.
+#: actions/editapplication.php:165

 msgid "Use this form to edit your application."
 msgstr "通过此表单来编辑你的应用。"
 
 msgid "Use this form to edit your application."
 msgstr "通过此表单来编辑你的应用。"
 

-#: actions/editapplication.php:177 actions/newapplication.php:159
+#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
+#: actions/editapplication.php:182 actions/newapplication.php:159

 msgid "Name is required."
 msgstr "名字为必填项。"
 
 msgid "Name is required."
 msgstr "名字为必填项。"
 

-#: actions/editapplication.php:180 actions/newapplication.php:165
-msgid "Name is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
+#: actions/editapplication.php:186
+#, fuzzy
+msgid "Name is too long (max 255 characters)."

 msgstr "名称过长(不能超过255个字符)。"
 
 msgstr "名称过长(不能超过255个字符)。"
 

-#: actions/editapplication.php:183 actions/newapplication.php:162
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
+#: actions/editapplication.php:190 actions/newapplication.php:162

 msgid "Name already in use. Try another one."
 msgstr "名字已被使用，换一个吧。"
 
 msgid "Name already in use. Try another one."
 msgstr "名字已被使用，换一个吧。"
 

-#: actions/editapplication.php:186 actions/newapplication.php:168
+#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
+#: actions/editapplication.php:194 actions/newapplication.php:168

 msgid "Description is required."
 msgstr "必须填写描述。"
 
 msgid "Description is required."
 msgstr "必须填写描述。"
 

-#: actions/editapplication.php:194
+#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#: actions/editapplication.php:199
+#, fuzzy, php-format
+msgid "Description is too long (maximum %d character)."
+msgid_plural "Description is too long (maximum %d characters)."
+msgstr[0] "描述过长(不能超过%d 个字符)。"
+
+#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
+#: actions/editapplication.php:206

 msgid "Source URL is too long."
 msgstr "来源 URL 太长。"
 
 msgid "Source URL is too long."
 msgstr "来源 URL 太长。"
 

-#: actions/editapplication.php:200 actions/newapplication.php:185
+#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
+#: actions/editapplication.php:213 actions/newapplication.php:185

 msgid "Source URL is not valid."
 msgstr "来源 URL 无效。"
 
 msgid "Source URL is not valid."
 msgstr "来源 URL 无效。"
 

-#: actions/editapplication.php:203 actions/newapplication.php:188
+#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
+#: actions/editapplication.php:217 actions/newapplication.php:188

 msgid "Organization is required."
 msgstr "组织名称必填。"
 
 msgid "Organization is required."
 msgstr "组织名称必填。"
 

-#: actions/editapplication.php:206 actions/newapplication.php:191
-msgid "Organization is too long (max 255 chars)."
+#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
+#: actions/editapplication.php:221
+#, fuzzy
+msgid "Organization is too long (maximum 255 characters)."

 msgstr "组织名称过长（不能超过255个字符）。"
 
 msgstr "组织名称过长（不能超过255个字符）。"
 

-#: actions/editapplication.php:209 actions/newapplication.php:194
+#: actions/editapplication.php:224 actions/newapplication.php:194

 msgid "Organization homepage is required."
 msgstr "组织首页必填。"
 
 msgid "Organization homepage is required."
 msgstr "组织首页必填。"
 

-#: actions/editapplication.php:218 actions/newapplication.php:206
+#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
+#: actions/editapplication.php:235 actions/newapplication.php:206

 msgid "Callback is too long."
 msgstr "调回地址（callback）过长。"
 
 msgid "Callback is too long."
 msgstr "调回地址（callback）过长。"
 

-#: actions/editapplication.php:225 actions/newapplication.php:215
+#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
+#: actions/editapplication.php:243 actions/newapplication.php:215

 msgid "Callback URL is not valid."
 msgstr "调回地址（Callback URL）无效。"
 
 msgid "Callback URL is not valid."
 msgstr "调回地址（Callback URL）无效。"
 

-#: actions/editapplication.php:261
+#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
+#: actions/editapplication.php:280

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


@@ -1703,7 +1849,7 @@ msgstr "无法将 request token 转换为 access token。"
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "远程服务使用了未知版本的 OMB 协议。"
 
 msgid "Remote service uses unknown version of OMB protocol."
 msgstr "远程服务使用了未知版本的 OMB 协议。"
 

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

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


@@ -2137,89 +2283,128 @@ msgstr "%s 的收件箱"
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是你的收件箱，包含发给你的私信。"
 
 msgid "This is your inbox, which lists your incoming private messages."
 msgstr "这是你的收件箱，包含发给你的私信。"
 

-#: actions/invite.php:39
+#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
+#: actions/invite.php:40

 msgid "Invites have been disabled."
 msgstr "邀请已被禁用。"
 
 msgid "Invites have been disabled."
 msgstr "邀请已被禁用。"
 

-#: actions/invite.php:41
+#. TRANS: Client error displayed when trying to sent invites while not logged in.
+#. TRANS: %s is the StatusNet site name.
+#: actions/invite.php:44

 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "你必须登录才能邀请他人使用%s。"
 
 #, php-format
 msgid "You must be logged in to invite other users to use %s."
 msgstr "你必须登录才能邀请他人使用%s。"
 

-#: actions/invite.php:72
-#, php-format
-msgid "Invalid email address: %s"
+#. TRANS: Form validation message when providing an e-mail address that does not validate.
+#. TRANS: %s is an invalid e-mail address.
+#: actions/invite.php:77
+#, fuzzy, php-format
+msgid "Invalid email address: %s."

 msgstr "无效的电子邮件地址：%s"
 
 msgstr "无效的电子邮件地址：%s"
 

-#: actions/invite.php:110
-msgid "Invitation(s) sent"
+#. TRANS: Page title when invitations have been sent.
+#: actions/invite.php:116
+#, fuzzy
+msgid "Invitations sent"

 msgstr "已发送邀请"
 
 msgstr "已发送邀请"
 

-#: actions/invite.php:112
+#. TRANS: Page title when inviting potential users.
+#: actions/invite.php:119

 msgid "Invite new users"
 msgstr "邀请新用户"
 
 msgid "Invite new users"
 msgstr "邀请新用户"
 

-#: actions/invite.php:128
-msgid "You are already subscribed to these users:"
-msgstr "你已经关注了这些用户："
-
+#. TRANS: Message displayed inviting users to use a StatusNet site while the inviting user
+#. TRANS: is already subscribed to one or more users with the given e-mail address(es).
+#. TRANS: Plural form is based on the number of reported already subscribed e-mail addresses.
+#. TRANS: Followed by a bullet list.
+#: actions/invite.php:139
+#, fuzzy
+msgid "You are already subscribed to this user:"
+msgid_plural "You are already subscribed to these users:"
+msgstr[0] "你已经关注了这些用户："
+
+#. TRANS: Used as list item for already subscribed users (%1$s is nickname, %2$s is e-mail address).
+#. TRANS: Used as list item for already registered people (%1$s is nickname, %2$s is e-mail address).

 #. 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:426
+#: actions/invite.php:145 actions/invite.php:159 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)"
 

-#: actions/invite.php:136
-msgid ""
+#. TRANS: Message displayed inviting users to use a StatusNet site while the invited user
+#. TRANS: already uses a this StatusNet site. Plural form is based on the number of
+#. TRANS: reported already present people. Followed by a bullet list.
+#: actions/invite.php:153
+#, fuzzy
+msgid "This person is already a user and you were automatically subscribed:"
+msgid_plural ""

 "These people are already users and you were automatically subscribed to them:"
 "These people are already users and you were automatically subscribed to them:"

-msgstr "这些好友已注册，你已自动关注了这些用户："
-
-#: actions/invite.php:144
-msgid "Invitation(s) sent to the following people:"
-msgstr "已发送邀请给这些人："
-
-#: actions/invite.php:150
+msgstr[0] "这些好友已注册，你已自动关注了这些用户："
+
+#. TRANS: Message displayed inviting users to use a StatusNet site. Plural form is
+#. TRANS: based on the number of invitations sent. Followed by a bullet list of
+#. TRANS: e-mail addresses to which invitations were sent.
+#: actions/invite.php:167
+#, fuzzy
+msgid "Invitation sent to the following person:"
+msgid_plural "Invitations sent to the following people:"
+msgstr[0] "已发送邀请给这些人："
+
+#. TRANS: Generic message displayed after sending out one or more invitations to
+#. TRANS: people to join a StatusNet site.
+#: actions/invite.php:177

 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr "如果其他人接受邀请并注册，你将得到通知。谢谢你推动了社区发展壮大！"
 
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr "如果其他人接受邀请并注册，你将得到通知。谢谢你推动了社区发展壮大！"
 

-#: actions/invite.php:162
+#. TRANS: Form instructions.
+#: actions/invite.php:190

 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 

-#: actions/invite.php:187
+#. TRANS: Field label for a list of e-mail addresses.
+#: actions/invite.php:217

 msgid "Email addresses"
 msgstr "电邮地址"
 
 msgid "Email addresses"
 msgstr "电邮地址"
 

-#: actions/invite.php:189
+#. TRANS: Tooltip for field label for a list of e-mail addresses.
+#: actions/invite.php:220

 msgid "Addresses of friends to invite (one per line)"
 msgstr "要邀请的好友地址(每行一个)"
 
 msgid "Addresses of friends to invite (one per line)"
 msgstr "要邀请的好友地址(每行一个)"
 

-#: actions/invite.php:192
+#. TRANS: Field label for a personal message to send to invitees.
+#: actions/invite.php:224

 msgid "Personal message"
 msgstr "个人消息"
 
 msgid "Personal message"
 msgstr "个人消息"
 

-#: actions/invite.php:194
+#. TRANS: Tooltip for field label for a personal message to send to invitees.
+#: actions/invite.php:227

 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #. TRANS: Send button for inviting friends
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #. TRANS: Send button for inviting friends

-#: actions/invite.php:198
+#: actions/invite.php:231

 msgctxt "BUTTON"
 msgid "Send"
 msgstr "发布"
 
 msgctxt "BUTTON"
 msgid "Send"
 msgstr "发布"
 

-#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
-#: actions/invite.php:228
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, $2$s is
+#. TRANS: the StatusNet sitename.
+#: actions/invite.php:263

 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请你加入 %2$s"
 
 #, php-format
 msgid "%1$s has invited you to join them on %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
+#. TRANS: singular 3rd-person pronoun in English. %1$s is the inviting user, %2$s is the
+#. TRANS: StatusNet sitename, %3$s is the site URL, %4$s is the personal message from the
+#. TRANS: inviting user, %s%5 a link to the timeline for the inviting user, %s$6 is a link
+#. TRANS: to register with the StatusNet site.
+#: actions/invite.php:270

 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"


@@ -2276,10 +2461,6 @@ msgstr ""
 msgid "You must be logged in to join a group."
 msgstr "你必须登录才能加入小组。"
 
 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。"
-

 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"
 #: actions/joingroup.php:141
 #, php-format
 msgid "%1$s joined group %2$s"


@@ -2486,10 +2667,18 @@ msgstr "你必须登录才能登记你的应用。"
 msgid "Use this form to register a new application."
 msgstr "通过此表单登记一个新的应用。"
 
 msgid "Use this form to register a new application."
 msgstr "通过此表单登记一个新的应用。"
 

+#: actions/newapplication.php:165
+msgid "Name is too long (max 255 chars)."
+msgstr "名称过长(不能超过255个字符)。"
+

 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr "Source URL 必填。"
 
 #: actions/newapplication.php:176
 msgid "Source URL is required."
 msgstr "Source URL 必填。"
 

+#: actions/newapplication.php:191
+msgid "Organization is too long (max 255 chars)."
+msgstr "组织名称过长（不能超过255个字符）。"
+

 #: actions/newapplication.php:258 actions/newapplication.php:267
 msgid "Could not create application."
 msgstr "无法创建应用。"
 #: actions/newapplication.php:258 actions/newapplication.php:267
 msgid "Could not create application."
 msgstr "无法创建应用。"


@@ -2518,6 +2707,11 @@ msgstr "无法向此用户发送消息。"
 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 "没有收件人。"
 #: actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "没有收件人。"


@@ -2598,8 +2792,10 @@ msgid "Updates matching search term \"%1$s\" on %2$s!"
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
 #: actions/nudge.php:85
 msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
 
 #: actions/nudge.php:85

+#, fuzzy

 msgid ""
 msgid ""

-"This user doesn't allow nudges or hasn't confirmed or set their email yet."
+"This user doesn't allow nudges or hasn't confirmed or set their email "
+"address yet."

 msgstr "此用户不允许呼叫或者还没有验证其电子邮件地址。"
 
 #: actions/nudge.php:94
 msgstr "此用户不允许呼叫或者还没有验证其电子邮件地址。"
 
 #: actions/nudge.php:94


@@ -2675,7 +2871,7 @@ 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:1200
 
 #. TRANS: Client error on an API request with an unsupported data format.
 #: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200

-#: lib/apiaction.php:1227 lib/apiaction.php:1350
+#: lib/apiaction.php:1227 lib/apiaction.php:1356

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


@@ -2823,147 +3019,166 @@ msgstr "路径"
 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"
 msgstr "什么时候使用 SSL"
 
 msgid "When to use SSL"
 msgstr "什么时候使用 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 "保存路径"
 


@@ -2999,135 +3214,188 @@ msgstr "无效的消息内容。"
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
 
 msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’."
 msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
 

-#: actions/profilesettings.php:60
+#. TRANS: Page title for profile settings.
+#: actions/profilesettings.php:61

 msgid "Profile settings"
 msgstr "个人设置"
 
 msgid "Profile settings"
 msgstr "个人设置"
 

-#: actions/profilesettings.php:71
+#. TRANS: Usage instructions for profile settings.
+#: actions/profilesettings.php:73

 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息，让大家对你了解得更多。"
 
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息，让大家对你了解得更多。"
 

-#: actions/profilesettings.php:99
+#. TRANS: Profile settings form legend.
+#: actions/profilesettings.php:102

 msgid "Profile information"
 msgstr "个人信息"
 
 msgid "Profile information"
 msgstr "个人信息"
 

-#: actions/profilesettings.php:108 lib/groupeditform.php:154
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:113
+#, fuzzy
+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
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:117 actions/register.php:455

 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr "全名"
 
 #: actions/showgroup.php:256 actions/tagother.php:104
 #: lib/groupeditform.php:157 lib/userprofile.php:150
 msgid "Full name"
 msgstr "全名"
 

+#. TRANS: Field label in form for profile settings.

 #. TRANS: Form input field label.
 #. TRANS: Form input field label.

-#: actions/profilesettings.php:115 actions/register.php:460
+#: actions/profilesettings.php:122 actions/register.php:460

 #: lib/applicationeditform.php:236 lib/groupeditform.php:161
 msgid "Homepage"
 msgstr "主页"
 
 #: 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"
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:125
+#, fuzzy
+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"
-msgstr "用不超过%d个字符描述你自己和你的兴趣"
-
-#: actions/profilesettings.php:125 actions/register.php:471
+#. TRANS: Tooltip for field label in form for profile settings. Plural
+#. TRANS: is decided by the number of characters available for the
+#. TRANS: biography (%d).
+#: actions/profilesettings.php:133
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d character"
+msgid_plural "Describe yourself and your interests in %d characters"
+msgstr[0] "用不超过%d个字符描述你自己和你的兴趣"
+
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:139 actions/register.php:471

 msgid "Describe yourself and your interests"
 msgstr "描述你自己和你的兴趣"
 
 msgid "Describe yourself and your interests"
 msgstr "描述你自己和你的兴趣"
 

-#: actions/profilesettings.php:127 actions/register.php:473
+#. TRANS: Text area label in form for profile settings where users can provide.
+#. TRANS: their biography.
+#: actions/profilesettings.php:143 actions/register.php:473

 msgid "Bio"
 msgstr "自述"
 
 msgid "Bio"
 msgstr "自述"
 

-#: actions/profilesettings.php:132 actions/register.php:478
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:149 actions/register.php:478

 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "位置"
 
 #: actions/showgroup.php:265 actions/tagother.php:112
 #: actions/userauthorization.php:166 lib/groupeditform.php:177
 #: lib/userprofile.php:165
 msgid "Location"
 msgstr "位置"
 

-#: actions/profilesettings.php:134 actions/register.php:480
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:152 actions/register.php:480

 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的地理位置，格式类似\"城市，省份，国家\""
 

-#: actions/profilesettings.php:138
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:157

 msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 
 msgid "Share my current location when posting notices"
 msgstr "当发布消息时分享我的地理位置"
 

-#: actions/profilesettings.php:145 actions/tagother.php:149
+#. TRANS: Field label in form for profile settings.
+#: actions/profilesettings.php:165 actions/tagother.php:149

 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:210
 msgid "Tags"
 msgstr "标签"
 
 #: actions/tagother.php:209 lib/subscriptionlist.php:106
 #: lib/subscriptionlist.php:108 lib/userprofile.php:210
 msgid "Tags"
 msgstr "标签"
 

-#: actions/profilesettings.php:147
+#. TRANS: Tooltip for field label in form for profile settings.
+#: actions/profilesettings.php:168

 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
 

-#: actions/profilesettings.php:151
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:173

 msgid "Language"
 msgstr "语言"
 
 msgid "Language"
 msgstr "语言"
 

-#: actions/profilesettings.php:152
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:175

 msgid "Preferred language"
 msgstr "首选语言"
 
 msgid "Preferred language"
 msgstr "首选语言"
 

-#: actions/profilesettings.php:161
+#. TRANS: Dropdownlist label in form for profile settings.
+#: actions/profilesettings.php:185

 msgid "Timezone"
 msgstr "时区"
 
 msgid "Timezone"
 msgstr "时区"
 

-#: actions/profilesettings.php:162
+#. TRANS: Tooltip for dropdown list label in form for profile settings.
+#: actions/profilesettings.php:187

 msgid "What timezone are you normally in?"
 msgstr "你一般处于哪个时区？"
 
 msgid "What timezone are you normally in?"
 msgstr "你一般处于哪个时区？"
 

-#: actions/profilesettings.php:167
+#. TRANS: Checkbox label in form for profile settings.
+#: actions/profilesettings.php:193

 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
 
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
 

-#: actions/profilesettings.php:228 actions/register.php:230
-#, php-format
-msgid "Bio is too long (max %d chars)."
-msgstr "描述过长(不能超过%d个字符)。"
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:256
+#, fuzzy
+msgid "Full name is too long (max 255 characters)."
+msgstr "全名过长(不能超过 255 个字符)。"
+
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: Plural form is used based on the maximum number of allowed
+#. TRANS: characters for the biography (%d).
+#: actions/profilesettings.php:262
+#, fuzzy, php-format
+msgid "Bio is too long (max %d character)."
+msgid_plural "Bio is too long (max %d characters)."
+msgstr[0] "描述过长(不能超过%d个字符)。"
+
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:269
+#, fuzzy
+msgid "Location is too long (max 255 characters)."
+msgstr "位置过长(不能超过255个字符)。"

 
 

-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:273 actions/siteadminpanel.php:151

 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 

-#: actions/profilesettings.php:241
-msgid "Language is too long (max 50 chars)."
+#. TRANS: Validation error in form for profile settings.
+#: actions/profilesettings.php:281
+#, fuzzy
+msgid "Language is too long (max 50 characters)."

 msgstr "语言过长(不能超过50个字符)。"
 
 msgstr "语言过长(不能超过50个字符)。"
 

-#: actions/profilesettings.php:253 actions/tagother.php:178
+#. TRANS: Validation error in form for profile settings.
+#. TRANS: %s is an invalid tag.
+#: actions/profilesettings.php:295 actions/tagother.php:178

 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "无效的标签：\"%s\"。"
 
 #, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "无效的标签：\"%s\"。"
 

-#: actions/profilesettings.php:306
+#. TRANS: Server error thrown when user profile settings could not be updated to
+#. TRANS: automatically subscribe to any subscriber.
+#: actions/profilesettings.php:351

 msgid "Couldn't update user for autosubscribe."
 msgstr "无法更新用户的自动关注。"
 
 msgid "Couldn't update user for autosubscribe."
 msgstr "无法更新用户的自动关注。"
 

-#: actions/profilesettings.php:363
+#. TRANS: Server error thrown when user profile location preference settings could not be updated.
+#: actions/profilesettings.php:409

 msgid "Couldn't save location prefs."
 msgstr "无法保存标签。"
 
 msgid "Couldn't save location prefs."
 msgstr "无法保存标签。"
 

-#: actions/profilesettings.php:375
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/profilesettings.php:422

 msgid "Couldn't save profile."
 msgstr "无法保存个人信息。"
 
 msgid "Couldn't save profile."
 msgstr "无法保存个人信息。"
 

-#: actions/profilesettings.php:383
+#. TRANS: Server error thrown when user profile settings tags could not be saved.
+#: actions/profilesettings.php:431

 msgid "Couldn't save tags."
 msgstr "无法保存标签。"
 
 msgid "Couldn't save tags."
 msgstr "无法保存标签。"
 

+#. TRANS: Confirmation shown when user profile settings are saved.

 #. TRANS: Message after successful saving of administrative settings.
 #. TRANS: Message after successful saving of administrative settings.

-#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:440 lib/adminpanelaction.php:138

 msgid "Settings saved."
 msgstr "设置已保存。"
 
 msgid "Settings saved."
 msgstr "设置已保存。"
 


@@ -3201,32 +3469,45 @@ msgstr ""
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微博"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 
 "这里是%%site.name%%，一个基于自由软件[StatusNet](http://status.net/)的[微博"
 "客](http://zh.wikipedia.org/zh-hans/%E5%BE%AE%E5%8D%9A%E5%AE%A2) 。"
 

+#. TRANS: Title for public tag cloud.

 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "公开的标签云"
 
 #: actions/publictagcloud.php:57
 msgid "Public tag cloud"
 msgstr "公开的标签云"
 

-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
+#. TRANS: Instructions (more used like an explanation/header).
+#. TRANS: %s is the StatusNet sitename.
+#: actions/publictagcloud.php:65
+#, fuzzy, php-format
+msgid "These are most popular recent tags on %s"

 msgstr "这些是%s最近的流行的标签 "
 
 msgstr "这些是%s最近的流行的标签 "
 

-#: actions/publictagcloud.php:69
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:74

 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "还没有人发布带[标签](%%doc.tags%%)的消息。"
 
 #, php-format
 msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
 msgstr "还没有人发布带[标签](%%doc.tags%%)的消息。"
 

-#: actions/publictagcloud.php:72
+#. TRANS: Message shown to a logged in user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#: actions/publictagcloud.php:79

 msgid "Be the first to post one!"
 msgstr "成为第一个发布消息的人！"
 
 msgid "Be the first to post one!"
 msgstr "成为第一个发布消息的人！"
 

-#: actions/publictagcloud.php:75
+#. TRANS: Message shown to a anonymous user for the public tag cloud
+#. TRANS: while no tags exist yet. "One" refers to the non-existing hashtag.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/publictagcloud.php:87

 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr "现在就[注册](%%action.register%%)并发布第一个！"
 
 #, php-format
 msgid ""
 "Why not [register an account](%%action.register%%) and be the first to post "
 "one!"
 msgstr "现在就[注册](%%action.register%%)并发布第一个！"
 

-#: actions/publictagcloud.php:134
+#: actions/publictagcloud.php:146

 msgid "Tag cloud"
 msgstr "标签云"
 
 msgid "Tag cloud"
 msgstr "标签云"
 


@@ -3378,6 +3659,11 @@ msgstr "你必须同意许可协议才能注册。"
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 

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

 #: actions/register.php:250 actions/register.php:272
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 #: actions/register.php:250 actions/register.php:272
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"


@@ -3416,6 +3702,15 @@ msgstr "只用于更新、通知及密码恢复"
 msgid "Longer name, preferably your \"real\" name"
 msgstr "更长的名字，最好是“真实姓名”"
 
 msgid "Longer name, preferably your \"real\" name"
 msgstr "更长的名字，最好是“真实姓名”"
 

+#: actions/register.php:462
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "你的主页、博客或在其他网站的URL"
+
+#: actions/register.php:468
+#, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "用不超过%d个字符描述你自己和你的兴趣"
+

 #: actions/register.php:518
 #, php-format
 msgid ""
 #: actions/register.php:518
 #, php-format
 msgid ""


@@ -3698,7 +3993,7 @@ msgstr "组织名称必填。"
 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 "统计"


@@ -3835,45 +4130,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
+#: actions/showgroup.php:399 actions/showgroup.php:451

 msgid "Members"
 msgstr "小组成员"
 
 msgid "Members"
 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."


@@ -3888,7 +4183,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."


@@ -3901,7 +4196,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 "管理员"
 


@@ -3927,53 +4222,53 @@ msgstr "来自 %1$s 的 %2$s 消息"
 msgid "Notice deleted."
 msgstr "消息已删除"
 
 msgid "Notice deleted."
 msgstr "消息已删除"
 

-#: actions/showstream.php:73
+#: actions/showstream.php:72

 #, php-format
 msgid " tagged %s"
 msgstr "带%s标签的"
 
 #, php-format
 msgid " tagged %s"
 msgstr "带%s标签的"
 

-#: actions/showstream.php:79
+#: actions/showstream.php:78

 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s，第%2$d页"
 
 #, php-format
 msgid "%1$s, page %2$d"
 msgstr "%1$s，第%2$d页"
 

-#: actions/showstream.php:122
+#: actions/showstream.php:120

 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$s的有%2$s标签的消息聚合 (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
 msgstr "%1$s的有%2$s标签的消息聚合 (RSS 1.0)"
 

-#: actions/showstream.php:129
+#: actions/showstream.php:127

 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s的消息聚合 (RSS 1.0)"
 
 #, php-format
 msgid "Notice feed for %s (RSS 1.0)"
 msgstr "%s的消息聚合 (RSS 1.0)"
 

-#: actions/showstream.php:136
+#: actions/showstream.php:134

 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s的消息聚合 (RSS 2.0)"
 
 #, php-format
 msgid "Notice feed for %s (RSS 2.0)"
 msgstr "%s的消息聚合 (RSS 2.0)"
 

-#: actions/showstream.php:143
+#: actions/showstream.php:141

 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s的消息聚合 (Atom)"
 
 #, php-format
 msgid "Notice feed for %s (Atom)"
 msgstr "%s的消息聚合 (Atom)"
 

-#: actions/showstream.php:148
+#: actions/showstream.php:146

 #, php-format
 msgid "FOAF for %s"
 msgstr "%s的FOAF"
 
 #, php-format
 msgid "FOAF for %s"
 msgstr "%s的FOAF"
 

-#: actions/showstream.php:200
+#: actions/showstream.php:197

 #, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%2$s还没有发布任何内容。"
 
 #, php-format
 msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
 msgstr "这是%1$s的时间线，但是%2$s还没有发布任何内容。"
 

-#: actions/showstream.php:205
+#: actions/showstream.php:202

 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢，现在开始吧 :)"
 
 msgid ""
 "Seen anything interesting recently? You haven't posted any notices yet, now "
 "would be a good time to start :)"
 msgstr "最近看到了什么有趣的消息了么？你还没有发布消息呢，现在开始吧 :)"
 

-#: actions/showstream.php:207
+#: actions/showstream.php:204

 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"
 #, php-format
 msgid ""
 "You can try to nudge %1$s or [post something to them](%%%%action.newnotice%%%"


@@ -3982,7 +4277,7 @@ msgstr ""
 "你可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)。"
 
 "你可以试着呼叫%1$s或给他们 [发一些消息](%%%%action.newnotice%%%%?"
 "status_textarea=%2$s)。"
 

-#: actions/showstream.php:246
+#: actions/showstream.php:243

 #, 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."


@@ -3995,7 +4290,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:251
+#: actions/showstream.php:248

 #, 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."


@@ -4006,7 +4301,7 @@ 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:308
+#: actions/showstream.php:305

 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"
 #, php-format
 msgid "Repeat of %s"
 msgstr "%s 的转发"


@@ -4377,37 +4672,54 @@ msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
 msgid "Subscribed"
 msgstr "已关注"
 
 msgid "Subscribed"
 msgstr "已关注"
 

-#: actions/subscribers.php:50
+#. TRANS: Header for list of subscribers for a user (first page).
+#. TRANS: %s is the user's nickname.
+#: actions/subscribers.php:51

 #, php-format
 msgid "%s subscribers"
 msgstr "%s的关注者"
 
 #, php-format
 msgid "%s subscribers"
 msgstr "%s的关注者"
 

-#: actions/subscribers.php:52
+#. TRANS: Header for list of subscribers for a user (not first page).
+#. TRANS: %1$s is the user's nickname, $2$d is the page number.
+#: actions/subscribers.php:55

 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s的关注者，第%2$d页"
 
 #, php-format
 msgid "%1$s subscribers, page %2$d"
 msgstr "%1$s的关注者，第%2$d页"
 

-#: actions/subscribers.php:63
+#. TRANS: Page notice for page with an overview of all subscribers
+#. TRANS: of the logged in user's own profile.
+#: actions/subscribers.php:68

 msgid "These are the people who listen to your notices."
 msgstr "这些用户关注了你的消息。"
 
 msgid "These are the people who listen to your notices."
 msgstr "这些用户关注了你的消息。"
 

-#: actions/subscribers.php:67
+#. TRANS: Page notice for page with an overview of all subscribers of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscribers.php:74

 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户关注了%s的消息。"
 
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户关注了%s的消息。"
 

-#: actions/subscribers.php:108
+#. TRANS: Subscriber list text when the logged in user has no subscribers.
+#: actions/subscribers.php:116
+#, fuzzy

 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "
 msgid ""
 "You have no subscribers. Try subscribing to people you know and they might "

-"return the favor"
+"return the favor."

 msgstr "还没有人关注你，尝试关注一些你认识的用户，他们或许会关注你"
 
 msgstr "还没有人关注你，尝试关注一些你认识的用户，他们或许会关注你"
 

-#: actions/subscribers.php:110
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user other
+#. TRANS: than the logged in user that has no subscribers. %s is the user nickname.
+#: actions/subscribers.php:120

 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "还没有人关注%s，成为第一个关注者？"
 
 #, php-format
 msgid "%s has no subscribers. Want to be the first?"
 msgstr "还没有人关注%s，成为第一个关注者？"
 

-#: actions/subscribers.php:114
+#. TRANS: Subscriber list text when looking at the subscribers for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#. TRANS: This message contains a Markdown URL. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscribers.php:129

 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"
 #, php-format
 msgid ""
 "%s has no subscribers. Why not [register an account](%%%%action.register%%%"


@@ -4416,26 +4728,38 @@ msgstr ""
 "还没有人关注%s。现在就[注册一个帐号](%%%%action.register%%%%)并成为第一个关注"
 "者！"
 
 "还没有人关注%s。现在就[注册一个帐号](%%%%action.register%%%%)并成为第一个关注"
 "者！"
 

-#: actions/subscriptions.php:52
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/subscriptions.php:51

 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 关注的用户"
 
 #, php-format
 msgid "%s subscriptions"
 msgstr "%s 关注的用户"
 

-#: actions/subscriptions.php:54
+#. TRANS: Header for subscriptions overview for a user (not first page).
+#. TRANS: %1$s is a user nickname, %2$d is the page number.
+#: actions/subscriptions.php:55

 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s 关注的用户，第%2$d页"
 
 #, php-format
 msgid "%1$s subscriptions, page %2$d"
 msgstr "%1$s 关注的用户，第%2$d页"
 

-#: actions/subscriptions.php:65
+#. TRANS: Page notice for page with an overview of all subscriptions
+#. TRANS: of the logged in user's own profile.
+#: actions/subscriptions.php:68

 msgid "These are the people whose notices you listen to."
 msgstr "这是你关注的用户。"
 
 msgid "These are the people whose notices you listen to."
 msgstr "这是你关注的用户。"
 

-#: actions/subscriptions.php:69
+#. TRANS: Page notice for page with an overview of all subscriptions of a user other
+#. TRANS: than the logged in user. %s is the user nickname.
+#: actions/subscriptions.php:74

 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是%s关注的用户。"
 
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是%s关注的用户。"
 

-#: actions/subscriptions.php:126
+#. TRANS: Subscription list text when the logged in user has no subscriptions.
+#. TRANS: This message contains Markdown URLs. The link description is between
+#. TRANS: square brackets, and the link between parentheses. Do not separate "]("
+#. TRANS: and do not change the URL part.
+#: actions/subscriptions.php:135

 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "
 #, php-format
 msgid ""
 "You're not listening to anyone's notices right now, try subscribing to "


@@ -4449,16 +4773,22 @@ msgstr ""
 "兴趣的小组的用户。如果你是  [Twitter用户](%%action.twittersettings%%)，你可以"
 "自动关注你已经关注的用户。"
 
 "兴趣的小组的用户。如果你是  [Twitter用户](%%action.twittersettings%%)，你可以"
 "自动关注你已经关注的用户。"
 

-#: actions/subscriptions.php:128 actions/subscriptions.php:132
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user other
+#. TRANS: than the logged in user that has no subscriptions. %s is the user nickname.
+#. TRANS: Subscription list text when looking at the subscriptions for a of a user that has none
+#. TRANS: as an anonymous user. %s is the user nickname.
+#: actions/subscriptions.php:143 actions/subscriptions.php:149

 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s没有关注任何人。"
 
 #, php-format
 msgid "%s is not listening to anyone."
 msgstr "%s没有关注任何人。"
 

-#: actions/subscriptions.php:208
+#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:226

 msgid "Jabber"
 msgstr "Jabber"
 
 msgid "Jabber"
 msgstr "Jabber"
 

-#: actions/subscriptions.php:222
+#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
+#: actions/subscriptions.php:241

 msgid "SMS"
 msgstr "SMS"
 
 msgid "SMS"
 msgstr "SMS"
 


@@ -4820,7 +5150,7 @@ msgid "Plugins"
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
 msgstr "插件"
 
 #. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.

-#: actions/version.php:198 lib/action.php:802
+#: actions/version.php:198 lib/action.php:830

 msgid "Version"
 msgstr "版本"
 
 msgid "Version"
 msgstr "版本"
 


@@ -5049,7 +5379,7 @@ msgid "Unable to save tag."
 msgstr "无法保存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
 msgstr "无法保存标签。"
 
 #. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.

-#: classes/Subscription.php:75 lib/oauthstore.php:466
+#: classes/Subscription.php:75 lib/oauthstore.php:482

 msgid "You have been banned from subscribing."
 msgstr "你被禁止添加关注。"
 
 msgid "You have been banned from subscribing."
 msgstr "你被禁止添加关注。"
 


@@ -5169,185 +5499,185 @@ msgid "Untitled page"
 msgstr "无标题页"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
 msgstr "无标题页"
 
 #. TRANS: DT element for primary navigation menu. String is hidden in default CSS.

-#: lib/action.php:448
+#: 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:454
+#: 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:457
+#: 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:459
+#: lib/action.php:487

 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "修改你的 email 地址、头像、密码、资料"
 
 #. TRANS: Tooltip for main menu option "Services"
 msgctxt "TOOLTIP"
 msgid "Change your email, avatar, password, profile"
 msgstr "修改你的 email 地址、头像、密码、资料"
 
 #. TRANS: Tooltip for main menu option "Services"

-#: lib/action.php:464
+#: 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:467
+#: 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:470
+#: 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
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.
 msgctxt "TOOLTIP"
 msgid "Change site configuration"
 msgstr "更改网站配置"
 
 #. TRANS: Main menu option when logged in and site admin for access to site configuration
 #. TRANS: Menu item in the group navigation page. Only shown for group administrators.

-#: lib/action.php:473 lib/groupnav.php:117
+#: 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:477
+#: 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:480
+#: 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:486
+#: 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:489
+#: 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:494
+#: 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:497
+#: 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:500
+#: lib/action.php:528

 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 
 msgctxt "TOOLTIP"
 msgid "Login to the site"
 msgstr "登录这个网站"
 

-#: lib/action.php:503
+#: 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:506
+#: lib/action.php:534

 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 
 msgctxt "TOOLTIP"
 msgid "Help me!"
 msgstr "帮助我！"
 

-#: lib/action.php:509
+#: 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:512
+#: 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:515
+#: 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:537 lib/adminpanelaction.php:387
+#: 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:604
+#: 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:674
+#: 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:775
+#: 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:781
+#: 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:784
+#: 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:787
+#: 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:792
+#: 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:796
+#: lib/action.php:824

 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option.
 msgid "Privacy"
 msgstr "隐私"
 
 #. TRANS: Secondary navigation menu option.

-#: lib/action.php:799
+#: 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:805
+#: lib/action.php:833

 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option.
 msgid "Contact"
 msgstr "联系"
 
 #. TRANS: Secondary navigation menu option.

-#: lib/action.php:808
+#: 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:837
+#: lib/action.php:865

 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 
 msgid "StatusNet software license"
 msgstr "StatusNet 软件许可证"
 


@@ -5355,7 +5685,7 @@ msgstr "StatusNet 软件许可证"
 #. 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
 #. 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:844
+#: 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."


@@ -5365,7 +5695,7 @@ 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:847
+#: lib/action.php:875

 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"
 #, php-format
 msgid "**%%site.name%%** is a microblogging service."
 msgstr "**%%site.name%%** 是一个微博客服务。"


@@ -5374,7 +5704,7 @@ msgstr "**%%site.name%%** 是一个微博客服务。"
 #. 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.
 #. 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:854
+#: 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 %"


@@ -5385,50 +5715,50 @@ 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:870
+#: 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:877
+#: 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:884
+#: 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:888
+#: lib/action.php:916

 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. 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.
 msgid "Content and data copyright by contributors. All rights reserved."
 msgstr "内容和数据贡献者版权所有并保留所有权利。"
 
 #. 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:902
+#: 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:1238
+#: 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:1249
+#: 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:1259
+#: lib/action.php:1305

 msgid "Before"
 msgstr "之前"
 
 msgid "Before"
 msgstr "之前"
 


@@ -5547,41 +5877,36 @@ 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.
 msgstr "API 资源需要读写的访问权限，但是你只有只读的权限。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.

-#: lib/apiauth.php:175
+#: lib/apiauth.php:177

 msgid "No application for that consumer key."
 msgstr "没有应用使用这个 consumer key。"
 
 #. TRANS: OAuth exception given when an incorrect access token was given for a user.
 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
+#: lib/apiauth.php:217

 msgid "Bad access token."
 msgstr "无效的 access token。"
 
 #. TRANS: OAuth exception given when no user was found for a given token (no token was found).
 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
+#: lib/apiauth.php:222

 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.
 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
+#: lib/apiauth.php:264 lib/apiauth.php:291

 msgid "Could not authenticate you."
 msgstr "无法验证你。"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
 msgid "Could not authenticate you."
 msgstr "无法验证你。"
 
 #. TRANS: Exception thrown when an attempt is made to revoke an unknown token.

-#: lib/apioauthstore.php:178
+#: lib/apioauthstore.php:189

 msgid "Tried to revoke unknown token."
 msgstr "尝试了取消未知的 token。"
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
 msgid "Tried to revoke unknown token."
 msgstr "尝试了取消未知的 token。"
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.

-#: lib/apioauthstore.php:183
+#: lib/apioauthstore.php:194

 msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 
 msgid "Failed to delete revoked token."
 msgstr "删除取消的 token 失败。"
 

-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr "编辑应用"
-

 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 msgid "Icon for this application"


@@ -5655,11 +5980,6 @@ msgstr "读写"
 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:353
-msgid "Cancel"
-msgstr "取消"
-

 #. TRANS: Application access type
 #: lib/applicationlist.php:134
 msgid "read-write"
 #. TRANS: Application access type
 #: lib/applicationlist.php:134
 msgid "read-write"


@@ -5686,11 +6006,6 @@ msgstr "取消"
 msgid "author element must contain a name element."
 msgstr "作者元素必须包含一个名称元素。"
 
 msgid "author element must contain a name element."
 msgstr "作者元素必须包含一个名称元素。"
 

-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:85
-msgid "Attachments"
-msgstr "附件"
-

 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:256
 msgid "Author"
 #. TRANS: DT element label in attachment list item.
 #: lib/attachmentlist.php:256
 msgid "Author"


@@ -5829,15 +6144,17 @@ msgid "Fullname: %s"
 msgstr "全名：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 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:434 lib/mail.php:268
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a location.
+#: lib/command.php:434 lib/mail.php:278

 #, php-format
 msgid "Location: %s"
 msgstr "位置：%s"
 
 #. TRANS: Whois output. %s is the homepage of the queried user.
 #, 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:438 lib/mail.php:271
+#. TRANS: Profile info line in new-subscriber notification e-mail.
+#. TRANS: %s is a homepage.
+#: lib/command.php:438 lib/mail.php:282

 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"


@@ -6099,13 +6416,15 @@ msgstr ""
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #: lib/common.php:136
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 #: lib/common.php:136

-msgid "No configuration file found. "
+#, fuzzy
+msgid "No configuration file found."

 msgstr "没有找到配置文件。 "
 
 #. 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
 msgstr "没有找到配置文件。 "
 
 #. 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: "
+#, fuzzy
+msgid "I looked for configuration files in the following places:"

 msgstr "我在以下位置查找了配置文件："
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
 msgstr "我在以下位置查找了配置文件："
 
 #. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.


@@ -6141,13 +6460,13 @@ msgstr "SMS"
 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 
 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 

-#. TRANS: Menu item for OAth connection settings.
+#. TRANS: Menu item for OuAth connection settings.

 #: lib/connectsettingsaction.php:120
 msgctxt "MENU"
 msgid "Connections"
 msgstr "关联"
 
 #: lib/connectsettingsaction.php:120
 msgctxt "MENU"
 msgid "Connections"
 msgstr "关联"
 

-#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.

 #: lib/connectsettingsaction.php:122
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 #: lib/connectsettingsaction.php:122
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"


@@ -6226,6 +6545,10 @@ msgstr "执行"
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 
 msgid "Grant this user the \"%s\" role"
 msgstr "给这个用户添加\\\"%s\\\"权限"
 

+#: lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
+

 #: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "这个小组或主题的主页或博客 URL"
 #: lib/groupeditform.php:163
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "这个小组或主题的主页或博客 URL"


@@ -6399,27 +6722,29 @@ msgstr "用用户名和密码登录。"
 msgid "Sign up for a new account"
 msgstr "注册一个新帐户"
 
 msgid "Sign up for a new account"
 msgstr "注册一个新帐户"
 

-#. TRANS: Subject for address confirmation email
+#. TRANS: Subject for address confirmation email.

 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #. TRANS: Body for address confirmation email.
 #: lib/mail.php:174
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #. TRANS: Body for address confirmation email.

-#: lib/mail.php:177
-#, php-format
+#. TRANS: %1$s is the addressed user's nickname, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the URL to confirm at.
+#: lib/mail.php:179
+#, fuzzy, php-format

 msgid ""
 msgid ""

-"Hey, %s.\n"
+"Hey, %1$s.\n"

 "\n"
 "\n"

-"Someone just entered this email address on %s.\n"
+"Someone just entered this email address on %2$s.\n"

 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"
 "\n"
 "If it was you, and you want to confirm your entry, use the URL below:\n"
 "\n"

-"\t%s\n"
+"\t%3$s\n"

 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"
 "\n"
 "If not, just ignore this message.\n"
 "\n"
 "Thanks for your time, \n"

-"%s\n"
+"%2$s\n"

 msgstr ""
 "嗨， %s。\n"
 "\n"
 msgstr ""
 "嗨， %s。\n"
 "\n"


@@ -6434,13 +6759,16 @@ msgstr ""
 "谢谢你的宝贵时间，\n"
 "%s\n"
 
 "谢谢你的宝贵时间，\n"
 "%s\n"
 

-#. TRANS: Subject of new-subscriber notification e-mail
-#: lib/mail.php:243
+#. TRANS: Subject of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscribing user's nickname, %2$s is the StatusNet sitename.
+#: lib/mail.php:246

 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注你在 %2$s 的消息。"
 
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注你在 %2$s 的消息。"
 

-#: lib/mail.php:248
+#. TRANS: This is a paragraph in a new-subscriber e-mail.
+#. TRANS: %s is a URL where the subscriber can be reported as abusive.
+#: lib/mail.php:253

 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "
 #, php-format
 msgid ""
 "If you believe this account is being used abusively, you can block them from "


@@ -6449,9 +6777,13 @@ msgstr ""
 "如果你认为此帐户正被人恶意使用，你可以将其从你的关注者中屏蔽掉并到 %s 报告给"
 "网站的管理员为他们在发垃圾信息。"
 
 "如果你认为此帐户正被人恶意使用，你可以将其从你的关注者中屏蔽掉并到 %s 报告给"
 "网站的管理员为他们在发垃圾信息。"
 

-#. TRANS: Main body of new-subscriber notification e-mail
-#: lib/mail.php:254
-#, php-format
+#. TRANS: Main body of new-subscriber notification e-mail.
+#. TRANS: %1$s is the subscriber's long name, %2$s is the StatusNet sitename,
+#. TRANS: %3$s is the subscriber's profile URL, %4$s is the subscriber's location (or empty)
+#. TRANS: %5$s is the subscriber's homepage URL (or empty), %6%s is the subscriber's bio (or empty)
+#. TRANS: %7$s is a link to the addressed user's e-mail settings.
+#: lib/mail.php:263
+#, fuzzy, php-format

 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"
 msgid ""
 "%1$s is now listening to your notices on %2$s.\n"
 "\n"


@@ -6459,10 +6791,10 @@ msgid ""
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"
 "\n"
 "%4$s%5$s%6$s\n"
 "Faithfully yours,\n"

-"%7$s.\n"
+"%2$s.\n"

 "\n"
 "----\n"
 "\n"
 "----\n"

-"Change your email address or notification options at %8$s\n"
+"Change your email address or notification options at %7$s\n"

 msgstr ""
 "%1$s开始关注你在%2$s的消息。\n"
 "\n"
 msgstr ""
 "%1$s开始关注你在%2$s的消息。\n"
 "\n"


@@ -6475,21 +6807,25 @@ msgstr ""
 "----\n"
 "在%8$s更改你的 email 地址或通知选项\n"
 
 "----\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.
+#. TRANS: %s is biographical information.
+#: lib/mail.php:286

 #, php-format
 msgid "Bio: %s"
 msgstr "自我介绍：%s"
 
 #, php-format
 msgid "Bio: %s"
 msgstr "自我介绍：%s"
 

-#. TRANS: Subject of notification mail for new posting email address
-#: lib/mail.php:304
+#. TRANS: Subject of notification mail for new posting email address.
+#. TRANS: %s is the StatusNet sitename.
+#: lib/mail.php:315

 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
 
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址，用于发布 %s 信息"
 

-#. TRANS: Body of notification mail for new posting email address
-#: lib/mail.php:308
-#, php-format
+#. TRANS: Body of notification mail for new posting email address.
+#. TRANS: %1$s is the StatusNet sitename, %2$s is the e-mail address to send
+#. TRANS: to to post by e-mail, %3$s is a URL to more instructions.
+#: lib/mail.php:321
+#, fuzzy, php-format

 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"
 msgid ""
 "You have a new posting address on %1$s.\n"
 "\n"


@@ -6498,7 +6834,7 @@ msgid ""
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"
 "More email instructions at %3$s.\n"
 "\n"
 "Faithfully yours,\n"

-"%4$s"
+"%1$s"

 msgstr ""
 "你的 %1$s 发布用地址已更新。\n"
 "\n"
 msgstr ""
 "你的 %1$s 发布用地址已更新。\n"
 "\n"


@@ -6510,31 +6846,36 @@ msgstr ""
 "\n"
 "%4$s"
 
 "\n"
 "%4$s"
 

-#. TRANS: Subject line for SMS-by-email notification messages
-#: lib/mail.php:433
+#. TRANS: Subject line for SMS-by-email notification messages.
+#. TRANS: %s is the posting user's nickname.
+#: lib/mail.php:442

 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 

-#. TRANS: Subject line for SMS-by-email address confirmation message
-#: lib/mail.php:460
+#. TRANS: Subject line for SMS-by-email address confirmation message.
+#: lib/mail.php:468

 msgid "SMS confirmation"
 msgstr "SMS 验证"
 
 msgid "SMS confirmation"
 msgstr "SMS 验证"
 

-#. TRANS: Main body heading for SMS-by-email address confirmation message
-#: lib/mail.php:463
+#. TRANS: Main body heading for SMS-by-email address confirmation message.
+#. TRANS: %s is the addressed user's nickname.
+#: lib/mail.php:472

 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s：通过此代码证明这是你的手机："
 
 #, php-format
 msgid "%s: confirm you own this phone number with this code:"
 msgstr "%s：通过此代码证明这是你的手机："
 

-#. TRANS: Subject for 'nudge' notification email
-#: lib/mail.php:484
+#. TRANS: Subject for 'nudge' notification email.
+#. TRANS: %s is the nudging user.
+#: lib/mail.php:493

 #, php-format
 msgid "You've been nudged by %s"
 msgstr "你被%s呼叫了"
 
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "你被%s呼叫了"
 

-#. TRANS: Body for 'nudge' notification email
-#: lib/mail.php:489
+#. TRANS: Body for 'nudge' notification email.
+#. TRANS: %1$s is the nuding user's long name, $2$s is the nudging user's nickname,
+#. TRANS: %3$s is a URL to post notices at, %4$s is the StatusNet sitename.
+#: lib/mail.php:500

 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "
 #, php-format
 msgid ""
 "%1$s (%2$s) is wondering what you are up to these days and is inviting you "


@@ -6560,14 +6901,18 @@ msgstr ""
 "亲切的问候，\n"
 "%4$s\n"
 
 "亲切的问候，\n"
 "%4$s\n"
 

-#. TRANS: Subject for direct-message notification email
-#: lib/mail.php:536
+#. TRANS: Subject for direct-message notification email.
+#. TRANS: %s is the sending user's nickname.
+#: lib/mail.php:547

 #, php-format
 msgid "New private message from %s"
 msgstr "来自%s的私信"
 
 #, php-format
 msgid "New private message from %s"
 msgstr "来自%s的私信"
 

-#. TRANS: Body for direct-message notification email
-#: lib/mail.php:541
+#. TRANS: Body for direct-message notification email.
+#. TRANS: %1$s is the sending user's long name, %2$s is the sending user's nickname,
+#. TRANS: %3$s is the message content, %4$s a URL to the message,
+#. TRANS: %5$s is the StatusNet sitename.
+#: lib/mail.php:555

 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"
 #, php-format
 msgid ""
 "%1$s (%2$s) sent you a private message:\n"


@@ -6600,14 +6945,19 @@ msgstr ""
 "亲切的问候，\n"
 "%5$s\n"
 
 "亲切的问候，\n"
 "%5$s\n"
 

-#. TRANS: Subject for favorite notification email
-#: lib/mail.php:589
-#, php-format
-msgid "%s (@%s) added your notice as a favorite"
+#. TRANS: Subject for favorite notification e-mail.
+#. TRANS: %1$s is the adding user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:603
+#, fuzzy, php-format
+msgid "%1s$ (@%2$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 e-mail.
+#. TRANS: %1$s is the adding user's long name, $2$s is the date the notice was created,
+#. TRANS: %3$s is a URL to the faved notice, %4$s is the faved notice text,
+#. TRANS: %5$s is a URL to all faves of the adding user, %6$s is the StatusNet sitename,
+#. TRANS: %7$s is the adding user's nickname.
+#: lib/mail.php:610

 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
 #, php-format
 msgid ""
 "%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"


@@ -6645,7 +6995,7 @@ msgstr ""
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
 "%6$s\n"
 
 #. TRANS: Line in @-reply notification e-mail. %s is conversation URL.

-#: lib/mail.php:651
+#: lib/mail.php:668

 #, php-format
 msgid ""
 "The full conversation can be read here:\n"
 #, php-format
 msgid ""
 "The full conversation can be read here:\n"


@@ -6656,13 +7006,20 @@ msgstr ""
 "\n"
 "\t%s"
 
 "\n"
 "\t%s"
 

-#: lib/mail.php:657
-#, php-format
-msgid "%s (@%s) sent a notice to your attention"
+#. TRANS: E-mail subject for notice notification.
+#. TRANS: %1$s is the sending user's long name, %2$s is the adding user's nickname.
+#: lib/mail.php:676
+#, fuzzy, php-format
+msgid "%1$s (@%2$s) sent a notice to your attention"

 msgstr "%s (@%s) 给你发送了一条消息"
 
 #. TRANS: Body of @-reply notification e-mail.
 msgstr "%s (@%s) 给你发送了一条消息"
 
 #. TRANS: Body of @-reply notification e-mail.

-#: lib/mail.php:660
+#. TRANS: %1$s is the sending user's long name, $2$s is the StatusNet sitename,
+#. TRANS: %3$s is a URL to the notice, %4$s is the notice text,
+#. TRANS: %5$s is a URL to the full conversion if it exists (otherwise empty),
+#. TRANS: %6$s is a URL to reply to the notice, %7$s is a URL to all @-replied for the addressed user,
+#. TRANS: %8$s is a URL to the addressed user's e-mail settings, %9$s is the sender's nickname.
+#: lib/mail.php:684

 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
 #, php-format
 msgid ""
 "%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"


@@ -6932,24 +7289,24 @@ msgstr "呼叫"
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 

-#: lib/oauthstore.php:283
+#: lib/oauthstore.php:294

 msgid "Error inserting new profile."
 msgstr "添加新个人信息出错。"
 
 msgid "Error inserting new profile."
 msgstr "添加新个人信息出错。"
 

-#: lib/oauthstore.php:291
+#: lib/oauthstore.php:302

 msgid "Error inserting avatar."
 msgstr "添加头像出错。"
 
 msgid "Error inserting avatar."
 msgstr "添加头像出错。"
 

-#: lib/oauthstore.php:311
+#: lib/oauthstore.php:322

 msgid "Error inserting remote profile."
 msgstr "添加远程个人信息时出错。"
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.
 msgid "Error inserting remote profile."
 msgstr "添加远程个人信息时出错。"
 
 #. TRANS: Exception thrown when a notice is denied because it has been sent before.

-#: lib/oauthstore.php:346
+#: lib/oauthstore.php:362

 msgid "Duplicate notice."
 msgstr "复制消息。"
 
 msgid "Duplicate notice."
 msgstr "复制消息。"
 

-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:507

 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 
 msgid "Couldn't insert new subscription."
 msgstr "无法添加新的关注。"
 


@@ -7301,77 +7658,79 @@ 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:1153
+#: 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:1156
+#: 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:1160
+#: lib/util.php:1170

 #, php-format
 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.
 #, php-format
 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.

-#: lib/util.php:1163
+#: 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:1167
+#: lib/util.php:1177

 #, php-format
 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.
 #, php-format
 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.

-#: lib/util.php:1170
+#: 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:1174
+#: lib/util.php:1184

 #, php-format
 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.
 #, php-format
 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.

-#: lib/util.php:1177
+#: 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:1181
+#: lib/util.php:1191

 #, php-format
 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.
 #, php-format
 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.

-#: lib/util.php:1184
+#: lib/util.php:1194

 msgid "about a year ago"
 msgstr "约1年前"
 
 msgid "about a year ago"
 msgstr "约1年前"
 

-#: lib/webcolor.php:82
+#: lib/webcolor.php:80

 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s不是有效的颜色！"
 
 #, php-format
 msgid "%s is not a valid color!"
 msgstr "%s不是有效的颜色！"
 

-#: lib/webcolor.php:123
-#, php-format
-msgid "%s is not a valid color! Use 3 or 6 hex chars."
+#. TRANS: Validation error for a web colour.
+#. TRANS: %s is the provided (invalid) text for colour.
+#: lib/webcolor.php:120
+#, fuzzy, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex characters."

 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
 
 #: scripts/restoreuser.php:82
 #, php-format
 msgid "Backup file for user %s (%s)"
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
 
 #: scripts/restoreuser.php:82
 #, php-format
 msgid "Backup file for user %s (%s)"

-msgstr "用户 %s (%s) 的备份文件\n"
+msgstr "用户 %s (%s) 的备份文件"

 
 #: scripts/restoreuser.php:88
 msgid "No user specified; using backup user."
 
 #: scripts/restoreuser.php:88
 msgid "No user specified; using backup user."


@@ -7381,3 +7740,6 @@ msgstr "没有用户被指定；使用备份用户。"
 #, php-format
 msgid "%d entries in backup."
 msgstr "备份中有 %d 个条目。"
 #, php-format
 msgid "%d entries in backup."
 msgstr "备份中有 %d 个条目。"

+
+#~ msgid "Edit Application"
+#~ msgstr "编辑应用"