# Translation of StatusNet - Core to Simplified Chinese (中文(简体))
-# Expored from translatewiki.net
+# Exported from translatewiki.net
#
# Author: Brion
# Author: Chenxiaoqino
+# Author: Hydra
# Author: Shizhao
# Author: Sweeite012f
# Author: Tommyang
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-30 20:16+0000\n"
-"PO-Revision-Date: 2010-11-30 20:18:25+0000\n"
+"POT-Creation-Date: 2011-03-03 15:58+0000\n"
+"PO-Revision-Date: 2011-03-03 16:01:29+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"
-"X-Generator: MediaWiki 1.17alpha (r77503); Translate extension (2010-09-17)\n"
+"X-Generator: MediaWiki 1.18alpha (r83149); Translate extension (2011-02-01)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-POT-Import-Date: 2010-11-30 17:54:26+0000\n"
+"X-POT-Import-Date: 2011-02-25 23:49:23+0000\n"
#. TRANS: Page title for Access admin panel that allows configuring site access.
#. TRANS: Menu item for site administration
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations).
#: actions/accessadminpanel.php:173
msgid "Disable new registrations."
-msgstr "禁止新用户注册"
+msgstr "禁止新用户注册。"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:175
msgstr "保存访问设置"
#. TRANS: Tooltip for button to save access settings in site admin panel.
+#. TRANS: Button text for saving theme settings.
#. TRANS: Button label to save e-mail preferences.
-#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save Instant Messaging preferences.
#. TRANS: Button text for saving "Other settings" in profile.
#. TRANS: Button text to store form data in the Paths admin panel.
#. TRANS: Button to save input in profile settings.
#. TRANS: Button text to save user settings in user admin panel.
#. TRANS: Button label in the "Edit application" form.
#. TRANS: Button text on profile design page to save settings.
-#: actions/accessadminpanel.php:193 actions/emailsettings.php:232
-#: actions/imsettings.php:187 actions/othersettings.php:134
-#: actions/pathsadminpanel.php:512 actions/profilesettings.php:201
-#: actions/sitenoticeadminpanel.php:197 actions/smssettings.php:209
-#: actions/subscriptions.php:246 actions/useradminpanel.php:298
-#: lib/applicationeditform.php:355 lib/designsettings.php:270
-#: lib/groupeditform.php:207
+#: actions/accessadminpanel.php:193 actions/designadminpanel.php:732
+#: actions/emailsettings.php:250 actions/imsettings.php:183
+#: actions/othersettings.php:136 actions/pathsadminpanel.php:512
+#: actions/profilesettings.php:197 actions/sitenoticeadminpanel.php:197
+#: actions/smssettings.php:205 actions/subscriptions.php:259
+#: actions/useradminpanel.php:298 lib/applicationeditform.php:355
+#: lib/designsettings.php:270 lib/groupeditform.php:201
msgctxt "BUTTON"
msgid "Save"
msgstr "保存"
#. TRANS: Server error when page not found (404).
#. TRANS: Server error when page not found (404)
#: actions/all.php:68 actions/public.php:98 actions/replies.php:93
-#: actions/showfavorites.php:138 actions/tag.php:52
+#: actions/showfavorites.php:140 actions/tag.php:52
msgid "No such page."
msgstr "没有这个页面。"
#. TRANS: Client error displayed if a user could not be found.
#. TRANS: Client error when user not found updating a profile background image.
#. TRANS: Client error displayed updating profile image without having a user object.
+#. TRANS: Client error displayed when making an Atom API request for an unknown user.
+#. TRANS: Client error displayed when trying to block a non-existing user or a user from another site.
#. TRANS: Client error when user not found for an API action to remove a block for a user.
#. TRANS: Client error given when a user was not found (404).
#. TRANS: Client error when user not found for an API direct message action.
#. TRANS: Client error displayed when requesting most recent mentions for a non-existing user.
#. TRANS: Client error displayed requesting most recent notices for a non-existing user.
#. TRANS: Client error displayed trying to get an avatar for a non-existing user.
+#. TRANS: Client error displayed when trying to get the RSS feed with favorites of a user that does not exist.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a user nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for an object that is not a user.
+#. TRANS: Client error displayed when trying to get a user hCard for a non-existing user.
+#. TRANS: Client error displayed when trying to display favourite notices for a non-existing user.
#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
+#. TRANS: Client error displayed when calling a profile action without specifying a user.
#: actions/all.php:80 actions/allrss.php:69
#: actions/apiaccountupdatedeliverydevice.php:110
#: actions/apiaccountupdateprofile.php:103
#: actions/apiaccountupdateprofilebackgroundimage.php:118
-#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:60
-#: actions/apiblockcreate.php:95 actions/apiblockdestroy.php:94
+#: actions/apiaccountupdateprofileimage.php:104 actions/apiatomservice.php:59
+#: actions/apiblockcreate.php:96 actions/apiblockdestroy.php:94
#: actions/apidirectmessage.php:75 actions/apidirectmessagenew.php:72
#: actions/apigroupcreate.php:111 actions/apigroupismember.php:89
#: actions/apigroupjoin.php:98 actions/apigroupleave.php:98
#: actions/apisubscriptions.php:85 actions/apitimelinefavorites.php:70
#: actions/apitimelinefriends.php:173 actions/apitimelinehome.php:78
#: actions/apitimelinementions.php:77 actions/apitimelineuser.php:79
-#: actions/avatarbynickname.php:79 actions/favoritesrss.php:74
-#: actions/foaf.php:40 actions/foaf.php:58 actions/hcard.php:67
+#: actions/avatarbynickname.php:79 actions/favoritesrss.php:72
+#: actions/foaf.php:42 actions/foaf.php:61 actions/hcard.php:67
#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
+#: actions/remotesubscribe.php:144 actions/remotesubscribe.php:153
#: actions/replies.php:73 actions/repliesrss.php:38 actions/rsd.php:116
-#: actions/showfavorites.php:105 actions/userbyid.php:74
+#: actions/showfavorites.php:106 actions/userbyid.php:74
#: actions/usergroups.php:93 actions/userrss.php:40 actions/userxrd.php:59
-#: actions/xrds.php:71 lib/command.php:497 lib/galleryaction.php:59
-#: lib/mailbox.php:82 lib/profileaction.php:77
+#: actions/xrds.php:71 lib/command.php:509 lib/galleryaction.php:59
+#: lib/mailbox.php:80 lib/profileaction.php:77
msgid "No such user."
msgstr "没有这个用户。"
#. TRANS: H1 text for page. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Timeline title for user and friends. %s is a user nickname.
+#. TRANS: Tooltop for personal group navigation menu option when logged in for viewing timeline of self and friends.
#: actions/all.php:94 actions/all.php:191 actions/allrss.php:117
#: actions/apitimelinefriends.php:207 actions/apitimelinehome.php:113
-#: lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:102
#, php-format
msgid "%s and friends"
msgstr "%s 和好友们"
#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:105
#: actions/apigroupshow.php:114 actions/apihelptest.php:84
#: actions/apistatusesdestroy.php:101 actions/apistatusesretweets.php:110
-#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:138
+#: actions/apistatusesshow.php:105 actions/apistatusnetconfig.php:139
#: actions/apistatusnetversion.php:91 actions/apisubscriptions.php:109
#: actions/apitimelinefavorites.php:174 actions/apitimelinefriends.php:268
-#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:173
+#: actions/apitimelinegroup.php:147 actions/apitimelinehome.php:173
#: actions/apitimelinementions.php:174 actions/apitimelinepublic.php:239
#: actions/apitimelineretweetedtome.php:118
#: actions/apitimelineretweetsofme.php:150 actions/apitimelinetag.php:159
"你必须指定一个名为'device'的参数，值可以是以下中的一个：sms, im, none。"
#. TRANS: Server error displayed when a user's delivery device cannot be updated.
+#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
+#. TRANS: Server error thrown on database error updating e-mail preferences.
+#. TRANS: Server error thrown on database error removing a registered e-mail address.
+#. TRANS: Server error thrown on database error updating Instant Messaging preferences.
+#. TRANS: Server error thrown on database error removing a registered Instant Messaging address.
+#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
+#. 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/apiaccountupdatedeliverydevice.php:130
+#: actions/confirmaddress.php:118 actions/emailsettings.php:352
+#: actions/emailsettings.php:498 actions/imsettings.php:276
+#: actions/imsettings.php:432 actions/othersettings.php:186
+#: actions/profilesettings.php:322 actions/smssettings.php:301
+#: actions/smssettings.php:454
msgid "Could not update user."
msgstr "无法更新用户。"
#. TRANS: Client error displayed if a user profile could not be found updating a profile image.
#. TRANS: Client error displayed when requesting user information for a user without a profile.
#. TRANS: Client error displayed trying to get an avatar for a user without a profile.
+#. TRANS: Server error displayed when requesting Friends of a Friend feed for a user for which the profile could not be found.
+#. TRANS: Server error displayed when trying to get a user hCard for a user without a profile.
+#. TRANS: Server error displayed when calling a profile action while the specified user does not have a profile.
#: actions/apiaccountupdateprofile.php:111
#: actions/apiaccountupdateprofilebackgroundimage.php:199
#: actions/apiaccountupdateprofilecolors.php:183
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:85 actions/foaf.php:65 actions/hcard.php:74
+#: actions/apiaccountupdateprofileimage.php:131
+#: actions/apiuserprofileimage.php:88 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:85 actions/foaf.php:69 actions/hcard.php:75
#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
-#: lib/profileaction.php:84
+#: lib/profileaction.php:85
msgid "User has no profile."
msgstr "用户没有个人信息。"
#. TRANS: Server error displayed if a user profile could not be saved.
-#: actions/apiaccountupdateprofile.php:147
+#. TRANS: Server error thrown when user profile settings could not be saved.
+#: actions/apiaccountupdateprofile.php:147 actions/profilesettings.php:418
msgid "Could not save profile."
msgstr "无法保存个人信息。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
#: actions/apiaccountupdateprofileimage.php:95 actions/apimediaupload.php:81
#: actions/apistatusesupdate.php:210 actions/avatarsettings.php:269
-#: actions/designadminpanel.php:125 actions/editapplication.php:121
-#: actions/newapplication.php:104 actions/newnotice.php:95
+#: actions/designadminpanel.php:120 actions/editapplication.php:121
+#: actions/newapplication.php:102 actions/newnotice.php:95
#: lib/designsettings.php:298
#, php-format
msgid ""
#. TRANS: Client error displayed when saving design settings fails because of an empty result.
#. TRANS: Client error displayed when a database error occurs inserting profile colours.
#. TRANS: Client error displayed when a database error occurs updating profile colours.
+#. TRANS: Form validation error displayed when group design settings could not be saved because of an application issue.
#: actions/apiaccountupdateprofilebackgroundimage.php:138
#: actions/apiaccountupdateprofilebackgroundimage.php:149
#: actions/apiaccountupdateprofilecolors.php:160
#: actions/apiaccountupdateprofilecolors.php:171
-#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
-#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
-#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:285 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:201 actions/userdesignsettings.php:211
+#: actions/userdesignsettings.php:253 actions/userdesignsettings.php:263
msgid "Unable to save your design settings."
msgstr "无法保存你的外观设置。"
#. TRANS: Client error displayed when a database error occurs updating profile colours.
#: actions/apiaccountupdateprofilebackgroundimage.php:191
#: actions/apiaccountupdateprofilecolors.php:139
+#: actions/userdesignsettings.php:179
msgid "Could not update your design."
msgstr "无法更新你的外观。"
+#. TRANS: Title for Atom feed.
#: actions/apiatomservice.php:85
+msgctxt "ATOM"
msgid "Main"
-msgstr ""
+msgstr "主要"
+#. TRANS: Title for Atom feed. %s is a user nickname.
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
-#: actions/apiatomservice.php:92 actions/grouprss.php:139
+#: actions/apiatomservice.php:93 actions/grouprss.php:138
#: actions/userrss.php:94 lib/atomgroupnoticefeed.php:63
-#: lib/atomusernoticefeed.php:68
+#: lib/atomusernoticefeed.php:88
#, php-format
msgid "%s timeline"
msgstr "%s的时间线"
+#. TRANS: Title for Atom feed with a user's subscriptions. %s is a user nickname.
+#. TRANS: Title for Atom subscription feed.
+#. TRANS: %s is a user nickname.
+#. TRANS: Header for subscriptions overview for a user (first page).
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:104 actions/atompubsubscriptionfeed.php:148
+#: actions/subscriptions.php:51
+#, php-format
+msgid "%s subscriptions"
+msgstr "%s 关注的用户"
+
+#. TRANS: Title for Atom feed with a user's favorite notices. %s is a user nickname.
+#. TRANS: Title for Atom favorites feed.
+#. TRANS: %s is a user nickname.
+#: actions/apiatomservice.php:115 actions/atompubfavoritefeed.php:142
+#, php-format
+msgid "%s favorites"
+msgstr "%s 收藏夹"
+
+#. TRANS: Title for Atom feed with a user's memberships. %s is a user nickname.
+#: actions/apiatomservice.php:126
+#, php-format
+msgid "%s memberships"
+msgstr "%s 的成员身份"
+
#. TRANS: Client error displayed when users try to block themselves.
-#: actions/apiblockcreate.php:104
+#: actions/apiblockcreate.php:105
msgid "You cannot block yourself!"
msgstr "你不能屏蔽自己！"
#. TRANS: Server error displayed when blocking a user has failed.
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
msgid "Block user failed."
msgstr "屏蔽用户失败。"
#. TRANS: Client error displayed trying to direct message another user who's not a friend (403).
#: actions/apidirectmessagenew.php:144
+#, fuzzy
msgid "Can't send direct messages to users who aren't your friend."
-msgstr "不能给未成为好友的用户发送私信。"
+msgstr "不能将直接邮件发送到用户的不是你的朋友。"
#. TRANS: Client error displayed trying to direct message self (403).
#: actions/apidirectmessagenew.php:154
#. TRANS: Client error displayed when trying to mark a notice favourite that already is a favourite.
#: actions/apifavoritecreate.php:120
msgid "This status is already a favorite."
-msgstr "已收藏此状态。"
+msgstr "已收藏过此消息。"
#. TRANS: Client error displayed when marking a notice as favourite fails.
+#. TRANS: Server error displayed when trying to mark a notice as favorite fails in the database.
#. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
+#: actions/apifavoritecreate.php:132 actions/favor.php:86 lib/command.php:306
msgid "Could not create favorite."
msgstr "无法创建收藏。"
#. TRANS: Client error displayed when trying to remove a favourite that was not a favourite.
#: actions/apifavoritedestroy.php:122
msgid "That status is not a favorite."
-msgstr "此状态未被收藏。"
+msgstr "此消息未被收藏。"
#. TRANS: Client error displayed when removing a favourite has failed.
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#. TRANS: Server error displayed when removing a favorite from the database fails.
+#: actions/apifavoritedestroy.php:135 actions/disfavor.php:90
msgid "Could not delete favorite."
msgstr "无法删除收藏。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:156 actions/editgroup.php:189
-#: actions/newgroup.php:129 actions/profilesettings.php:277
+#: actions/apigroupcreate.php:156 actions/editgroup.php:191
+#: actions/newgroup.php:137 actions/profilesettings.php:273
#: actions/register.php:214
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用，换一个吧。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:164 actions/editgroup.php:193
-#: actions/newgroup.php:133 actions/profilesettings.php:247
+#: actions/apigroupcreate.php:164 actions/editgroup.php:195
+#: actions/newgroup.php:141 actions/profilesettings.php:243
#: actions/register.php:216
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
#. TRANS: Client error in form for group creation.
#. TRANS: Validation error shown when providing an invalid homepage URL in the "Edit application" form.
#. TRANS: Group edit form validation error.
+#. TRANS: Validation error shown when providing an invalid homepage URL in the "New application" form.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:181 actions/editapplication.php:233
-#: actions/editgroup.php:200 actions/newapplication.php:211
-#: actions/newgroup.php:140 actions/profilesettings.php:252
+#: actions/apigroupcreate.php:181 actions/editapplication.php:235
+#: actions/editgroup.php:202 actions/newapplication.php:221
+#: actions/newgroup.php:148 actions/profilesettings.php:248
#: actions/register.php:223
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:191 actions/editgroup.php:204
-#: actions/newgroup.php:144 actions/profilesettings.php:256
+#: actions/apigroupcreate.php:191 actions/editgroup.php:206
+#: actions/newgroup.php:152 actions/profilesettings.php:252
#: actions/register.php:226
msgid "Full name is too long (maximum 255 characters)."
msgstr "全名过长(不能超过 255 个字符)。"
#. TRANS: Client error shown when providing too long a description during group creation.
#. TRANS: %d is the maximum number of allowed characters.
#. TRANS: Validation error shown when providing too long a description in the "Edit application" form.
+#. TRANS: %d is the maximum number of allowed characters.
#. TRANS: Group edit form validation error.
#. TRANS: Form validation error in New application form.
#. TRANS: %d is the maximum number of characters for the description.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed characters.
-#: actions/apigroupcreate.php:201 actions/editapplication.php:201
-#: actions/editgroup.php:209 actions/newapplication.php:178
-#: actions/newgroup.php:149
+#: actions/apigroupcreate.php:201 actions/editapplication.php:202
+#: actions/editgroup.php:211 actions/newapplication.php:182
+#: actions/newgroup.php:157
#, php-format
msgid "Description is too long (maximum %d character)."
msgid_plural "Description is too long (maximum %d characters)."
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
#. TRANS: Validation error in form for profile settings.
-#: actions/apigroupcreate.php:215 actions/editgroup.php:216
-#: actions/newgroup.php:156 actions/profilesettings.php:269
+#: actions/apigroupcreate.php:215 actions/editgroup.php:218
+#: actions/newgroup.php:164 actions/profilesettings.php:265
#: actions/register.php:235
msgid "Location is too long (maximum 255 characters)."
msgstr "位置过长(不能超过255个字符)。"
#. TRANS: %d is the maximum number of allowed aliases.
#. TRANS: Group create form validation error.
#. TRANS: %d is the maximum number of allowed aliases.
-#: actions/apigroupcreate.php:236 actions/editgroup.php:229
-#: actions/newgroup.php:169
+#: actions/apigroupcreate.php:236 actions/editgroup.php:231
+#: actions/newgroup.php:177
#, php-format
msgid "Too many aliases! Maximum %d allowed."
msgid_plural "Too many aliases! Maximum %d allowed."
#. TRANS: Client error displayed when trying to use an alias during group creation that is already in use.
#. TRANS: %s is the alias that is already in use.
#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:264 actions/editgroup.php:244
-#: actions/newgroup.php:184
+#. TRANS: Group create form validation error. %s is the already used alias.
+#: actions/apigroupcreate.php:264 actions/editgroup.php:246
+#: actions/newgroup.php:193
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "%s这个别名已被使用，换一个吧。"
#. TRANS: Client error displayed when trying to use an alias during group creation that is the same as the group's nickname.
#. TRANS: Group edit form validation error.
-#. TRANS: Group create form validation error.
-#: actions/apigroupcreate.php:278 actions/editgroup.php:251
-#: actions/newgroup.php:191
+#: actions/apigroupcreate.php:278 actions/editgroup.php:253
msgid "Alias can't be the same as nickname."
msgstr "别名不能和昵称相同。"
#. TRANS: Client error displayed when trying to show a group that could not be found.
#. TRANS: Client error displayed requesting most recent notices to a group for a non-existing group.
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
-#: actions/apigroupleave.php:104 actions/apigroupmembership.php:89
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:71
#: actions/apigroupshow.php:81 actions/apitimelinegroup.php:89
msgid "Group not found."
msgstr "小组未找到。"
#. TRANS: Server error displayed when trying to join a group the user is already a member of.
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:333
+#: actions/apigroupjoin.php:111 actions/joingroup.php:103 lib/command.php:345
msgid "You are already a member of that group."
msgstr "你已经是该小组成员。"
#. TRANS: Server error displayed when trying to join a group the user is blocked from joining.
+#. TRANS: Client error displayed when trying to join a group while being blocked form joining it.
#. 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:338
+#: actions/apigroupjoin.php:121 actions/joingroup.php:109 lib/command.php:350
msgid "You have been blocked from that group by the admin."
msgstr "你已经被管理员从该小组中屏蔽。"
#. TRANS: Server error displayed when joining a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when joining a group failed in the database.
+#. TRANS: %1$s is the joining user's nickname, $2$s is the group nickname for which the join failed.
#. 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:142 actions/joingroup.php:134 lib/command.php:350
+#: actions/apigroupjoin.php:142 actions/joingroup.php:139 lib/command.php:362
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "无法把用户%1$s添加到%2$s小组"
#. TRANS: Server error displayed when leaving a group fails.
#. TRANS: %1$s is a user nickname, $2$s is a group nickname.
+#. TRANS: Server error displayed when leaving a group failed in the database.
+#. TRANS: %1$s is the leaving user's nickname, $2$s is the group nickname for which the leave failed.
#. 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:127 actions/leavegroup.php:129
-#: lib/command.php:398
+#: actions/apigroupleave.php:127 actions/leavegroup.php:133
+#: lib/command.php:410
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "无法把用户%1$s从%2$s小组删除"
msgstr "上传失败"
#. TRANS: Client error given from the OAuth API when the request token or verifier is invalid.
-#: actions/apioauthaccesstoken.php:101
+#: actions/apioauthaccesstoken.php:102
msgid "Invalid request token or verifier."
msgstr "无效的请求 token 或 verifier。"
msgstr "请求 token 已被授权了。"
#. TRANS: Form validation error in API OAuth authorisation because of an invalid session token.
+#. TRANS: Client error displayed when the session token does not match or is not given.
+#. TRANS: Form validation error message.
+#. TRANS: Form validation error.
+#. TRANS: Form validation error message.
#: actions/apioauthauthorize.php:147 actions/avatarsettings.php:280
-#: actions/deletenotice.php:177 actions/disfavor.php:74
-#: actions/emailsettings.php:275 actions/favor.php:75 actions/geocode.php:55
-#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:65 actions/imsettings.php:230
-#: actions/invite.php:59 actions/login.php:137 actions/makeadmin.php:66
+#: actions/deletenotice.php:177 actions/disfavor.php:75
+#: actions/emailsettings.php:291 actions/favor.php:75 actions/geocode.php:55
+#: actions/groupblock.php:65 actions/grouplogo.php:321
+#: actions/groupunblock.php:65 actions/imsettings.php:224
+#: actions/invite.php:60 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:105 actions/nudge.php:80
#: actions/oauthappssettings.php:165 actions/oauthconnectionssettings.php:138
-#: actions/othersettings.php:153 actions/passwordsettings.php:138
-#: 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:40
+#: actions/othersettings.php:155 actions/passwordsettings.php:138
+#: actions/profilesettings.php:217 actions/recoverpassword.php:383
+#: actions/register.php:172 actions/remotesubscribe.php:76
+#: actions/repeat.php:82 actions/smssettings.php:250 actions/subedit.php:40
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:310
#. TRANS: Client error given on when invalid data was passed through a form in the OAuth API.
#. TRANS: Unexpected validation error on avatar upload form.
+#. TRANS: Client error displayed when the submitted form contains unexpected data.
#. 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: Form validation error message when an unsupported argument is used.
+#. TRANS: Message given submitting a form with an unknown action in Instant Messaging settings.
+#. TRANS: Client error displayed when encountering an unexpected action on form submission.
#. TRANS: Client error when submitting a form with unexpected information.
+#. TRANS: Client error displayed when unexpected data is posted in the password recovery form.
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#. TRANS: Unknown form validation error in design settings form.
#: actions/apioauthauthorize.php:294 actions/avatarsettings.php:294
-#: actions/designadminpanel.php:104 actions/editapplication.php:144
-#: actions/emailsettings.php:294 actions/grouplogo.php:322
-#: actions/imsettings.php:245 actions/newapplication.php:125
-#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:277 lib/designsettings.php:321
+#: actions/designadminpanel.php:100 actions/editapplication.php:144
+#: actions/emailsettings.php:310 actions/grouplogo.php:332
+#: actions/imsettings.php:239 actions/newapplication.php:124
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:46
+#: actions/smssettings.php:271 lib/designsettings.php:321
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group nickname (dt). Text hidden by default.
+#. TRANS: DT for nick name in a profile.
#: actions/apioauthauthorize.php:459 actions/login.php:252
-#: actions/profilesettings.php:110 actions/register.php:432
-#: actions/showgroup.php:240 actions/tagother.php:94
-#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:134
+#: actions/profilesettings.php:106 actions/register.php:432
+#: actions/showgroup.php:243 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:145
+#: lib/userprofile.php:137
msgid "Nickname"
msgstr "昵称"
#. TRANS: Field label on OAuth API authorisation form.
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:463 actions/login.php:255
-#: actions/register.php:437 lib/accountsettingsaction.php:120
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "密码"
#. TRANS: Button text that when clicked will cancel the process of allowing access to an account
#. TRANS: by an external application.
#. TRANS: Button label to cancel an e-mail address confirmation procedure.
-#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel an Instant Messaging address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
#. TRANS: Button label in the "Edit application" form.
-#: actions/apioauthauthorize.php:478 actions/emailsettings.php:127
-#: actions/imsettings.php:131 actions/smssettings.php:137
+#: actions/apioauthauthorize.php:478 actions/emailsettings.php:124
+#: actions/imsettings.php:127 actions/smssettings.php:133
#: lib/applicationeditform.php:351
msgctxt "BUTTON"
msgid "Cancel"
#. TRANS: Client error displayed trying to repeat a non-existing notice through the API.
#. TRANS: Client error displayed trying to display redents of a non-exiting notice.
+#. TRANS: Client exception thrown when referencing a non-existing notice.
#. TRANS: Error message displayed trying to delete a non-existing notice.
#: actions/apistatusesretweet.php:74 actions/apistatusesretweets.php:70
-#: actions/deletenotice.php:61 actions/shownotice.php:92
+#: actions/atompubshowfavorite.php:82 actions/deletenotice.php:61
+#: actions/shownotice.php:92
msgid "No such notice."
msgstr "没有这条消息。"
#. TRANS: Client error displayed trying to repeat an own notice through the API.
#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:537
+#: actions/apistatusesretweet.php:83 lib/command.php:549
msgid "Cannot repeat your own notice."
msgstr "不能转发你自己的消息。"
#. TRANS: Client error displayed trying to re-repeat a notice through the API.
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:92 lib/command.php:543
+#: actions/apistatusesretweet.php:92 lib/command.php:555
msgid "Already repeated that notice."
msgstr "已转发了该消息。"
-#: actions/apistatusesshow.php:117
+#. TRANS: Client error displayed calling an unsupported HTTP error in API status show.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client exception thrown using an unsupported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#. TRANS: Client error shown when using a non-supported HTTP method.
+#. TRANS: Client exception thrown when using an unsupported HTTP method.
+#: actions/apistatusesshow.php:118 actions/atompubfavoritefeed.php:103
+#: actions/atompubmembershipfeed.php:105 actions/atompubshowfavorite.php:117
+#: actions/atompubshowmembership.php:116
+#: actions/atompubshowsubscription.php:122
+#: actions/atompubsubscriptionfeed.php:109
msgid "HTTP method not supported."
msgstr "HTTP 方法不支持。"
-#: actions/apistatusesshow.php:141
-#, php-format
+#. TRANS: Exception thrown requesting an unsupported notice output format.
+#. TRANS: %s is the requested output format.
+#: actions/apistatusesshow.php:144
+#, fuzzy, php-format
msgid "Unsupported format: %s"
-msgstr "不支持的格式：%s"
+msgstr "不支持的格式： %s。"
#. TRANS: Client error displayed requesting a deleted status.
-#: actions/apistatusesshow.php:152
+#: actions/apistatusesshow.php:155
msgid "Status deleted."
msgstr "消息已删除。"
#. TRANS: Client error displayed requesting a status with an invalid ID.
-#: actions/apistatusesshow.php:159
+#: actions/apistatusesshow.php:162
msgid "No status with that ID found."
msgstr "没有找到此 ID 的消息。"
+#. TRANS: Client error displayed when trying to delete a notice not using the Atom format.
#: actions/apistatusesshow.php:227
msgid "Can only delete using the Atom format."
msgstr "只能使用 Atom 格式删除。"
+#. TRANS: Client error displayed when a user has no rights to delete notices of other users.
#. TRANS: Error message displayed trying to delete a notice that was not made by the current user.
-#: actions/apistatusesshow.php:234 actions/deletenotice.php:78
-msgid "Can't delete this notice."
-msgstr "无法删除这条消息。"
+#: actions/apistatusesshow.php:235 actions/deletenotice.php:78
+msgid "Cannot delete this notice."
+msgstr "不能删除此通知。"
-#: actions/apistatusesshow.php:247
+#. TRANS: Confirmation of notice deletion in API. %d is the ID (number) of the deleted notice.
+#: actions/apistatusesshow.php:249
#, php-format
msgid "Deleted notice %d"
msgstr "删除消息 %d"
#. TRANS: Server error displayed when generating an Atom feed fails.
#. TRANS: %s is the error.
-#: actions/apitimelinegroup.php:138
+#: actions/apitimelinegroup.php:134
#, php-format
msgid "Could not generate feed for group - %s"
msgstr "无法生成小组的 feed - %s"
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上有 %1$s 标签的消息！"
-#: actions/apitimelineuser.php:300
+#. TRANS: Client error displayed trying to add a notice to another user's timeline.
+#: actions/apitimelineuser.php:297
msgid "Only the user can add to their own timeline."
msgstr "只有该用户才能添加到他们的时间线。"
-#: actions/apitimelineuser.php:306
-msgid "Only accept AtomPub for atom feeds."
-msgstr "Atom feeds 只接受 AtomPub。"
-
-#: actions/apitimelineuser.php:316
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:304
+msgid "Only accept AtomPub for Atom feeds."
+msgstr "只接受 AtomPub 原子饲料。"
+
+#. TRANS: Client error displayed attempting to post an empty API notice.
+#: actions/apitimelineuser.php:311
+msgid "Atom post must not be empty."
+msgstr "原子开机自检不能为空。"
+
+#. TRANS: Client error displayed attempting to post an API that is not well-formed XML.
+#: actions/apitimelineuser.php:317
+msgid "Atom post must be well-formed XML."
+msgstr "原子后必须是格式良好 XML。"
+
+#. TRANS: Client error displayed when not using an Atom entry.
+#: actions/apitimelineuser.php:323 actions/atompubfavoritefeed.php:228
+#: actions/atompubmembershipfeed.php:230
+#: actions/atompubsubscriptionfeed.php:236
msgid "Atom post must be an Atom entry."
-msgstr ""
+msgstr "原子后必须是一个原子的条目。"
-#: actions/apitimelineuser.php:325
-msgid "Can only handle post activities."
-msgstr ""
+#. TRANS: Client error displayed when not using the POST verb. Do not translate POST.
+#: actions/apitimelineuser.php:335
+msgid "Can only handle POST activities."
+msgstr "只能处理开机自检活动。"
-#: actions/apitimelineuser.php:334
+#. TRANS: Client error displayed when using an unsupported activity object type.
+#. TRANS: %s is the unsupported activity object type.
+#: actions/apitimelineuser.php:346
#, php-format
-msgid "Cannot handle activity object type \"%s\""
-msgstr ""
+msgid "Cannot handle activity object type \"%s\"."
+msgstr "无法处理活动对象类型 %s。"
-#: actions/apitimelineuser.php:392
-#, fuzzy, php-format
-msgid "Notice with URI \"%s\" already exists."
-msgstr "没有此 id 的消息。"
+#. TRANS: Client error displayed when posting a notice without content through the API.
+#. TRANS: %d is the notice ID (number).
+#: actions/apitimelineuser.php:380
+#, php-format
+msgid "No content for notice %d."
+msgstr "没有通知 %d 的内容。"
-#: actions/apitimelineuser.php:423
+#. TRANS: Client error displayed when using another format than AtomPub.
+#: actions/apitimelineuser.php:408
#, php-format
-msgid "AtomPub post with unknown attention URI %s"
-msgstr ""
+msgid "Notice with URI \"%s\" already exists."
+msgstr "已存在使用 URI \"%s\" 的消息了。"
#. TRANS: Server error for unfinished API method showTrends.
#: actions/apitrends.php:85
msgstr "API 方法尚未实现。"
#. TRANS: Client error displayed when requesting user information for a non-existing user.
-#: actions/apiusershow.php:94
+#: actions/apiuserprofileimage.php:80 actions/apiusershow.php:94
msgid "User not found."
msgstr "API方法没有找到。"
+#. TRANS: Client exception thrown when requesting a favorite feed for a non-existing profile.
+#. TRANS: Client exception.
+#: actions/atompubfavoritefeed.php:69 actions/atompubmembershipfeed.php:71
+#: actions/atompubshowfavorite.php:75 actions/atompubshowmembership.php:72
+#: actions/subscribe.php:107
+msgid "No such profile."
+msgstr "没有这个文件。"
+
+#. TRANS: Subtitle for Atom favorites feed.
+#. TRANS: %1$s is a user nickname, %2$s is the StatusNet sitename.
+#: actions/atompubfavoritefeed.php:147
+#, php-format
+msgid "Notices %1$s has favorited on %2$s"
+msgstr "%1$s在%2$s上收藏的消息"
+
+#. TRANS: Client exception thrown when trying to set a favorite for another user.
+#. TRANS: Client exception thrown when trying to subscribe another user.
+#: actions/atompubfavoritefeed.php:217 actions/atompubsubscriptionfeed.php:225
+msgid "Cannot add someone else's subscription."
+msgstr "无法添加其他人的订阅。"
+
+#. TRANS: Client exception thrown when trying use an incorrect activity verb for the Atom pub method.
+#: actions/atompubfavoritefeed.php:240
+msgid "Can only handle favorite activities."
+msgstr "只能处理最喜欢的活动。"
+
+#. TRANS: Client exception thrown when trying favorite an object that is not a notice.
+#: actions/atompubfavoritefeed.php:250 actions/atompubmembershipfeed.php:250
+msgid "Can only fave notices."
+msgstr "可以只为心目中的绝对通知书。"
+
+#. TRANS: Client exception thrown when trying favorite a notice without content.
+#: actions/atompubfavoritefeed.php:259
+msgid "Unknown note."
+msgstr "未知的注意。"
+
+#. TRANS: Client exception thrown when trying favorite an already favorited notice.
+#: actions/atompubfavoritefeed.php:267
+msgid "Already a favorite."
+msgstr "已经是一种收藏。"
+
+#. TRANS: Title for group membership feed.
+#. TRANS: %s is a username.
+#: actions/atompubmembershipfeed.php:144
+#, php-format
+msgid "%s group memberships"
+msgstr "%s 组成员身份"
+
+#. TRANS: Subtitle for group membership feed.
+#. TRANS: %1$s is a username, %2$s is the StatusNet sitename.
+#: actions/atompubmembershipfeed.php:149
+#, php-format
+msgid "Groups %1$s is a member of on %2$s"
+msgstr "组 %1$s 是在 %2$s 上的成员"
+
+#. TRANS: Client exception thrown when trying subscribe someone else to a group.
+#: actions/atompubmembershipfeed.php:219
+msgid "Cannot add someone else's membership."
+msgstr "无法添加其他人的成员资格。"
+
+#. TRANS: Client error displayed when not using the POST verb.
+#. TRANS: Do not translate POST.
+#: actions/atompubmembershipfeed.php:242
+msgid "Can only handle join activities."
+msgstr "只能处理加入活动。"
+
+#. TRANS: Client exception thrown when trying to subscribe to a non-existing group.
+#: actions/atompubmembershipfeed.php:259
+msgid "Unknown group."
+msgstr "未知的组。"
+
+#. TRANS: Client exception thrown when trying to subscribe to an already subscribed group.
+#: actions/atompubmembershipfeed.php:267
+msgid "Already a member."
+msgstr "已经是会员。"
+
+#. TRANS: Client exception thrown when trying to subscribe to group while blocked from that group.
+#: actions/atompubmembershipfeed.php:275
+msgid "Blocked by admin."
+msgstr "阻止的管理员。"
+
+#. TRANS: Client exception thrown when referencing a non-existing favorite.
+#: actions/atompubshowfavorite.php:90
+msgid "No such favorite."
+msgstr "没有这种喜欢。"
+
+#. TRANS: Client exception thrown when trying to remove a favorite notice of another user.
+#: actions/atompubshowfavorite.php:151
+msgid "Cannot delete someone else's favorite."
+msgstr "不能删除其他人的最爱。"
+
+#. TRANS: Client exception thrown when referencing a non-existing group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
+#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
+#. TRANS: Client error when trying to delete a non-local group.
+#. TRANS: Client error when trying to delete a non-existing group.
+#. TRANS: Client error displayed trying to edit a non-existing group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed without providing a group nickname.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a non-local group.
+#. TRANS: Client error displayed when requesting Friends of a Friend feed for a nickname that is not a group.
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing group.
+#. TRANS: Client error displayed referring to a group's permalink for a non-existing group ID.
+#. TRANS: Client error displayed trying to change group design settings while providing a nickname for a non-existing group.
+#. TRANS: Client error displayed when trying to update logo settings for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for a non-existing group.
+#. TRANS: Client error displayed when trying to view group members for an object that is not a group.
+#. TRANS: Client error displayed when requesting a group RSS feed for group that does not exist.
+#. TRANS: Client error displayed when requesting a group RSS feed for an object that is not a group.
+#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
+#. TRANS: Client error displayed when trying to join a non-local group.
+#. TRANS: Client error displayed when trying to join a non-existing group.
+#. TRANS: Client error displayed when trying to leave a non-local group.
+#. TRANS: Client error displayed when trying to leave a non-existing group.
+#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
+#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
+#. TRANS: Command exception text shown when a group is requested that does not exist.
+#. TRANS: Error text shown when trying to leave a group that does not exist.
+#: actions/atompubshowmembership.php:81 actions/blockedfromgroup.php:81
+#: actions/blockedfromgroup.php:89 actions/deletegroup.php:87
+#: actions/deletegroup.php:100 actions/editgroup.php:102
+#: actions/foafgroup.php:46 actions/foafgroup.php:65 actions/foafgroup.php:73
+#: actions/groupblock.php:89 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:101 actions/grouplogo.php:103
+#: actions/groupmembers.php:84 actions/groupmembers.php:92
+#: actions/grouprss.php:97 actions/grouprss.php:105
+#: actions/groupunblock.php:89 actions/joingroup.php:82
+#: actions/joingroup.php:95 actions/leavegroup.php:82
+#: actions/leavegroup.php:95 actions/makeadmin.php:86
+#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
+#: lib/command.php:392
+msgid "No such group."
+msgstr "没有这个组。"
+
+#. TRANS: Client exception thrown when trying to show membership of a non-subscribed group
+#: actions/atompubshowmembership.php:91
+msgid "Not a member."
+msgstr "不是会员。"
+
+#. TRANS: Client exception thrown when deleting someone else's membership.
+#: actions/atompubshowmembership.php:151
+msgid "Cannot delete someone else's membership."
+msgstr "不能删除其他人的成员资格。"
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-existing profile ID.
+#. TRANS: %d is the non-existing profile ID number.
+#: actions/atompubshowsubscription.php:72
+#: actions/atompubshowsubscription.php:83
+#: actions/atompubsubscriptionfeed.php:74
+#, php-format
+msgid "No such profile id: %d."
+msgstr "没有这种配置文件 id： %d。"
+
+#. TRANS: Client exception thrown when trying to display a subscription for a non-subscribed profile ID.
+#. TRANS: %1$d is the non-existing subscriber ID number, $2$d is the ID of the profile that was not subscribed to.
+#: actions/atompubshowsubscription.php:94
+#, php-format
+msgid "Profile %1$d not subscribed to profile %2$d."
+msgstr "配置文件 %1$d 不订阅配置文件 %2$d。"
+
+#. TRANS: Client exception thrown when trying to delete a subscription of another user.
+#: actions/atompubshowsubscription.php:157
+msgid "Cannot delete someone else's subscription."
+msgstr "不能删除别人的订阅。"
+
+#. TRANS: Subtitle for Atom subscription feed.
+#. TRANS: %1$s is a user nickname, %s$s is the StatusNet sitename.
+#: actions/atompubsubscriptionfeed.php:153
+#, php-format
+msgid "People %1$s has subscribed to on %2$s"
+msgstr "人 %1$s 已经订阅的 %2$s"
+
+#. TRANS: Client error displayed when not using the follow verb.
+#: actions/atompubsubscriptionfeed.php:248
+msgid "Can only handle Follow activities."
+msgstr "只能处理后续活动。"
+
+#. TRANS: Client exception thrown when subscribing to an object that is not a person.
+#: actions/atompubsubscriptionfeed.php:256
+msgid "Can only follow people."
+msgstr "只能跟人。"
+
+#. TRANS: Client exception thrown when subscribing to a non-existing profile.
+#. TRANS: %s is the unknown profile ID.
+#: actions/atompubsubscriptionfeed.php:267
+#, php-format
+msgid "Unknown profile %s."
+msgstr "未知的配置文件 %s。"
+
+#. TRANS: Client error displayed trying to subscribe to an already subscribed profile.
+#. TRANS: %s is the profile the user already has a subscription on.
+#: actions/atompubsubscriptionfeed.php:275
+#, php-format
+msgid "Already subscribed to %s."
+msgstr "已经订阅了%s。"
+
#. TRANS: Client error displayed trying to get a non-existing attachment.
#: actions/attachment.php:73
msgid "No such attachment."
#. TRANS: Client error displayed trying to get an avatar without providing a nickname.
#. TRANS: Client error displayed when requesting a list of blocked users for a group without providing a group nickname.
#. TRANS: Client error displayed trying to edit a group while not proving a nickname for the group to edit.
+#. TRANS: Client error displayed trying to change group design settings without providing a group nickname.
+#. TRANS: Client error displayed when trying to change group logo settings without providing a nickname.
+#. TRANS: Client error displayed when trying to view group members without providing a group nickname.
+#. TRANS: Client error displayed when requesting a group RSS feed without providing a group nickname.
#. TRANS: Client error displayed if no nickname argument was given requesting a group page.
#: actions/avatarbynickname.php:60 actions/blockedfromgroup.php:73
#: actions/editgroup.php:85 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/showgroup.php:116
+#: actions/grouprss.php:89 actions/showgroup.php:116
msgid "No nickname."
msgstr "没有昵称。"
#. TRANS: Title for avatar upload page.
#. TRANS: Label for group avatar (dt). Text hidden by default.
#. TRANS: Link description in user account settings menu.
-#: actions/avatarsettings.php:66 actions/showgroup.php:224
+#: actions/avatarsettings.php:66 actions/showgroup.php:227
#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr "头像"
msgstr "你可以上传你的个人头像。文件大小限制在%s以下。"
#. TRANS: Server error displayed in avatar upload page when no matching profile can be found for a user.
+#. TRANS: Server error displayed coming across a request from a user without a profile.
#: actions/avatarsettings.php:108 actions/avatarsettings.php:192
-#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/grouplogo.php:184 actions/remotesubscribe.php:190
#: actions/userauthorization.php:72 actions/userrss.php:108
msgid "User without matching profile."
msgstr "用户没有相应个人信息。"
#. TRANS: Avatar upload page form legend.
#. TRANS: Avatar upload page crop form legend.
+#. TRANS: Legend for group logo settings fieldset.
#: actions/avatarsettings.php:122 actions/avatarsettings.php:205
-#: actions/grouplogo.php:254
+#: actions/grouplogo.php:261
msgid "Avatar settings"
msgstr "头像设置"
#. TRANS: Header on avatar upload page for thumbnail of originally uploaded avatar (h2).
#. TRANS: Header on avatar upload crop form for thumbnail of originally uploaded avatar (h2).
+#. TRANS: Uploaded original file in group logo form.
+#. TRANS: Header for originally uploaded file before a crop on the group logo page.
#: actions/avatarsettings.php:131 actions/avatarsettings.php:214
-#: actions/grouplogo.php:202 actions/grouplogo.php:262
+#: actions/grouplogo.php:207 actions/grouplogo.php:270
msgid "Original"
msgstr "原始"
#. TRANS: Header on avatar upload page for thumbnail of to be used rendition of uploaded avatar (h2).
#. TRANS: Header on avatar upload crop form for thumbnail of to be used rendition of uploaded avatar (h2).
+#. TRANS: Header for preview of to be displayed group logo.
+#. TRANS: Header for the cropped group logo on the group logo page.
#: actions/avatarsettings.php:147 actions/avatarsettings.php:227
-#: actions/grouplogo.php:213 actions/grouplogo.php:274
+#: actions/grouplogo.php:219 actions/grouplogo.php:283
msgid "Preview"
msgstr "预览"
#. TRANS: Button on avatar upload page to delete current avatar.
-#: actions/avatarsettings.php:155
+#. TRANS: Button text for user account deletion.
+#: actions/avatarsettings.php:155 actions/deleteaccount.php:319
msgctxt "BUTTON"
msgid "Delete"
msgstr "删除"
#. TRANS: Button on avatar upload page to upload an avatar.
-#: actions/avatarsettings.php:173
+#. TRANS: Submit button to confirm upload of a user backup file for account restore.
+#: actions/avatarsettings.php:173 actions/restoreaccount.php:369
msgctxt "BUTTON"
msgid "Upload"
msgstr "上传"
msgstr "没有文件被上传。"
#. TRANS: Avatar upload form unstruction after uploading a file.
-#: actions/avatarsettings.php:346
+#: actions/avatarsettings.php:345
+#, fuzzy
msgid "Pick a square area of the image to be your avatar"
-msgstr "请选择一块方形区域作为你的头像"
+msgstr "选择一个方形的区域的图像为您的虚拟形象。"
#. TRANS: Server error displayed if an avatar upload went wrong somehow server side.
-#: actions/avatarsettings.php:361 actions/grouplogo.php:380
+#. TRANS: Server error displayed trying to crop an uploaded group logo that is no longer present.
+#: actions/avatarsettings.php:360 actions/grouplogo.php:391
msgid "Lost our file data."
msgstr "文件数据丢失"
#. TRANS: Success message for having updated a user avatar.
-#: actions/avatarsettings.php:385
+#: actions/avatarsettings.php:384
msgid "Avatar updated."
msgstr "头像已更新。"
#. TRANS: Error displayed on the avatar upload page if the avatar could not be updated for an unknown reason.
-#: actions/avatarsettings.php:389
+#: actions/avatarsettings.php:388
msgid "Failed updating avatar."
msgstr "更新头像失败。"
#. TRANS: Success message for deleting a user avatar.
-#: actions/avatarsettings.php:413
+#: actions/avatarsettings.php:412
msgid "Avatar deleted."
msgstr "头像已删除。"
+#. TRANS: Title for backup account page.
+#. TRANS: Option in profile settings to create a backup of the account of the currently logged in user.
+#: actions/backupaccount.php:61 actions/profilesettings.php:467
+msgid "Backup account"
+msgstr "备份的帐户"
+
+#. TRANS: Client exception thrown when trying to backup an account while not logged in.
+#: actions/backupaccount.php:79
+msgid "Only logged-in users can backup their account."
+msgstr "只有已登录的用户可以备份他们的帐户。"
+
+#. TRANS: Client exception thrown when trying to backup an account without having backup rights.
+#: actions/backupaccount.php:84
+msgid "You may not backup your account."
+msgstr "您可能不会备份您的帐户。"
+
+#. TRANS: Information displayed on the backup account page.
+#: actions/backupaccount.php:227
+msgid ""
+"You can backup your account data in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format. This is an experimental feature and provides "
+"an incomplete backup; private account information like email and IM "
+"addresses is not backed up. Additionally, uploaded files and direct messages "
+"are not backed up."
+msgstr ""
+"您可以备份您的帐户数据 <a href=\"http://activitystrea.ms/\">活动流</a> 格式。"
+"这是一项试验功能，并提供了不完整的备份 ；私人帐户信息如电子邮件和即时消息地址"
+"不备份。此外上，传的文件和直接的消息不备份。"
+
+#. TRANS: Submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:250
+msgctxt "BUTTON"
+msgid "Backup"
+msgstr "备份"
+
+#. TRANS: Title for submit button to backup an account on the backup account page.
+#: actions/backupaccount.php:254
+#, fuzzy
+msgid "Backup your account"
+msgstr "备份您的帐户。"
+
#. TRANS: Client error displayed when blocking a user that has already been blocked.
#: actions/block.php:68
msgid "You already blocked that user."
#. TRANS: Title for block user page.
#. TRANS: Legend for block user form.
-#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:158
+#. TRANS: Fieldset legend for block user from group form.
+#: actions/block.php:106 actions/block.php:136 actions/groupblock.php:165
msgid "Block user"
msgstr "屏蔽用户。"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:154 actions/deleteapplication.php:157
#: actions/deletegroup.php:220 actions/deletenotice.php:155
-#: actions/deleteuser.php:152 actions/groupblock.php:178
+#: actions/deleteuser.php:154 actions/groupblock.php:187
msgctxt "BUTTON"
msgid "No"
msgstr "否"
#. TRANS: Submit button title for 'No' when blocking a user.
-#. TRANS: Submit button title for 'No' when deleting a user.
-#: actions/block.php:158 actions/deleteuser.php:156
+#: actions/block.php:158
+#, fuzzy
msgid "Do not block this user"
msgstr "不要屏蔽这个用户"
#. TRANS: Button label on the form to block a user from a group.
#: actions/block.php:161 actions/deleteapplication.php:164
#: actions/deletegroup.php:227 actions/deletenotice.php:162
-#: actions/deleteuser.php:159 actions/groupblock.php:185
+#: actions/deleteuser.php:161 actions/groupblock.php:194
msgctxt "BUTTON"
msgid "Yes"
msgstr "是"
msgid "Failed to save block information."
msgstr "保存屏蔽信息失败。"
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-local group.
-#. TRANS: Client error displayed when requesting a list of blocked users for a non-existing group.
-#. TRANS: Client error when trying to delete a non-local group.
-#. TRANS: Client error when trying to delete a non-existing group.
-#. TRANS: Client error displayed trying to edit a non-existing group.
-#. TRANS: Client error displayed when trying to unblock a user from a non-existing group.
-#. TRANS: Client error displayed if no remote group with a given name was found requesting group page.
-#. TRANS: Client error displayed if no local group with a given name was found requesting group page.
-#. TRANS: Command exception text shown when a group is requested that does not exist.
-#. TRANS: Error text shown when trying to leave a group that does not exist.
-#: actions/blockedfromgroup.php:81 actions/blockedfromgroup.php:89
-#: actions/deletegroup.php:87 actions/deletegroup.php:100
-#: actions/editgroup.php:102 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/groupmembers.php:83 actions/groupmembers.php:90
-#: actions/grouprss.php:98 actions/grouprss.php:105
-#: actions/groupunblock.php:88 actions/joingroup.php:82
-#: actions/joingroup.php:93 actions/leavegroup.php:82
-#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:134 actions/showgroup.php:143 lib/command.php:168
-#: lib/command.php:380
-msgid "No such group."
-msgstr "没有这个组。"
-
#. TRANS: Title for first page with list of users blocked from a group.
#. TRANS: %s is a group nickname.
#: actions/blockedfromgroup.php:101
msgid "That address has already been confirmed."
msgstr "此地址已被确认过了。"
-#. TRANS: Server error displayed when a user update to the database fails in the contact address confirmation action.
-#. TRANS: Server error thrown on database error updating e-mail preferences.
-#. TRANS: Server error thrown on database error removing a registered e-mail address.
-#. TRANS: Server error thrown on database error updating IM preferences.
-#. TRANS: Server error thrown on database error removing a registered IM address.
-#. TRANS: Server error displayed when "Other" settings in user profile could not be updated on the server.
-#. 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:118 actions/emailsettings.php:337
-#: actions/emailsettings.php:486 actions/imsettings.php:283
-#: actions/imsettings.php:442 actions/othersettings.php:184
-#: actions/profilesettings.php:326 actions/smssettings.php:308
-#: actions/smssettings.php:464
-msgid "Couldn't update user."
-msgstr "无法更新用户。"
-
#. TRANS: Server error displayed when an address confirmation code deletion from the
#. TRANS: database fails in the contact address confirmation action.
#: actions/confirmaddress.php:132
msgstr "对话"
#. TRANS: Header on conversation page. Hidden by default (h2).
-#: actions/conversation.php:149 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:229 lib/searchgroupnav.php:82
+#. TRANS: Label for user statistics.
+#: actions/conversation.php:149 lib/noticelist.php:87
+#: lib/profileaction.php:246 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "消息"
+#. TRANS: Client exception displayed trying to delete a user account while not logged in.
+#: actions/deleteaccount.php:71
+msgid "Only logged-in users can delete their account."
+msgstr "只有已登录的用户可以删除他们的帐户。"
+
+#. TRANS: Client exception displayed trying to delete a user account without have the rights to do that.
+#: actions/deleteaccount.php:77
+msgid "You cannot delete your account."
+msgstr "您不能删除您的帐户。"
+
+#. TRANS: Confirmation text for user deletion. The user has to type this exactly the same, including punctuation.
+#: actions/deleteaccount.php:160 actions/deleteaccount.php:297
+msgid "I am sure."
+msgstr "我敢肯定。"
+
+#. TRANS: Notification for user about the text that must be input to be able to delete a user account.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:164
+#, php-format
+msgid "You must write \"%s\" exactly in the box."
+msgstr "你必须在框中输入“%s”。"
+
+#. TRANS: Confirmation that a user account has been deleted.
+#: actions/deleteaccount.php:206
+msgid "Account deleted."
+msgstr "删除的帐户。"
+
+#. TRANS: Page title for page on which a user account can be deleted.
+#. TRANS: Option in profile settings to delete the account of the currently logged in user.
+#: actions/deleteaccount.php:228 actions/profilesettings.php:475
+msgid "Delete account"
+msgstr "删除帐户"
+
+#. TRANS: Form text for user deletion form.
+#: actions/deleteaccount.php:279
+msgid ""
+"This will <strong>permanently delete</strong> your account data from this "
+"server."
+msgstr "这将 <strong>永久删除</strong> 您的帐户数据从该服务器。"
+
+#. TRANS: Additional form text for user deletion form shown if a user has account backup rights.
+#. TRANS: %s is a URL to the backup page.
+#: actions/deleteaccount.php:285
+#, php-format
+msgid ""
+"You are strongly advised to <a href=\"%s\">back up your data</a> before "
+"deletion."
+msgstr "强烈建议您在删除前 <a href=\"%s\">备份您的数据</a>。"
+
+#. TRANS: Field label for delete account confirmation entry.
+#. TRANS: Field label for password reset form where the password has to be typed again.
+#: actions/deleteaccount.php:300 actions/passwordsettings.php:112
+#: actions/recoverpassword.php:262 actions/register.php:440
+msgid "Confirm"
+msgstr "密码确认"
+
+#. TRANS: Input title for the delete account field.
+#. TRANS: %s is the text that needs to be input.
+#: actions/deleteaccount.php:304
+#, php-format
+msgid "Enter \"%s\" to confirm that you want to delete your account."
+msgstr "输入\"%s\"，以确认您要删除您的帐户。"
+
+#. TRANS: Button title for user account deletion.
+#: actions/deleteaccount.php:323
+msgid "Permanently delete your account"
+msgstr "永久删除您的帐户"
+
#. TRANS: Client error displayed trying to delete an application while not logged in.
#: actions/deleteapplication.php:62
msgid "You must be logged in to delete an application."
#. TRANS: Client error text when there is a problem with the session token.
#: actions/deleteapplication.php:102 actions/editapplication.php:131
-#: actions/newapplication.php:114 actions/showapplication.php:118
-#: lib/action.php:1409
+#: actions/newapplication.php:112 actions/showapplication.php:118
+#: lib/action.php:1425
msgid "There was a problem with your session token."
msgstr "你的 session token 出现了问题。"
#. TRANS: Submit button title for 'No' when deleting an application.
#: actions/deleteapplication.php:161
+#, fuzzy
msgid "Do not delete this application"
-msgstr "不删除该应用"
+msgstr "不要删除此应用程序。"
#. TRANS: Submit button title for 'Yes' when deleting an application.
#: actions/deleteapplication.php:167
+#, fuzzy
msgid "Delete this application"
-msgstr "删除这个应用"
+msgstr "删除此应用程序。"
#. TRANS: Client error when trying to delete group while not logged in.
#: actions/deletegroup.php:64
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
+#. TRANS: Client error displayed when trying to join a group without providing a group name or group ID.
+#. TRANS: Client error displayed when trying to leave a group without providing a group name or group ID.
+#: actions/deletegroup.php:94 actions/joingroup.php:89
+#: actions/leavegroup.php:89
msgid "No nickname or ID."
msgstr "没有昵称或 ID。"
#. TRANS: Submit button title for 'No' when deleting a group.
#: actions/deletegroup.php:224
+#, fuzzy
msgid "Do not delete this group"
-msgstr "不要删除这个小组"
+msgstr "不要删除此组。"
#. TRANS: Submit button title for 'Yes' when deleting a group.
#: actions/deletegroup.php:231
+#, fuzzy
msgid "Delete this group"
-msgstr "删除这个小组"
+msgstr "删除此组。"
#. TRANS: Error message displayed trying to delete a notice while not logged in.
+#. TRANS: Client error displayed when trying to remove a favorite while not logged in.
+#. TRANS: Client error displayed when trying to mark a notice as favorite without being logged in.
+#. TRANS: Client error displayed trying to block a user from a group while not logged in.
#. TRANS: Client error displayed when trying to unblock a user from a group while not logged in.
#. TRANS: Client error displayed trying a change a subscription while not logged in.
#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
+#. TRANS: Client error displayed when trying to change user options while not logged in.
#: actions/deletenotice.php:52 actions/disfavor.php:61 actions/favor.php:62
-#: actions/groupblock.php:61 actions/groupunblock.php:60 actions/logout.php:69
+#: actions/groupblock.php:60 actions/groupunblock.php:60 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:88
#: actions/nudge.php:63 actions/subedit.php:33 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:63
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
#. TRANS: Submit button title for 'No' when deleting a notice.
#: actions/deletenotice.php:159
+#, fuzzy
msgid "Do not delete this notice"
-msgstr "不要删除这个消息"
+msgstr "不要删除此通知。"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:166 lib/noticelist.php:672
+#: actions/deletenotice.php:166 lib/noticelist.php:673
msgid "Delete this notice"
msgstr "删除"
-#: actions/deleteuser.php:67
+#. TRANS: Client error displayed when trying to delete a user without having the right to delete users.
+#: actions/deleteuser.php:66
msgid "You cannot delete users."
msgstr "你不能删除用户。"
+#. TRANS: Client error displayed when trying to delete a non-local user.
#: actions/deleteuser.php:74
msgid "You can only delete local users."
msgstr "你只能删除本地用户。"
-#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#. TRANS: Title of delete user page.
+#: actions/deleteuser.php:110
+msgctxt "TITLE"
+msgid "Delete user"
+msgstr "删除用户"
+
+#. TRANS: Fieldset legend on delete user page.
+#: actions/deleteuser.php:134
msgid "Delete user"
msgstr "删除用户"
-#: actions/deleteuser.php:136
+#. TRANS: Information text to request if a user is certain that the described action has to be performed.
+#: actions/deleteuser.php:138
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
"你确定要删除这个用户吗？这将从数据库中清除有关这个用户的所有数据，没有备份。"
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/deleteuser.php:158
+#, fuzzy
+msgid "Do not delete this user"
+msgstr "请不要删除该用户。"
+
#. TRANS: Submit button title for 'Yes' when deleting a user.
-#: actions/deleteuser.php:163 lib/deleteuserform.php:77
+#. TRANS: Description of form for deleting a user.
+#: actions/deleteuser.php:165 lib/deleteuserform.php:75
msgid "Delete this user"
msgstr "删除这个用户"
#. 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:134
+#: actions/designadminpanel.php:60 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "外观"
-#: actions/designadminpanel.php:74
+#. TRANS: Instructions for design adminsitration panel.
+#: actions/designadminpanel.php:71
msgid "Design settings for this StatusNet site"
msgstr "这个 StatusNet 网站的外观设置"
-#: actions/designadminpanel.php:335
+#. TRANS: Client error displayed when a logo URL does is not valid.
+#: actions/designadminpanel.php:327
msgid "Invalid logo URL."
msgstr "无效的 logo URL。"
-#: actions/designadminpanel.php:340
+#. TRANS: Client error displayed when an SSL logo URL is invalid.
+#: actions/designadminpanel.php:333
msgid "Invalid SSL logo URL."
msgstr "无效的 SSL logo URL。"
-#: actions/designadminpanel.php:344
+#. TRANS: Client error displayed when a theme is submitted through the form that is not in the theme list.
+#. TRANS: %s is the chosen unavailable theme.
+#: actions/designadminpanel.php:339
#, php-format
msgid "Theme not available: %s."
msgstr "主题不可用：%s。"
-#: actions/designadminpanel.php:448
+#. TRANS: Fieldset legend for form to change logo.
+#: actions/designadminpanel.php:437
msgid "Change logo"
msgstr "更换 logo"
-#: actions/designadminpanel.php:453
+#. TRANS: Field label for StatusNet site logo.
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "网站 logo"
-#: actions/designadminpanel.php:457
+#. TRANS: Field label for SSL StatusNet site logo.
+#: actions/designadminpanel.php:452
msgid "SSL logo"
msgstr "网站 SSL logo"
-#: actions/designadminpanel.php:469
+#. TRANS: Fieldset legend for form change StatusNet site's theme.
+#: actions/designadminpanel.php:467
msgid "Change theme"
msgstr "更换主题"
-#: actions/designadminpanel.php:486
+#. TRANS: Field label for dropdown to choose site theme.
+#: actions/designadminpanel.php:485
msgid "Site theme"
msgstr "网站主题"
+#. TRANS: Title for field label for dropdown to choose site theme.
#: actions/designadminpanel.php:487
msgid "Theme for the site."
msgstr "这个网站的主题。"
-#: actions/designadminpanel.php:493
+#. TRANS: Field label for uploading a cutom theme.
+#: actions/designadminpanel.php:494
msgid "Custom theme"
msgstr "自定义主题"
-#: actions/designadminpanel.php:497
+#. TRANS: Form instructions for uploading a cutom StatusNet theme.
+#: actions/designadminpanel.php:499
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
+#. TRANS: Fieldset legend for theme background image.
#. TRANS: Fieldset legend on profile design page.
-#: actions/designadminpanel.php:512 lib/designsettings.php:98
+#: actions/designadminpanel.php:515 lib/designsettings.php:98
msgid "Change background image"
msgstr "更换背景图像"
+#. TRANS: Field label for background image on theme designer page.
+#. TRANS: Field label for background color selector.
#. TRANS: Label on profile design page for setting a profile page background colour.
-#: actions/designadminpanel.php:517 actions/designadminpanel.php:600
+#: actions/designadminpanel.php:525 actions/designadminpanel.php:609
#: lib/designsettings.php:183
msgid "Background"
msgstr "背景"
-#: actions/designadminpanel.php:522
+#. TRANS: Form guide for background image upload form on theme designer page.
+#: actions/designadminpanel.php:531
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:553
+#: actions/designadminpanel.php:558
msgid "On"
msgstr "打开"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:570
+#: actions/designadminpanel.php:575
msgid "Off"
msgstr "关闭"
+#. TRANS: Form guide for turning background image on or off on theme designer page.
#. TRANS: Form guide for a set of radio buttons on the profile design page that will enable or disable
#. TRANS: use of the uploaded profile image.
-#: actions/designadminpanel.php:571 lib/designsettings.php:159
+#: actions/designadminpanel.php:577 lib/designsettings.php:159
msgid "Turn background image on or off."
msgstr "打开或关闭背景图片"
+#. TRANS: Checkbox label to title background image on theme designer page.
#. TRANS: Checkbox label on profile design page that will cause the profile image to be tiled.
-#: actions/designadminpanel.php:576 lib/designsettings.php:165
+#: actions/designadminpanel.php:583 lib/designsettings.php:165
msgid "Tile background image"
msgstr "平铺背景图片"
-#. TRANS: Fieldset legend on profile design page to change profile page colours.
-#: actions/designadminpanel.php:590 lib/designsettings.php:175
-msgid "Change colours"
-msgstr "æ\94¹å\8f\98颜色"
+#. TRANS: Fieldset legend for theme colors.
+#: actions/designadminpanel.php:598
+msgid "Change colors"
+msgstr "æ\9b´æ\94¹颜色"
+#. TRANS: Field label for content color selector.
#. TRANS: Label on profile design page for setting a profile page content colour.
-#: actions/designadminpanel.php:613 lib/designsettings.php:197
+#: actions/designadminpanel.php:623 lib/designsettings.php:197
msgid "Content"
msgstr "内容"
+#. TRANS: Field label for sidebar color selector.
#. TRANS: Label on profile design page for setting a profile page sidebar colour.
-#: actions/designadminpanel.php:626 lib/designsettings.php:211
+#: actions/designadminpanel.php:637 lib/designsettings.php:211
msgid "Sidebar"
msgstr "边栏"
+#. TRANS: Field label for text color selector.
#. TRANS: Label on profile design page for setting a profile page text colour.
-#: actions/designadminpanel.php:639 lib/designsettings.php:225
+#: actions/designadminpanel.php:651 lib/designsettings.php:225
msgid "Text"
msgstr "文字"
+#. TRANS: Field label for link color selector.
#. TRANS: Label on profile design page for setting a profile page links colour.
-#: actions/designadminpanel.php:652 lib/designsettings.php:239
+#: actions/designadminpanel.php:665 lib/designsettings.php:239
msgid "Links"
msgstr "链接"
-#: actions/designadminpanel.php:677
+#. TRANS: Fieldset legend for advanced theme design settings.
+#: actions/designadminpanel.php:691
msgid "Advanced"
msgstr "高级"
-#: actions/designadminpanel.php:681
+#. TRANS: Field label for custom CSS.
+#: actions/designadminpanel.php:696
msgid "Custom CSS"
msgstr "自定义CSS"
-#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
-#: actions/designadminpanel.php:702 lib/designsettings.php:257
+#. TRANS: Button text for resetting theme settings.
+#: actions/designadminpanel.php:718
+msgctxt "BUTTON"
msgid "Use defaults"
msgstr "使用默认值"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default.
-#: actions/designadminpanel.php:703 lib/designsettings.php:259
+#: actions/designadminpanel.php:720 lib/designsettings.php:259
msgid "Restore default designs"
msgstr "恢复默认外观"
+#. TRANS: Title for button for resetting theme settings.
#. TRANS: Title for button on profile design page to reset all colour settings to default without saving.
-#: actions/designadminpanel.php:709 lib/designsettings.php:267
+#: actions/designadminpanel.php:728 lib/designsettings.php:267
msgid "Reset back to default"
msgstr "重置到默认"
-#. TRANS: Submit button title.
-#: actions/designadminpanel.php:711 actions/licenseadminpanel.php:319
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/snapshotadminpanel.php:245 actions/tagother.php:154
-#: lib/applicationeditform.php:357
-msgid "Save"
-msgstr "保存"
-
+#. TRANS: Title for button for saving theme settings.
#. TRANS: Title for button on profile design page to save settings.
-#: actions/designadminpanel.php:712 lib/designsettings.php:272
+#: actions/designadminpanel.php:736 lib/designsettings.php:272
msgid "Save design"
msgstr "保存外观"
-#: actions/disfavor.php:81
+#. TRANS: Client error displayed when trying to remove favorite status for a notice that is not a favorite.
+#: actions/disfavor.php:83
msgid "This notice is not a favorite!"
msgstr "此消息未被收藏！"
-#: actions/disfavor.php:94
+#. TRANS: Title for page on which favorites can be added.
+#: actions/disfavor.php:98
msgid "Add to favorites"
msgstr "加入收藏"
-#: actions/doc.php:158
+#. TRANS: Client exception thrown when requesting a document from the documentation that does not exist.
+#. TRANS: %s is the non-existing document.
+#: actions/doc.php:155
#, php-format
-msgid "No such document \"%s\""
-msgstr "没有这个文件“%s”。"
+msgid "No such document \"%s\"."
+msgstr "没有这样的文档\"%s\"。"
#. TRANS: Title for "Edit application" form.
#. TRANS: Form legend.
msgstr "通过此表单来编辑你的应用。"
#. TRANS: Validation error shown when not providing a name in the "Edit application" form.
-#: actions/editapplication.php:184 actions/newapplication.php:163
+#. TRANS: Validation error shown when not providing a name in the "New application" form.
+#: actions/editapplication.php:184 actions/newapplication.php:164
msgid "Name is required."
msgstr "名字为必填项。"
#. TRANS: Validation error shown when providing too long a name in the "Edit application" form.
-#: actions/editapplication.php:188 actions/newapplication.php:169
+#. TRANS: Validation error shown when providing too long a name in the "New application" form.
+#: actions/editapplication.php:188 actions/newapplication.php:172
msgid "Name is too long (maximum 255 characters)."
msgstr "名称过长(不能超过255个字符)。"
#. TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form.
-#: actions/editapplication.php:192 actions/newapplication.php:166
+#. TRANS: Validation error shown when providing a name for an application that already exists in the "New application" form.
+#: actions/editapplication.php:192 actions/newapplication.php:168
msgid "Name already in use. Try another one."
msgstr "名字已被使用，换一个吧。"
#. TRANS: Validation error shown when not providing a description in the "Edit application" form.
-#: actions/editapplication.php:196 actions/newapplication.php:172
+#. TRANS: Validation error shown when not providing a description in the "New application" form.
+#: actions/editapplication.php:196 actions/newapplication.php:176
msgid "Description is required."
msgstr "必须填写描述。"
#. TRANS: Validation error shown when providing too long a source URL in the "Edit application" form.
-#: actions/editapplication.php:208
+#: actions/editapplication.php:209
msgid "Source URL is too long."
msgstr "来源 URL 太长。"
#. TRANS: Validation error shown when providing an invalid source URL in the "Edit application" form.
-#: actions/editapplication.php:215 actions/newapplication.php:193
+#. TRANS: Validation error shown when providing an invalid source URL in the "New application" form.
+#: actions/editapplication.php:216 actions/newapplication.php:199
msgid "Source URL is not valid."
msgstr "来源 URL 无效。"
#. TRANS: Validation error shown when not providing an organisation in the "Edit application" form.
-#: actions/editapplication.php:219 actions/newapplication.php:196
+#. TRANS: Validation error shown when not providing an organisation in the "New application" form.
+#: actions/editapplication.php:220 actions/newapplication.php:203
msgid "Organization is required."
msgstr "组织名称必填。"
#. TRANS: Validation error shown when providing too long an arganisation name in the "Edit application" form.
-#: actions/editapplication.php:223 actions/newapplication.php:199
+#: actions/editapplication.php:224 actions/newapplication.php:207
msgid "Organization is too long (maximum 255 characters)."
msgstr "组织名称过长（不能超过255个字符）。"
-#: actions/editapplication.php:226 actions/newapplication.php:202
+#. TRANS: Form validation error show when an organisation name has not been provided in the edit application form.
+#. TRANS: Form validation error show when an organisation name has not been provided in the new application form.
+#: actions/editapplication.php:228 actions/newapplication.php:211
msgid "Organization homepage is required."
msgstr "组织首页必填。"
#. TRANS: Validation error shown when providing too long a callback URL in the "Edit application" form.
-#: actions/editapplication.php:237 actions/newapplication.php:214
+#. TRANS: Validation error shown when providing too long a callback URL in the "New application" form.
+#: actions/editapplication.php:239 actions/newapplication.php:225
msgid "Callback is too long."
msgstr "调回地址（callback）过长。"
#. TRANS: Validation error shown when providing an invalid callback URL in the "Edit application" form.
-#: actions/editapplication.php:245 actions/newapplication.php:223
+#. TRANS: Validation error shown when providing an invalid callback URL in the "New application" form.
+#: actions/editapplication.php:247 actions/newapplication.php:235
msgid "Callback URL is not valid."
msgstr "调回地址（Callback URL）无效。"
#. TRANS: Server error occuring when an application could not be updated from the "Edit application" form.
-#: actions/editapplication.php:282
+#: actions/editapplication.php:284
msgid "Could not update application."
msgstr "无法更新应用。"
msgstr "编辑 %s 小组"
#. TRANS: Client error displayed trying to edit a group while not logged in.
+#. TRANS: Client error displayed when trying to create a group while not logged in.
#. TRANS: Client error displayed trying to create a group while not logged in.
-#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+#: actions/editgroup.php:68 actions/grouplogo.php:69 actions/newgroup.php:65
msgid "You must be logged in to create a group."
msgstr "你必须登录才能创建小组。"
#. TRANS: Client error displayed trying to edit a group while not being a group admin.
+#. TRANS: Client error displayed trying to change group design settings without being a (group) admin.
+#. TRANS: Client error displayed when trying to change group logo settings while not being a group admin.
#: actions/editgroup.php:110 actions/editgroup.php:176
-#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
+#: actions/groupdesignsettings.php:109 actions/grouplogo.php:111
msgid "You must be an admin to edit the group."
msgstr "管理员才可以编辑小组。"
#. TRANS: Group edit form validation error.
#. TRANS: Group create form validation error.
-#: actions/editgroup.php:239 actions/newgroup.php:179
+#. TRANS: %s is the invalid alias.
+#: actions/editgroup.php:241 actions/newgroup.php:188
#, php-format
msgid "Invalid alias: \"%s\""
msgstr "无效的别名：“%s”。"
#. TRANS: Server error displayed when editing a group fails.
-#: actions/editgroup.php:272
+#: actions/editgroup.php:274
msgid "Could not update group."
msgstr "无法更新小组"
#. TRANS: Server error displayed when group aliases could not be added.
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:279 classes/User_group.php:529
+#: actions/editgroup.php:281 classes/User_group.php:540
msgid "Could not create aliases."
msgstr "无法创建别名。"
#. TRANS: Group edit form success message.
-#: actions/editgroup.php:296
+#: actions/editgroup.php:301
msgid "Options saved."
msgstr "选项已保存。"
#. TRANS: Title for e-mail settings.
-#: actions/emailsettings.php:61
+#: actions/emailsettings.php:59
msgid "Email settings"
msgstr "Email 设置"
#. TRANS: E-mail settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
-#: actions/emailsettings.php:76
+#: actions/emailsettings.php:73
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "设置你如何接受来自 %%site.name%% 的邮件。"
#. TRANS: Form legend for e-mail settings form.
#. TRANS: Field label for e-mail address input in e-mail settings form.
-#: actions/emailsettings.php:106 actions/emailsettings.php:132
+#: actions/emailsettings.php:103 actions/emailsettings.php:129
msgid "Email address"
msgstr "电邮地址"
#. TRANS: Form note in e-mail settings form.
-#: actions/emailsettings.php:112
+#: actions/emailsettings.php:109
msgid "Current confirmed email address."
msgstr "当前确认的电子邮件。"
#. TRANS: Button label to remove a confirmed e-mail address.
#. TRANS: Button label for removing a set sender e-mail address to post notices from.
-#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed Instant Messaging address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:162
-#: actions/imsettings.php:116 actions/smssettings.php:124
-#: actions/smssettings.php:180
+#: actions/emailsettings.php:112 actions/emailsettings.php:179
+#: actions/imsettings.php:112 actions/smssettings.php:120
+#: actions/smssettings.php:176
msgctxt "BUTTON"
msgid "Remove"
msgstr "移除"
-#: actions/emailsettings.php:122
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:119
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
#. TRANS: Any other domain may be owned by a legitimate person or
#. TRANS: organization.
-#: actions/emailsettings.php:139
+#: actions/emailsettings.php:136
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件，类似 \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
-#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding an Instant Messaging address in Instant Messaging settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:143 actions/imsettings.php:151
-#: actions/smssettings.php:162
+#: actions/emailsettings.php:140 actions/imsettings.php:147
+#: actions/smssettings.php:158
msgctxt "BUTTON"
msgid "Add"
msgstr "添加"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:151 actions/smssettings.php:171
+#: actions/emailsettings.php:148 actions/smssettings.php:167
msgid "Incoming email"
msgstr "接收用 email"
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:154
+msgid "I want to post notices by email."
+msgstr "我希望通过邮件发布信息。"
+
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:159 actions/smssettings.php:178
+#: actions/emailsettings.php:176 actions/smssettings.php:174
msgid "Send email to this address to post new notices."
msgstr "通过发送电子邮件到这个地址来发布新的消息。"
-#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming e-mail address input form, when an address has already been assigned.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:168 actions/smssettings.php:186
+#: actions/emailsettings.php:185 actions/smssettings.php:182
msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布消息；取消旧的。"
+#. TRANS: Instructions for incoming e-mail address input form.
+#: actions/emailsettings.php:189
+msgid ""
+"To send notices via email, we need to create a unique email address for you "
+"on this server:"
+msgstr ""
+"要发送电子邮件通知，我们需要在此服务器上为您创建一个唯一的电子邮件地址："
+
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:172 actions/smssettings.php:189
+#: actions/emailsettings.php:195 actions/smssettings.php:185
msgctxt "BUTTON"
msgid "New"
msgstr "新增"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:178
+#: actions/emailsettings.php:204
msgid "Email preferences"
msgstr "Email 偏好"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:212
msgid "Send me notices of new subscriptions through email."
msgstr "将新的关注通过电子邮件发送给我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:192
+#: actions/emailsettings.php:218
msgid "Send me email when someone adds my notice as a favorite."
msgstr "有人收藏我的消息时，发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:225
msgid "Send me email when someone sends me a private message."
msgstr "有人给我发送私信时，发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:231
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "有人给我发送 @ 消息时，发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:211
+#: actions/emailsettings.php:237
msgid "Allow friends to nudge me and send me an email."
msgstr "允许朋友们呼叫我并给我发送邮件。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:218
-msgid "I want to post notices by email."
-msgstr "我希望通过邮件发布信息。"
-
-#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:225
+#: actions/emailsettings.php:243
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:346
+#: actions/emailsettings.php:361
msgid "Email preferences saved."
msgstr "Email 偏好已保存。"
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:366
+#: actions/emailsettings.php:380
msgid "No email address."
msgstr "没有电子邮件地址。"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:374
-msgid "Cannot normalize that email address"
-msgstr "无法识别此电子邮件"
+#: actions/emailsettings.php:388
+msgid "Cannot normalize that email address."
+msgstr "无法识别此电子邮件。"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:379 actions/register.php:212
+#: actions/emailsettings.php:393 actions/register.php:212
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:383
+#: actions/emailsettings.php:397
msgid "That is already your email address."
msgstr "你已登记此电子邮件。"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:387
+#: actions/emailsettings.php:401
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
-#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding Instant Messaging confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:404 actions/imsettings.php:351
-#: actions/smssettings.php:373
-msgid "Couldn't insert confirmation code."
+#: actions/emailsettings.php:418 actions/imsettings.php:343
+#: actions/smssettings.php:365
+msgid "Could not insert confirmation code."
msgstr "无法插入确认码。"
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:411
+#: actions/emailsettings.php:425
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
"用说明。"
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
-#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling Instant Messaging address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:432 actions/imsettings.php:386
-#: actions/smssettings.php:408
+#: actions/emailsettings.php:445 actions/imsettings.php:377
+#: actions/smssettings.php:399
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:437
+#: actions/emailsettings.php:450
msgid "That is the wrong email address."
msgstr "这是错误的电子邮件地址。"
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/emailsettings.php:446 actions/smssettings.php:422
-msgid "Couldn't delete email confirmation."
+#: actions/emailsettings.php:459 actions/smssettings.php:413
+msgid "Could not delete email confirmation."
msgstr "无法删除电子邮件确认。"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:451
+#: actions/emailsettings.php:464
msgid "Email confirmation cancelled."
msgstr "Email 确认已取消。"
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:471
+#: actions/emailsettings.php:483
msgid "That is not your email address."
msgstr "这个不是你的电子邮件地址。"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:492
+#: actions/emailsettings.php:504
msgid "The email address was removed."
msgstr "电子邮件地址已被删除。"
-#: actions/emailsettings.php:506 actions/smssettings.php:568
+#. TRANS: Form validation error displayed when trying to remove an incoming e-mail address while no address has been set.
+#: actions/emailsettings.php:518 actions/smssettings.php:555
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:517 actions/emailsettings.php:541
-#: actions/smssettings.php:578 actions/smssettings.php:602
-msgid "Couldn't update user record."
+#: actions/emailsettings.php:530 actions/emailsettings.php:554
+#: actions/smssettings.php:565 actions/smssettings.php:588
+msgid "Could not update user record."
msgstr "无法更新用户记录。"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:521 actions/smssettings.php:581
+#: actions/emailsettings.php:534 actions/smssettings.php:568
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被删除。"
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:545 actions/smssettings.php:605
+#: actions/emailsettings.php:558 actions/smssettings.php:591
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
-#: actions/favor.php:79
+#. TRANS: Client error displayed when trying to mark a notice as favorite that already is a favorite.
+#: actions/favor.php:80
msgid "This notice is already a favorite!"
msgstr "已收藏过此消息！"
-#: actions/favor.php:92 lib/disfavorform.php:144
+#. TRANS: Page title for page on which favorite notices can be unfavourited.
+#: actions/favor.php:95
+#, fuzzy
msgid "Disfavor favorite"
-msgstr "取消收藏"
+msgstr "不赞成的最爱"
+#. TRANS: Page title for first page of favorited notices.
+#. TRANS: Title for favourited notices section.
#: actions/favorited.php:65 lib/popularnoticesection.php:62
#: lib/publicgroupnav.php:93
msgid "Popular notices"
msgstr "最新被收藏的消息"
-#: actions/favorited.php:67
+#. TRANS: Page title for all but first page of favorited notices.
+#. TRANS: %d is the page number being displayed.
+#: actions/favorited.php:69
#, php-format
msgid "Popular notices, page %d"
msgstr "最新被收藏的消息，第%d页"
-#: actions/favorited.php:79
+#. TRANS: Description on page displaying favorited notices.
+#: actions/favorited.php:81
msgid "The most popular notices on the site right now."
msgstr "目前网站上最新被收藏的消息。"
-#: actions/favorited.php:150
+#. TRANS: Text displayed instead of a list when a site does not yet have any favourited notices.
+#: actions/favorited.php:149
msgid "Favorite notices appear on this page but no one has favorited one yet."
msgstr "此页面展示收藏的消息，但还没有人收藏任何消息。"
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for logged in users.
#: actions/favorited.php:153
msgid ""
"Be the first to add a notice to your favorites by clicking the fave button "
"next to any notice you like."
msgstr "通过点击任意消息下的收藏图标成为第一个给自己的收藏添加消息的人。"
-#: actions/favorited.php:156
+#. TRANS: Additional text displayed instead of a list when a site does not yet have any favourited notices for not logged in users.
+#. TRANS: %%action.register%% is a registration link. "[link text](link)" is Mark Down. Do not change the formatting.
+#: actions/favorited.php:158
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to add a "
"notice to your favorites!"
msgstr "现在就[注册一个账户](%%action.register%%)并成为第一个添加收藏的人！"
-#: actions/favoritesrss.php:111 actions/showfavorites.php:77
-#: lib/personalgroupnav.php:118
+#. TRANS: Title of RSS feed with favourite notices of a user.
+#. TRANS: %s is a user's nickname.
+#. TRANS: Title for first page of favourite notices of a user.
+#. TRANS: %s is the user for whom the favourite notices are displayed.
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing own favourited notices.
+#: actions/favoritesrss.php:111 actions/showfavorites.php:76
+#: lib/personalgroupnav.php:122
#, php-format
msgid "%s's favorite notices"
msgstr "%s收藏的消息"
-#: actions/favoritesrss.php:115
+#. TRANS: Desciption of RSS feed with favourite notices of a user.
+#. TRANS: %1$s is a user's nickname, %2$s is the name of the StatusNet site.
+#: actions/favoritesrss.php:117
#, php-format
msgid "Updates favored by %1$s on %2$s!"
msgstr "%2$s 上被 %1$s 收藏的消息！"
+#. TRANS: Page title for first page of featured users.
+#. TRANS: Title for featured users section.
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
msgid "Featured users"
msgstr "推荐用户"
-#: actions/featured.php:71
+#. TRANS: Page title for all but first page of featured users.
+#. TRANS: %d is the page number being displayed.
+#: actions/featured.php:73
#, php-format
msgid "Featured users, page %d"
msgstr "推荐用户，第 %d 页"
-#: actions/featured.php:99
+#. TRANS: Description on page displaying featured users.
+#: actions/featured.php:102
#, php-format
-msgid "A selection of some great users on %s"
-msgstr "%sä¸\8aç\9a\84ä¼\98ç§\80ç\94¨æ\88·æ\91\98é\80\89"
+msgid "A selection of some great users on %s."
+msgstr "%sä¸\8aç\9a\84ä¸\80äº\9bä¼\98ç§\80ç\9a\84ç\94¨æ\88·æ\91\98é\80\89ã\80\82"
-#: actions/file.php:34
+#. TRANS: Client error displayed when no notice ID was given trying do display a file.
+#: actions/file.php:36
msgid "No notice ID."
msgstr "没有消息 ID。"
-#: actions/file.php:38
+#. TRANS: Client error displayed when an invalid notice ID was given trying do display a file.
+#: actions/file.php:41
msgid "No notice."
msgstr "没有消息。"
-#: actions/file.php:42
+#. TRANS: Client error displayed when trying do display a file for a notice without a file attachement.
+#: actions/file.php:46
msgid "No attachments."
msgstr "没有附件。"
-#: actions/file.php:51
+#. TRANS: Client error displayed when trying do display a file for a notice with file attachements
+#. TRANS: that could not be found.
+#: actions/file.php:58
msgid "No uploaded attachments."
msgstr "没有已上传的附件。"
+#. TRANS: Client error displayed when subscribing to a remote profile and an unexpected response is received.
#: actions/finishremotesubscribe.php:69
msgid "Not expecting this response!"
msgstr "未预料的响应！"
-#: actions/finishremotesubscribe.php:80
+#. TRANS: Client error displayed when subscribing to a remote profile that does not exist.
+#: actions/finishremotesubscribe.php:81
msgid "User being listened to does not exist."
msgstr "要查看的用户不存在。"
-#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+#. TRANS: Client error displayed when subscribing to a remote profile that is a local profile.
+#: actions/finishremotesubscribe.php:89 actions/remotesubscribe.php:58
msgid "You can use the local subscription!"
msgstr "你可以使用本地关注！"
-#: actions/finishremotesubscribe.php:99
+#. TRANS: Client error displayed when subscribing to a remote profile that is blocked form subscribing to.
+#: actions/finishremotesubscribe.php:102
msgid "That user has blocked you from subscribing."
msgstr "该用户屏蔽了你，无法关注。"
-#: actions/finishremotesubscribe.php:110
+#. TRANS: Client error displayed when subscribing to a remote profile without providing an authorised token.
+#: actions/finishremotesubscribe.php:114
msgid "You are not authorized."
msgstr "你没有被授权。"
-#: actions/finishremotesubscribe.php:113
+#. TRANS: Client error displayed when subscribing to a remote profile and conversion of the request token to access token fails.
+#: actions/finishremotesubscribe.php:118
msgid "Could not convert request token to access token."
msgstr "无法将 request token 转换为 access token。"
-#: actions/finishremotesubscribe.php:118
+#. TRANS: Client error displayed when subscribing to a remote profile fails because of an unsupported version of the OMB protocol.
+#: actions/finishremotesubscribe.php:124
msgid "Remote service uses unknown version of OMB protocol."
msgstr "远程服务使用了未知版本的 OMB 协议。"
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:317
+#. TRANS: Server error displayed when subscribing to a remote profile fails because the remote profile could not be updated.
+#: actions/finishremotesubscribe.php:145 lib/oauthstore.php:317
msgid "Error updating remote profile."
msgstr "更新远程的个人信息时出错。"
-#: actions/getfile.php:79
+#. TRANS: Client error displayed when requesting a non-existent file.
+#: actions/getfile.php:77
msgid "No such file."
msgstr "没有这个文件。"
-#: actions/getfile.php:83
+#. TRANS: Client error displayed when requesting a file without having read access to it.
+#: actions/getfile.php:82
msgid "Cannot read file."
msgstr "无法读取文件。"
-#: actions/grantrole.php:62 actions/revokerole.php:62
+#. TRANS: Client error displayed when trying to assign an invalid role to a user.
+#: actions/grantrole.php:61 actions/revokerole.php:62
msgid "Invalid role."
msgstr "无效的权限。"
+#. TRANS: Client error displayed when trying to assign an reserved role to a user.
#: actions/grantrole.php:66 actions/revokerole.php:66
msgid "This role is reserved and cannot be set."
msgstr "此权限是保留的且不能被设置。"
-#: actions/grantrole.php:75
+#. TRANS: Client error displayed when trying to assign a role to a user while not being allowed to set roles.
+#: actions/grantrole.php:76
msgid "You cannot grant user roles on this site."
msgstr "你不能在这个网站授予用户权限。"
-#: actions/grantrole.php:82
+#. TRANS: Client error displayed when trying to assign a role to a user that already has that role.
+#: actions/grantrole.php:84
msgid "User already has this role."
msgstr "用户已有此权限。"
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a to be blocked user profile.
#. TRANS: Client error displayed when trying to unblock a user from a group without providing a profile.
#. TRANS: Client error displayed trying a change a subscription without providing a profile.
+#. TRANS: Client error displayed when trying to change user options without specifying a user to work on.
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:49
#: lib/profileformaction.php:79
msgid "No profile specified."
msgstr "没有指定的用户。"
+#. TRANS: Client error displayed trying to block a user from a group while specifying a non-existing profile.
#. TRANS: Client error displayed when trying to unblock a user from a group without providing an existing profile.
#. TRANS: Client error displayed trying a change a subscription for a non-existant profile ID.
-#: actions/groupblock.php:76 actions/groupunblock.php:77
+#. TRANS: Client error displayed when trying to change user options without specifying an existing user to work on.
+#: actions/groupblock.php:77 actions/groupunblock.php:77
#: actions/makeadmin.php:76 actions/subedit.php:57 actions/tagother.php:46
-#: actions/unsubscribe.php:84 lib/profileformaction.php:86
+#: actions/unsubscribe.php:84 lib/profileformaction.php:87
msgid "No profile with that ID."
msgstr "此 ID 没有用户。"
-#: actions/groupblock.php:81 actions/groupunblock.php:82
+#. TRANS: Client error displayed trying to block a user from a group while not specifying a group to block a profile from.
+#. TRANS: Client error displayed when trying to unblock a user from a group without providing a group.
+#: actions/groupblock.php:83 actions/groupunblock.php:83
#: actions/makeadmin.php:81
msgid "No group specified."
msgstr "没有指定小组。"
-#: actions/groupblock.php:91
+#. TRANS: Client error displayed trying to block a user from a group while not being an admin user.
+#: actions/groupblock.php:95
msgid "Only an admin can block group members."
msgstr "只有管理员可以屏蔽小组成员。"
-#: actions/groupblock.php:95
+#. TRANS: Client error displayed trying to block a user from a group while user is already blocked from the given group.
+#: actions/groupblock.php:100
msgid "User is already blocked from group."
msgstr "用户已经被小组屏蔽。"
-#: actions/groupblock.php:100
+#. TRANS: Client error displayed trying to block a user from a group while user is not a member of given group.
+#: actions/groupblock.php:106
msgid "User is not a member of group."
msgstr "用户不是小组成员。"
-#: actions/groupblock.php:134 actions/groupmembers.php:364
+#. TRANS: Title for block user from group page.
+#. TRANS: Form legend for form to block user from a group.
+#: actions/groupblock.php:141 actions/groupmembers.php:364
msgid "Block user from group"
msgstr "从小组中屏蔽用户"
-#: actions/groupblock.php:160
+#. TRANS: Explanatory text for block user from group form before setting the block.
+#. TRANS: %1$s is that to be blocked user, %2$s is the group the user will be blocked from.
+#: actions/groupblock.php:169
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
"内发布消息或关注该小组。"
#. TRANS: Submit button title for 'No' when blocking a user from a group.
-#: actions/groupblock.php:182
+#: actions/groupblock.php:191
+#, fuzzy
msgid "Do not block this user from this group"
msgstr "不要在此小组屏蔽此用户。"
#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
-#: actions/groupblock.php:189
+#: actions/groupblock.php:198
+#, fuzzy
msgid "Block this user from this group"
-msgstr "在小组中屏蔽此用户。"
+msgstr "阻止此此组中的用户。"
-#: actions/groupblock.php:206
+#. TRANS: Server error displayed when trying to block a user from a group fails because of an application error.
+#: actions/groupblock.php:215
msgid "Database error blocking user from group."
msgstr "在小组中屏蔽用户时数据库发生错误。"
-#: actions/groupbyid.php:74 actions/userbyid.php:70
+#. TRANS: Client error displayed referring to a group's permalink without providing a group ID.
+#: actions/groupbyid.php:73 actions/userbyid.php:70
msgid "No ID."
msgstr "没有 ID。"
-#: actions/groupdesignsettings.php:68
+#. TRANS: Client error displayed trying to change group design settings while not logged in.
+#: actions/groupdesignsettings.php:67
msgid "You must be logged in to edit a group."
msgstr "你必须登录才能创建小组。"
-#: actions/groupdesignsettings.php:144
+#. TRANS: Title group design settings page.
+#: actions/groupdesignsettings.php:146
msgid "Group design"
msgstr "小组页面外观。"
-#: actions/groupdesignsettings.php:155
+#. TRANS: Instructions for group design settings page.
+#: actions/groupdesignsettings.php:157
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr "通过背景图片和颜色板来自定义你的小组的外观。"
-#. TRANS: Error message displayed if design settings could not be saved.
-#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
-#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
-#: lib/designsettings.php:405 lib/designsettings.php:427
-msgid "Couldn't update your design."
-msgstr "无法更新你的外观。"
+#. TRANS: Form validation error displayed when group design settings could not be updated because of an application issue.
+#: actions/groupdesignsettings.php:262
+msgid "Unable to update your design settings."
+msgstr "无法更新你的外观设置。"
-#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
+#. TRANS: Form text to confirm saved group design settings.
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:222
msgid "Design preferences saved."
msgstr "外观偏好已保存。"
-#: actions/grouplogo.php:142 actions/grouplogo.php:195
+#. TRANS: Title for group logo settings page.
+#. TRANS: Group logo form legend.
+#: actions/grouplogo.php:144 actions/grouplogo.php:199
msgid "Group logo"
msgstr "小组logo"
-#: actions/grouplogo.php:153
+#. TRANS: Instructions for group logo page.
+#. TRANS: %s is the maximum file size for that site.
+#: actions/grouplogo.php:156
#, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr "你可以给你的小组上传一个 logo。文件最大限制为%s。"
-#: actions/grouplogo.php:236
+#. TRANS: Submit button for uploading a group logo.
+#: actions/grouplogo.php:243
msgid "Upload"
msgstr "上传"
-#: actions/grouplogo.php:289
+#. TRANS: Button text for cropping an uploaded group logo.
+#: actions/grouplogo.php:299
msgid "Crop"
msgstr "剪裁"
-#: actions/grouplogo.php:365
+#. TRANS: Form instructions on the group logo page.
+#: actions/grouplogo.php:376
msgid "Pick a square area of the image to be the logo."
msgstr "请选择一块方形区域作为 logo。"
-#: actions/grouplogo.php:399
+#. TRANS: Form success message after updating a group logo.
+#: actions/grouplogo.php:411
msgid "Logo updated."
msgstr "logo已更新。"
-#: actions/grouplogo.php:401
+#. TRANS: Form failure message after failing to update a group logo.
+#: actions/grouplogo.php:414
msgid "Failed updating logo."
msgstr "更新 logo 失败。"
#. TRANS: Title of the page showing group members.
#. TRANS: %s is the name of the group.
-#: actions/groupmembers.php:102
+#: actions/groupmembers.php:104
#, php-format
msgid "%s group members"
msgstr "%s 的小组成员"
#. TRANS: Title of the page showing group members.
#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
-#: actions/groupmembers.php:107
+#: actions/groupmembers.php:109
#, php-format
msgid "%1$s group members, page %2$d"
msgstr "%s 的小组成员，第%2$d页"
-#: actions/groupmembers.php:122
+#. TRANS: Page notice for group members page.
+#: actions/groupmembers.php:125
msgid "A list of the users in this group."
msgstr "该小组的成员列表。"
-#: actions/groupmembers.php:186
+#. TRANS: Indicator in group members list that this user is a group administrator.
+#: actions/groupmembers.php:190
msgid "Admin"
msgstr "管理"
#. TRANS: Button text for the form that will block a user from a group.
-#: actions/groupmembers.php:399
+#: actions/groupmembers.php:397
msgctxt "BUTTON"
msgid "Block"
msgstr "屏蔽"
#. TRANS: Submit button title.
-#: actions/groupmembers.php:403
+#: actions/groupmembers.php:401
msgctxt "TOOLTIP"
msgid "Block this user"
msgstr "屏蔽这个用户"
-#: actions/groupmembers.php:498
+#. TRANS: Form legend for form to make a user a group admin.
+#: actions/groupmembers.php:488
msgid "Make user an admin of the group"
msgstr "使用户成为小组的管理员"
#. TRANS: Button text for the form that will make a user administrator.
-#: actions/groupmembers.php:533
+#: actions/groupmembers.php:521
msgctxt "BUTTON"
msgid "Make Admin"
msgstr "设置管理员"
#. TRANS: Submit button title.
-#: actions/groupmembers.php:537
+#: actions/groupmembers.php:525
msgctxt "TOOLTIP"
msgid "Make this user an admin"
msgstr "将这个用户设为管理员"
#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
-#: actions/grouprss.php:142
+#: actions/grouprss.php:141
#, php-format
msgid "Updates from members of %1$s on %2$s!"
msgstr "在%2$s上%1$s小组组员的更新！"
-#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
-#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+#. TRANS: Title for first page of the groups list.
+#: actions/groups.php:62
+msgctxt "TITLE"
msgid "Groups"
msgstr "小组"
-#: actions/groups.php:64
+#. TRANS: Title for all but the first page of the groups list.
+#. TRANS: %d is the page number.
+#: actions/groups.php:66
#, php-format
+msgctxt "TITLE"
msgid "Groups, page %d"
-msgstr "小组，第 %d 页"
+msgstr "小组列表，第 %d 页"
-#: actions/groups.php:90
+#. TRANS: Page notice of group list. %%%%site.name%%%% is the StatusNet site name,
+#. TRANS: %%%%action.groupsearch%%%% and %%%%action.newgroup%%%% are URLs. Do not change them.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#: actions/groups.php:95
#, php-format
msgid ""
"%%%%site.name%%%% groups let you find and talk with people of similar "
"interests. After you join a group you can send messages to all other members "
"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
-"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
-"%%%%)"
+"for one](%%%%action.groupsearch%%%%) or [start your own](%%%%action.newgroup%"
+"%%%)!"
msgstr ""
"%%%%site.name%%%%的小组可以让你找到有相同兴趣的朋友一起交流。当你加入到一个小"
"组后可以可以通过使用“!小组名称”发布消息给所有其他的小组成员。找不到感兴趣的小"
"组？试一下[搜索小组](%%%%action.groupsearch%%%%)或[建立自己的小组](%%%%"
"action.newgroup%%%%)！"
-#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
+#. TRANS: Link to create a new group on the group list page.
+#: actions/groups.php:113 actions/usergroups.php:126 lib/groupeditform.php:115
msgid "Create a new group"
msgstr "新建一个小组"
-#: actions/groupsearch.php:52
+#. TRANS: Instructions for page where groups can be searched. %%site.name%% is the name of the StatusNet site.
+#: actions/groupsearch.php:53
#, php-format
msgid ""
"Search for groups on %%site.name%% by their name, location, or description. "
"在%%site.name%%通过名称、地点或者描述搜索小组。请用空格将关键词分开，每个关键"
"词至少3个字符。"
-#: actions/groupsearch.php:58
+#. TRANS: Title for page where groups can be searched.
+#: actions/groupsearch.php:60
msgid "Group search"
msgstr "小组搜索"
-#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#. TRANS: Text on page where groups can be searched if no results were found for a query.
+#: actions/groupsearch.php:82 actions/noticesearch.php:117
#: actions/peoplesearch.php:83
msgid "No results."
msgstr "没有查询结果。"
-#: actions/groupsearch.php:82
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#: actions/groupsearch.php:87
#, php-format
msgid ""
-"If you can't find the group you're looking for, you can [create it](%%action."
-"newgroup%%) yourself."
-msgstr "如果你找不到你想要的小组，你可以自己 [创建它](%%action.newgroup%%) 。"
+"If you cannot find the group you're looking for, you can [create it](%%"
+"action.newgroup%%) yourself."
+msgstr "如果你找不到想要的小组，你可以自己 [创建它](%%action.newgroup%%) 。"
-#: actions/groupsearch.php:85
+#. TRANS: Additional text on page where groups can be searched if no results were found for a query for a not logged in user.
+#. TRANS: This message contains Markdown links in the form [link text](link).
+#: actions/groupsearch.php:92
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and [create the group](%%"
"%) ！"
#. TRANS: Client error displayed when trying to unblock a user from a group without being an administrator for the group.
-#: actions/groupunblock.php:94
+#: actions/groupunblock.php:95
msgid "Only an admin can unblock group members."
msgstr "只有管理员可以取消屏蔽小组成员。"
#. TRANS: Client error displayed when trying to unblock a non-blocked user from a group.
-#: actions/groupunblock.php:99
+#: actions/groupunblock.php:100
msgid "User is not blocked from group."
msgstr "用户未被小组屏蔽。"
#. TRANS: Server error displayed when unblocking a user from a group fails because of an unknown error.
-#: actions/groupunblock.php:131 actions/unblock.php:86
+#: actions/groupunblock.php:132 actions/unblock.php:86
msgid "Error removing the block."
msgstr "取消屏蔽时出错。"
-#. TRANS: Title for instance messaging settings.
-#: actions/imsettings.php:60
+#. TRANS: Title for Instant Messaging settings.
+#: actions/imsettings.php:58
msgid "IM settings"
msgstr "IM 设置"
#. TRANS: Instant messaging settings page instructions.
#. TRANS: [instant messages] is link text, "(%%doc.im%%)" is the link.
#. TRANS: the order and formatting of link text and link should remain unchanged.
-#: actions/imsettings.php:74
+#: actions/imsettings.php:71
#, php-format
msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"You can send and receive notices through Jabber/Google Talk [instant "
+"messages](%%doc.im%%). Configure your address and settings below."
msgstr ""
"你可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接收消息。在这里配置它"
"们。"
-#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
-#: actions/imsettings.php:94
+#. TRANS: Message given in the Instant Messaging settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:90
msgid "IM is not available."
msgstr "IM 不可用。"
-#. TRANS: Form legend for IM settings form.
-#. TRANS: Field label for IM address input in IM settings form.
-#: actions/imsettings.php:106 actions/imsettings.php:136
+#. TRANS: Form legend for Instant Messaging settings form.
+#. TRANS: Field label for Instant Messaging address input in Instant Messaging settings form.
+#: actions/imsettings.php:102 actions/imsettings.php:132
msgid "IM address"
msgstr "IM 地址"
-#: actions/imsettings.php:113
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "已确认ç\9a\84Jabber/GTalkå¸\90号。"
+#: actions/imsettings.php:109
+msgid "Current confirmed Jabber/Google Talk address."
+msgstr "å½\93å\89\8d已确认ç\9a\84Jabber/GTalkè´¦号。"
-#. TRANS: Form note in IM settings form.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:124
+#. TRANS: Form note in Instant Messaging settings form.
+#. TRANS: %s is the Instant Messaging address set for the site.
+#: actions/imsettings.php:120
#, php-format
msgid ""
-"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
-"message with further instructions. (Did you add %s to your buddy list?)"
+"Awaiting confirmation on this address. Check your Jabber/Google Talk account "
+"for a message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-"æ£å\9c¨ç\89å¾\85éª\8cè¯\81è¿\99个å\9c°å\9d\80ã\80\82请æ\9f¥é\98\85你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
-"（你添加 %s 为到你的好友了吗？）"
+"æ£å\9c¨ç\89å¾\85éª\8cè¯\81è¿\99个å\9c°å\9d\80ã\80\82请æ£\80æ\9f¥你的 Jabber/GTalk 帐户看有没有收到下一步的指示。"
+"（你添加 %s 为你的好友了吗？）"
-#. TRANS: IM address input field instructions in IM settings form.
-#. TRANS: %s is the IM address set for the site.
+#. TRANS: IM address input field instructions in Instant Messaging settings form.
+#. TRANS: %s is the Instant Messaging address set for the site.
#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
#. TRANS: person or organization.
-#: actions/imsettings.php:143
+#: actions/imsettings.php:139
#, php-format
msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+"Jabber or Google Talk address, like \"UserName@example.org\". First, make "
+"sure to add %s to your buddy list in your IM client or on Google Talk."
msgstr ""
-"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
-"或 GTalk 中将 %s 加为好友。"
+"Jabber 或 Google Talk 地址，比如 \"UserName@example.org\"。首先，请确认你已"
+"在 IM 聊天工具或 Google Talk 中将 %s 添加了好友。"
-#. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:158
+#. TRANS: Form legend for Instant Messaging preferences form.
+#: actions/imsettings.php:154
msgid "IM preferences"
msgstr "IM 首选项已保存。"
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:163
-msgid "Send me notices through Jabber/GTalk."
-msgstr "通过 Jabber/GTalk 发送通告。"
+#. TRANS: Checkbox label in Instant Messaging preferences form.
+#: actions/imsettings.php:159
+msgid "Send me notices through Jabber/Google Talk."
+msgstr "通过 Jabber/Google Talk 给我发送消息。"
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:169
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"
+#. TRANS: Checkbox label in Instant Messaging preferences form.
+#: actions/imsettings.php:165
+msgid "Post a notice when my Jabber/Google Talk status changes."
+msgstr "当我的 Jabber/Google Talk 状态消息改变时自动发布消息。"
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:175
-msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
-msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
+#. TRANS: Checkbox label in Instant Messaging preferences form.
+#: actions/imsettings.php:171
+msgid ""
+"Send me replies through Jabber/Google Talk from people I'm not subscribed to."
+msgstr "将我没有关注的用户给我的回复通过 Jabber/Google Talk 发送给我。"
-#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:182
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
+#. TRANS: Checkbox label in Instant Messaging preferences form.
+#: actions/imsettings.php:178
+msgid "Publish a MicroID for my Jabber/Google Talk address."
+msgstr "为我的 Jabber/Google Talk 地址发布一个 MicroID。"
-#. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:290 actions/othersettings.php:190
+#. TRANS: Confirmation message for successful Instant Messaging preferences save.
+#: actions/imsettings.php:283 actions/othersettings.php:192
msgid "Preferences saved."
msgstr "首选项已保存。"
-#. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:312
+#. TRANS: Message given saving Instant Messaging address without having provided one.
+#: actions/imsettings.php:304
msgid "No Jabber ID."
msgstr "没有 Jabber ID。"
-#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:320
-msgid "Cannot normalize that Jabber ID"
-msgstr "无法识别此 Jabber ID"
+#. TRANS: Message given saving Instant Messaging address that cannot be normalised.
+#: actions/imsettings.php:312
+msgid "Cannot normalize that Jabber ID."
+msgstr "无法识别此 Jabber ID。"
-#. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:325
-msgid "Not a valid Jabber ID"
-msgstr "不是有效的 Jabber ID"
+#. TRANS: Message given saving Instant Messaging address that not valid.
+#: actions/imsettings.php:317
+msgid "Not a valid Jabber ID."
+msgstr "不是有效的 Jabber ID。"
-#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:329
+#. TRANS: Message given saving Instant Messaging address that is already set.
+#: actions/imsettings.php:321
msgid "That is already your Jabber ID."
msgstr "这个已经是你的 Jabber 帐号了。"
-#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:333
+#. TRANS: Message given saving Instant Messaging address that is already set for another user.
+#: actions/imsettings.php:325
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID 属于另一用户。"
-#. TRANS: Message given saving valid IM address that is to be confirmed.
-#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:361
+#. TRANS: Message given saving valid Instant Messaging address that is to be confirmed.
+#. TRANS: %s is the Instant Messaging address set for the site.
+#: actions/imsettings.php:353
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
-#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:391
+#. TRANS: Message given canceling Instant Messaging address confirmation for the wrong IM address.
+#: actions/imsettings.php:382
msgid "That is the wrong IM address."
msgstr "IM 地址错误。"
-#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:400
-msgid "Couldn't delete IM confirmation."
+#. TRANS: Server error thrown on database error canceling Instant Messaging address confirmation.
+#: actions/imsettings.php:391
+msgid "Could not delete IM confirmation."
msgstr "无法删除 IM 确认。"
-#. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:405
+#. TRANS: Message given after successfully canceling Instant Messaging address confirmation.
+#: actions/imsettings.php:396
msgid "IM confirmation cancelled."
msgstr "IM 确认已取消。"
-#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: Message given trying to remove an Instant Messaging address that is not
#. TRANS: registered for the active user.
-#: actions/imsettings.php:427
+#: actions/imsettings.php:417
msgid "That is not your Jabber ID."
msgstr "这不是你的 Jabber ID。"
-#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:450
+#. TRANS: Message given after successfully removing a registered Instant Messaging address.
+#: actions/imsettings.php:440
msgid "The IM address was removed."
msgstr "IM 地址已删除。"
+#. TRANS: Title for all but the first page of the inbox page.
+#. TRANS: %1$s is the user's nickname, %2$s is the page number.
#: actions/inbox.php:59
#, php-format
msgid "Inbox for %1$s - page %2$d"
msgstr "%1$s的收件箱 - 第%2$d页"
-#: actions/inbox.php:62
+#. TRANS: Title for the first page of the inbox page.
+#. TRANS: %s is the user's nickname.
+#: actions/inbox.php:64
#, php-format
msgid "Inbox for %s"
msgstr "%s 的收件箱"
-#: actions/inbox.php:115
+#. TRANS: Instructions for user inbox page.
+#: actions/inbox.php:106
msgid "This is your inbox, which lists your incoming private messages."
msgstr "这是你的收件箱，包含发给你的私信。"
#. TRANS: Client error displayed when trying to sent invites while they have been disabled.
-#: actions/invite.php:40
+#: actions/invite.php:41
msgid "Invites have been disabled."
msgstr "邀请已被禁用。"
#. TRANS: Client error displayed when trying to sent invites while not logged in.
#. TRANS: %s is the StatusNet site name.
-#: actions/invite.php:44
+#: actions/invite.php:45
#, php-format
msgid "You must be logged in to invite other users to use %s."
msgstr "你必须登录才能邀请他人使用%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
+#: actions/invite.php:78
#, php-format
msgid "Invalid email address: %s."
msgstr "无效的电子邮件地址：%s"
#. TRANS: Page title when invitations have been sent.
-#: actions/invite.php:116
+#: actions/invite.php:117
msgid "Invitations sent"
msgstr "邀请已发送"
#. TRANS: Page title when inviting potential users.
-#: actions/invite.php:119
+#: actions/invite.php:120
msgid "Invite new users"
msgstr "邀请新用户"
#. 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
+#: actions/invite.php:140
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).
-#: actions/invite.php:145 actions/invite.php:159
+#: actions/invite.php:146 actions/invite.php:160
#, php-format
msgctxt "INVITE"
msgid "%1$s (%2$s)"
#. 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
+#: actions/invite.php:154
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:"
#. 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
+#: actions/invite.php:168
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
+#: actions/invite.php:178
msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
msgstr "如果其他人接受邀请并注册，你将得到通知。谢谢你推动了社区发展壮大！"
#. TRANS: Form instructions.
-#: actions/invite.php:190
+#: actions/invite.php:191
msgid ""
"Use this form to invite your friends and colleagues to use this service."
msgstr "使用这个表单来邀请好友和同事加入。"
#. TRANS: Field label for a list of e-mail addresses.
-#: actions/invite.php:217
+#: actions/invite.php:218
msgid "Email addresses"
msgstr "电邮地址"
#. 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 "要邀请的好友地址(每行一个)"
+#: actions/invite.php:221
+msgid "Addresses of friends to invite (one per line)."
+msgstr "朋友邀请的地址（每行一个）。"
#. TRANS: Field label for a personal message to send to invitees.
-#: actions/invite.php:224
+#: actions/invite.php:225
msgid "Personal message"
msgstr "个人消息"
#. TRANS: Tooltip for field label for a personal message to send to invitees.
-#: actions/invite.php:227
+#: actions/invite.php:228
msgid "Optionally add a personal message to the invitation."
msgstr "在邀请中加几句话(可选)。"
#. TRANS: Send button for inviting friends
-#: actions/invite.php:231
+#: actions/invite.php:232
msgctxt "BUTTON"
msgid "Send"
msgstr "发布"
#. 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
+#: actions/invite.php:264
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s 邀请你加入 %2$s"
#. 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
+#: actions/invite.php:271
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
"\n"
"诚挚的感谢, %2$s\n"
-#: actions/joingroup.php:60
+#. TRANS: Client error displayed when trying to join a group while not logged in.
+#: actions/joingroup.php:59
msgid "You must be logged in to join a group."
msgstr "你必须登录才能加入小组。"
-#: actions/joingroup.php:141
+#. TRANS: Title for join group page after joining.
+#: actions/joingroup.php:147
#, php-format
+msgctxt "TITLE"
msgid "%1$s joined group %2$s"
-msgstr "%1$s加入了%2$s小组"
+msgstr "%1$s 加入 %2$s 组"
-#: actions/leavegroup.php:60
+#. TRANS: Client error displayed when trying to leave a group while not logged in.
+#: actions/leavegroup.php:59
msgid "You must be logged in to leave a group."
msgstr "你必须登录才能离开小组。"
+#. TRANS: Client error displayed when trying to join a group while already a member.
#. 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:386
+#: actions/leavegroup.php:103 lib/command.php:398
msgid "You are not a member of that group."
msgstr "你不是该群小组成员。"
-#: actions/leavegroup.php:137
+#. TRANS: Title for leave group page after leaving.
+#: actions/leavegroup.php:142
#, php-format
+msgctxt "TITLE"
msgid "%1$s left group %2$s"
-msgstr "%1$s离开了%2$s小组。"
+msgstr "离开 %2$s 组的 %1$s"
#. TRANS: User admin panel title
-#: actions/licenseadminpanel.php:56
+#: actions/licenseadminpanel.php:55
msgctxt "TITLE"
msgid "License"
msgstr "许可协议"
-#: actions/licenseadminpanel.php:67
+#: actions/licenseadminpanel.php:65
msgid "License for this StatusNet site"
msgstr "这个 StatusNet 网站的许可协议"
-#: actions/licenseadminpanel.php:139
+#: actions/licenseadminpanel.php:134
msgid "Invalid license selection."
msgstr "无效的许可协议选择。"
-#: actions/licenseadminpanel.php:149
+#: actions/licenseadminpanel.php:144
msgid ""
"You must specify the owner of the content when using the All Rights Reserved "
"license."
msgstr "当使用版权所有的许可协议时，你必须指定内容的所有者。"
-#: actions/licenseadminpanel.php:156
+#: actions/licenseadminpanel.php:151
msgid "Invalid license title. Maximum length is 255 characters."
msgstr "无效的许可标题。最大长度255个字符。"
-#: actions/licenseadminpanel.php:168
+#: actions/licenseadminpanel.php:163
msgid "Invalid license URL."
msgstr "无效的许可协议 URL。"
-#: actions/licenseadminpanel.php:171
+#: actions/licenseadminpanel.php:166
msgid "Invalid license image URL."
msgstr "无效的许可协议图片 URL。"
-#: actions/licenseadminpanel.php:179
+#: actions/licenseadminpanel.php:174
msgid "License URL must be blank or a valid URL."
msgstr "许可协议 URL 必须是个有效的 URL 或者为空。"
-#: actions/licenseadminpanel.php:187
+#: actions/licenseadminpanel.php:182
msgid "License image must be blank or valid URL."
msgstr "许可协议图片 URL 必须是个有效的 URL 或者为空。"
-#: actions/licenseadminpanel.php:239
+#: actions/licenseadminpanel.php:232
msgid "License selection"
msgstr "许可协议选择"
-#: actions/licenseadminpanel.php:245
+#: actions/licenseadminpanel.php:238
msgid "Private"
msgstr "私有"
-#: actions/licenseadminpanel.php:246
+#: actions/licenseadminpanel.php:239
msgid "All Rights Reserved"
msgstr "版权所有"
-#: actions/licenseadminpanel.php:247
+#: actions/licenseadminpanel.php:240
msgid "Creative Commons"
msgstr "创作共用"
-#: actions/licenseadminpanel.php:252
+#: actions/licenseadminpanel.php:245
msgid "Type"
msgstr "类型"
-#: actions/licenseadminpanel.php:254
+#: actions/licenseadminpanel.php:247
msgid "Select license"
msgstr "选择许可协议"
-#: actions/licenseadminpanel.php:268
+#: actions/licenseadminpanel.php:261
msgid "License details"
msgstr "许可协议细节"
-#: actions/licenseadminpanel.php:274
+#: actions/licenseadminpanel.php:267
msgid "Owner"
msgstr "所有者"
-#: actions/licenseadminpanel.php:275
+#: actions/licenseadminpanel.php:268
msgid "Name of the owner of the site's content (if applicable)."
msgstr "这个网站内容的所有者姓名（如果适用）。"
-#: actions/licenseadminpanel.php:283
+#: actions/licenseadminpanel.php:276
msgid "License Title"
msgstr "许可协议标题"
-#: actions/licenseadminpanel.php:284
+#: actions/licenseadminpanel.php:277
msgid "The title of the license."
msgstr "许可协议的标题。"
-#: actions/licenseadminpanel.php:292
+#: actions/licenseadminpanel.php:285
msgid "License URL"
msgstr "许可协议 URL"
-#: actions/licenseadminpanel.php:293
+#: actions/licenseadminpanel.php:286
msgid "URL for more information about the license."
msgstr "更多许可协议信息的 URL。"
-#: actions/licenseadminpanel.php:300
+#: actions/licenseadminpanel.php:293
msgid "License Image URL"
msgstr "许可协议图片 URL。"
-#: actions/licenseadminpanel.php:301
+#: actions/licenseadminpanel.php:294
msgid "URL for an image to display with the license."
msgstr "与许可协议一起出现的图片 URL。"
-#: actions/licenseadminpanel.php:319
+#. TRANS: Submit button title.
+#: actions/licenseadminpanel.php:311 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/snapshotadminpanel.php:245
+#: actions/tagother.php:154 lib/applicationeditform.php:357
+msgid "Save"
+msgstr "保存"
+
+#: actions/licenseadminpanel.php:311
msgid "Save license settings"
msgstr "保存许可协议设置"
msgid "Error setting user. You are probably not authorized."
msgstr "设置用户时出错。你可能没有被认证。"
-#: actions/login.php:210 actions/login.php:263 lib/logingroupnav.php:79
+#: actions/login.php:210 actions/login.php:263
msgid "Login"
msgstr "登录"
msgid "Login to site"
msgstr "登录"
-#: actions/login.php:258 actions/register.php:491
+#: actions/login.php:258 actions/register.php:490
msgid "Remember me"
msgstr "记住登录状态"
-#: actions/login.php:259 actions/register.php:493
+#: actions/login.php:259 actions/register.php:492
msgid "Automatically login in the future; not for shared computers!"
msgstr "下次自动登录，请不要在公共电脑上使用此选项！"
msgstr "新应用"
#. TRANS: Client error displayed trying to add a new application while not logged in.
-#: actions/newapplication.php:65
+#: actions/newapplication.php:64
msgid "You must be logged in to register an application."
msgstr "你必须登录才能登记你的应用。"
+#. TRANS: Form instructions for registering a new application.
#: actions/newapplication.php:147
msgid "Use this form to register a new application."
msgstr "通过此表单登记一个新的应用。"
-#: actions/newapplication.php:184
+#. TRANS: Validation error shown when not providing a source URL in the "New application" form.
+#: actions/newapplication.php:189
msgid "Source URL is required."
msgstr "Source URL 必填。"
-#: actions/newapplication.php:266 actions/newapplication.php:275
+#. TRANS: Server error displayed when an application could not be registered in the database through the "New application" form.
+#: actions/newapplication.php:279 actions/newapplication.php:289
msgid "Could not create application."
msgstr "无法创建应用。"
msgid "New group"
msgstr "新小组"
+#. TRANS: Client exception thrown when a user tries to create a group while banned.
+#: actions/newgroup.php:73 classes/User_group.php:485
+msgid "You are not allowed to create groups on this site."
+msgstr "您不被允许创建此站点上的小组。"
+
#. TRANS: Form instructions for group create form.
-#: actions/newgroup.php:110
+#: actions/newgroup.php:117
msgid "Use this form to create a new group."
msgstr "通过此表单创建小组。"
+#. TRANS: Group create form validation error.
+#: actions/newgroup.php:200
+msgid "Alias cannot be the same as nickname."
+msgstr "别名不能昵称相同。"
+
#: actions/newmessage.php:71 actions/newmessage.php:234
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).
-#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:501
+#: actions/newmessage.php:121 actions/newmessage.php:164 lib/command.php:513
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:140 lib/command.php:478
-#: lib/command.php:581
+#: actions/newmessage.php:144 actions/newnotice.php:140 lib/command.php:490
+#: lib/command.php:593
msgid "No content!"
msgstr "没有内容！"
msgstr "没有收件人。"
#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:167 lib/command.php:505
+#: actions/newmessage.php:167 lib/command.php:517
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:188 lib/command.php:513
+#: actions/newmessage.php:188 lib/command.php:525
#, php-format
msgid "Direct message to %s sent."
msgstr "向%s发送私信成功。"
msgstr "\"%s\"的更新"
#: actions/noticesearchrss.php:98
-#, php-format
+#, fuzzy, php-format
msgid "Updates matching search term \"%1$s\" on %2$s!"
msgstr "%2$s上符合搜索关键字\"%1$s\"的更新！"
msgstr "请只用HTTP明文的%sURLs的地址。"
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1206
-#: lib/apiaction.php:1233 lib/apiaction.php:1362
+#: actions/oembed.php:193 actions/oembed.php:212 lib/apiaction.php:1205
+#: lib/apiaction.php:1232 lib/apiaction.php:1367
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
msgstr "管理其他选项。"
#. TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
-#. TRANS: user's profile settings. This message has one space at the beginning. Use your
-#. TRANS: language's word separator here if it has one (most likely a single space).
-#: actions/othersettings.php:111
+#. TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
+#. TRANS: information on the shortener site is freely distributable.
+#. TRANS: This message has one space at the beginning. Use your language's word separator
+#. TRANS: here if it has one (most likely a single space).
+#: actions/othersettings.php:113
msgid " (free service)"
msgstr "（免费服务）"
#. TRANS: Label for dropdown with URL shortener services.
-#: actions/othersettings.php:120
+#: actions/othersettings.php:122
msgid "Shorten URLs with"
msgstr "缩短 URL 使用"
#. TRANS: Tooltip for for dropdown with URL shortener services.
-#: actions/othersettings.php:122
+#: actions/othersettings.php:124
msgid "Automatic shortening service to use."
msgstr "要使用的自动短网址服务。"
#. TRANS: Label for checkbox.
-#: actions/othersettings.php:128
+#: actions/othersettings.php:130
msgid "View profile designs"
msgstr "查看个人页面外观"
#. TRANS: Tooltip for checkbox.
-#: actions/othersettings.php:130
+#: actions/othersettings.php:132
msgid "Show or hide profile designs."
msgstr "显示或隐藏个人页面外观。"
#. TRANS: Form validation error for form "Other settings" in user profile.
-#: actions/othersettings.php:162
+#: actions/othersettings.php:164
msgid "URL shortening service is too long (maximum 50 characters)."
msgstr "短网址服务过长(不能超过50个字符)。"
msgid "Outbox for %s"
msgstr "%s 的发件箱"
-#: actions/outbox.php:116
+#: actions/outbox.php:104
msgid "This is your outbox, which lists private messages you have sent."
msgstr "这是你的发件箱，包含你发送的私信。"
msgid "Change your password."
msgstr "修改你的密码"
-#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#. TRANS: Fieldset legend for password reset form.
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:251
msgid "Password change"
msgstr "修改密码"
msgid "Old password"
msgstr "旧密码"
-#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+#. TRANS: Field label for password reset form.
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:256
msgid "New password"
msgstr "新密码"
#: actions/passwordsettings.php:109
+#, fuzzy
msgid "6 or more characters"
msgstr "6 个或更多字符"
-#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:441
-msgid "Confirm"
-msgstr "密码确认"
-
-#: actions/passwordsettings.php:113 actions/recoverpassword.php:240
+#: actions/passwordsettings.php:113
+#, fuzzy
msgid "Same as password above"
msgstr "与上面相同的密码"
msgid "Error saving user; invalid."
msgstr "保存用户时出错；无效。"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
+#: actions/passwordsettings.php:186
+#, fuzzy
msgid "Can't save new password."
msgstr "无法保存新密码。"
-#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+#. TRANS: Title for password recovery page in password saved mode.
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:229
msgid "Password saved."
msgstr "密码已保存。"
#. TRANS: Fieldset legens in Paths admin panel.
#. TRANS: DT element label in attachment list.
-#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:99
+#: actions/pathsadminpanel.php:419 lib/attachmentlist.php:98
msgid "Attachments"
msgstr "附件"
msgstr "消息许可证“%1$s”与这个网站的许可证“%2$s”不兼容。"
#. TRANS: Page title for profile settings.
-#: actions/profilesettings.php:61
+#: actions/profilesettings.php:59
msgid "Profile settings"
msgstr "个人设置"
#. TRANS: Usage instructions for profile settings.
-#: actions/profilesettings.php:73
+#: actions/profilesettings.php:70
msgid ""
"You can update your personal profile info here so people know more about you."
msgstr "在这里更新个人信息，让大家对你了解得更多。"
#. TRANS: Profile settings form legend.
-#: actions/profilesettings.php:102
+#: actions/profilesettings.php:98
msgid "Profile information"
msgstr "个人信息"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:113
+#: actions/profilesettings.php:109 actions/register.php:433
msgid "1-64 lowercase letters or numbers, no punctuation or spaces."
msgstr "1 到 64 个小写字母或数字，不包含标点或空格。"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for full group name (dt). Text hidden by default.
-#: actions/profilesettings.php:117 actions/register.php:456
-#: actions/showgroup.php:252 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:152
+#. TRANS: DT for full name in a profile.
+#: actions/profilesettings.php:113 actions/register.php:455
+#: actions/showgroup.php:255 actions/tagother.php:104
+#: lib/groupeditform.php:150 lib/userprofile.php:156
msgid "Full name"
msgstr "全名"
#. TRANS: Field label in form for profile settings.
#. TRANS: Form input field label.
-#: actions/profilesettings.php:122 actions/register.php:461
-#: lib/applicationeditform.php:236 lib/groupeditform.php:161
+#: actions/profilesettings.php:118 actions/register.php:460
+#: lib/applicationeditform.php:236 lib/groupeditform.php:154
msgid "Homepage"
msgstr "主页"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:125
+#: actions/profilesettings.php:121
msgid "URL of your homepage, blog, or profile on another site."
msgstr "你的主页、博客或在其他网站的URL。"
#. 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 actions/register.php:472
+#: actions/profilesettings.php:129 actions/register.php:471
#, 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:477
+#: actions/profilesettings.php:135 actions/register.php:476
msgid "Describe yourself and your interests"
msgstr "描述你自己和你的兴趣"
#. TRANS: Text area label in form for profile settings where users can provide.
#. TRANS: their biography.
-#: actions/profilesettings.php:143 actions/register.php:479
+#: actions/profilesettings.php:139 actions/register.php:478
msgid "Bio"
msgstr "自述"
#. TRANS: Field label in form for profile settings.
#. TRANS: Label for group location (dt). Text hidden by default.
-#: actions/profilesettings.php:149 actions/register.php:484
-#: actions/showgroup.php:262 actions/tagother.php:112
-#: actions/userauthorization.php:166 lib/groupeditform.php:180
-#: lib/userprofile.php:167
+#. TRANS: DT for location in a profile.
+#: actions/profilesettings.php:145 actions/register.php:483
+#: actions/showgroup.php:265 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:173
+#: lib/userprofile.php:172
msgid "Location"
msgstr "位置"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:152 actions/register.php:486
+#: actions/profilesettings.php:148 actions/register.php:485
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的地理位置，格式类似\"城市，省份，国家\""
#. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:157
+#: actions/profilesettings.php:153
msgid "Share my current location when posting notices"
msgstr "当发布消息时分享我的地理位置"
#. TRANS: Field label in form for profile settings.
-#: actions/profilesettings.php:165 actions/tagother.php:149
+#. TRANS: DT for tags in a profile.
+#: actions/profilesettings.php:161 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:212
+#: lib/subscriptionlist.php:108 lib/userprofile.php:220
msgid "Tags"
msgstr "标签"
#. TRANS: Tooltip for field label in form for profile settings.
-#: actions/profilesettings.php:168
+#: actions/profilesettings.php:164
+#, fuzzy
msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "你的标签 (字母、数字、“-”、“. ”和“ _”)， 以逗号或空格分隔"
#. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:173
+#: actions/profilesettings.php:169
msgid "Language"
msgstr "语言"
#. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:175
+#: actions/profilesettings.php:171
+#, fuzzy
msgid "Preferred language"
-msgstr "首选语言"
+msgstr "首选的语言。"
#. TRANS: Dropdownlist label in form for profile settings.
-#: actions/profilesettings.php:185
+#: actions/profilesettings.php:181
msgid "Timezone"
msgstr "时区"
#. TRANS: Tooltip for dropdown list label in form for profile settings.
-#: actions/profilesettings.php:187
+#: actions/profilesettings.php:183
msgid "What timezone are you normally in?"
msgstr "你一般处于哪个时区？"
#. TRANS: Checkbox label in form for profile settings.
-#: actions/profilesettings.php:193
+#: actions/profilesettings.php:189
+#, fuzzy
msgid ""
"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "自动关注任何关注我的人 (这个选项适合机器人)"
+msgstr "自动关注任何关注我的人（这个选项适合机器人）"
#. 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 actions/register.php:229
+#: actions/profilesettings.php:258 actions/register.php:229
#, php-format
msgid "Bio is too long (maximum %d character)."
msgid_plural "Bio is too long (maximum %d characters)."
msgstr[0] "自述过长(不能超过%d个字符)。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:273 actions/siteadminpanel.php:151
+#: actions/profilesettings.php:269 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "未选择时区。"
#. TRANS: Validation error in form for profile settings.
-#: actions/profilesettings.php:281
+#: actions/profilesettings.php:277
msgid "Language is too long (maximum 50 characters)."
msgstr "语言过长(不能超过50个字符)。"
#. TRANS: Validation error in form for profile settings.
#. TRANS: %s is an invalid tag.
-#: actions/profilesettings.php:295 actions/tagother.php:178
+#: actions/profilesettings.php:291 actions/tagother.php:178
#, php-format
msgid "Invalid tag: \"%s\""
msgstr "无效的标签：\"%s\"。"
#. 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."
+#: actions/profilesettings.php:347
+msgid "Could not update user for autosubscribe."
msgstr "无法更新用户的自动关注。"
#. 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 "无法保存标签。"
-
-#. TRANS: Server error thrown when user profile settings could not be saved.
-#: actions/profilesettings.php:422
-msgid "Couldn't save profile."
-msgstr "无法保存个人信息。"
+#: actions/profilesettings.php:405
+msgid "Could not save location prefs."
+msgstr "无法保存位置设置。"
#. TRANS: Server error thrown when user profile settings tags could not be saved.
-#: actions/profilesettings.php:431
-msgid "Couldn't save tags."
+#: actions/profilesettings.php:427 actions/tagother.php:200
+msgid "Could not save tags."
msgstr "无法保存标签。"
#. TRANS: Confirmation shown when user profile settings are saved.
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:440 lib/adminpanelaction.php:138
+#: actions/profilesettings.php:436 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "设置已保存。"
+#. TRANS: Option in profile settings to restore the account of the currently logged in user from a backup.
+#. TRANS: Page title for page where a user account can be restored from backup.
+#: actions/profilesettings.php:483 actions/restoreaccount.php:60
+msgid "Restore account"
+msgstr "还原账户"
+
#: actions/public.php:83
#, php-format
msgid "Beyond the page limit (%s)."
msgid "Tag cloud"
msgstr "标签云"
-#: actions/recoverpassword.php:36
+#. TRANS: Client error displayed trying to recover password while already logged in.
+#: actions/recoverpassword.php:37
msgid "You are already logged in!"
msgstr "你已经登录了！"
-#: actions/recoverpassword.php:62
+#. TRANS: Client error displayed when password recovery code is not correct.
+#: actions/recoverpassword.php:64
msgid "No such recovery code."
msgstr "没有这个恢复码。"
-#: actions/recoverpassword.php:66
+#. TRANS: Client error displayed when no proper password recovery code was submitted.
+#: actions/recoverpassword.php:69
msgid "Not a recovery code."
msgstr "不是恢复码。"
-#: actions/recoverpassword.php:73
+#. TRANS: Server error displayed trying to recover password without providing a user.
+#: actions/recoverpassword.php:77
msgid "Recovery code for unknown user."
msgstr "未知用户的恢复码"
-#: actions/recoverpassword.php:86
+#. TRANS: Server error displayed removing a password recovery code from the database.
+#: actions/recoverpassword.php:91
msgid "Error with confirmation code."
msgstr "验证码出错。"
-#: actions/recoverpassword.php:97
+#. TRANS: Client error displayed trying to recover password with too old a recovery code.
+#: actions/recoverpassword.php:103
msgid "This confirmation code is too old. Please start again."
msgstr "验证码已过期，请重来。"
-#: actions/recoverpassword.php:111
+#. TRANS: Server error displayed when updating a user's e-mail address in the database fails while recovering a password.
+#: actions/recoverpassword.php:118
msgid "Could not update user with confirmed email address."
msgstr "无法更新已确认的电子邮件。"
-#: actions/recoverpassword.php:152
+#. TRANS: Page notice for password recovery page.
+#: actions/recoverpassword.php:160
msgid ""
"If you have forgotten or lost your password, you can get a new one sent to "
"the email address you have stored in your account."
msgstr "如果你忘记或丢失了密码，你可以发送一个新的密码到你之前设置的邮箱中。"
-#: actions/recoverpassword.php:158
-msgid "You have been identified. Enter a new password below. "
-msgstr "你的身份已被验证，请在下面输入新的密码。 "
+#: actions/recoverpassword.php:167
+msgid "You have been identified. Enter a new password below."
+msgstr "你的身份已被验证，请在下面输入新的密码。"
-#: actions/recoverpassword.php:188
+#. TRANS: Fieldset legend for password recovery page.
+#: actions/recoverpassword.php:198
msgid "Password recovery"
msgstr "恢复密码"
-#: actions/recoverpassword.php:191
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:202
msgid "Nickname or email address"
msgstr "昵称或电子邮件"
-#: actions/recoverpassword.php:193
+#. TRANS: Title for field label on password recovery page.
+#: actions/recoverpassword.php:205
msgid "Your nickname on this server, or your registered email address."
msgstr "你在此服务器的昵称，或登记的邮箱。"
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+#. TRANS: Field label on password recovery page.
+#: actions/recoverpassword.php:212
+msgid "Recover"
+msgstr "恢复"
+
+#. TRANS: Button text on password recovery page.
+#: actions/recoverpassword.php:214
+msgctxt "BUTTON"
msgid "Recover"
msgstr "恢复"
-#: actions/recoverpassword.php:208
+#. TRANS: Title for password recovery page in password reset mode.
+#: actions/recoverpassword.php:223
msgid "Reset password"
msgstr "重置密码"
-#: actions/recoverpassword.php:209
+#. TRANS: Title for password recovery page in password recover mode.
+#: actions/recoverpassword.php:225
msgid "Recover password"
msgstr "恢复密码"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
+#. TRANS: Title for password recovery page in email sent mode.
+#. TRANS: Subject for password recovery e-mail.
+#: actions/recoverpassword.php:227 actions/recoverpassword.php:366
msgid "Password recovery requested"
msgstr "已请求密码恢复"
-#: actions/recoverpassword.php:213
+#. TRANS: Title for password recovery page when an unknown action has been specified.
+#: actions/recoverpassword.php:232
msgid "Unknown action"
msgstr "未知动作"
-#: actions/recoverpassword.php:236
-msgid "6 or more characters, and don't forget it!"
+#. TRANS: Title for field label for password reset form.
+#: actions/recoverpassword.php:258
+msgid "6 or more characters, and do not forget it!"
msgstr "至少6个字符，还有，别忘记它！"
-#: actions/recoverpassword.php:243
+#. TRANS: Ttile for field label for password reset form where the password has to be typed again.
+#: actions/recoverpassword.php:264 actions/register.php:441
+msgid "Same as password above."
+msgstr "与上面相同的密码"
+
+#. TRANS: Button text for password reset form.
+#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
+#: actions/recoverpassword.php:268 lib/designsettings.php:264
+msgctxt "BUTTON"
msgid "Reset"
msgstr "重置"
-#: actions/recoverpassword.php:252
+#. TRANS: Form instructions for password recovery form.
+#: actions/recoverpassword.php:278
msgid "Enter a nickname or email address."
msgstr "输入昵称或电子邮件。"
-#: actions/recoverpassword.php:282
+#. TRANS: Information on password recovery form if no known username or e-mail address was specified.
+#: actions/recoverpassword.php:309
msgid "No user with that email address or username."
msgstr "没有拥有这个用户名或电子邮件的用户。"
-#: actions/recoverpassword.php:299
+#. TRANS: Client error displayed on password recovery form if a user does not have a registered e-mail address.
+#: actions/recoverpassword.php:327
msgid "No registered email address for that user."
msgstr "该用户没有登记电子邮件。"
-#: actions/recoverpassword.php:313
+#. TRANS: Server error displayed if e-mail address confirmation fails in the database on the password recovery form.
+#: actions/recoverpassword.php:342
msgid "Error saving address confirmation."
msgstr "保存地址确认时出错。"
-#: actions/recoverpassword.php:338
+#. TRANS: User notification after an e-mail with instructions was sent from the password recovery form.
+#: actions/recoverpassword.php:370
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "恢复密码的说明已被发送到你登记的电子邮箱中。"
-#: actions/recoverpassword.php:357
+#. TRANS: Client error displayed when trying to reset as password without providing a user.
+#: actions/recoverpassword.php:391
msgid "Unexpected password reset."
msgstr "未预料的密码重置。"
-#: actions/recoverpassword.php:365
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:400
msgid "Password must be 6 characters or more."
msgstr "密码必须是 6 位或更多字符。"
-#: actions/recoverpassword.php:369
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:405
msgid "Password and confirmation do not match."
msgstr "密码和确认密码不匹配。"
-#: actions/recoverpassword.php:388 actions/register.php:256
+#. TRANS: Reset password form validation error message.
+#: actions/recoverpassword.php:418
+msgid "Cannot save new password."
+msgstr "无法保存新密码。"
+
+#. TRANS: Server error displayed when something does wrong with the user object during password reset.
+#: actions/recoverpassword.php:426 actions/register.php:256
msgid "Error setting user."
msgstr "保存用户设置时出错。"
-#: actions/recoverpassword.php:395
+#. TRANS: Success message for user after password reset.
+#: actions/recoverpassword.php:434
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存，你现在已登录。"
msgid "Registration successful"
msgstr "注册成功"
-#: actions/register.php:121 actions/register.php:512 lib/logingroupnav.php:85
+#: actions/register.php:121 actions/register.php:511
msgid "Register"
msgstr "注册"
msgstr "不允许注册。"
#: actions/register.php:209
+#, fuzzy
msgid "You can't register if you don't agree to the license."
-msgstr "ä½ å¿\85é¡»å\90\8cæ\84\8f许å\8f¯å\8d\8fè®®æ\89\8dè\83½æ³¨å\86\8cã\80\82"
+msgstr "å¦\82æ\9e\9cæ\82¨ä¸\8då\90\8cæ\84\8f该许å\8f¯ï¼\8cæ\82¨ä¸\8dè\83½æ³¨å\86\8cã\80\82"
#: actions/register.php:218
msgid "Email address already exists."
msgstr "用户名或密码不正确。"
#: actions/register.php:351
+#, fuzzy
msgid ""
"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
-msgstr ""
-"你可以通过此表单建立一个新的账户。然后你就可以发布消息并与朋友和同事们保持联"
-"系。 "
+msgstr "使用此窗体可以创建一个新的帐户。然后可以张贴告示及链接到的朋友和同事。"
-#: actions/register.php:433
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 到 64 位的小写字母或数字，不能使用标点和空格。此项必填。"
-
-#: actions/register.php:438
-msgid "6 or more characters. Required."
-msgstr "至少 6 位字符。此项必填。"
-
-#: actions/register.php:442
-msgid "Same as password above. Required."
-msgstr "与上面输入相同的密码。此项必填。"
+#: actions/register.php:437
+msgid "6 or more characters."
+msgstr "6 个或更多字符"
#. TRANS: Link description in user account settings menu.
-#: actions/register.php:446 actions/register.php:450
+#: actions/register.php:445 actions/register.php:449
#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "电子邮件"
-#: actions/register.php:447 actions/register.php:451
+#: actions/register.php:446 actions/register.php:450
+#, fuzzy
msgid "Used only for updates, announcements, and password recovery"
-msgstr "只用于更新、通知及密码恢复"
+msgstr "仅用于更新、 公告及密码恢复。"
-#: actions/register.php:458
+#: actions/register.php:457
+#, fuzzy
msgid "Longer name, preferably your \"real\" name"
-msgstr "更长的名字，最好是“真实姓名”"
+msgstr "你最好是\"真正的\"的名字的长名称技术。"
-#: actions/register.php:463
+#: actions/register.php:462
+#, fuzzy
msgid "URL of your homepage, blog, or profile on another site"
-msgstr "你的主页、博客或在其他网站的URL"
+msgstr "你的主页、博客或在其他网站的URL。"
-#: actions/register.php:524
+#: actions/register.php:523
#, php-format
msgid ""
"I understand that content and data of %1$s are private and confidential."
msgstr "我明白%1$s的信息是私人且保密的。"
-#: actions/register.php:534
+#: actions/register.php:533
#, php-format
msgid "My text and files are copyright by %1$s."
msgstr "我的文字和文件的版权归%1$s所有。"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved with ownership left to contributors.
-#: actions/register.php:538
+#: actions/register.php:537
msgid "My text and files remain under my own copyright."
msgstr "我的文字和文件的版权由我自己保留。"
#. TRANS: Copyright checkbox label in registration dialog, for all rights reserved.
-#: actions/register.php:541
+#: actions/register.php:540
msgid "All rights reserved."
msgstr "保留所有权利。"
#. TRANS: Copyright checkbox label in registration dialog, for Creative Commons-style licenses.
-#: actions/register.php:546
+#: actions/register.php:545
#, php-format
msgid ""
"My text and files are available under %s except this private data: password, "
"我的文字和文件在%s下提供，除了如下隐私内容：密码、电子邮件地址、IM 地址和电话"
"号码。"
-#: actions/register.php:589
+#: actions/register.php:588
#, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
"\n"
"感谢你的注册，希望你喜欢这个服务。"
-#: actions/register.php:613
+#: actions/register.php:612
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
msgstr "(你将收到一封邮件，包含了如何确认邮件地址的说明。)"
-#: actions/remotesubscribe.php:98
+#: actions/remotesubscribe.php:97
#, php-format
msgid ""
"To subscribe, you can [login](%%action.login%%), or [register](%%action."
"%) 一个新账户。如果你已经在另一个[兼容的微博客](%%doc.openmublog%%)有账户，请"
"填入你的资料页 URL。"
-#: actions/remotesubscribe.php:112
+#: actions/remotesubscribe.php:111
msgid "Remote subscribe"
msgstr "远程关注"
-#: actions/remotesubscribe.php:124
+#: actions/remotesubscribe.php:123
msgid "Subscribe to a remote user"
msgstr "关注一个远程用户"
-#: actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:128
msgid "User nickname"
msgstr "昵称"
-#: actions/remotesubscribe.php:130
+#: actions/remotesubscribe.php:129
+#, fuzzy
msgid "Nickname of the user you want to follow"
-msgstr "希望关注的用户昵称"
+msgstr "您要执行的用户的别名。"
-#: actions/remotesubscribe.php:133
+#: actions/remotesubscribe.php:132
msgid "Profile URL"
msgstr "资料页 URL"
-#: actions/remotesubscribe.php:134
+#: actions/remotesubscribe.php:133
+#, fuzzy
msgid "URL of your profile on another compatible microblogging service"
-msgstr "你在其他兼容的微博客服务的资料页 URL"
+msgstr "另一种兼容的微博客服务配置文件的 URL。"
-#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:411
+#. TRANS: Link text for link that will subscribe to a remote profile.
+#: actions/remotesubscribe.php:136 lib/subscribeform.php:139
+#: lib/userprofile.php:431
msgid "Subscribe"
msgstr "关注"
-#: actions/remotesubscribe.php:159
+#: actions/remotesubscribe.php:158
+#, fuzzy
msgid "Invalid profile URL (bad format)"
msgstr "无效的用户 URL (格式错误)"
-#: actions/remotesubscribe.php:168
+#: actions/remotesubscribe.php:167
msgid "Not a valid profile URL (no YADIS document or invalid XRDS defined)."
msgstr "不是有效的资料页 URL (没有YADIS 文档或定义了无效的 XRDS)。"
-#: actions/remotesubscribe.php:176
-msgid "That’s a local profile! Login to subscribe."
-msgstr "这是一个本地用户！登录才能关注。"
+#: actions/remotesubscribe.php:175
+msgid "That is a local profile! Login to subscribe."
+msgstr "这是一个本地用户！请登录以关注。"
-#: actions/remotesubscribe.php:183
-msgid "Couldn’t get a request token."
+#: actions/remotesubscribe.php:182
+msgid "Could not get a request token."
msgstr "无法获得一个 request token。"
-#: actions/repeat.php:57
+#: actions/repeat.php:56
msgid "Only logged-in users can repeat notices."
msgstr "只有登录的用户才能重复发消息。"
-#: actions/repeat.php:64 actions/repeat.php:71
+#: actions/repeat.php:63 actions/repeat.php:70
msgid "No notice specified."
msgstr "没有指定的消息。"
-#: actions/repeat.php:76
-msgid "You can't repeat your own notice."
+#: actions/repeat.php:75
+msgid "You cannot repeat your own notice."
msgstr "你不能重复自己的消息。"
-#: actions/repeat.php:90
+#: actions/repeat.php:89
msgid "You already repeated that notice."
msgstr "你已转发过了那个消息。"
-#: actions/repeat.php:114 lib/noticelist.php:691
+#: actions/repeat.php:112 lib/noticelist.php:692
msgid "Repeated"
msgstr "已转发"
-#: actions/repeat.php:119
+#: actions/repeat.php:117
msgid "Repeated!"
msgstr "已转发！"
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing @-replies.
#: actions/replies.php:126 actions/repliesrss.php:68
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:109
#, php-format
msgid "Replies to %s"
msgstr "对 %s 的回复"
"%%?status_textarea=%3$s)。"
#: actions/repliesrss.php:72
-#, php-format
+#, fuzzy, php-format
msgid "Replies to %1$s on %2$s!"
msgstr "在%2$s上对%1$s的回复!"
+#. TRANS: Client exception displayed when trying to restore an account while not logged in.
+#: actions/restoreaccount.php:78
+msgid "Only logged-in users can restore their account."
+msgstr "只有登录的用户才能恢复帐号。"
+
+#. TRANS: Client exception displayed when trying to restore an account without having restore rights.
+#: actions/restoreaccount.php:83
+msgid "You may not restore your account."
+msgstr "您不能恢复您的帐户。"
+
+#. TRANS: Client exception displayed trying to restore an account while something went wrong uploading a file.
+#. TRANS: Client exception. No file; probably just a non-AJAX submission.
+#: actions/restoreaccount.php:121 actions/restoreaccount.php:146
+msgid "No uploaded file."
+msgstr "没有上传文件。"
+
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: actions/restoreaccount.php:129 lib/mediafile.php:194
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:135 lib/mediafile.php:200
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
+
+#. TRANS: Client exception.
+#: actions/restoreaccount.php:141 lib/mediafile.php:206
+msgid "The uploaded file was only partially uploaded."
+msgstr "上传的文件只有部分被上传。"
+
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: actions/restoreaccount.php:150 lib/mediafile.php:214
+msgid "Missing a temporary folder."
+msgstr "缺少一个临时文件夹。"
+
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: actions/restoreaccount.php:154 lib/mediafile.php:218
+msgid "Failed to write file to disk."
+msgstr "写入磁盘失败。"
+
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: actions/restoreaccount.php:158 lib/mediafile.php:222
+msgid "File upload stopped by extension."
+msgstr "文件上传被扩展停止了。"
+
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#. TRANS: Exception thrown when uploading an image fails for an unknown reason.
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: actions/restoreaccount.php:164 lib/imagefile.php:106 lib/mediafile.php:228
+msgid "System error uploading file."
+msgstr "上传文件时出错。"
+
+#. TRANS: Client exception thrown when a feed is not an Atom feed.
+#: actions/restoreaccount.php:207
+msgid "Not an Atom feed."
+msgstr "不是一个Atom源"
+
+#. TRANS: Success message when a feed has been restored.
+#: actions/restoreaccount.php:241
+msgid ""
+"Feed has been restored. Your old posts should now appear in search and your "
+"profile page."
+msgstr "订阅源已恢复。您以前的帖子现在应已显示在搜索和您的资料页里。"
+
+#. TRANS: Message when a feed restore is in progress.
+#: actions/restoreaccount.php:245
+msgid "Feed will be restored. Please wait a few minutes for results."
+msgstr "将还原订阅源。请等待几分钟。"
+
+#. TRANS: Form instructions for feed restore.
+#: actions/restoreaccount.php:342
+msgid ""
+"You can upload a backed-up stream in <a href=\"http://activitystrea.ms/"
+"\">Activity Streams</a> format."
+msgstr ""
+"你可以以<a href=\"http://activitystrea.ms/\">Activity Streams</a>格式上传一个"
+"备份的流"
+
+#. TRANS: Title for submit button to confirm upload of a user backup file for account restore.
+#: actions/restoreaccount.php:373
+msgid "Upload the file"
+msgstr "上传文件"
+
#: actions/revokerole.php:75
msgid "You cannot revoke user roles on this site."
msgstr "你不能在这个网站移除用户角色。"
msgstr "未找到应用。"
#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:173
+#: actions/showapplication.php:159 lib/applicationeditform.php:177
msgid "Icon"
msgstr "图标"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:208 lib/groupeditform.php:175
+#: lib/applicationeditform.php:208 lib/groupeditform.php:168
msgid "Description"
msgstr "描述"
#. TRANS: Header for group statistics on a group page (h2).
-#: actions/showapplication.php:192 actions/showgroup.php:448
-#: lib/profileaction.php:187
+#. TRANS: H2 text for user statistics.
+#: actions/showapplication.php:192 actions/showgroup.php:460
+#: lib/profileaction.php:205
msgid "Statistics"
msgstr "统计"
msgid "Reset key & secret"
msgstr "重置key和secret"
+#. TRANS: Title of form for deleting a user.
#: actions/showapplication.php:252 lib/deletegroupform.php:121
-#: lib/deleteuserform.php:66 lib/noticelist.php:672
+#: lib/deleteuserform.php:64 lib/noticelist.php:673
msgid "Delete"
msgstr "删除"
msgid "Are you sure you want to reset your consumer key and secret?"
msgstr "你确定要重置你的consumer key和secret吗？"
-#: actions/showfavorites.php:79
+#. TRANS: Title for all but the first page of favourite notices of a user.
+#. TRANS: %1$s is the user for whom the favourite notices are displayed, %2$d is the page number.
+#: actions/showfavorites.php:80
#, php-format
msgid "%1$s's favorite notices, page %2$d"
msgstr "%1$s收藏的消息，第%2$d页"
-#: actions/showfavorites.php:132
+#. TRANS: Server error displayed when favourite notices could not be retrieved from the database.
+#: actions/showfavorites.php:134
msgid "Could not retrieve favorite notices."
msgstr "无法获取收藏的消息。"
-#: actions/showfavorites.php:171
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:172
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
msgstr "%s 好友的聚合"
-#: actions/showfavorites.php:178
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:180
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "%s 好友的聚合"
-#: actions/showfavorites.php:185
+#. TRANS: Feed link text. %s is a username.
+#: actions/showfavorites.php:188
#, php-format
msgid "Feed for favorites of %s (Atom)"
msgstr "%s 好友的聚合"
-#: actions/showfavorites.php:206
+#. TRANS: Text displayed instead of favourite notices for the current logged in user that has no favourites.
+#: actions/showfavorites.php:209
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
"你还没收藏任何消息呢。点击消息上的添加收藏按钮就可以添加到收藏夹以后查看或者"
"收藏一堆有趣的消息。"
-#: actions/showfavorites.php:208
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while logged in.
+#. TRANS: %s is a username.
+#: actions/showfavorites.php:213
#, php-format
msgid ""
"%s hasn't added any favorite notices yet. Post something interesting they "
"would add to their favorites :)"
msgstr "%s还没有收藏任何的消息。发一些他/她可能会添加到收藏的有趣的消息吧 :)"
-#: actions/showfavorites.php:212
+#. TRANS: Text displayed instead of favourite notices for a user that has no favourites while not logged in.
+#. TRANS: %s is a username, %%%%action.register%%%% is a link to the user registration page.
+#. TRANS: (link text)[link] is a Mark Down link.
+#: actions/showfavorites.php:220
#, php-format
msgid ""
"%s hasn't added any favorite notices yet. Why not [register an account](%%%%"
"%s还没有收藏任何的消息。现在就 [注册账户](%%%%action.register%%%%) 并发一些"
"他/她可能会添加到收藏的有趣的消息吧 :)"
-#: actions/showfavorites.php:243
+#. TRANS: Page notice for show favourites page.
+#: actions/showfavorites.php:251
msgid "This is a way to share what you like."
msgstr "这是一种分享你喜欢的内容的方式。"
msgstr "%1$s小组，第%2$d页"
#. TRANS: Group profile header (h2). Text hidden by default.
-#: actions/showgroup.php:220
+#: actions/showgroup.php:223
msgid "Group profile"
msgstr "小组资料"
#. TRANS: Label for group URL (dt). Text hidden by default.
-#: actions/showgroup.php:270 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:180
+#. TRANS: DT for URL in a profile.
+#: actions/showgroup.php:273 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:186
msgid "URL"
msgstr "URL 互联网地址"
#. TRANS: Label for group description or group note (dt). Text hidden by default.
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:197
+#. TRANS: DT for note in a profile.
+#: actions/showgroup.php:285 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:204
msgid "Note"
msgstr "注释"
#. TRANS: Label for group aliases (dt). Text hidden by default.
-#: actions/showgroup.php:293 lib/groupeditform.php:187
+#: actions/showgroup.php:296 lib/groupeditform.php:180
msgid "Aliases"
msgstr "别名"
#. TRANS: Group actions header (h2). Text hidden by default.
-#: actions/showgroup.php:304
+#: actions/showgroup.php:313
msgid "Group actions"
msgstr "小组动作"
#. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:345
+#: actions/showgroup.php:357
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s小组的消息聚合 (RSS 1.0)"
#. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:352
+#: actions/showgroup.php:364
#, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s小组的消息聚合 (RSS 2.0)"
#. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:359
+#: actions/showgroup.php:371
#, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s小组的消息聚合 (Atom)"
#. TRANS: Tooltip for feed link. %s is a group nickname.
-#: actions/showgroup.php:365
+#: actions/showgroup.php:377
#, php-format
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
#. TRANS: Header for mini list of group members on a group page (h2).
-#: actions/showgroup.php:402
+#: actions/showgroup.php:414
msgid "Members"
msgstr "小组成员"
#. TRANS: Description for mini list of group members on a group page when the group has no members.
-#: actions/showgroup.php:408 lib/profileaction.php:117
-#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#. TRANS: Text for user subscription statistics if the user has no subscriptions.
+#. TRANS: Text for user subscriber statistics if user has no subscribers.
+#. TRANS: Text for user user group membership statistics if user is not a member of any group.
+#: actions/showgroup.php:420 lib/profileaction.php:137
+#: lib/profileaction.php:174 lib/profileaction.php:298 lib/section.php:95
#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "（无）"
#. TRANS: Link to all group members from mini list of group members if group has more than n members.
-#: actions/showgroup.php:417
+#: actions/showgroup.php:429
msgid "All members"
msgstr "所有成员"
#. TRANS: Label for creation date in statistics on group page.
-#: actions/showgroup.php:453
+#: actions/showgroup.php:465
msgctxt "LABEL"
msgid "Created"
msgstr "已创建"
#. TRANS: Label for member count in statistics on group page.
-#: actions/showgroup.php:461
+#: actions/showgroup.php:473
msgctxt "LABEL"
msgid "Members"
msgstr "成员"
#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
#. TRANS: %%%%action.register%%%% is the URL for registration, %%%%doc.help%%%% is a URL to help.
#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:476
+#: actions/showgroup.php:488
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
#. TRANS: Notice on group pages for anonymous users for StatusNet sites that accept no new registrations.
#. TRANS: **%s** is the group alias, %%%%site.name%%%% is the site name,
#. TRANS: This message contains Markdown links. Ensure they are formatted correctly: [Description](link).
-#: actions/showgroup.php:486
+#: actions/showgroup.php:498
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
"趣的消息。"
#. TRANS: Header for list of group administrators on a group page (h2).
-#: actions/showgroup.php:515
+#: actions/showgroup.php:527
msgid "Admins"
msgstr "管理员"
#. TRANS: Client error displayed requesting a single message that does not exist.
-#: actions/showmessage.php:79
+#: actions/showmessage.php:76
msgid "No such message."
msgstr "未找到此消息。"
#. TRANS: Client error displayed requesting a single direct message the requesting user was not a party in.
-#: actions/showmessage.php:97
+#: actions/showmessage.php:86
msgid "Only the sender and recipient may read this message."
msgstr "只有发送和接受双方可以阅读此消息。"
#. TRANS: Page title for single direct message display when viewing user is the sender.
#. TRANS: %1$s is the addressed user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:110
+#: actions/showmessage.php:105
#, php-format
msgid "Message to %1$s on %2$s"
msgstr "发送给 %1$s 的 %2$s 消息"
#. TRANS: Page title for single message display.
#. TRANS: %1$s is the sending user's nickname, $2$s is a timestamp.
-#: actions/showmessage.php:118
+#: actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
msgstr "来自 %1$s 的 %2$s 消息"
#. TRANS: Title for button to save site notice in admin panel.
#: actions/sitenoticeadminpanel.php:201
+#, fuzzy
msgid "Save site notice"
-msgstr "保存网站公告"
+msgstr "保存网站公告。"
#. TRANS: Title for SMS settings.
-#: actions/smssettings.php:59
+#: actions/smssettings.php:57
msgid "SMS settings"
msgstr "SMS 设置"
#. TRANS: SMS settings page instructions.
#. TRANS: %%site.name%% is the name of the site.
-#: actions/smssettings.php:74
+#: actions/smssettings.php:71
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "你可以通过 %%site.name%% 的电子邮件接收SMS短信。"
#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
-#: actions/smssettings.php:97
+#: actions/smssettings.php:93
msgid "SMS is not available."
msgstr "SMS 不可用。"
#. TRANS: Form legend for SMS settings form.
-#: actions/smssettings.php:111
+#: actions/smssettings.php:107
msgid "SMS address"
msgstr "SMS 地址"
#. TRANS: Form guide in SMS settings form.
-#: actions/smssettings.php:120
+#: actions/smssettings.php:116
msgid "Current confirmed SMS-enabled phone number."
msgstr "已确认的可以发送SMS短消息的电话号码。"
#. TRANS: Form guide in IM settings form.
-#: actions/smssettings.php:133
+#: actions/smssettings.php:129
msgid "Awaiting confirmation on this phone number."
msgstr "等待确认此电话号码。"
#. TRANS: Field label for SMS address input in SMS settings form.
-#: actions/smssettings.php:142
+#: actions/smssettings.php:138
msgid "Confirmation code"
msgstr "确认码"
#. TRANS: Form field instructions in SMS settings form.
-#: actions/smssettings.php:144
+#: actions/smssettings.php:140
msgid "Enter the code you received on your phone."
msgstr "输入手机收到的验证码。"
#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
-#: actions/smssettings.php:148
+#: actions/smssettings.php:144
msgctxt "BUTTON"
msgid "Confirm"
msgstr "确认"
#. TRANS: Field label for SMS phone number input in SMS settings form.
-#: actions/smssettings.php:153
+#: actions/smssettings.php:149
msgid "SMS phone number"
msgstr "SMS 电话号码"
#. TRANS: SMS phone number input field instructions in SMS settings form.
-#: actions/smssettings.php:156
+#: actions/smssettings.php:152
+#, fuzzy
msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "电话号码，不带标点或空格，包含地区代码"
+msgstr "电话号码、 没有标点或带区号的空格。"
#. TRANS: Form legend for SMS preferences form.
-#: actions/smssettings.php:195
+#: actions/smssettings.php:191
msgid "SMS preferences"
msgstr "SMS 偏好"
#. TRANS: Checkbox label in SMS preferences form.
-#: actions/smssettings.php:201
+#: actions/smssettings.php:197
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr "通过SMS短信将消息发给我；我了解这样也许会给我带来不菲的开支。"
#. TRANS: Confirmation message for successful SMS preferences save.
-#: actions/smssettings.php:315
+#: actions/smssettings.php:308
msgid "SMS preferences saved."
msgstr "SMS设置已保存。"
#. TRANS: Message given saving SMS phone number without having provided one.
-#: actions/smssettings.php:338
+#: actions/smssettings.php:330
msgid "No phone number."
msgstr "没有电话号码。"
#. TRANS: Message given saving SMS phone number without having selected a carrier.
-#: actions/smssettings.php:344
+#: actions/smssettings.php:336
msgid "No carrier selected."
msgstr "未选择运营商。"
#. TRANS: Message given saving SMS phone number that is already set.
-#: actions/smssettings.php:352
+#: actions/smssettings.php:344
msgid "That is already your phone number."
msgstr "你已登记此电话号码。"
#. TRANS: Message given saving SMS phone number that is already set for another user.
-#: actions/smssettings.php:356
+#: actions/smssettings.php:348
msgid "That phone number already belongs to another user."
msgstr "这个电话号码属于另一个用户。"
#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
-#: actions/smssettings.php:384
+#: actions/smssettings.php:376
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
"for the code and instructions on how to use it."
"验证码已被发送到你新增的电话号码。请检查你的电话，找到验证码并按要求使用它。"
#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
-#: actions/smssettings.php:413
+#: actions/smssettings.php:404
msgid "That is the wrong confirmation number."
msgstr "确认码错误。"
#. TRANS: Message given after successfully canceling SMS phone number confirmation.
-#: actions/smssettings.php:427
+#: actions/smssettings.php:418
msgid "SMS confirmation cancelled."
msgstr "SMS 验证已取消。"
#. TRANS: Message given trying to remove an SMS phone number that is not
#. TRANS: registered for the active user.
-#: actions/smssettings.php:448
+#: actions/smssettings.php:438
msgid "That is not your phone number."
msgstr "这是他人的电话号码。"
#. TRANS: Message given after successfully removing a registered SMS phone number.
-#: actions/smssettings.php:470
+#: actions/smssettings.php:460
msgid "The SMS phone number was removed."
msgstr "SMS 电话号码已移除。"
#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:511
+#: actions/smssettings.php:499
msgid "Mobile carrier"
msgstr "移动运营商"
#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
-#: actions/smssettings.php:516
+#: actions/smssettings.php:504
msgid "Select a carrier"
msgstr "选择运营商"
#. TRANS: Form instructions for mobile carrier dropdown menu in SMS settings.
#. TRANS: %s is an administrative contact's e-mail address.
-#: actions/smssettings.php:525
+#: actions/smssettings.php:513
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"系 %s 以告知。"
#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
-#: actions/smssettings.php:548
-msgid "No code entered"
-msgstr "没有输入验证码"
+#: actions/smssettings.php:535
+msgid "No code entered."
+msgstr "没有输入的代码。"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
#. TRANS: Server error displayed when updating a subscription fails with a database error.
#. TRANS: Exception thrown when a subscription could not be stored on the server.
-#: actions/subedit.php:89 classes/Subscription.php:136
+#: actions/subedit.php:89 classes/Subscription.php:141
msgid "Could not save subscription."
msgstr "无法保存关注。"
msgid "This action only accepts POST requests."
msgstr "这个动作只接受 POST 请求"
-#: actions/subscribe.php:107
-msgid "No such profile."
-msgstr "没有这个文件。"
-
#: actions/subscribe.php:117
msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
msgstr "你不能用这个操作关注一个 OMB 0.1 远程用户。"
msgstr "这些用户关注了%s的消息。"
#. TRANS: Subscriber list text when the logged in user has no subscribers.
-#: actions/subscribers.php:116
+#: actions/subscribers.php:114
msgid ""
"You have no subscribers. Try subscribing to people you know and they might "
"return the favor."
#. 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
+#: actions/subscribers.php:118
#, php-format
msgid "%s has no subscribers. Want to be the first?"
msgstr "还没有人关注%s，成为第一个关注者？"
#. 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
+#: actions/subscribers.php:127
#, php-format
msgid ""
"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
"还没有人关注%s。现在就[注册一个帐号](%%%%action.register%%%%)并成为第一个关注"
"者！"
-#. 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 关注的用户"
-
#. 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
#. 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
+#: actions/subscriptions.php:133
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
#. 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
+#: actions/subscriptions.php:141 actions/subscriptions.php:147
#, php-format
msgid "%s is not listening to anyone."
msgstr "%s没有关注任何人。"
+#. TRANS: Atom feed title. %s is a profile nickname.
+#: actions/subscriptions.php:176
+#, php-format
+msgid "Subscription feed for %s (Atom)"
+msgstr "%s的订阅源 (Atom)"
+
#. TRANS: Checkbox label for enabling Jabber messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:226
+#: actions/subscriptions.php:239
msgid "Jabber"
msgstr "Jabber"
#. TRANS: Checkbox label for enabling SMS messages for a profile in a subscriptions list.
-#: actions/subscriptions.php:241
+#: actions/subscriptions.php:254
msgid "SMS"
msgstr "SMS"
msgid "Tag %s"
msgstr "将%s加为标签"
+#. TRANS: H2 for user profile information.
#: actions/tagother.php:77 lib/userprofile.php:76
msgid "User profile"
msgstr "用户页面"
+#. TRANS: DT element in area for user avatar.
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:107
+#: lib/userprofile.php:108
msgid "Photo"
msgstr "相片"
"You can only tag people you are subscribed to or who are subscribed to you."
msgstr "你只能给你关注或关注你的人添加标签。"
-#: actions/tagother.php:200
-msgid "Could not save tags."
-msgstr "无法保存标签。"
-
#: actions/tagother.php:236
msgid "Use this form to add tags to your subscribers or subscriptions."
msgstr "使用这个表单给你的关注者或你关注的用户添加标签。"
#. TRANS: Client error displayed when trying to set a non-existing user as default subscription for new
#. TRANS: users in user admin panel. %1$s is the invalid nickname.
#: actions/useradminpanel.php:166
-#, php-format
+#, fuzzy, php-format
msgid "Invalid default subscripton: '%1$s' is not a user."
msgstr "无效的默认关注：“%1$s”不是一个用户。"
#. TRANS: Link description in user account settings menu.
#: actions/useradminpanel.php:215 lib/accountsettingsaction.php:106
-#: lib/personalgroupnav.php:112
msgid "Profile"
msgstr "个人信息"
#. TRANS: Title for button to save user settings in user admin panel.
#: actions/useradminpanel.php:302
+#, fuzzy
msgid "Save user settings"
-msgstr "保存用户设置"
+msgstr "保存用户设置。"
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "授权关注"
#: actions/userauthorization.php:110
+#, fuzzy
msgid ""
"Please check these details to make sure that you want to subscribe to this "
"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
"click “Reject”."
msgstr ""
-"请检查这些详细信息，确认希望关注此用户的消息。如果你不想关注，请点击\\\"拒绝"
-"\\\"。"
+"请检查这些详细信息，请确保您要订阅此用户的通知。如果您不只是要求某人的通知订"
+"阅，请单击\"拒绝\"。"
#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
msgstr "许可协议"
#: actions/userauthorization.php:217
+#, fuzzy
msgid "Accept"
msgstr "接受"
msgstr "关注这个用户"
#: actions/userauthorization.php:219
+#, fuzzy
msgid "Reject"
msgstr "拒绝"
#: actions/userauthorization.php:220
+#, fuzzy
msgid "Reject this subscription"
-msgstr "拒绝此关注"
+msgstr "拒绝此订阅。"
#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "关注已拒绝，但是没有回传 URL。请到网站查看如何完全拒绝关注。"
#: actions/userauthorization.php:303
-#, php-format
+#, fuzzy, php-format
msgid "Listener URI ‘%s’ not found here."
msgstr "Listener URI ‘%s’ 没有找到。"
#: actions/userauthorization.php:308
-#, php-format
+#, fuzzy, php-format
msgid "Listenee URI ‘%s’ is too long."
msgstr "Listenee URI ‘%s’ 过长。"
#: actions/userauthorization.php:314
-#, php-format
+#, fuzzy, php-format
msgid "Listenee URI ‘%s’ is a local user."
msgstr "Listenee URI ‘%s’ 是一个本地用户。"
#: actions/userauthorization.php:329
-#, php-format
+#, fuzzy, php-format
msgid "Profile URL ‘%s’ is for a local user."
msgstr "个人信息 URL “%s” 是为本地用户的。"
#: actions/userauthorization.php:345
-#, php-format
+#, fuzzy, php-format
msgid "Avatar URL ‘%s’ is not valid."
msgstr "头像地址‘%s’无效。"
#: actions/userauthorization.php:350
-#, php-format
+#, fuzzy, php-format
msgid "Can’t read avatar URL ‘%s’."
msgstr "无法读取头像 URL '%s'。"
#: actions/userauthorization.php:355
-#, php-format
+#, fuzzy, php-format
msgid "Wrong image type for avatar URL ‘%s’."
msgstr "头像 URL ‘%s’ 图像格式错误。"
#. TRANS: Page title for profile design page.
-#: actions/userdesignsettings.php:76 lib/designsettings.php:63
+#: actions/userdesignsettings.php:74 lib/designsettings.php:63
msgid "Profile design"
msgstr "个人页面外观"
#. TRANS: Instructions for profile design page.
-#: actions/userdesignsettings.php:87 lib/designsettings.php:74
+#: actions/userdesignsettings.php:84 lib/designsettings.php:74
msgid ""
"Customize the way your profile looks with a background image and a colour "
"palette of your choice."
msgstr "通过背景图片和调色板自定义你的页面外观。"
-#: actions/userdesignsettings.php:282
+#: actions/userdesignsettings.php:272
msgid "Enjoy your hotdog!"
msgstr "享受你的成果吧！"
#. 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:75
+#: lib/atomusernoticefeed.php:95
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新！"
msgstr "插件"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:885
+#: actions/version.php:198 lib/action.php:901
msgid "Version"
msgstr "版本"
msgstr "作者"
#. TRANS: Activity title when marking a notice as favorite.
-#: classes/Fave.php:148 lib/favorform.php:143
+#: classes/Fave.php:164
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
+#: classes/Fave.php:167
#, php-format
msgid "%1$s marked notice %2$s as a favorite."
-msgstr "%1$s 将消息 %2$s 标记了收藏。"
+msgstr "%1$s 收藏了消息 %2$s 。"
#. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:156
+#: classes/File.php:162
#, php-format
msgid "Cannot process URL '%s'"
msgstr "不能处理 URL “%s”"
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:188
+#: classes/File.php:194
msgid "Robin thinks something is impossible."
msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
#. TRANS: Message given if an upload is larger than the configured maximum.
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
#. TRANS: %1$s is used for plural.
-#: classes/File.php:204
+#: classes/File.php:210
#, php-format
msgid ""
"No file may be larger than %1$d byte and the file you sent was %2$d bytes. "
#. TRANS: Message given if an upload would exceed user quota.
#. TRANS: %d (number) is the user quota in bytes and is used for plural.
-#: classes/File.php:217
+#: classes/File.php:223
#, php-format
msgid "A file this large would exceed your user quota of %d byte."
msgid_plural "A file this large would exceed your user quota of %d bytes."
#. TRANS: Message given id an upload would exceed a user's monthly quota.
#. TRANS: $d (number) is the monthly user quota in bytes and is used for plural.
-#: classes/File.php:229
+#: classes/File.php:235
#, php-format
msgid "A file this large would exceed your monthly quota of %d byte."
msgid_plural "A file this large would exceed your monthly quota of %d bytes."
msgstr[0] "这么大的文件会超过你%d字节的每月配额。"
#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:276 classes/File.php:291
+#: classes/File.php:282 classes/File.php:297
msgid "Invalid filename."
msgstr "无效的文件名。"
#. TRANS: Exception thrown when joining a group fails.
-#: classes/Group_member.php:42
+#: classes/Group_member.php:51
msgid "Group join failed."
msgstr "加入小组失败。"
#. TRANS: Exception thrown when trying to leave a group the user is not a member of.
-#: classes/Group_member.php:55
+#: classes/Group_member.php:64
msgid "Not part of group."
msgstr "不是小组成员。"
#. TRANS: Exception thrown when trying to leave a group fails.
-#: classes/Group_member.php:63
+#: classes/Group_member.php:72
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
+#: classes/Group_member.php:85
#, 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
+#: classes/Group_member.php:98
#, php-format
msgid "Group ID %s is invalid."
msgstr "小组 ID %s 无效。"
#. TRANS: Activity title.
-#: classes/Group_member.php:113 lib/joinform.php:114
+#: classes/Group_member.php:147 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
+#: classes/Group_member.php:151
#, php-format
msgid "%1$s has joined group %2$s."
msgstr "%1$s加入了%2$s小组。"
msgstr "无法创建别名。"
#. TRANS: Exception thrown when database name or Data Source Name could not be found.
-#: classes/Memcached_DataObject.php:533
+#: classes/Memcached_DataObject.php:542
msgid "No database name or DSN found anywhere."
msgstr "没有找到数据库名称或者 DSN。"
msgstr "你被禁止发送私信。"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:62
+#: classes/Message.php:69
msgid "Could not insert message."
msgstr "无法添加信息。"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:73
+#: classes/Message.php:80
msgid "Could not update message with new URI."
msgstr "无法通过新的 URI 更新消息。"
msgstr "没有对于 消息 (%2$d) 的 个人信息页 (%1$d) 。"
#. TRANS: Server exception. %s are the error details.
-#: classes/Notice.php:193
+#: classes/Notice.php:199
#, php-format
msgid "Database error inserting hashtag: %s"
msgstr "插入标签时数据库出错：%s"
#. TRANS: Client exception thrown if a notice contains too many characters.
-#: classes/Notice.php:265
+#: classes/Notice.php:279
msgid "Problem saving notice. Too long."
msgstr "保存消息时出错。太长。"
#. TRANS: Client exception thrown when trying to save a notice for an unknown user.
-#: classes/Notice.php:270
+#: classes/Notice.php:284
msgid "Problem saving notice. Unknown user."
msgstr "保存消息时出错。未知用户。"
#. TRANS: Client exception thrown when a user tries to post too many notices in a given time frame.
-#: classes/Notice.php:276
+#: classes/Notice.php:290
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
#. TRANS: Client exception thrown when a user tries to post too many duplicate notices in a given time frame.
-#: classes/Notice.php:283
+#: classes/Notice.php:297
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里发布了过多的重复消息，请深呼吸，过几分钟再发消息。"
#. TRANS: Client exception thrown when a user tries to post while being banned.
-#: classes/Notice.php:291
+#: classes/Notice.php:305
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
#. TRANS: Server exception thrown when a notice cannot be saved.
#. TRANS: Server exception thrown when a notice cannot be updated.
-#: classes/Notice.php:358 classes/Notice.php:385
+#: classes/Notice.php:372 classes/Notice.php:399
msgid "Problem saving notice."
msgstr "保存消息时出错。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:909
+#: classes/Notice.php:929
msgid "Bad type provided to saveKnownGroups."
msgstr "对 saveKnownGroups 提供的类型无效。"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:1008
+#: classes/Notice.php:1028
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:1122
+#: classes/Notice.php:1144
#, 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.
-#: classes/Notice.php:1853
+#: classes/Notice.php:1663
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#. TRANS: Full name of a profile or group followed by nickname in parens
-#: classes/Profile.php:172 classes/User_group.php:247
+#: classes/Profile.php:172 classes/User_group.php:242
#, php-format
msgctxt "FANCYNAME"
msgid "%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:845
+#: classes/Profile.php:779
#, 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:854
+#: classes/Profile.php:788
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限，数据库错误。"
msgstr "无法保存标签。"
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:482
+#: classes/Subscription.php:77 lib/oauthstore.php:482
msgid "You have been banned from subscribing."
msgstr "你被禁止添加关注。"
#. TRANS: Exception thrown when trying to subscribe while already subscribed.
-#: classes/Subscription.php:80
+#: classes/Subscription.php:82
msgid "Already subscribed!"
msgstr "已经关注了！"
#. TRANS: Exception thrown when trying to subscribe to a user who has blocked the subscribing user.
-#: classes/Subscription.php:85
+#: classes/Subscription.php:87
msgid "User has blocked you."
msgstr "用户将你屏蔽了。"
#. TRANS: Exception thrown when trying to unsibscribe without a subscription.
-#: classes/Subscription.php:171
+#: classes/Subscription.php:176
msgid "Not subscribed!"
msgstr "未关注！"
#. TRANS: Exception thrown when trying to unsubscribe a user from themselves.
-#: classes/Subscription.php:178
+#: classes/Subscription.php:183
msgid "Could not delete self-subscription."
msgstr "无法删除自我关注。"
#. TRANS: Exception thrown when the OMB token for a subscription could not deleted on the server.
-#: classes/Subscription.php:206
+#: classes/Subscription.php:211
msgid "Could not delete subscription OMB token."
msgstr "无法删除关注 OMB token。"
#. TRANS: Exception thrown when a subscription could not be deleted on the server.
-#: classes/Subscription.php:218
+#: classes/Subscription.php:223
msgid "Could not delete subscription."
msgstr "无法取消关注。"
#. TRANS: Activity tile when subscribing to another person.
-#: classes/Subscription.php:255
+#: classes/Subscription.php:265
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
+#: classes/Subscription.php:268
#, php-format
msgid "%1$s is now following %2$s."
msgstr "%1$s 现在开始关注了 %2$s。"
msgstr "欢迎来到 %1$s，@%2$s！"
#. TRANS: Server exception.
-#: classes/User.php:923
+#: classes/User.php:918
msgid "No single user defined for single-user mode."
msgstr "没有单独的用户被定义为单用户模式。"
#. TRANS: Server exception.
-#: classes/User.php:927
+#: classes/User.php:922
msgid "Single-user mode code called when not enabled."
msgstr "没启用单用户模式的代码。"
#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:511
+#: classes/User_group.php:522
msgid "Could not create group."
msgstr "无法创建小组。"
#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:521
+#: classes/User_group.php:532
msgid "Could not set group URI."
msgstr "无法设置小组 URI。"
#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:555
msgid "Could not set group membership."
msgstr "无法设置小组成员。"
#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:559
+#: classes/User_group.php:570
msgid "Could not save local group info."
msgstr "无法保存本地小组信息。"
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:65
+#, php-format
+msgid "Cannot locate account %s."
+msgstr "找不到帐户 %s。"
+
+#. TRANS: Exception thrown when a service document could not be located account move.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:106
+#, php-format
+msgid "Cannot find XRD for %s."
+msgstr ""
+
+#. TRANS: Exception thrown when an account could not be located when it should be moved.
+#. TRANS: %s is the remote site.
+#: lib/accountmover.php:131
+#, php-format
+msgid "No AtomPub API service for %s."
+msgstr ""
+
#. TRANS: Link title attribute in user account settings menu.
#: lib/accountsettingsaction.php:104
msgid "Change your profile settings"
msgstr "其他"
#. TRANS: Page title. %1$s is the title, %2$s is the site name.
-#: lib/action.php:148
+#: lib/action.php:161
#, php-format
msgid "%1$s - %2$s"
msgstr "%1$s - %2$s"
#. TRANS: Page title for a page without a title set.
-#: lib/action.php:164
+#: lib/action.php:177
msgid "Untitled page"
msgstr "无标题页"
#. TRANS: Localized tooltip for '...' expansion button on overlong remote messages.
-#: lib/action.php:312
+#: lib/action.php:325
msgctxt "TOOLTIP"
msgid "Show more"
msgstr "显示更多"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:531
+#: lib/action.php:544
msgid "Primary site navigation"
msgstr "主站导航"
-#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:537
+#. TRANS: Tooltip for main menu option "Personal".
+#: lib/action.php:550
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:540
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline.
+#. TRANS: Personal group navigation menu option when logged in for viewing timeline of self and friends.
+#: lib/action.php:553 lib/personalgroupnav.php:100
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
-#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:542
+#. TRANS: Tooltip for main menu option "Account".
+#: lib/action.php:555
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改你的 email 地址、头像、密码、资料"
-#. TRANS: Main menu option when logged in for access to user settings
-#: lib/action.php:545
+#. TRANS: Main menu option when logged in for access to user settings.
+#: lib/action.php:558
msgid "Account"
msgstr "帐号"
-#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:547
+#. TRANS: Tooltip for main menu option "Services".
+#: lib/action.php:560
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:550
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services.
+#: lib/action.php:563
msgid "Connect"
msgstr "关联"
-#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:553
+#. TRANS: Tooltip for menu option "Admin".
+#: lib/action.php:566
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "更改网站配置"
-#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#. 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:556 lib/groupnav.php:117
+#: lib/action.php:569 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "管理"
-#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:560
+#. TRANS: Tooltip for main menu option "Invite".
+#: lib/action.php:573
#, 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:563
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users.
+#: lib/action.php:576
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:569
+#: lib/action.php:582
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "从网站登出"
-#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:572
+#. TRANS: Main menu option when logged in to log out the current user.
+#: lib/action.php:585
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
-#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:577
+#. TRANS: Tooltip for main menu option "Register".
+#: lib/action.php:590
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建一个账户"
-#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:580
+#. TRANS: Main menu option when not logged in to register a new account.
+#. TRANS: Menu item for registering with the StatusNet site.
+#: lib/action.php:593 lib/logingroupnav.php:85
msgctxt "MENU"
msgid "Register"
msgstr "注册"
-#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:583
+#. TRANS: Tooltip for main menu option "Login".
+#: lib/action.php:596
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登录这个网站"
-#. TRANS: Main menu option when not logged in to log in
-#: lib/action.php:586
+#. TRANS: Main menu option when not logged in to log in.
+#. TRANS: Menu item for logging in to the StatusNet site.
+#: lib/action.php:599 lib/logingroupnav.php:77
msgctxt "MENU"
msgid "Login"
msgstr "登录"
-#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:589
+#. TRANS: Tooltip for main menu option "Help".
+#: lib/action.php:602
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助我！"
-#. TRANS: Main menu option for help on the StatusNet site
-#: lib/action.php:592
+#. TRANS: Main menu option for help on the StatusNet site.
+#: lib/action.php:605
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
-#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:595
+#. TRANS: Tooltip for main menu option "Search".
+#: lib/action.php:608
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "搜索人或文字"
-#. TRANS: Main menu option when logged in or when the StatusNet instance is not private
-#: lib/action.php:598
+#. TRANS: Main menu option when logged in or when the StatusNet instance is not private.
+#: lib/action.php:611
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:620 lib/adminpanelaction.php:387
+#: lib/action.php:633 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "网站消息"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:687
+#: lib/action.php:700
msgid "Local views"
msgstr "本地显示"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:757
+#: lib/action.php:770
msgid "Page notice"
msgstr "页面消息"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:858
+#: lib/action.php:874
msgid "Secondary site navigation"
msgstr "副站导航"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:864
+#: lib/action.php:880
msgid "Help"
msgstr "帮助"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:867
+#: lib/action.php:883
msgid "About"
msgstr "关于"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:870
+#: lib/action.php:886
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:875
+#: lib/action.php:891
msgid "TOS"
msgstr "条款"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:879
+#: lib/action.php:895
msgid "Privacy"
msgstr "隐私"
#. TRANS: Secondary navigation menu option. Leads to information about StatusNet and its license.
-#: lib/action.php:882
+#: lib/action.php:898
msgid "Source"
msgstr "源码"
#. TRANS: Secondary navigation menu option leading to e-mail contact information on the
#. TRANS: StatusNet site, where to report bugs, ...
-#: lib/action.php:889
+#: lib/action.php:905
msgid "Contact"
msgstr "联系"
#. TRANS: Secondary navigation menu option. Leads to information about embedding a timeline widget.
-#: lib/action.php:892
+#: lib/action.php:908
msgid "Badge"
msgstr "挂件"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:921
+#: lib/action.php:937
msgid "StatusNet software license"
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
-#: lib/action.php:928
+#: lib/action.php:944
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
"broughtbyurl%%)。"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:931
+#: lib/action.php:947
#, php-format
msgid "**%%site.name%%** is a microblogging service."
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.
-#: lib/action.php:938
+#: lib/action.php:954
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:954
+#: lib/action.php:970
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:961
+#: lib/action.php:977
#, 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:968
+#: lib/action.php:984
#, 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:972
+#: lib/action.php:988
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:1004
+#: lib/action.php:1020
#, 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:1340
+#: lib/action.php:1356
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:1351
+#: lib/action.php:1367
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:1361
+#: lib/action.php:1377
msgid "Before"
msgstr "之前"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:120
+#: lib/activity.php:125
msgid "Expecting a root feed element but got a whole XML document."
msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
+#. TRANS: Client exception thrown when using an unknown verb for the activity importer.
+#: lib/activityimporter.php:81
+#, php-format
+msgid "Unknown verb: \"%s\"."
+msgstr "未知的动词：“%s”"
+
+#. TRANS: Client exception thrown when trying to force a subscription for an untrusted user.
+#: lib/activityimporter.php:107
+msgid "Cannot force subscription for untrusted user."
+msgstr "不能强迫不受信任的用户订阅。"
+
+#. TRANS: Client exception thrown when trying to for a remote user to subscribe.
+#: lib/activityimporter.php:117
+msgid "Cannot force remote user to subscribe."
+msgstr "不能强制远程用户订阅。"
+
+#. TRANS: Client exception thrown when trying to subscribe to an unknown profile.
+#: lib/activityimporter.php:132
+msgid "Unknown profile."
+msgstr "未知的配置文件"
+
+#. TRANS: Client exception thrown when trying to import an event not related to the importing user.
+#: lib/activityimporter.php:138
+msgid "This activity seems unrelated to our user."
+msgstr "这项活动似乎与我们的用户无关。"
+
+#. TRANS: Client exception thrown when trying to join a remote group that is not a group.
+#: lib/activityimporter.php:154
+msgid "Remote profile is not a group!"
+msgstr "远程配置文件不是一个组 ！"
+
+#. TRANS: Client exception thrown when trying to join a group the importing user is already a member of.
+#: lib/activityimporter.php:163
+msgid "User is already a member of this group."
+msgstr "用户已经是该小组成员。"
+
+#. TRANS: Client exception thrown when trying to import a notice by another user.
+#. TRANS: %1$s is the source URI of the notice, %2$s is the URI of the author.
+#: lib/activityimporter.php:201
+#, php-format
+msgid "Already know about notice %1$s and it has a different author %2$s."
+msgstr ""
+
+#. TRANS: Client exception thrown when trying to overwrite the author information for a non-trusted user during import.
+#: lib/activityimporter.php:207
+msgid "Not overwriting author info for non-trusted user."
+msgstr "不受信任的用户的信息不被重写。"
+
+#. TRANS: Client exception thrown when trying to import a notice without content.
+#. TRANS: %s is the notice URI.
+#: lib/activityimporter.php:223
+#, php-format
+msgid "No content for notice %s."
+msgstr "通知 %s 没有内容。"
+
+#: lib/activitymover.php:84
+#, php-format
+msgid "No such user %s."
+msgstr "没有这样的用户 %s。"
+
+#. TRANS: Client exception thrown when post to collection fails with a 400 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Server exception thrown when post to collection fails with a 500 status.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#. TRANS: Exception thrown when post to collection fails with a status that is not handled.
+#. TRANS: %1$s is a URL, %2$s is the status, %s$s is the fail reason.
+#: lib/activitysink.php:163 lib/activitysink.php:167 lib/activitysink.php:172
+#, php-format
+msgctxt "URLSTATUSREASON"
+msgid "%1$s %2$s %3$s"
+msgstr "%1$s %2$s %3$s"
+
#. TRANS: Client exception thrown when there is no source attribute.
#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
msgstr "用户配置"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:118
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:122
msgid "User"
msgstr "用户"
msgstr "无法找到请求 token 对应的用户和应用。"
#. TRANS: Exception thrown when no access token can be issued.
-#: lib/apioauthstore.php:186
+#: lib/apioauthstore.php:209
msgid "Could not issue access token."
msgstr "无法发行 access token。"
-#. TRANS: Server error displayed when a database error occurs.
-#: lib/apioauthstore.php:243
+#: lib/apioauthstore.php:317
msgid "Database error inserting OAuth application user."
msgstr "插入 OAuth 应用用户时数据库出错。"
+#: lib/apioauthstore.php:345
+msgid "Database error updating OAuth application user."
+msgstr "插入 OAuth 应用用户时数据库出错。"
+
#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
-#: lib/apioauthstore.php:285
+#: lib/apioauthstore.php:371
msgid "Tried to revoke unknown token."
msgstr "尝试了取消未知的 token。"
#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
-#: lib/apioauthstore.php:290
+#: lib/apioauthstore.php:376
msgid "Failed to delete revoked token."
msgstr "删除取消的 token 失败。"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:178
+#: lib/applicationeditform.php:182
msgid "Icon for this application"
msgstr "该应用的图标"
msgid "Revoke"
msgstr "取消"
-#: lib/atom10feed.php:112
-msgid "author element must contain a name element."
+#: lib/atom10feed.php:113
+msgid "Author element must contain a name element."
msgstr "作者元素必须包含一个名称元素。"
+#. TRANS: Server exception thrown when using the method setActivitySubject() in the class Atom10Feed.
+#: lib/atom10feed.php:160
+msgid "Do not use this method!"
+msgstr "不要使用此方法 ！"
+
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:294
+#: lib/attachmentlist.php:293
msgid "Author"
msgstr "作者"
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:308
+#: lib/attachmentlist.php:307
msgid "Provider"
msgstr "提供者"
#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
#. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:99 lib/command.php:630
+#: lib/command.php:99 lib/command.php:642
msgid "User has no last notice."
msgstr "用户没有最后一条的消息。"
"关注者： %2$s\\n\n"
"消息数： %3$s"
+#. TRANS: Error message text shown when a favorite could not be set because it has already been favorited.
+#: lib/command.php:298
+#, fuzzy
+msgid "Could not create favorite: already favorited."
+msgstr "无法创建收藏。"
+
#. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:312
+#: lib/command.php:324
msgid "Notice marked as fave."
-msgstr "æ¶\88æ\81¯è¢«æ \87记为æ\94¶è\97\8f。"
+msgstr "æ\94¶è\97\8fäº\86æ¶\88æ\81¯。"
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:357
+#: lib/command.php:369
#, php-format
msgid "%1$s joined group %2$s."
msgstr "%1$s加入了%2$s小组。"
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:405
+#: lib/command.php:417
#, php-format
msgid "%1$s left group %2$s."
msgstr "%1$s离开了%2$s小组。"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: lib/command.php:426
+#: lib/command.php:438
#, php-format
msgctxt "WHOIS"
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:430
+#: lib/command.php:442
#, 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.
#. TRANS: %s is a location.
-#: lib/command.php:434 lib/mail.php:278
+#: lib/command.php:446 lib/mail.php:270
#, 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.
#. TRANS: %s is a homepage.
-#: lib/command.php:438 lib/mail.php:282
+#: lib/command.php:450 lib/mail.php:274
#, php-format
msgid "Homepage: %s"
msgstr "主页：%s"
#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:442
+#: lib/command.php:454
#, 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).
#. TRANS: %s is a remote profile.
-#: lib/command.php:471
+#: lib/command.php:483
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
#. TRANS: Message given if content is too long. %1$sd is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:488
+#: lib/command.php:500
#, php-format
msgid "Message too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr[0] "消息太长了 - 最大长度为%1$d字符，你发送的是%2$d字符。"
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:516
+#: lib/command.php:528
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:553
+#: lib/command.php:565
#, 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:556
+#: lib/command.php:568
msgid "Error repeating notice."
msgstr "转发消息时出错。"
#. TRANS: Message given if content of a notice for a reply is too long. %1$d is used for plural.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:591
+#: lib/command.php:603
#, php-format
msgid "Notice too long - maximum is %1$d character, you sent %2$d."
msgid_plural "Notice too long - maximum is %1$d characters, you sent %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:604
+#: lib/command.php:616
#, 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:607
+#: lib/command.php:619
msgid "Error saving notice."
msgstr "保存消息时出错。"
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:654
+#: lib/command.php:666
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:663
+#: lib/command.php:675
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:671
+#: lib/command.php:683
#, 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:692 lib/command.php:803
+#: lib/command.php:704 lib/command.php:815
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:703
+#: lib/command.php:715
#, 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:723 lib/command.php:749
+#: lib/command.php:735 lib/command.php:761
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
#. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:727
+#: lib/command.php:739
msgid "Notification off."
msgstr "通知已关闭。"
#. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:730
+#: lib/command.php:742
msgid "Can't turn off notification."
msgstr "无法关闭通知。"
#. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:753
+#: lib/command.php:765
msgid "Notification on."
msgstr "通知已开启。"
#. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:756
+#: lib/command.php:768
msgid "Can't turn on notification."
msgstr "无法开启通知。"
#. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:770
+#: lib/command.php:782
msgid "Login command is disabled."
msgstr "登录命令被禁用。"
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
-#: lib/command.php:783
+#: lib/command.php:795
#, 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:812
+#: lib/command.php:824
#, 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:830
+#: lib/command.php:842
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:835
+#: lib/command.php:847
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:857
+#: lib/command.php:869
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:862
+#: lib/command.php:874
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:884
+#: lib/command.php:896
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:889
+#: lib/command.php:901
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:904
+#: lib/command.php:916
msgid ""
"Commands:\n"
"on - turn on notifications\n"
"tracking - 尚未实现。\n"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:147
+#: lib/common.php:162
msgid "No configuration file found."
msgstr "没有找到配置文件。"
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
#. TRANS: Is followed by a list of directories (separated by HTML breaks).
-#: lib/common.php:150
+#: lib/common.php:165
msgid "I looked for configuration files in the following places:"
msgstr "我在以下位置查找了配置文件："
#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
-#: lib/common.php:153
+#: lib/common.php:168
msgid "You may wish to run the installer to fix this."
msgstr "或许你想运行安装程序来解决这个问题。"
#. 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:157
+#: lib/common.php:172
msgid "Go to the installer."
msgstr "去安装程序。"
#. TRANS: Label in form on profile design page.
#. TRANS: Field contains file name on user's computer that could be that user's custom profile background image.
-#: lib/designsettings.php:104
+#: lib/designsettings.php:108
msgid "Upload file"
msgstr "上传文件"
#. TRANS: Instructions for form on profile design page.
-#: lib/designsettings.php:109
+#: lib/designsettings.php:113
msgid ""
"You can upload your personal background image. The maximum file size is 2MB."
msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
msgid "Off"
msgstr "关闭"
-#. TRANS: Button text on profile design page to reset all colour settings to default without saving.
-#: lib/designsettings.php:264
-msgctxt "BUTTON"
-msgid "Reset"
-msgstr "重置"
+#. TRANS: Fieldset legend on profile design page to change profile page colours.
+#: lib/designsettings.php:175
+msgid "Change colours"
+msgstr "改变颜色"
+
+#. TRANS: Button text on profile design page to immediately reset all colour settings to default.
+#: lib/designsettings.php:257
+msgid "Use defaults"
+msgstr "使用默认值"
+
+#. TRANS: Error message displayed if design settings could not be saved.
+#. TRANS: Error message displayed if design settings could not be saved after clicking "Use defaults".
+#: lib/designsettings.php:405 lib/designsettings.php:427
+msgid "Couldn't update your design."
+msgstr "无法更新你的外观。"
#. TRANS: Success message displayed if design settings were saved after clicking "Use defaults".
#: lib/designsettings.php:433
msgid "Design defaults restored."
msgstr "默认外观已恢复。"
-#: lib/disfavorform.php:114 lib/disfavorform.php:144
+#. TRANS: Exception. %s is an ID.
+#: lib/discovery.php:153
+#, php-format
+msgid "Unable to find services for %s."
+msgstr "无法找到 %s 的服务。"
+
+#. TRANS: Form legend for removing the favourite status for a favourite notice.
+#. TRANS: Title for button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:108 lib/disfavorform.php:140
msgid "Disfavor this notice"
msgstr "取消收藏这个消息"
-#: lib/favorform.php:114 lib/favorform.php:143
+#. TRANS: Button text for removing the favourite status for a favourite notice.
+#: lib/disfavorform.php:136
+msgctxt "BUTTON"
+msgid "Disfavor favorite"
+msgstr "不赞成的最爱"
+
+#. TRANS: Form legend for adding the favourite status to a notice.
+#. TRANS: Title for button text for adding the favourite status to a notice.
+#: lib/favorform.php:108 lib/favorform.php:139
msgid "Favor this notice"
msgstr "收藏"
+#. TRANS: Button text for adding the favourite status to a notice.
+#: lib/favorform.php:135
+msgctxt "BUTTON"
+msgid "Favor"
+msgstr "请"
+
#: lib/feed.php:84
msgid "RSS 1.0"
msgstr "RSS 1.0"
msgid "FOAF"
msgstr "FOAF"
+#: lib/feedimporter.php:75
+msgid "Not an atom feed."
+msgstr "不是一个Atom源"
+
+#: lib/feedimporter.php:82
+msgid "No author in the feed."
+msgstr "没有在源中的作者。"
+
+#: lib/feedimporter.php:89
+msgid "Can't import without a user."
+msgstr "没有用户无法导入。"
+
#. TRANS: Header for feed links (h2).
#: lib/feedlist.php:66
msgid "Feeds"
msgid "Grant this user the \"%s\" role"
msgstr "给这个用户添加\\\"%s\\\"权限"
-#: lib/groupeditform.php:154
+#: lib/groupeditform.php:147
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个小写字母或数字，不包含标点或空格"
-#: lib/groupeditform.php:163
+#: lib/groupeditform.php:156
msgid "URL of the homepage or blog of the group or topic."
msgstr "这个小组或主题的主页或博客 URL。"
-#: lib/groupeditform.php:168
+#: lib/groupeditform.php:161
msgid "Describe the group or topic"
msgstr "小组或主题的描述"
-#: lib/groupeditform.php:170
+#: lib/groupeditform.php:163
#, php-format
msgid "Describe the group or topic in %d character or less"
msgid_plural "Describe the group or topic in %d characters or less"
msgstr[0] "用不超过%d个字符描述下这个小组或者主题"
-#: lib/groupeditform.php:182
+#: lib/groupeditform.php:175
msgid ""
"Location for the group, if any, like \"City, State (or Region), Country\"."
msgstr "小组的地理位置，例如“国家、省份、城市”。"
-#: lib/groupeditform.php:190
+#: lib/groupeditform.php:183
#, php-format
msgid ""
"Extra nicknames for the group, separated with commas or spaces. Maximum %d "
msgid "This page is not available in a media type you accept"
msgstr "这个页面不提供你想要的媒体类型"
-#: lib/imagefile.php:72
+#. TRANS: Exception thrown when trying to upload an unsupported image file format.
+#: lib/imagefile.php:73
msgid "Unsupported image file format."
msgstr "不支持这种图像格式。"
#. TRANS: Exception thrown when too large a file is uploaded.
#. TRANS: %s is the maximum file size, for example "500b", "10kB" or "2MB".
-#: lib/imagefile.php:90
+#: lib/imagefile.php:91
#, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "文件太大。文件大小限制在%s以下。"
-#: lib/imagefile.php:95
+#. TRANS: Exception thrown when uploading an image and that action could not be completed.
+#: lib/imagefile.php:97
msgid "Partial upload."
msgstr "部分上传。"
-#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
-#: lib/imagefile.php:103 lib/mediafile.php:228
-msgid "System error uploading file."
-msgstr "上传文件时出错。"
-
-#: lib/imagefile.php:111
+#. TRANS: Exception thrown when uploading a file as image that is not an image or is a corrupt file.
+#: lib/imagefile.php:115
msgid "Not an image or corrupt file."
msgstr "不是图片文件或文件已损坏。"
-#: lib/imagefile.php:160
+#. TRANS: Exception thrown during resize when image has been registered as present, but is no longer there.
+#: lib/imagefile.php:178
msgid "Lost our file."
msgstr "文件数据丢失"
-#: lib/imagefile.php:197 lib/imagefile.php:237
+#. TRANS: Exception thrown when trying to resize an unknown file type.
+#. TRANS: Exception thrown when trying resize an unknown file type.
+#: lib/imagefile.php:216 lib/imagefile.php:257
msgid "Unknown file type"
msgstr "未知文件类型"
#. TRANS: Number of megabytes. %d is the number.
-#: lib/imagefile.php:283
+#: lib/imagefile.php:303
#, php-format
msgid "%dMB"
msgid_plural "%dMB"
msgstr[0] "%dMB"
#. TRANS: Number of kilobytes. %d is the number.
-#: lib/imagefile.php:287
+#: lib/imagefile.php:307
#, php-format
msgid "%dkB"
msgid_plural "%dkB"
msgstr[0] "%dkB"
#. TRANS: Number of bytes. %d is the number.
-#: lib/imagefile.php:290
+#: lib/imagefile.php:310
#, php-format
msgid "%dB"
msgid_plural "%dB"
msgid "Leave"
msgstr "离开"
-#: lib/logingroupnav.php:80
+#. TRANS: Title for menu item for logging in to the StatusNet site.
+#: lib/logingroupnav.php:79
msgid "Login with a username and password"
msgstr "用用户名和密码登录。"
-#: lib/logingroupnav.php:86
+#. TRANS: Title for menu item for registering with the StatusNet site.
+#: lib/logingroupnav.php:87
msgid "Sign up for a new account"
msgstr "注册一个新帐户"
#. TRANS: Subject for address confirmation email.
-#: lib/mail.php:174
+#: lib/mail.php:168
msgid "Email address confirmation"
msgstr "电子邮件地址确认"
#. TRANS: Body for address confirmation email.
#. 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
+#: lib/mail.php:173
#, php-format
msgid ""
"Hey, %1$s.\n"
#. 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
+#: lib/mail.php:238
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注你在 %2$s 的消息。"
#. 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
+#: lib/mail.php:245
#, php-format
msgid ""
"If you believe this account is being used abusively, you can block them from "
#. 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
+#: lib/mail.php:255
#, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
#. TRANS: Profile info line in new-subscriber notification e-mail.
#. TRANS: %s is biographical information.
-#: lib/mail.php:286
+#: lib/mail.php:278
#, php-format
msgid "Bio: %s"
msgstr "自我介绍：%s"
#. TRANS: Subject of notification mail for new posting email address.
#. TRANS: %s is the StatusNet sitename.
-#: lib/mail.php:315
+#: lib/mail.php:307
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电子邮件地址，用于发布 %s 信息"
#. 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
+#: lib/mail.php:313
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
#. TRANS: Subject line for SMS-by-email notification messages.
#. TRANS: %s is the posting user's nickname.
-#: lib/mail.php:442
+#: lib/mail.php:434
#, php-format
msgid "%s status"
msgstr "%s 状态"
#. TRANS: Subject line for SMS-by-email address confirmation message.
-#: lib/mail.php:468
+#: lib/mail.php:460
msgid "SMS confirmation"
msgstr "SMS 验证"
#. TRANS: Main body heading for SMS-by-email address confirmation message.
#. TRANS: %s is the addressed user's nickname.
-#: lib/mail.php:472
+#: lib/mail.php:464
#, php-format
msgid "%s: confirm you own this phone number with this code:"
msgstr "%s：通过此代码证明这是你的手机："
#. TRANS: Subject for 'nudge' notification email.
#. TRANS: %s is the nudging user.
-#: lib/mail.php:493
+#: lib/mail.php:485
#, php-format
-msgid "You've been nudged by %s"
-msgstr "你被%s呼叫了"
+msgid "You have been nudged by %s"
+msgstr "您被 %s 已推动"
#. 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
+#: lib/mail.php:492
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
#. TRANS: Subject for direct-message notification email.
#. TRANS: %s is the sending user's nickname.
-#: lib/mail.php:547
+#: lib/mail.php:539
#, php-format
msgid "New private message from %s"
msgstr "来自%s的私信"
#. 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
+#: lib/mail.php:547
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
#. 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:607
+#: lib/mail.php:599
#, php-format
msgid "%1$s (@%2$s) added your notice as a favorite"
msgstr "%1$s (@%2$s) 收藏了你的消息"
#. 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:614
+#: lib/mail.php:606
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
"%6$s\n"
#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
-#: lib/mail.php:672
+#: lib/mail.php:664
#, php-format
msgid ""
"The full conversation can be read here:\n"
#. 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:680
+#: lib/mail.php:672
#, php-format
msgid "%1$s (@%2$s) sent a notice to your attention"
msgstr "%1$s (@%2$s) 给你发送了一条消息"
#. 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:688
+#: lib/mail.php:680
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
"\n"
"P.S. 你可以到这里关掉这些邮件提醒：%8$s\n"
-#: lib/mailbox.php:89
+#: lib/mailbox.php:87
msgid "Only the user can read their own mailboxes."
msgstr "只有该用户才能查看自己的私信。"
-#: lib/mailbox.php:139
+#: lib/mailbox.php:125
msgid ""
"You have no private messages. You can send private message to engage other "
"users in conversation. People can send you messages for your eyes only."
"你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
"发给你你私信只有你看得到。"
-#: lib/mailbox.php:228 lib/noticelist.php:521
-msgid "from"
-msgstr "通过"
-
#: lib/mailhandler.php:37
msgid "Could not parse message."
msgstr "无法解析消息。"
msgid "There was a database error while saving your file. Please try again."
msgstr "保存你的文件时数据库出现了一个错误。请重试。"
-#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
-#: lib/mediafile.php:194
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
-msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:200
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form."
-msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
-
-#. TRANS: Client exception.
-#: lib/mediafile.php:206
-msgid "The uploaded file was only partially uploaded."
-msgstr "上传的文件只有部分被上传。"
-
-#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
-#: lib/mediafile.php:214
-msgid "Missing a temporary folder."
-msgstr "缺少一个临时文件夹。"
-
-#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
-#: lib/mediafile.php:218
-msgid "Failed to write file to disk."
-msgstr "写入磁盘失败。"
-
-#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
-#: lib/mediafile.php:222
-msgid "File upload stopped by extension."
-msgstr "文件上传被扩展停止了。"
-
#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
#: lib/mediafile.php:238 lib/mediafile.php:281
msgid "File exceeds user's quota."
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
#. TRANS: the MIME type that was denied.
-#: lib/mediafile.php:394
+#: lib/mediafile.php:396
#, php-format
msgid ""
"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
#. TRANS: %s is the file type that was denied.
-#: lib/mediafile.php:399
+#: lib/mediafile.php:401
#, php-format
msgid "\"%s\" is not a supported file type on this server."
msgstr "这个服务器不支持 %s 的文件格式。"
#. TRANS Label entry in drop-down selection box in direct-message inbox/outbox. This is the default entry in the drop-down box, doubling as instructions and a brake against accidental submissions with the first user in the list.
#: lib/messageform.php:137
-#, fuzzy
msgid "Select recipient:"
-msgstr "选择许可协议"
+msgstr "选择收件人："
#. TRANS Entry in drop-down selection box in direct-message inbox/outbox when no one is available to message.
#: lib/messageform.php:150
-#, fuzzy
msgid "No mutual subscribers."
-msgstr "æ\9cªå\85³æ³¨ï¼\81"
+msgstr "没æ\9c\89å\85±å\90\8cç\9a\84å\85³æ³¨è\80\85ã\80\82"
#: lib/messageform.php:153
msgid "To"
msgid "Send"
msgstr "发布"
+#: lib/messagelist.php:77
+msgid "Messages"
+msgstr "消息"
+
+#: lib/messagelistitem.php:123 lib/noticelist.php:522
+msgid "from"
+msgstr "通过"
+
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:145
+#: lib/nickname.php:165
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字且不能使用空格。"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:158
+#: lib/nickname.php:178
msgid "Nickname cannot be empty."
-msgstr ""
+msgstr "昵称不能为空。"
#. TRANS: Validation error in form for registration, profile and group settings, etc.
-#: lib/nickname.php:171
+#: lib/nickname.php:191
#, php-format
msgid "Nickname cannot be more than %d character long."
msgid_plural "Nickname cannot be more than %d characters long."
-msgstr[0] ""
+msgstr[0] "昵称长度不能超过%d字符。"
#: lib/noticeform.php:160
msgid "Send a notice"
msgid "What's up, %s?"
msgstr "%s，最近怎么样？"
-#: lib/noticeform.php:193
+#: lib/noticeform.php:194
msgid "Attach"
msgstr "附件"
-#: lib/noticeform.php:197
+#: lib/noticeform.php:198
msgid "Attach a file"
msgstr "添加一个文件附件"
msgstr "抱歉，获取你的地理位置时间过长，请稍候重试"
#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:451
+#: lib/noticelist.php:452
msgid "N"
msgstr "N"
#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:453
+#: lib/noticelist.php:454
msgid "S"
msgstr "S"
#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:455
+#: lib/noticelist.php:456
msgid "E"
msgstr "E"
#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:457
+#: lib/noticelist.php:458
msgid "W"
msgstr "W"
-#: lib/noticelist.php:459
+#: lib/noticelist.php:460
#, 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:468
+#: lib/noticelist.php:469
msgid "at"
msgstr "位于"
-#: lib/noticelist.php:517
+#: lib/noticelist.php:518
msgid "web"
msgstr "网页"
-#: lib/noticelist.php:583
+#: lib/noticelist.php:584
msgid "in context"
msgstr "查看对话"
-#: lib/noticelist.php:618
+#: lib/noticelist.php:619
msgid "Repeated by"
msgstr "转发来自"
-#: lib/noticelist.php:645
+#: lib/noticelist.php:646
msgid "Reply to this notice"
msgstr "回复"
-#: lib/noticelist.php:646
+#: lib/noticelist.php:647
msgid "Reply"
msgstr "回复"
-#: lib/noticelist.php:690
+#: lib/noticelist.php:691
msgid "Notice repeated"
msgstr "消息已转发"
msgid "Couldn't insert new subscription."
msgstr "无法添加新的关注。"
-#: lib/personalgroupnav.php:102
-msgid "Personal"
-msgstr "我的主页"
-
+#. TRANS: Personal group navigation menu option when logged in for viewing @-replies.
#: lib/personalgroupnav.php:107
+msgctxt "MENU"
msgid "Replies"
-msgstr "回复"
+msgstr "答复"
+
+#. TRANS: Personal group navigation menu option when logged in for seeing own profile.
+#: lib/personalgroupnav.php:114
+msgctxt "MENU"
+msgid "Profile"
+msgstr "配置文件"
-#: lib/personalgroupnav.php:117
+#. TRANS: Personal group navigation menu option when logged in for viewing own favourited notices.
+#: lib/personalgroupnav.php:120
+msgctxt "MENU"
msgid "Favorites"
msgstr "收藏夹"
-#: lib/personalgroupnav.php:128
+#. TRANS: Personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:133
+msgctxt "MENU"
msgid "Inbox"
msgstr "收件箱"
-#: lib/personalgroupnav.php:129
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing recieved personal messages.
+#: lib/personalgroupnav.php:135
msgid "Your incoming messages"
msgstr "你收到的私信"
-#: lib/personalgroupnav.php:133
+#. TRANS: Personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:140
+msgctxt "MENU"
msgid "Outbox"
msgstr "发件箱"
-#: lib/personalgroupnav.php:134
+#. TRANS: Tooltip for personal group navigation menu option when logged in for viewing senet personal messages.
+#: lib/personalgroupnav.php:142
msgid "Your sent messages"
msgstr "你发送的私信"
+#. TRANS: Title for personal tag cloud section. %s is a user nickname.
#: lib/personaltagcloudsection.php:56
#, php-format
msgid "Tags in %s's notices"
msgstr "%s的消息中的标签"
#. TRANS: Displayed as version information for a plugin if no version information was found.
-#: lib/plugin.php:121
+#: lib/plugin.php:126
msgid "Unknown"
msgstr "未知的"
-#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
+#. TRANS: H2 text for user subscription statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:127 lib/profileaction.php:225 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "关注的"
-#: lib/profileaction.php:126
+#. TRANS: Text for user subscription statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:144
msgid "All subscriptions"
msgstr "所有关注的"
-#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
+#. TRANS: H2 text for user subscriber statistics.
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:164 lib/profileaction.php:232 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "关注者"
-#: lib/profileaction.php:161
+#. TRANS: Text for user subscription statistics if user has more subscribers than displayed.
+#: lib/profileaction.php:181
msgid "All subscribers"
msgstr "所有关注者"
-#: lib/profileaction.php:191
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:213
msgid "User ID"
msgstr "用户 ID"
-#: lib/profileaction.php:196
+#. TRANS: Label for user statistics.
+#: lib/profileaction.php:219
msgid "Member since"
msgstr "注册时间"
-#. TRANS: Average count of posts made per day since account registration
-#: lib/profileaction.php:235
+#. TRANS: Label for user statistics.
+#. TRANS: H2 text for user group membership statistics.
+#: lib/profileaction.php:239 lib/profileaction.php:290
+#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "小组"
+
+#. TRANS: Label for user statistics.
+#. TRANS: Average count of posts made per day since account registration.
+#: lib/profileaction.php:253
msgid "Daily average"
msgstr "日均"
-#: lib/profileaction.php:264
+#. TRANS: Text for user group membership statistics if user has more subscriptions than displayed.
+#: lib/profileaction.php:305
msgid "All groups"
msgstr "所有小组"
+#. TRANS: Server error displayed when using an unimplemented method.
#: lib/profileformaction.php:123
msgid "Unimplemented method."
msgstr "未使用的方法。"
msgstr "取消这个用户的\"%s\"权限"
#. TRANS: Client error on action trying to visit a non-existing page.
-#: lib/router.php:938
+#: lib/router.php:974
msgid "Page not found."
msgstr "没有找到页面。"
msgid "User %1$s (%2$d) has no profile record."
msgstr "用户 %1$s (%2$d) 没有个人信息记录。"
-#: lib/userprofile.php:119
+#. TRANS: Link text for changeing the avatar of the logged in user.
+#: lib/userprofile.php:121
msgid "Edit Avatar"
msgstr "编辑头像"
-#: lib/userprofile.php:236 lib/userprofile.php:250
+#. TRANS: H2 for user actions in a profile.
+#. TRANS: H2 for entity actions in a profile.
+#: lib/userprofile.php:245 lib/userprofile.php:261
msgid "User actions"
msgstr "用户动作"
-#: lib/userprofile.php:239
+#. TRANS: Text shown in user profile of not yet compeltely deleted users.
+#: lib/userprofile.php:249
msgid "User deletion in progress..."
msgstr "用户删除处理中……"
-#: lib/userprofile.php:265
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:277
msgid "Edit profile settings"
msgstr "编辑个人信息设置"
-#: lib/userprofile.php:266
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:279
msgid "Edit"
msgstr "编辑"
-#: lib/userprofile.php:289
+#. TRANS: Link title for link on user profile.
+#: lib/userprofile.php:303
msgid "Send a direct message to this user"
msgstr "给该用户发送私信"
-#: lib/userprofile.php:290
+#. TRANS: Link text for link on user profile.
+#: lib/userprofile.php:305
msgid "Message"
msgstr "私信"
-#: lib/userprofile.php:331
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:347
msgid "Moderate"
msgstr "审核"
-#: lib/userprofile.php:369
+#. TRANS: Label text on user profile to select a user role.
+#: lib/userprofile.php:386
msgid "User role"
msgstr "用户权限"
-#: lib/userprofile.php:371
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:389
msgctxt "role"
msgid "Administrator"
msgstr "管理员"
-#: lib/userprofile.php:372
+#. TRANS: Role that can be set for a user profile.
+#: lib/userprofile.php:391
msgctxt "role"
msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1276
+#: lib/util.php:1306
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1279
+#: lib/util.php:1309
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1283
+#: lib/util.php:1313
#, php-format
msgid "about one minute ago"
msgid_plural "about %d minutes ago"
msgstr[0] "约%d分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1286
+#: lib/util.php:1316
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1290
+#: lib/util.php:1320
#, php-format
msgid "about one hour ago"
msgid_plural "about %d hours ago"
msgstr[0] "约%d小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1293
+#: lib/util.php:1323
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1297
+#: lib/util.php:1327
#, php-format
msgid "about one day ago"
msgid_plural "about %d days ago"
msgstr[0] "约%d天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1300
+#: lib/util.php:1330
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1304
+#: lib/util.php:1334
#, php-format
msgid "about one month ago"
msgid_plural "about %d months ago"
msgstr[0] "约%d个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1307
+#: lib/util.php:1337
msgid "about a year ago"
msgstr "约1年前"
-#: lib/webcolor.php:80
-#, php-format
-msgid "%s is not a valid color!"
-msgstr "%s不是有效的颜色！"
-
-#. TRANS: Validation error for a web colour.
-#. TRANS: %s is the provided (invalid) text for colour.
-#: lib/webcolor.php:120
+#. TRANS: Web color exception thrown when a hexadecimal color code does not validate.
+#. TRANS: %s is the provided (invalid) color code.
+#: lib/webcolor.php:81 lib/webcolor.php:121
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex characters."
msgstr "%s不是有效的颜色！应使用3或6个十六进制字符。"
msgstr[0] "消息太长了，不能超过%1$d个字符，你发送的是%2$d。"
#. TRANS: Exception.
-#: lib/xrd.php:64
-#, fuzzy
+#: lib/xrd.php:63
msgid "Invalid XML."
-msgstr "大小不正确。"
+msgstr "无效的 XML。"
#. TRANS: Exception.
-#: lib/xrd.php:69
+#: lib/xrd.php:68
msgid "Invalid XML, missing XRD root."
-msgstr ""
+msgstr "不合法的XML, 缺少XRD根"
#. TRANS: Commandline script output. %s is the filename that contains a backup for a user.
-#: scripts/restoreuser.php:61
+#: scripts/restoreuser.php:62
#, php-format
msgid "Getting backup from file '%s'."
msgstr "从文件'%s'获取备份。"
-#. TRANS: Commandline script output.
-#: scripts/restoreuser.php:91
-msgid "No user specified; using backup user."
-msgstr "没有用户被指定；使用备份用户。"
+#~ msgid "Block this user."
+#~ msgstr "屏蔽这个用户"
-#. TRANS: Commandline script output. %d is the number of entries in the activity stream in backup; used for plural.
-#: scripts/restoreuser.php:98
-#, php-format
-msgid "%d entry in backup."
-msgid_plural "%d entries in backup."
-msgstr[0] "备份中有 %d 个条目。"
+#~ msgid "Delete this notice."
+#~ msgstr "删除此通知。"
+
+#~ msgid "Delete this user."
+#~ msgstr "删除此用户。"
+
+#~ msgid "Restore default designs."
+#~ msgstr "还原默认设计。"
+
+#~ msgid "Reset back to default."
+#~ msgstr "重置回默认值。"
+
+#~ msgid "Save design."
+#~ msgstr "保存设计。"
+
+#~ msgid "Disfavor favorite."
+#~ msgstr "不是赞成的最爱。"
+
+#~ msgid "\"%s\" not found."
+#~ msgstr "找不到\"%s\"。"
+
+#~ msgid "Notice %s not found."
+#~ msgstr "找不到 %s 的通知。"
+
+#~ msgid "Attachment %s not found."
+#~ msgstr "找不到 %s 的附件。"
+
+#~ msgid "\"%s\" not supported for oembed requests."
+#~ msgstr "\"%s\"不支持 oembed 的请求。"
+
+#~ msgid "Invalid tag: \"%s\"."
+#~ msgstr "无效的标记： %s。"
+
+#, fuzzy
+#~ msgid "%s updates from everyone."
+#~ msgstr "%s条来自所有人的消息！"
+
+#~ msgid "Password saved"
+#~ msgstr "密码已保存。"
+
+#~ msgid "Where you are, like \"City, State (or Region), Country\"."
+#~ msgstr "你在哪里，像\"城市、 国家（或地区）、国家\"。"
+
+#~ msgid "Subscribe to this user."
+#~ msgstr "订阅此用户。"
+
+#, fuzzy
+#~ msgid ""
+#~ "Listenee stream license \"%1$s\" is not compatible with site license \"%2"
+#~ "$s\"."
+#~ msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
+
+#~ msgid "Not allowed to log in."
+#~ msgstr "不允许登录。"
projects / quix0rs-gnu-social.git / blobdiff