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 e2257f3319fbc0ea4d17bc71021ce35f54a6a789..06f822d1860a871c94900e8e4716e447b7d09f8d 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,6 +1,7 @@
 # Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
 # Expored from translatewiki.net
 #
 # Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
 # Expored from translatewiki.net
 #

+# Author: Brion

 # Author: Chenxiaoqino
 # Author: Shizhao
 # Author: Sweeite012f
 # Author: Chenxiaoqino
 # Author: Shizhao
 # Author: Sweeite012f


@@ -13,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-09-18 22:06+0000\n"
-"PO-Revision-Date: 2010-09-18 22:08:31+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 (r73298); 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: 1284-74-75 38::+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


@@ -80,11 +81,14 @@ 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
-#: lib/applicationeditform.php:351
+#: actions/imsettings.php:187 actions/profilesettings.php:201
+#: actions/smssettings.php:209 actions/subscriptions.php:246
+#: lib/applicationeditform.php:355

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


@@ -95,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


@@ -115,7 +120,7 @@ msgstr "没有这个页面。"
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
 #: actions/remotesubscribe.php:154 actions/replies.php:73
 #: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
 #: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40

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

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


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

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

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


@@ -179,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 "


@@ -200,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


@@ -232,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


@@ -266,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


@@ -305,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."


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

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

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


@@ -393,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个字符)。"
 


@@ -465,18 +489,18 @@ msgid "Group not found."
 msgstr "小组未找到。"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.
 msgstr "小组未找到。"
 
 #. TRANS: Error text shown a user tries to join a group they already are a member of.

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

 msgid "You are already a member of that group."
 msgstr "你已经是该小组成员。"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
 msgid "You are already a member of that group."
 msgstr "你已经是该小组成员。"
 
 #. TRANS: Error text shown when a user tries to join a group they are blocked from joining.

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

 msgid "You have been blocked from that group by the admin."
 msgstr "你已经被管理员从该小组中屏蔽。"
 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 msgid "You have been blocked from that group by the admin."
 msgstr "你已经被管理员从该小组中屏蔽。"
 
 #. TRANS: Message given having failed to add a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

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

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


@@ -488,7 +512,7 @@ msgstr "你不是该小组成员。"
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:126 actions/leavegroup.php:129
 #. TRANS: Message given having failed to remove a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #: actions/apigroupleave.php:126 actions/leavegroup.php:129

-#: lib/command.php:401
+#: lib/command.php:398

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


@@ -521,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/deletenotice.php:169 actions/disfavor.php:74
+#: 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/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


@@ -547,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


@@ -583,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 "


@@ -602,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:463
+#: 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


@@ -615,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/register.php:436 lib/accountsettingsaction.php:125
+#: actions/apioauthauthorize.php:362 actions/login.php:255
+#: actions/register.php:436 lib/accountsettingsaction.php:120

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

-#: actions/apioauthauthorize.php:328
-msgid "Deny"
-msgstr "阻止"
+#. TRANS: Submit button title.
+#: actions/apioauthauthorize.php: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请求。"


@@ -641,17 +686,17 @@ msgid "You may not delete another user's status."
 msgstr "你不能删除其他用户的消息。"
 
 #: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
 msgstr "你不能删除其他用户的消息。"
 
 #: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72

-#: actions/deletenotice.php:52 actions/shownotice.php:92
+#: actions/deletenotice.php:58 actions/shownotice.php:92

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

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

 msgid "Cannot repeat your own notice."
 msgstr "不能转发你自己的消息。"
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
 msgid "Cannot repeat your own notice."
 msgstr "不能转发你自己的消息。"
 
 #. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.

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

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


@@ -682,7 +727,7 @@ msgstr "未找到。"
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "每条消息最长%d字符，包括附件的链接 URL。"
 
 msgid "Max notice size is %d chars, including attachment URL."
 msgstr "每条消息最长%d字符，包括附件的链接 URL。"
 

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

 msgid "Unsupported format."
 msgstr "不支持的格式。"
 
 msgid "Unsupported format."
 msgstr "不支持的格式。"
 


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

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

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


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

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

 msgid "Avatar"
 msgstr "头像"
 
 msgid "Avatar"
 msgstr "头像"
 


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

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


@@ -847,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:147 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 "否"


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

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

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

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

 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.
 msgctxt "BUTTON"
 msgid "Yes"
 msgstr "是"
 
 #. TRANS: Submit button title for 'Yes' when blocking a user.

-#. TRANS: Submit button title.

 #. TRANS: Description of the form to block a user.
 #. TRANS: Description of the form to block a user.

-#: actions/block.php:164 actions/groupmembers.php:403 lib/blockform.php:82
+#: actions/block.php:164 lib/blockform.php:79

 msgid "Block this user"
 msgstr "屏蔽这个用户"
 
 msgid "Block this user"
 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


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

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

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


@@ -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:1315
+#: 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,8 +1093,68 @@ 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.
 #. TRANS: Client error message thrown when trying to access the admin panel while not logged in.

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

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


@@ -1052,31 +1164,31 @@ msgstr "删除这个应用"
 msgid "Not logged in."
 msgstr "未登录。"
 
 msgid "Not logged in."
 msgstr "未登录。"
 

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

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

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

 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "你即将永久删除一条消息，此操作无法撤销。"
 
 msgid ""
 "You are about to permanently delete a notice. Once this is done, it cannot "
 "be undone."
 msgstr "你即将永久删除一条消息，此操作无法撤销。"
 

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

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

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

 msgid "Are you sure you want to delete this notice?"
 msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.
 msgid "Are you sure you want to delete this notice?"
 msgstr "你确定要删除这条消息吗？"
 
 #. TRANS: Submit button title for 'No' when deleting a notice.

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

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

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

 msgid "Delete this notice"
 msgstr "删除"
 
 msgid "Delete this notice"
 msgstr "删除"
 


@@ -1106,61 +1218,71 @@ msgstr "删除这个用户"
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.
 
 #. TRANS: Message used as title for design settings for the site.
 #. TRANS: Link description in user account settings menu.

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

 msgid "Design"
 msgstr "外观"
 
 #: actions/designadminpanel.php:74
 msgid "Design"
 msgstr "外观"
 
 #: actions/designadminpanel.php:74

-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"

 msgstr "这个 StatusNet 网站的外观设置"
 
 msgstr "这个 StatusNet 网站的外观设置"
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


@@ -1168,75 +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:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:550 lib/designsettings.php:139

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

-#: actions/designadminpanel.php:683 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:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
+#: 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/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 #: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245

-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:353
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202

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

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

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


@@ -1253,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:258
+#. 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 "无法更新应用。"
 


@@ -1351,7 +1498,7 @@ msgid "Could not update group."
 msgstr "无法更新小组"
 
 #. TRANS: Server exception thrown when creating group aliases failed.
 msgstr "无法更新小组"
 
 #. TRANS: Server exception thrown when creating group aliases failed.

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

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


@@ -1407,7 +1554,7 @@ msgstr ""
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131
 #. TRANS: Button label to cancel a SMS address confirmation procedure.
 #. TRANS: Button label in the "Edit application" form.
 #: actions/emailsettings.php:127 actions/imsettings.php:131

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

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


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

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

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

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

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

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

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

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

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


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

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

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


@@ -1702,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 "更新远程的个人信息时出错。"
 


@@ -1864,6 +2011,12 @@ msgctxt "BUTTON"
 msgid "Block"
 msgstr "屏蔽"
 
 msgid "Block"
 msgstr "屏蔽"
 

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

 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "使用户成为小组的管理员"
 #: actions/groupmembers.php:498
 msgid "Make user an admin of the group"
 msgstr "使用户成为小组的管理员"


@@ -1884,7 +2037,7 @@ msgstr "将这个用户设为管理员"
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94
 #. TRANS: Title in atom group notice feed. %s is a group name.
 #. TRANS: Title in atom user notice feed. %s is a user name.
 #: actions/grouprss.php:139 actions/userrss.php:94

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

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


@@ -2130,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:430
+#: 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"


@@ -2269,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"


@@ -2283,7 +2471,7 @@ msgid "You must be logged in to leave a group."
 msgstr "你必须登录才能离开小组。"
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
 msgstr "你必须登录才能离开小组。"
 
 #. TRANS: Error text shown when trying to leave an existing group the user is not a member of.

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

 msgid "You are not a member of that group."
 msgstr "你不是该群小组成员。"
 
 msgid "You are not a member of that group."
 msgstr "你不是该群小组成员。"
 


@@ -2292,6 +2480,110 @@ msgstr "你不是该群小组成员。"
 msgid "%1$s left group %2$s"
 msgstr "%1$s离开了%2$s小组。"
 
 msgid "%1$s left group %2$s"
 msgstr "%1$s离开了%2$s小组。"
 

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

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


@@ -2375,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 "无法创建应用。"


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

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

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

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

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

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

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

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

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


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

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

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

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

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


@@ -2487,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


@@ -2521,8 +2828,8 @@ msgid "Connected applications"
 msgstr "关联的应用"
 
 #: actions/oauthconnectionssettings.php:83
 msgstr "关联的应用"
 
 #: actions/oauthconnectionssettings.php:83

-msgid "You have allowed the following applications to access you account."
-msgstr "你已允许以下程序访问你的è´¦æ\88·ã\80\82"
+msgid "You have allowed the following applications to access your account."
+msgstr "你已允许以下程序访问你的å¸\90å\8f·ã\80\82"

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


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

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

 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"
 #, php-format
 msgid "%1$s's status on %2$s"
 msgstr "%1$s在%2$s时发的消息"


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

-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1356
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1356

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


@@ -2709,150 +3016,169 @@ msgid "Paths"
 msgstr "路径"
 
 #: actions/pathsadminpanel.php:70
 msgstr "路径"
 
 #: actions/pathsadminpanel.php:70

-msgid "Path and server settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的路径和服务器设置"
+msgid "Path and server settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的路径和服务器设置。"

 
 

-#: actions/pathsadminpanel.php:157
+#: actions/pathsadminpanel.php:158

 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "主题目录无法读取：%s。"
 
 #, php-format
 msgid "Theme directory not readable: %s."
 msgstr "主题目录无法读取：%s。"
 

-#: actions/pathsadminpanel.php:163
+#: actions/pathsadminpanel.php:164

 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 
 #, php-format
 msgid "Avatar directory not writable: %s."
 msgstr "头像目录无法写入：%s。"
 

-#: actions/pathsadminpanel.php:169
+#: actions/pathsadminpanel.php:170

 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "背景目录无法写入：%s。"
 
 #, php-format
 msgid "Background directory not writable: %s."
 msgstr "背景目录无法写入：%s。"
 

-#: actions/pathsadminpanel.php:177
+#: actions/pathsadminpanel.php:178

 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "本地化目录无法读取：%s。"
 
 #, php-format
 msgid "Locales directory not readable: %s."
 msgstr "本地化目录无法读取：%s。"
 

-#: actions/pathsadminpanel.php:183
+#: actions/pathsadminpanel.php:184

 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "无效的 SSL 服务器。最大长度255个字符。"
 
 msgid "Invalid SSL server. The maximum length is 255 characters."
 msgstr "无效的 SSL 服务器。最大长度255个字符。"
 

-#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
+#: actions/pathsadminpanel.php:235 actions/siteadminpanel.php:58

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

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239 actions/pathsadminpanel.php:265
+#: actions/pathsadminpanel.php:314 actions/pathsadminpanel.php:343

 msgid "Server"
 msgstr "服务器"
 
 msgid "Server"
 msgstr "服务器"
 

-#: actions/pathsadminpanel.php:238
+#: actions/pathsadminpanel.php:239

 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 
 msgid "Site's server hostname."
 msgstr "网站的服务器主机名。"
 

-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243 actions/pathsadminpanel.php:269
+#: actions/pathsadminpanel.php:318 actions/pathsadminpanel.php:347

 msgid "Path"
 msgstr "路径"
 
 msgid "Path"
 msgstr "路径"
 

-#: actions/pathsadminpanel.php:242
+#: actions/pathsadminpanel.php:243

 msgid "Site path"
 msgstr "网站路径"
 
 msgid "Site path"
 msgstr "网站路径"
 

-#: actions/pathsadminpanel.php:246
-msgid "Path to locales"
-msgstr "本地化文件路径"
+#: actions/pathsadminpanel.php:247
+#, fuzzy
+msgid "Locale Directory"
+msgstr "主题目录"

 
 

-#: actions/pathsadminpanel.php:246
+#: actions/pathsadminpanel.php:247

 msgid "Directory path to locales"
 msgstr "本地化文件的目录路径"
 
 msgid "Directory path to locales"
 msgstr "本地化文件的目录路径"
 

-#: actions/pathsadminpanel.php:250
+#: actions/pathsadminpanel.php:251

 msgid "Fancy URLs"
 msgstr "优化 URLs"
 
 msgid "Fancy URLs"
 msgstr "优化 URLs"
 

-#: actions/pathsadminpanel.php:252
+#: actions/pathsadminpanel.php:253

 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 
 msgid "Use fancy (more readable and memorable) URLs?"
 msgstr "使用优化的 URLs（更简洁易记）？"
 

-#: actions/pathsadminpanel.php:259
+#: actions/pathsadminpanel.php:260

 msgid "Theme"
 msgstr "主题"
 
 msgid "Theme"
 msgstr "主题"
 

-#: actions/pathsadminpanel.php:264
-msgid "Theme server"
-msgstr "主题服务器"
+#: actions/pathsadminpanel.php:265
+#, fuzzy
+msgid "Server for themes"
+msgstr "这个网站的主题。"

 
 

-#: actions/pathsadminpanel.php:268
-msgid "Theme path"
-msgstr "主题路径"
+#: actions/pathsadminpanel.php:269
+msgid "Web path to themes"
+msgstr ""

 
 

-#: actions/pathsadminpanel.php:272
-msgid "Theme directory"
+#: 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:277 actions/pathsadminpanel.php:326
+#: actions/pathsadminpanel.php:355
+#, fuzzy
+msgid "SSL path"
+msgstr "网站路径"
+
+#: 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 "保存路径"
 


@@ -2888,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"
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
+#. 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 个小写字母或数字，不包含标点或空格"

 
 

-#: 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
-#: lib/applicationeditform.php:235 lib/groupeditform.php:161
+#: actions/profilesettings.php:122 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161

 msgid "Homepage"
 msgstr "主页"
 
 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 个字符)。"

 
 

-#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
+#. 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个字符)。"
+
+#. 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 "设置已保存。"
 


@@ -3090,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 "标签云"
 


@@ -3267,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 "用户名或密码不正确。"


@@ -3293,7 +3690,7 @@ msgstr "与上面输入相同的密码。此项必填。"
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449
 
 #. TRANS: Link description in user account settings menu.
 #: actions/register.php:445 actions/register.php:449

-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127

 msgid "Email"
 msgstr "电子邮件"
 
 msgid "Email"
 msgstr "电子邮件"
 


@@ -3305,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 ""


@@ -3333,8 +3739,8 @@ msgid ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""
 "My text and files are available under %s except this private data: password, "
 "email address, IM address, and phone number."
 msgstr ""

-"我的文字和文件在%s下提供，除了隐私内容：密码、电子邮件地址、IM 地址和电话号"
-"码。"
+"我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
+"号码。"

 
 #: actions/register.php:583
 #, php-format
 
 #: actions/register.php:583
 #, php-format


@@ -3444,7 +3850,7 @@ msgstr "你不能重复自己的消息。"
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 
 msgid "You already repeated that notice."
 msgstr "你已转发过了那个消息。"
 

-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:114 lib/noticelist.php:686

 msgid "Repeated"
 msgstr "已转发"
 
 msgid "Repeated"
 msgstr "已转发"
 


@@ -3534,8 +3940,8 @@ msgid "Sessions"
 msgstr "Sessions"
 
 #: actions/sessionsadminpanel.php:65
 msgstr "Sessions"
 
 #: actions/sessionsadminpanel.php:65

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

 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"
 
 #: actions/sessionsadminpanel.php:175
 msgid "Handle sessions"


@@ -3554,7 +3960,6 @@ msgid "Turn on debugging output for sessions."
 msgstr "打开 sessions 的调试输出。"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
 msgstr "打开 sessions 的调试输出。"
 
 #: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292

-#: actions/useradminpanel.php:294

 msgid "Save site settings"
 msgstr "保存访问设置"
 
 msgid "Save site settings"
 msgstr "保存访问设置"
 


@@ -3578,17 +3983,17 @@ msgid "Name"
 msgstr "名称"
 
 #. TRANS: Form input field label.
 msgstr "名称"
 
 #. TRANS: Form input field label.

-#: actions/showapplication.php:178 lib/applicationeditform.php:226
+#: actions/showapplication.php:178 lib/applicationeditform.php:227

 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200
 msgid "Organization"
 msgstr "组织名称必填。"
 
 #. TRANS: Form input field label.
 #: actions/showapplication.php:187 actions/version.php:200

-#: lib/applicationeditform.php:207 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172

 msgid "Description"
 msgstr "描述"
 
 msgid "Description"
 msgstr "描述"
 

-#: actions/showapplication.php:192 actions/showgroup.php:436
+#: actions/showapplication.php:192 actions/showgroup.php:442

 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "统计"
 #: lib/profileaction.php:187
 msgid "Statistics"
 msgstr "统计"


@@ -3725,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."


@@ -3778,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."


@@ -3791,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 "管理员"
 


@@ -3817,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%%%"


@@ -4267,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%%%"


@@ -4306,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 "


@@ -4339,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 lib/connectsettingsaction.php:115
+#. 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"
 


@@ -4445,74 +4885,78 @@ msgid ""
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
 #. TRANS: User admin panel title
 msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
 
 #. TRANS: User admin panel title

-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60

 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 
 msgctxt "TITLE"
 msgid "User"
 msgstr "用户"
 

-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"

 msgstr "这个 StatusNet 网站的用户设置"
 
 msgstr "这个 StatusNet 网站的用户设置"
 

-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150

 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 
 msgid "Invalid bio limit. Must be numeric."
 msgstr "无效的自述限制，必须为数字。"
 

-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156

 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 
 msgid "Invalid welcome text. Max length is 255 characters."
 msgstr "无效的欢迎文字。最大长度255个字符。"
 

-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166

 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.
 #, php-format
 msgid "Invalid default subscripton: '%1$s' is not user."
 msgstr "无效的默认关注：“%1$s”不是一个用户。"
 
 #. TRANS: Link description in user account settings menu.

-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106

 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "个人信息"
 
 #: lib/personalgroupnav.php:109
 msgid "Profile"
 msgstr "个人信息"
 

-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223

 msgid "Bio Limit"
 msgstr "自述限制"
 
 msgid "Bio Limit"
 msgstr "自述限制"
 

-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224

 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 
 msgid "Maximum length of a profile bio in characters."
 msgstr "个人资料自述最长的字符数。"
 

-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232

 msgid "New users"
 msgstr "新用户"
 
 msgid "New users"
 msgstr "新用户"
 

-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236

 msgid "New user welcome"
 msgstr "新用户欢迎"
 
 msgid "New user welcome"
 msgstr "新用户欢迎"
 

-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237

 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 
 msgid "Welcome text for new users (Max 255 chars)."
 msgstr "给新用户的欢迎文字(不能超过255个字符)。"
 

-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242

 msgid "Default subscription"
 msgstr "默认关注"
 
 msgid "Default subscription"
 msgstr "默认关注"
 

-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243

 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 
 msgid "Automatically subscribe new users to this user."
 msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
 

-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252

 msgid "Invitations"
 msgstr "邀请"
 
 msgid "Invitations"
 msgstr "邀请"
 

-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257

 msgid "Invitations enabled"
 msgstr "邀请已启用"
 
 msgid "Invitations enabled"
 msgstr "邀请已启用"
 

-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259

 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 
 msgid "Whether to allow users to invite new users."
 msgstr "是否允许用户发送注册邀请。"
 

+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr "保存用户设置"
+

 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "授权关注"
 #: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "授权关注"


@@ -4526,7 +4970,9 @@ msgstr ""
 "请检查这些详细信息，确认希望关注此用户的消息。如果你不想关注，请点击\\\"拒绝"
 "\\\"。"
 
 "请检查这些详细信息，确认希望关注此用户的消息。如果你不想关注，请点击\\\"拒绝"
 "\\\"。"
 

+#. TRANS: Menu item for site administration

 #: actions/userauthorization.php:196 actions/version.php:167
 #: actions/userauthorization.php:196 actions/version.php:167

+#: lib/adminpanelaction.php:403

 msgid "License"
 msgstr "许可协议"
 
 msgid "License"
 msgstr "许可协议"
 


@@ -4650,7 +5096,7 @@ msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
 #. TRANS: Message is used as a subtitle in atom user notice feed.
 #. TRANS: %1$s is a user name, %2$s is a site name.
 #: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70

-#: lib/atomusernoticefeed.php:76
+#: lib/atomusernoticefeed.php:75

 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"
 #, php-format
 msgid "Updates from %1$s on %2$s!"
 msgstr "%2$s 上 %1$s 的更新！"


@@ -4704,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:805
+#: actions/version.php:198 lib/action.php:830

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


@@ -4712,20 +5158,32 @@ msgstr "版本"
 msgid "Author(s)"
 msgstr "作者"
 
 msgid "Author(s)"
 msgstr "作者"
 

+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "收藏"
+
+#. TRANS: Ntofication given when a user marks a notice as favorite.
+#. TRANS: %1$s is a user nickname or full name, %2$s is a notice URI.
+#: classes/Fave.php:151
+#, php-format
+msgid "%1$s marked notice %2$s as a favorite."
+msgstr "%1$s 将消息 %2$s 标记了收藏。"
+

 #. TRANS: Server exception thrown when a URL cannot be processed.
 #. TRANS: Server exception thrown when a URL cannot be processed.

-#: classes/File.php:143
+#: classes/File.php:142

 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "不能处理 URL “%s”"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!
 #, php-format
 msgid "Cannot process URL '%s'"
 msgstr "不能处理 URL “%s”"
 
 #. TRANS: Server exception thrown when... Robin thinks something is impossible!

-#: classes/File.php:175
+#: classes/File.php:174

 msgid "Robin thinks something is impossible."
 msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
 msgid "Robin thinks something is impossible."
 msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
 
 #. TRANS: Message given if an upload is larger than the configured maximum.
 #. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.

-#: classes/File.php:190
+#: classes/File.php:189

 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
 #, php-format
 msgid ""
 "No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "


@@ -4735,20 +5193,20 @@ msgstr ""
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.
 
 #. TRANS: Message given if an upload would exceed user quota.
 #. TRANS: %d (number) is the user quota in bytes.

-#: classes/File.php:202
+#: classes/File.php:201

 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr "这么大的文件会超过你%d字节的用户配额。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.
 #, php-format
 msgid "A file this large would exceed your user quota of %d bytes."
 msgstr "这么大的文件会超过你%d字节的用户配额。"
 
 #. TRANS: Message given id an upload would exceed a user's monthly quota.
 #. TRANS: $d (number) is the monthly user quota in bytes.

-#: classes/File.php:211
+#: classes/File.php:210

 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr "这么大的文件会超过你%d字节的每月配额。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.
 #, php-format
 msgid "A file this large would exceed your monthly quota of %d bytes."
 msgstr "这么大的文件会超过你%d字节的每月配额。"
 
 #. TRANS: Client exception thrown if a file upload does not have a valid name.

-#: classes/File.php:248 classes/File.php:263
+#: classes/File.php:247 classes/File.php:262

 msgid "Invalid filename."
 msgstr "无效的文件名。"
 
 msgid "Invalid filename."
 msgstr "无效的文件名。"
 


@@ -4767,6 +5225,32 @@ msgstr "不是小组成员。"
 msgid "Group leave failed."
 msgstr "离开小组失败。"
 
 msgid "Group leave failed."
 msgstr "离开小组失败。"
 

+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr "无效的用户 ID %s。"
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, php-format
+msgid "Group ID %s is invalid."
+msgstr "小组 ID %s 无效。"
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "加入"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s加入了%2$s小组。"
+

 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."
 #. TRANS: Server exception thrown when updating a local group fails.
 #: classes/Local_group.php:42
 msgid "Could not update local group."


@@ -4785,17 +5269,17 @@ msgid "No database name or DSN found anywhere."
 msgstr "没有找到数据库名称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
 msgstr "没有找到数据库名称或者 DSN。"
 
 #. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.

-#: classes/Message.php:46
+#: classes/Message.php:45

 msgid "You are banned from sending direct messages."
 msgstr "你被禁止发送私信。"
 
 #. TRANS: Message given when a message could not be stored on the server.
 msgid "You are banned from sending direct messages."
 msgstr "你被禁止发送私信。"
 
 #. TRANS: Message given when a message could not be stored on the server.

-#: classes/Message.php:63
+#: classes/Message.php:62

 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 #. TRANS: Message given when a message could not be updated on the server.
 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 #. TRANS: Message given when a message could not be updated on the server.

-#: classes/Message.php:74
+#: classes/Message.php:73

 msgid "Could not update message with new URI."
 msgstr "无法通过新的 URI 更新消息。"
 
 msgid "Could not update message with new URI."
 msgstr "无法通过新的 URI 更新消息。"
 


@@ -4847,32 +5331,39 @@ msgid "Problem saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
 msgstr "保存消息时出错。"
 
 #. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().

-#: classes/Notice.php:899
+#: classes/Notice.php:907

 msgid "Bad type provided to saveKnownGroups"
 msgstr "对 saveKnownGroups 提供的类型无效"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.
 msgid "Bad type provided to saveKnownGroups"
 msgstr "对 saveKnownGroups 提供的类型无效"
 
 #. TRANS: Server exception thrown when an update for a group inbox fails.

-#: classes/Notice.php:998
+#: classes/Notice.php:1006

 msgid "Problem saving group inbox."
 msgstr "保存小组收件箱时出错。"
 
 msgid "Problem saving group inbox."
 msgstr "保存小组收件箱时出错。"
 

+#. TRANS: Server exception thrown when a reply cannot be saved.
+#. TRANS: %1$d is a notice ID, %2$d is the ID of the mentioned user.
+#: classes/Notice.php:1120
+#, php-format
+msgid "Could not save reply for %1$d, %2$d."
+msgstr "无法保存回复，%1$d 对 %2$d。"
+

 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
 #. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
 #. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.

-#: classes/Notice.php:1759
+#: classes/Notice.php:1822

 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "RT @%1$s %2$s"
 msgstr "RT @%1$s %2$s"
 
 #. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:737
+#: classes/Profile.php:785

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，不存在。"
 
 #. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
 #. TRANS: %1$s is the role name, %2$s is the user ID (number).

-#: classes/Profile.php:746
+#: classes/Profile.php:794

 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
 #, php-format
 msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
 msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"


@@ -4883,12 +5374,12 @@ msgid "Missing profile."
 msgstr "丢失的个人信息。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.
 msgstr "丢失的个人信息。"
 
 #. TRANS: Exception thrown when a tag cannot be saved.

-#: classes/Status_network.php:339
+#: classes/Status_network.php:338

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

-#: classes/Subscription.php:75 lib/oauthstore.php: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 "你被禁止添加关注。"
 


@@ -4922,65 +5413,77 @@ msgstr "无法删除关注 OMB token。"
 msgid "Could not delete subscription."
 msgstr "无法取消关注。"
 
 msgid "Could not delete subscription."
 msgstr "无法取消关注。"
 

+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr "关注"
+
+#. TRANS: Notification given when one person starts following another.
+#. TRANS: %1$s is the subscriber, %2$s is the subscribed.
+#: classes/Subscription.php:258
+#, php-format
+msgid "%1$s is now following %2$s."
+msgstr "%1$s 现在开始关注了 %2$s。"
+

 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
 #. TRANS: Notice given on user registration.
 #. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.

-#: classes/User.php:365
+#: classes/User.php:384

 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception thrown when creating a group failed.
 #, php-format
 msgid "Welcome to %1$s, @%2$s!"
 msgstr "欢迎来到 %1$s，@%2$s！"
 
 #. TRANS: Server exception thrown when creating a group failed.

-#: classes/User_group.php:496
+#: classes/User_group.php:495

 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.
 msgid "Could not create group."
 msgstr "无法创建小组。"
 
 #. TRANS: Server exception thrown when updating a group URI failed.

-#: classes/User_group.php:506
+#: classes/User_group.php:505

 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.
 msgid "Could not set group URI."
 msgstr "无法设置小组 URI。"
 
 #. TRANS: Server exception thrown when setting group membership failed.

-#: classes/User_group.php:529
+#: classes/User_group.php:528

 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.
 msgid "Could not set group membership."
 msgstr "无法设置小组成员。"
 
 #. TRANS: Server exception thrown when saving local group information failed.

-#: classes/User_group.php:544
+#: classes/User_group.php:543

 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Could not save local group info."
 msgstr "无法保存本地小组信息。"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104

 msgid "Change your profile settings"
 msgstr "修改你的个人信息"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your profile settings"
 msgstr "修改你的个人信息"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111

 msgid "Upload an avatar"
 msgstr "上传一个头像。"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Upload an avatar"
 msgstr "上传一个头像。"
 
 #. TRANS: Link title attribute in user account settings menu.

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

 msgid "Change your password"
 msgstr "修改密码"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change your password"
 msgstr "修改密码"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125

 msgid "Change email handling"
 msgstr "修改电子邮件"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132

 msgid "Design your profile"
 msgstr "设计你的个人页面外观"
 
 #. TRANS: Link title attribute in user account settings menu.
 msgid "Design your profile"
 msgstr "设计你的个人页面外观"
 
 #. TRANS: Link title attribute in user account settings menu.

-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139

 msgid "Other options"
 msgstr "其他选项"
 
 #. TRANS: Link description in user account settings menu.
 msgid "Other options"
 msgstr "其他选项"
 
 #. TRANS: Link description in user account settings menu.

-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141

 msgid "Other"
 msgstr "其他"
 
 msgid "Other"
 msgstr "其他"
 


@@ -4996,184 +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:449
+#: 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:455
+#: 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:458
+#: 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:460
+#: 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:465
+#: 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:468
+#: 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:471
+#: 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:474 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:478
+#: 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:481
+#: 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:487
+#: 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:490
+#: 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:495
+#: 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:498
+#: 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:501
+#: lib/action.php:528

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

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

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

-#: lib/action.php:510
+#: 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:513
+#: 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:516
+#: 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:538 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:605
+#: 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:675
+#: 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:778
+#: 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:784
+#: 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:787
+#: 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:790
+#: 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:795
+#: 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:799
+#: lib/action.php:824

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

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

 msgid "Contact"
 msgstr "联系"
 
 msgid "Contact"
 msgstr "联系"
 

-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:836

 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.
 msgid "Badge"
 msgstr "挂件"
 
 #. TRANS: DT element for StatusNet software license.

-#: lib/action.php:839
+#: lib/action.php:865

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


@@ -5181,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:846
+#: 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."


@@ -5191,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:849
+#: 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%%** 是一个微博客服务。"


@@ -5200,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:856
+#: 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 %"


@@ -5211,70 +5715,70 @@ 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:872
+#: 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:879
+#: 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:886
+#: 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:890
+#: 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:904
+#: 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:1243
+#: 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:1254
+#: 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:1264
+#: lib/action.php:1305

 msgid "Before"
 msgstr "之前"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.
 msgid "Before"
 msgstr "之前"
 
 #. TRANS: Client exception thrown when a feed instance is a DOMDocument.

-#: lib/activity.php:122
+#: lib/activity.php:120

 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 #. TRANS: Client exception thrown when there is no source attribute.
 msgid "Expecting a root feed element but got a whole XML document."
 msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
 
 #. TRANS: Client exception thrown when there is no source attribute.

-#: lib/activityutils.php:203
+#: lib/activityutils.php:200

 msgid "Can't handle remote content yet."
 msgstr "还不能处理远程内容。"
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
 msgid "Can't handle remote content yet."
 msgstr "还不能处理远程内容。"
 
 #. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.

-#: lib/activityutils.php:240
+#: lib/activityutils.php:237

 msgid "Can't handle embedded XML content yet."
 msgstr "还不能处理嵌入式 XML 内容。"
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
 msgid "Can't handle embedded XML content yet."
 msgstr "还不能处理嵌入式 XML 内容。"
 
 #. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.

-#: lib/activityutils.php:245
+#: lib/activityutils.php:242

 msgid "Can't handle embedded Base64 content yet."
 msgstr "还不能处理嵌入式 Base64 内容。"
 
 msgid "Can't handle embedded Base64 content yet."
 msgstr "还不能处理嵌入式 Base64 内容。"
 


@@ -5362,46 +5866,46 @@ msgstr "编辑网站消息"
 msgid "Snapshots configuration"
 msgstr "更改站点配置"
 
 msgid "Snapshots configuration"
 msgstr "更改站点配置"
 

+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr "设置网站许可协议"
+

 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 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.
 #. TRANS: Client error 401.
 #: lib/apiauth.php:111
 msgid "API resource requires read-write access, but you only have read access."
 msgstr "API 资源需要读写的访问权限，但是你只有只读的权限。"
 
 #. TRANS: OAuth exception thrown when no application is found for a given consumer key.

-#: lib/apiauth.php:175
+#: 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."
 msgid "Tried to revoke unknown token."

-msgstr ""
+msgstr "尝试了取消未知的 token。"

 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.
 
 #. TRANS: Exception thrown when an attempt is made to remove a revoked token.

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

 msgid "Failed to delete revoked token."
 msgid "Failed to delete revoked token."

-msgstr ""
-
-#. TRANS: Form legend.
-#: lib/applicationeditform.php:129
-msgid "Edit application"
-msgstr "编辑应用"
+msgstr "删除取消的 token 失败。"

 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178
 
 #. TRANS: Form guide.
 #: lib/applicationeditform.php:178


@@ -5409,186 +5913,192 @@ msgid "Icon for this application"
 msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.
 msgstr "该应用的图标"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:200
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201

 #, php-format
 #, php-format

-msgid "Describe your application in %d characters"
-msgstr "用不超过%d个字符描述你的应用"
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "用不超过%d个字符描述你的应用"

 
 #. TRANS: Form input field instructions.
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:204
+#: lib/applicationeditform.php:205

 msgid "Describe your application"
 msgstr "描述你的应用"
 
 #. TRANS: Form input field instructions.
 msgid "Describe your application"
 msgstr "描述你的应用"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:215
+#: lib/applicationeditform.php:216

 msgid "URL of the homepage of this application"
 msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.
 msgid "URL of the homepage of this application"
 msgstr "这个应用的主页 URL"
 
 #. TRANS: Form input field label.

-#: lib/applicationeditform.php:217
+#: lib/applicationeditform.php:218

 msgid "Source URL"
 msgstr "来源网址"
 
 #. TRANS: Form input field instructions.
 msgid "Source URL"
 msgstr "来源网址"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:225

 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
 #. TRANS: Form input field instructions.
 msgid "Organization responsible for this application"
 msgstr "该应用的负责组织"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:234

 msgid "URL for the homepage of the organization"
 msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.
 msgid "URL for the homepage of the organization"
 msgstr "这个组织的主页 URL"
 
 #. TRANS: Form input field instructions.

-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:243

 msgid "URL to redirect to after authentication"
 msgstr "通过授权后转向的 URL"
 
 #. TRANS: Radio button label for application type
 msgid "URL to redirect to after authentication"
 msgstr "通过授权后转向的 URL"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:269
+#: lib/applicationeditform.php:271

 msgid "Browser"
 msgstr "浏览器"
 
 #. TRANS: Radio button label for application type
 msgid "Browser"
 msgstr "浏览器"
 
 #. TRANS: Radio button label for application type

-#: lib/applicationeditform.php:286
+#: lib/applicationeditform.php:288

 msgid "Desktop"
 msgstr "桌面"
 
 #. TRANS: Form guide.
 msgid "Desktop"
 msgstr "桌面"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:288
+#: lib/applicationeditform.php:290

 msgid "Type of application, browser or desktop"
 msgstr "应用的类型，浏览器或桌面"
 
 #. TRANS: Radio button label for access type.
 msgid "Type of application, browser or desktop"
 msgstr "应用的类型，浏览器或桌面"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:311
+#: lib/applicationeditform.php:314

 msgid "Read-only"
 msgstr "只读"
 
 #. TRANS: Radio button label for access type.
 msgid "Read-only"
 msgstr "只读"
 
 #. TRANS: Radio button label for access type.

-#: lib/applicationeditform.php:330
+#: lib/applicationeditform.php:334

 msgid "Read-write"
 msgstr "读写"
 
 #. TRANS: Form guide.
 msgid "Read-write"
 msgstr "读写"
 
 #. TRANS: Form guide.

-#: lib/applicationeditform.php:332
+#: lib/applicationeditform.php:336

 msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 
 msgid "Default access for this application: read-only, or read-write"
 msgstr "该应用默认的访问权限：只读或读写"
 

-#. TRANS: Submit button title.
-#: lib/applicationeditform.php:349
-msgid "Cancel"
-msgstr "取消"
-

 #. TRANS: Application access type
 #. TRANS: Application access type

-#: lib/applicationlist.php:135
+#: lib/applicationlist.php:134

 msgid "read-write"
 msgstr "读写"
 
 #. TRANS: Application access type
 msgid "read-write"
 msgstr "读写"
 
 #. TRANS: Application access type

-#: lib/applicationlist.php:137
+#: lib/applicationlist.php:136

 msgid "read-only"
 msgstr "只读"
 
 msgid "read-only"
 msgstr "只读"
 

-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:143
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142

 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "通过了%1$s - \"%2$s\"的访问权限。"
 
 #. TRANS: Button label
 #, php-format
 msgid "Approved %1$s - \"%2$s\" access."
 msgstr "通过了%1$s - \"%2$s\"的访问权限。"
 
 #. TRANS: Button label

-#: lib/applicationlist.php:158
+#: lib/applicationlist.php:157

 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 
 msgctxt "BUTTON"
 msgid "Revoke"
 msgstr "取消"
 

-#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
-msgid "Attachments"
-msgstr "附件"
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr "作者元素必须包含一个名称元素。"

 
 #. TRANS: DT element label in attachment list item.
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256

 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.
 msgid "Author"
 msgstr "作者"
 
 #. TRANS: DT element label in attachment list item.

-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270

 msgid "Provider"
 msgstr "提供者"
 
 #. TRANS: Title.
 msgid "Provider"
 msgstr "提供者"
 
 #. TRANS: Title.

-#: lib/attachmentnoticesection.php:68
+#: lib/attachmentnoticesection.php:67

 msgid "Notices where this attachment appears"
 msgstr "出现这个附件的消息"
 
 #. TRANS: Title.
 msgid "Notices where this attachment appears"
 msgstr "出现这个附件的消息"
 
 #. TRANS: Title.

-#: lib/attachmenttagcloudsection.php:49
+#: lib/attachmenttagcloudsection.php:48

 msgid "Tags for this attachment"
 msgstr "此附件的标签"
 
 msgid "Tags for this attachment"
 msgstr "此附件的标签"
 

-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
-msgstr "不允许更改密码"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+msgid "Password changing failed."
+msgstr "修改密码失败。"

 
 

-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
-msgstr "不允许更改密码"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+msgid "Password changing is not allowed."
+msgstr "不允许更改密码。"

 
 #. TRANS: Title for the form to block a user.
 
 #. TRANS: Title for the form to block a user.

-#: lib/blockform.php:70
+#: lib/blockform.php:68

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

-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181

 msgid "Command results"
 msgstr "执行结果"
 
 msgid "Command results"
 msgstr "执行结果"
 

-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+msgid "AJAX error"
+msgstr "AJAX 错误"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142

 msgid "Command complete"
 msgstr "执行完毕"
 
 msgid "Command complete"
 msgstr "执行完毕"
 

-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244

 msgid "Command failed"
 msgstr "执行失败"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.
 msgid "Command failed"
 msgstr "执行失败"
 
 #. TRANS: Command exception text shown when a notice ID is requested that does not exist.

-#: lib/command.php:84 lib/command.php:108
+#: lib/command.php:82 lib/command.php:106

 msgid "Notice with that id does not exist."
 msgstr "没有此 id 的消息。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.
 msgid "Notice with that id does not exist."
 msgstr "没有此 id 的消息。"
 
 #. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
 #. TRANS: Error text shown when a last user notice is requested and it does not exist.

-#: lib/command.php:101 lib/command.php:630
+#: lib/command.php:99 lib/command.php:626

 msgid "User has no last notice."
 msgstr "用户没有最后一条的消息。"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.
 msgid "User has no last notice."
 msgstr "用户没有最后一条的消息。"
 
 #. TRANS: Message given requesting a profile for a non-existing user.
 #. TRANS: %s is the nickname of the user for which the profile could not be found.

-#: lib/command.php:130
+#: lib/command.php:128

 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "无法找到昵称为 %s 的用户。"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.
 #, php-format
 msgid "Could not find a user with nickname %s."
 msgstr "无法找到昵称为 %s 的用户。"
 
 #. TRANS: Message given getting a non-existing user.
 #. TRANS: %s is the nickname of the user that could not be found.

-#: lib/command.php:150
+#: lib/command.php:148

 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "无法在本地找到昵称为%s的用户。"
 
 #. TRANS: Error text shown when an unimplemented command is given.
 #, php-format
 msgid "Could not find a local user with nickname %s."
 msgstr "无法在本地找到昵称为%s的用户。"
 
 #. TRANS: Error text shown when an unimplemented command is given.

-#: lib/command.php:185
+#: lib/command.php:183

 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起，这个命令还没有实现。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.
 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起，这个命令还没有实现。"
 
 #. TRANS: Command exception text shown when a user tries to nudge themselves.

-#: lib/command.php:231
+#: lib/command.php:229

 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "呼叫自己不太符合逻辑吧。"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.
 msgid "It does not make a lot of sense to nudge yourself!"
 msgstr "呼叫自己不太符合逻辑吧。"
 
 #. TRANS: Message given having nudged another user.
 #. TRANS: %s is the nickname of the user that was nudged.

-#: lib/command.php:240
+#: lib/command.php:238

 #, php-format
 msgid "Nudge sent to %s."
 msgstr "呼叫已发给 %s。"
 #, php-format
 msgid "Nudge sent to %s."
 msgstr "呼叫已发给 %s。"


@@ -5597,7 +6107,7 @@ msgstr "呼叫已发给 %s。"
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.
 #. TRANS: %1$s is the number of other user the user is subscribed to.
 #. TRANS: %2$s is the number of users that are subscribed to the user.
 #. TRANS: %3$s is the number of notices the user has sent.

-#: lib/command.php:270
+#: lib/command.php:268

 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"
 #, php-format
 msgid ""
 "Subscriptions: %1$s\n"


@@ -5609,52 +6119,55 @@ msgstr ""
 "消息数： %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.
 "消息数： %3$s"
 
 #. TRANS: Text shown when a notice has been marked as favourite successfully.

-#: lib/command.php:314
+#: lib/command.php:312

 msgid "Notice marked as fave."
 msgstr "消息被标记为收藏。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 msgid "Notice marked as fave."
 msgstr "消息被标记为收藏。"
 
 #. TRANS: Message given having added a user to a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:360
+#: lib/command.php:357

 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s加入了%2$s小组。"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
 #, php-format
 msgid "%1$s joined group %2$s."
 msgstr "%1$s加入了%2$s小组。"
 
 #. TRANS: Message given having removed a user from a group.
 #. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.

-#: lib/command.php:408
+#: lib/command.php:405

 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s离开了%2$s小组。"
 
 #. TRANS: Whois output. %s is the full name of the queried user.
 #, php-format
 msgid "%1$s left group %2$s."
 msgstr "%1$s离开了%2$s小组。"
 
 #. TRANS: Whois output. %s is the full name of the queried user.

-#: lib/command.php:434
+#: lib/command.php:430

 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名：%s"
 
 #. TRANS: Whois output. %s is the location of the queried user.

-#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#. 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:442 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"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页：%s"
 
 #. TRANS: Whois output. %s is the bio information of the queried user.

-#: lib/command.php:446
+#: lib/command.php:442

 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
 #, php-format
 msgid "About: %s"
 msgstr "关于：%s"
 
 #. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).

-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471

 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "
 #, php-format
 msgid ""
 "%s is a remote profile; you can only send direct messages to users on the "


@@ -5663,165 +6176,165 @@ msgstr "%s是一个远程的用户；你只能给同一个服务器上的用户
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 
 #. TRANS: Message given if content is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488 lib/xmppmanager.php:403

 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.
 #, php-format
 msgid "Message too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息包含%2$d个字符，超出长度限制 - 不能超过%1$d个字符。"
 
 #. TRANS: Error text shown sending a direct message fails with an unknown reason.

-#: lib/command.php:517
+#: lib/command.php:514

 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 #. TRANS: Message given having repeated a notice from another user.
 #. TRANS: %s is the name of the user for which the notice was repeated.

-#: lib/command.php:554
+#: lib/command.php:551

 #, php-format
 msgid "Notice from %s repeated."
 msgstr "来自 %s 的消息已转发。"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.
 #, php-format
 msgid "Notice from %s repeated."
 msgstr "来自 %s 的消息已转发。"
 
 #. TRANS: Error text shown when repeating a notice fails with an unknown reason.

-#: lib/command.php:557
+#: lib/command.php:554

 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
 msgid "Error repeating notice."
 msgstr "转发消息时出错。"
 
 #. TRANS: Message given if content of a notice for a reply is too long.
 #. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.

-#: lib/command.php:592
+#: lib/command.php:589

 #, php-format
 msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.
 #, php-format
 msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
 msgstr "消息过长 - 最长%1$d个字符，你发送的是%2$d。"
 
 #. TRANS: Text shown having sent a reply to a notice successfully.
 #. TRANS: %s is the nickname of the user of the notice the reply was sent to.

-#: lib/command.php:603
+#: lib/command.php:600

 #, php-format
 msgid "Reply to %s sent."
 msgstr "给 %s 的回复已发送。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
 #, php-format
 msgid "Reply to %s sent."
 msgstr "给 %s 的回复已发送。"
 
 #. TRANS: Error text shown when a reply to a notice fails with an unknown reason.

-#: lib/command.php:606
+#: lib/command.php:603

 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.
 msgid "Error saving notice."
 msgstr "保存消息时出错。"
 
 #. TRANS: Error text shown when no username was provided when issuing a subscribe command.

-#: lib/command.php:655
+#: lib/command.php:650

 msgid "Specify the name of the user to subscribe to."
 msgstr "指定要关注的用户名。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
 msgid "Specify the name of the user to subscribe to."
 msgstr "指定要关注的用户名。"
 
 #. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.

-#: lib/command.php:664
+#: lib/command.php:659

 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.
 msgid "Can't subscribe to OMB profiles by command."
 msgstr "无法通过命令行关注 OMB 用户。"
 
 #. TRANS: Text shown after having subscribed to another user successfully.
 #. TRANS: %s is the name of the user the subscription was requested for.

-#: lib/command.php:672
+#: lib/command.php:667

 #, php-format
 msgid "Subscribed to %s."
 msgstr "已关注%s。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.
 #, php-format
 msgid "Subscribed to %s."
 msgstr "已关注%s。"
 
 #. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
 #. TRANS: Error text shown when no username was provided when issuing the command.

-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:688 lib/command.php:799

 msgid "Specify the name of the user to unsubscribe from."
 msgstr "指定要取消关注的用户名。"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 msgid "Specify the name of the user to unsubscribe from."
 msgstr "指定要取消关注的用户名。"
 
 #. TRANS: Text shown after having unsubscribed from another user successfully.
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:705
+#: lib/command.php:699

 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "取消关注%s。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
 #, php-format
 msgid "Unsubscribed from %s."
 msgstr "取消关注%s。"
 
 #. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
 #. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.

-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:719 lib/command.php:745

 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 #. TRANS: Text shown when issuing the command "off" successfully.

-#: lib/command.php:728
+#: lib/command.php:723

 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.
 msgid "Notification off."
 msgstr "通知已关闭。"
 
 #. TRANS: Error text shown when the command "off" fails for an unknown reason.

-#: lib/command.php:731
+#: lib/command.php:726

 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.
 msgid "Can't turn off notification."
 msgstr "无法关闭通知。"
 
 #. TRANS: Text shown when issuing the command "on" successfully.

-#: lib/command.php:754
+#: lib/command.php:749

 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.
 msgid "Notification on."
 msgstr "通知已开启。"
 
 #. TRANS: Error text shown when the command "on" fails for an unknown reason.

-#: lib/command.php:757
+#: lib/command.php:752

 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.
 msgid "Can't turn on notification."
 msgstr "无法开启通知。"
 
 #. TRANS: Error text shown when issuing the login command while login is disabled.

-#: lib/command.php:771
+#: lib/command.php:766

 msgid "Login command is disabled."
 msgstr "登录命令被禁用。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..
 msgid "Login command is disabled."
 msgstr "登录命令被禁用。"
 
 #. TRANS: Text shown after issuing the login command successfully.
 #. TRANS: %s is a logon link..

-#: lib/command.php:784
+#: lib/command.php:779

 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.
 #, php-format
 msgid "This link is useable only once and is valid for only 2 minutes: %s."
 msgstr "这个链接只能使用一次并且仅在2分钟内有效：%s。"
 
 #. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
 #. TRANS: %s is the name of the user the unsubscription was requested for.

-#: lib/command.php:813
+#: lib/command.php:808

 #, php-format
 msgid "Unsubscribed %s."
 msgstr "已取消关注%s。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
 #, php-format
 msgid "Unsubscribed %s."
 msgstr "已取消关注%s。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.

-#: lib/command.php:831
+#: lib/command.php:826

 msgid "You are not subscribed to anyone."
 msgstr "你没有关注任何人。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.
 msgid "You are not subscribed to anyone."
 msgstr "你没有关注任何人。"
 
 #. TRANS: Text shown after requesting other users a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed users.

-#: lib/command.php:836
+#: lib/command.php:831

 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "你已关注了这个用户："
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.
 msgid "You are subscribed to this person:"
 msgid_plural "You are subscribed to these people:"
 msgstr[0] "你已关注了这个用户："
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user
 #. TRANS: (followers) without having any subscribers.

-#: lib/command.php:858
+#: lib/command.php:853

 msgid "No one is subscribed to you."
 msgstr "没有人关注你。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.
 msgid "No one is subscribed to you."
 msgstr "没有人关注你。"
 
 #. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribing users.

-#: lib/command.php:863
+#: lib/command.php:858

 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "这个用户正在关注你："
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.
 msgid "This person is subscribed to you:"
 msgid_plural "These people are subscribed to you:"
 msgstr[0] "这个用户正在关注你："
 
 #. TRANS: Text shown after requesting groups a user is subscribed to without having
 #. TRANS: any group subscriptions.

-#: lib/command.php:885
+#: lib/command.php:880

 msgid "You are not a member of any groups."
 msgstr "你还未成为任何一个小组的成员。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.
 msgid "You are not a member of any groups."
 msgstr "你还未成为任何一个小组的成员。"
 
 #. TRANS: Text shown after requesting groups a user is subscribed to.
 #. TRANS: This message supports plural forms. This message is followed by a
 #. TRANS: hard coded space and a comma separated list of subscribed groups.

-#: lib/command.php:890
+#: lib/command.php:885

 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
 msgid "You are a member of this group:"
 msgid_plural "You are a member of these groups:"
 msgstr[0] "你是该小组成员："
 
 #. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.

-#: lib/command.php:905
+#: lib/command.php:900

 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"
 msgid ""
 "Commands:\n"
 "on - turn on notifications\n"


@@ -5901,39 +6414,60 @@ msgstr ""
 "tracks - 尚未实现。\n"
 "tracking - 尚未实现。\n"
 
 "tracks - 尚未实现。\n"
 "tracking - 尚未实现。\n"
 

-#: lib/common.php:135
-msgid "No configuration file found. "
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136
+#, fuzzy
+msgid "No configuration file found."

 msgstr "没有找到配置文件。 "
 
 msgstr "没有找到配置文件。 "
 

-#: lib/common.php:136
-msgid "I looked for configuration files in the following places: "
+#. 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
+#, fuzzy
+msgid "I looked for configuration files in the following places:"

 msgstr "我在以下位置查找了配置文件："
 
 msgstr "我在以下位置查找了配置文件："
 

-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142

 msgid "You may wish to run the installer to fix this."
 msgstr "或许你想运行安装程序来解决这个问题。"
 
 msgid "You may wish to run the installer to fix this."
 msgstr "或许你想运行安装程序来解决这个问题。"
 

-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146

 msgid "Go to the installer."
 msgstr "去安装程序。"
 
 msgid "Go to the installer."
 msgstr "去安装程序。"
 

-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+msgctxt "MENU"

 msgid "IM"
 msgstr "即时通讯IM"
 
 msgid "IM"
 msgstr "即时通讯IM"
 

-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108

 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 

-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115

 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 
 msgid "Updates by SMS"
 msgstr "使用 SMS 更新"
 

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

 #: lib/connectsettingsaction.php:120
 #: lib/connectsettingsaction.php:120

+msgctxt "MENU"

 msgid "Connections"
 msgstr "关联"
 
 msgid "Connections"
 msgstr "关联"
 

-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAuth) menu item.
+#: lib/connectsettingsaction.php:122

 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 
 msgid "Authorized connected applications"
 msgstr "被授权已连接的应用"
 


@@ -5954,18 +6488,14 @@ msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
 msgid "Design defaults restored."
 msgstr "默认外观已恢复。"
 
 msgid "Design defaults restored."
 msgstr "默认外观已恢复。"
 

-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144

 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 
 msgid "Disfavor this notice"
 msgstr "取消收藏这个消息"
 

-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143

 msgid "Favor this notice"
 msgstr "收藏"
 
 msgid "Favor this notice"
 msgstr "收藏"
 

-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "收藏"
-

 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"
 #: lib/feed.php:85
 msgid "RSS 1.0"
 msgstr "RSS 1.0"


@@ -5982,9 +6512,9 @@ msgstr "Atom"
 msgid "FOAF"
 msgstr "FOAF"
 
 msgid "FOAF"
 msgstr "FOAF"
 

-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "RSS 订阅"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr "Feeds"

 
 #: lib/galleryaction.php:121
 msgid "Filter tags"
 
 #: lib/galleryaction.php:121
 msgid "Filter tags"


@@ -6015,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"


@@ -6176,10 +6710,6 @@ msgstr "[%s]"
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 
 msgid "Unknown inbox source %d."
 msgstr "未知的收件箱来源%d。"
 

-#: lib/joinform.php:114
-msgid "Join"
-msgstr "加入"
-

 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"
 #: lib/leaveform.php:114
 msgid "Leave"
 msgstr "离开"


@@ -6192,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"


@@ -6227,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 "


@@ -6242,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"


@@ -6252,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"


@@ -6268,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"


@@ -6291,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"


@@ -6303,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 "


@@ -6353,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"


@@ -6393,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"


@@ -6438,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"


@@ -6449,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"


@@ -6516,7 +7080,7 @@ msgstr ""
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 
 "你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
 "发给你你私信只有你看得到。"
 

-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:516

 msgid "from"
 msgstr "通过"
 
 msgid "from"
 msgstr "通过"
 


@@ -6631,7 +7195,7 @@ msgstr "发布"
 
 #: lib/noticeform.php:160
 msgid "Send a notice"
 
 #: lib/noticeform.php:160
 msgid "Send a notice"

-msgstr "发送一个消息"
+msgstr "发送一个通知"

 
 #: lib/noticeform.php:174
 #, php-format
 
 #: lib/noticeform.php:174
 #, php-format


@@ -6661,55 +7225,55 @@ msgid ""
 msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
 
 #. TRANS: Used in coordinates as abbreviation of north
 msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
 
 #. TRANS: Used in coordinates as abbreviation of north

-#: lib/noticelist.php:436
+#: lib/noticelist.php:446

 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south
 msgid "N"
 msgstr "N"
 
 #. TRANS: Used in coordinates as abbreviation of south

-#: lib/noticelist.php:438
+#: lib/noticelist.php:448

 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east
 msgid "S"
 msgstr "S"
 
 #. TRANS: Used in coordinates as abbreviation of east

-#: lib/noticelist.php:440
+#: lib/noticelist.php:450

 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west
 msgid "E"
 msgstr "E"
 
 #. TRANS: Used in coordinates as abbreviation of west

-#: lib/noticelist.php:442
+#: lib/noticelist.php:452

 msgid "W"
 msgstr "W"
 
 msgid "W"
 msgstr "W"
 

-#: lib/noticelist.php:444
+#: lib/noticelist.php:454

 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 
 #, php-format
 msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
 

-#: lib/noticelist.php:453
+#: lib/noticelist.php:463

 msgid "at"
 msgstr "位于"
 
 msgid "at"
 msgstr "位于"
 

-#: lib/noticelist.php:502
+#: lib/noticelist.php:512

 msgid "web"
 msgstr "网页"
 
 msgid "web"
 msgstr "网页"
 

-#: lib/noticelist.php:568
+#: lib/noticelist.php:578

 msgid "in context"
 msgstr "查看对话"
 
 msgid "in context"
 msgstr "查看对话"
 

-#: lib/noticelist.php:603
+#: lib/noticelist.php:613

 msgid "Repeated by"
 msgstr "转发来自"
 
 msgid "Repeated by"
 msgstr "转发来自"
 

-#: lib/noticelist.php:630
+#: lib/noticelist.php:640

 msgid "Reply to this notice"
 msgstr "回复"
 
 msgid "Reply to this notice"
 msgstr "回复"
 

-#: lib/noticelist.php:631
+#: lib/noticelist.php:641

 msgid "Reply"
 msgstr "回复"
 
 msgid "Reply"
 msgstr "回复"
 

-#: lib/noticelist.php:675
+#: lib/noticelist.php:685

 msgid "Notice repeated"
 msgstr "消息已转发"
 
 msgid "Notice repeated"
 msgstr "消息已转发"
 


@@ -6725,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 "无法添加新的关注。"
 


@@ -6780,7 +7344,7 @@ msgid "Tags in %s's notices"
 msgstr "%s的消息中的标签"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.
 msgstr "%s的消息中的标签"
 
 #. TRANS: Displayed as version information for a plugin if no version information was found.

-#: lib/plugin.php:116
+#: lib/plugin.php:121

 msgid "Unknown"
 msgstr "未知的"
 
 msgid "Unknown"
 msgstr "未知的"
 


@@ -6862,7 +7426,7 @@ msgstr "转发"
 msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 
 msgid "Revoke the \"%s\" role from this user"
 msgstr "取消这个用户的\"%s\"权限"
 

-#: lib/router.php:709
+#: lib/router.php:711

 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 
 msgid "No single user defined for single-user mode."
 msgstr "没有单独的用户被定义为单用户模式。"
 


@@ -7040,6 +7604,13 @@ msgstr "取消关注这个用户"
 msgid "Unsubscribe"
 msgstr "取消关注"
 
 msgid "Unsubscribe"
 msgstr "取消关注"
 

+#. TRANS: Exception text shown when no profile can be found for a user.
+#. TRANS: %1$s is a user nickname, $2$d is a user ID (number).
+#: lib/usernoprofileexception.php:60
+#, php-format
+msgid "User %1$s (%2$d) has no profile record."
+msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
+

 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "编辑头像"
 #: lib/userprofile.php:117
 msgid "Edit Avatar"
 msgstr "编辑头像"


@@ -7087,69 +7658,88 @@ msgid "Moderator"
 msgstr "审核员"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgstr "审核员"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1103
+#: lib/util.php:1163

 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1106
+#: lib/util.php:1166

 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a minute ago"
 msgstr "约1分钟前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1110
+#: lib/util.php:1170

 #, php-format
 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:1113
+#: lib/util.php:1173

 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about an hour ago"
 msgstr "约1小时前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1117
+#: lib/util.php:1177

 #, php-format
 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:1120
+#: lib/util.php:1180

 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a day ago"
 msgstr "约1天前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

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

 #, php-format
 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:1127
+#: lib/util.php:1187

 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.
 msgid "about a month ago"
 msgstr "约1个月前"
 
 #. TRANS: Used in notices to indicate when the notice was made compared to now.

-#: lib/util.php:1131
+#: lib/util.php:1191

 #, php-format
 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:1134
+#: 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个十六进制字符。"
 msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"

+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)"
+msgstr "用户 %s (%s) 的备份文件"
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user."
+msgstr "没有用户被指定；使用备份用户。"
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr "备份中有 %d 个条目。"
+
+#~ msgid "Edit Application"
+#~ msgstr "编辑应用"