summaryrefslogtreecommitdiff
path: root/locale/zh_CN/LC_MESSAGES
diff options
context:
space:
mode:
Diffstat (limited to 'locale/zh_CN/LC_MESSAGES')
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po1878
1 files changed, 1169 insertions, 709 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index cc1761616..e38cda2ec 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-06 23:49+0000\n"
-"PO-Revision-Date: 2010-03-06 23:51:13+0000\n"
+"POT-Creation-Date: 2010-04-24 14:16+0000\n"
+"PO-Revision-Date: 2010-04-26 22:18:51+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r65552); Translate extension (2010-04-25)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -23,7 +23,7 @@ msgstr ""
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:375
#, fuzzy
msgid "Access"
msgstr "接受"
@@ -43,7 +43,7 @@ msgstr "注册"
#. TRANS: Checkbox instructions for admin setting "Private"
#: actions/accessadminpanel.php:165
msgid "Prohibit anonymous users (not logged in) from viewing site?"
-msgstr ""
+msgstr "要禁止匿名用户(未登录)浏览网站吗?"
#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
#: actions/accessadminpanel.php:167
@@ -55,7 +55,7 @@ msgstr "隐私"
#. TRANS: Checkbox instructions for admin setting "Invite only"
#: actions/accessadminpanel.php:174
msgid "Make registration invitation only."
-msgstr ""
+msgstr "只允许邀请注册。"
#. TRANS: Checkbox label for configuring site as invite only.
#: actions/accessadminpanel.php:176
@@ -66,13 +66,13 @@ msgstr "邀请"
#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
#: actions/accessadminpanel.php:183
msgid "Disable new registrations."
-msgstr ""
+msgstr "禁止新用户注册"
#. TRANS: Checkbox label for disabling new user registrations.
#: actions/accessadminpanel.php:185
#, fuzzy
msgid "Closed"
-msgstr "阻止"
+msgstr "已关闭"
#. TRANS: Title / tooltip for button to save access settings in site admin panel
#: actions/accessadminpanel.php:202
@@ -80,7 +80,13 @@ msgstr "阻止"
msgid "Save access settings"
msgstr "头像设置"
-#: actions/accessadminpanel.php:203
+#. TRANS: Button label to save e-mail preferences.
+#. TRANS: Button label to save IM preferences.
+#. TRANS: Button label to save SMS preferences.
+#. TRANS: Button label
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
+#: actions/imsettings.php:184 actions/smssettings.php:209
+#: lib/applicationeditform.php:361
#, fuzzy
msgctxt "BUTTON"
msgid "Save"
@@ -89,7 +95,8 @@ msgstr "保存"
#. TRANS: Server error when page not found (404)
#: actions/all.php:64 actions/public.php:98 actions/replies.php:93
#: actions/showfavorites.php:138 actions/tag.php:52
-msgid "No such page"
+#, fuzzy
+msgid "No such page."
msgstr "没有该页面"
#: actions/all.php:75 actions/allrss.php:68
@@ -100,9 +107,9 @@ msgstr "没有该页面"
#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
-#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
-#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87
-#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:72
+#: actions/apistatusesupdate.php:239 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:71 actions/apitimelinefriends.php:173
#: actions/apitimelinehome.php:79 actions/apitimelinementions.php:79
#: actions/apitimelineuser.php:81 actions/avatarbynickname.php:75
#: actions/favoritesrss.php:74 actions/foaf.php:40 actions/foaf.php:58
@@ -110,24 +117,23 @@ msgstr "没有该页面"
#: actions/otp.php:76 actions/remotesubscribe.php:145
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
-#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:163 lib/command.php:302
-#: lib/command.php:355 lib/command.php:401 lib/command.php:462
-#: lib/command.php:518 lib/galleryaction.php:59 lib/mailbox.php:82
-#: lib/profileaction.php:77
+#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
+#: actions/xrds.php:71 lib/command.php:478 lib/galleryaction.php:59
+#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "没有这个用户。"
#. TRANS: Page title. %1$s is user nickname, %2$d is page number
#: actions/all.php:86
-#, fuzzy, php-format
+#, php-format
msgid "%1$s and friends, page %2$d"
-msgstr "%s 及好友"
+msgstr "%1$s 和好友,第%2$d页"
#. TRANS: Page title. %1$s is user nickname
#. TRANS: H1 text. %1$s is user nickname
-#: actions/all.php:89 actions/all.php:181 actions/allrss.php:115
-#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
+#. TRANS: Message is used as link title. %s is a user nickname.
+#: actions/all.php:89 actions/all.php:181 actions/allrss.php:116
+#: actions/apitimelinefriends.php:209 actions/apitimelinehome.php:115
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
@@ -182,12 +188,13 @@ msgstr ""
#. TRANS: H1 text
#: actions/all.php:178
-#, fuzzy
msgid "You and friends"
-msgstr "%s 及好友"
+msgstr "你和好友"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:119
-#: actions/apitimelinehome.php:120
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle. %1$s is a user nickname, %2$s is a site name.
+#: actions/allrss.php:121 actions/apitimelinefriends.php:215
+#: actions/apitimelinehome.php:121
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "来自%2$s 上 %1$s 和好友的更新!"
@@ -202,18 +209,18 @@ msgstr "来自%2$s 上 %1$s 和好友的更新!"
#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:138
#: actions/apigroupismember.php:114 actions/apigroupjoin.php:155
-#: actions/apigroupleave.php:141 actions/apigrouplist.php:132
-#: actions/apigrouplistall.php:120 actions/apigroupmembership.php:106
+#: actions/apigroupleave.php:141 actions/apigrouplist.php:136
+#: actions/apigrouplistall.php:121 actions/apigroupmembership.php:106
#: actions/apigroupshow.php:115 actions/apihelptest.php:88
#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
-#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:141
#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
-#: actions/apitimelinefavorites.php:183 actions/apitimelinefriends.php:187
-#: actions/apitimelinegroup.php:160 actions/apitimelinehome.php:184
-#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:148
+#: actions/apitimelinefavorites.php:173 actions/apitimelinefriends.php:270
+#: actions/apitimelinegroup.php:151 actions/apitimelinehome.php:174
+#: actions/apitimelinementions.php:173 actions/apitimelinepublic.php:240
#: actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
-#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:160
+#: actions/apitimelineuser.php:162 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
msgstr "API 方法未实现!"
@@ -227,15 +234,15 @@ msgstr "API 方法未实现!"
#: actions/apifavoritecreate.php:90 actions/apifavoritedestroy.php:91
#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
#: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91
-#: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65
-#: actions/apistatusesupdate.php:118
+#: actions/apigroupleave.php:91 actions/apimediaupload.php:67
+#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:209
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
#: actions/apiaccountupdatedeliverydevice.php:105
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
-"none"
+"none."
msgstr ""
#: actions/apiaccountupdatedeliverydevice.php:132
@@ -248,7 +255,7 @@ msgstr "无法更新用户。"
#: actions/apiaccountupdateprofilecolors.php:185
#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
-#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66
+#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "用户没有个人信息。"
@@ -259,9 +266,9 @@ msgid "Could not save profile."
msgstr "无法保存个人信息。"
#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97
-#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257
-#: actions/designadminpanel.php:122 actions/editapplication.php:118
+#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
+#: actions/apistatusesupdate.php:222 actions/avatarsettings.php:257
+#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
#, php-format
@@ -347,7 +354,7 @@ msgstr "没有找到此ID的信息。"
msgid "This status is already a favorite."
msgstr "已收藏此通告!"
-#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:285
msgid "Could not create favorite."
msgstr "无法创建收藏。"
@@ -442,10 +449,9 @@ msgstr "位置过长(不能超过255个字符)。"
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:266 actions/editgroup.php:228
-#: actions/newgroup.php:168
+#: actions/apigroupcreate.php:266
#, fuzzy, php-format
-msgid "Invalid alias: \"%s\""
+msgid "Invalid alias: \"%s\"."
msgstr "主页'%s'不正确"
#: actions/apigroupcreate.php:275 actions/editgroup.php:232
@@ -463,7 +469,7 @@ msgstr ""
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91
#, fuzzy
-msgid "Group not found!"
+msgid "Group not found."
msgstr "API 方法未实现!"
#: actions/apigroupjoin.php:110 actions/joingroup.php:100
@@ -471,7 +477,7 @@ msgstr "API 方法未实现!"
msgid "You are already a member of that group."
msgstr "您已经是该组成员"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:327
msgid "You have been blocked from that group by the admin."
msgstr ""
@@ -490,17 +496,26 @@ msgstr "您未告知此个人信息"
msgid "Could not remove user %1$s from group %2$s."
msgstr "无法订阅用户:未找到。"
-#: actions/apigrouplist.php:95
+#. TRANS: %s is a user name
+#: actions/apigrouplist.php:97
#, fuzzy, php-format
msgid "%s's groups"
msgstr "%s 群组"
-#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#. TRANS: Meant to convey the user %2$s is a member of each of the groups listed on site %1$s
+#: actions/apigrouplist.php:107
+#, fuzzy, php-format
+msgid "%1$s groups %2$s is a member of."
+msgstr "%s 组是成员组成了"
+
+#. TRANS: Message is used as a title. %s is a site name.
+#. TRANS: Message is used as a page title. %s is a nick name.
+#: actions/apigrouplistall.php:91 actions/usergroups.php:63
#, php-format
msgid "%s groups"
msgstr "%s 群组"
-#: actions/apigrouplistall.php:94
+#: actions/apigrouplistall.php:95
#, fuzzy, php-format
msgid "groups on %s"
msgstr "组动作"
@@ -515,17 +530,17 @@ msgid "Invalid token."
msgstr "大小不正确。"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
-#: actions/deletenotice.php:157 actions/disfavor.php:74
-#: actions/emailsettings.php:238 actions/favor.php:75 actions/geocode.php:54
+#: actions/deletenotice.php:169 actions/disfavor.php:74
+#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:54
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/groupunblock.php:66 actions/imsettings.php:227
#: actions/invite.php:56 actions/login.php:115 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
#: actions/othersettings.php:145 actions/passwordsettings.php:138
-#: actions/profilesettings.php:194 actions/recoverpassword.php:337
+#: actions/profilesettings.php:194 actions/recoverpassword.php:350
#: actions/register.php:165 actions/remotesubscribe.php:77
-#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
+#: actions/repeat.php:83 actions/smssettings.php:256 actions/subedit.php:38
#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
@@ -559,12 +574,15 @@ msgstr ""
msgid "The request token %s has been denied and revoked."
msgstr ""
+#. TRANS: Message given submitting a form with an unknown action in e-mail settings.
+#. TRANS: Message given submitting a form with an unknown action in IM settings.
+#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
-#: actions/designadminpanel.php:103 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:322
-#: actions/imsettings.php:220 actions/newapplication.php:121
+#: actions/designadminpanel.php:104 actions/editapplication.php:139
+#: actions/emailsettings.php:286 actions/grouplogo.php:322
+#: actions/imsettings.php:242 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
-#: actions/smssettings.php:248 lib/designsettings.php:304
+#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
@@ -584,20 +602,22 @@ msgid ""
"give access to your %4$s account to third parties you trust."
msgstr ""
-#: actions/apioauthauthorize.php:310 lib/action.php:438
+#. TRANS: Main menu option when logged in for access to user settings
+#: actions/apioauthauthorize.php:310 lib/action.php:440
msgid "Account"
msgstr "帐号"
#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/showgroup.php:245 actions/tagother.php:94
#: actions/userauthorization.php:145 lib/groupeditform.php:152
-#: lib/userprofile.php:131
+#: lib/userprofile.php:132
msgid "Nickname"
msgstr "昵称"
+#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:316 actions/login.php:233
-#: actions/register.php:429 lib/accountsettingsaction.php:116
+#: actions/register.php:429 lib/accountsettingsaction.php:125
msgid "Password"
msgstr "密码"
@@ -646,17 +666,18 @@ msgstr "头像已更新。"
msgid "No status with that ID found."
msgstr "没有找到此ID的信息。"
-#: actions/apistatusesupdate.php:161 actions/newnotice.php:155
+#: actions/apistatusesupdate.php:252 actions/newnotice.php:155
#: lib/mailhandler.php:60
#, fuzzy, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "超出长度限制。不能超过 140 个字符。"
-#: actions/apistatusesupdate.php:202
-msgid "Not found"
+#: actions/apistatusesupdate.php:293 actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
msgstr "未找到"
-#: actions/apistatusesupdate.php:225 actions/newnotice.php:178
+#: actions/apistatusesupdate.php:316 actions/newnotice.php:178
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
@@ -666,12 +687,12 @@ msgstr ""
msgid "Unsupported format."
msgstr "不支持这种图像格式。"
-#: actions/apitimelinefavorites.php:108
+#: actions/apitimelinefavorites.php:109
#, fuzzy, php-format
msgid "%1$s / Favorites from %2$s"
msgstr "%s 的收藏 / %s"
-#: actions/apitimelinefavorites.php:117
+#: actions/apitimelinefavorites.php:118
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s 收藏了 %s 的 %s 通告。"
@@ -681,17 +702,17 @@ msgstr "%s 收藏了 %s 的 %s 通告。"
msgid "%1$s / Updates mentioning %2$s"
msgstr "%1$s / 回复 %2$s 的消息"
-#: actions/apitimelinementions.php:127
+#: actions/apitimelinementions.php:130
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
-#: actions/apitimelinepublic.php:107 actions/publicrss.php:103
+#: actions/apitimelinepublic.php:196 actions/publicrss.php:103
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: actions/apitimelinepublic.php:111 actions/publicrss.php:105
+#: actions/apitimelinepublic.php:201 actions/publicrss.php:105
#, php-format
msgid "%s updates from everyone!"
msgstr "来自所有人的 %s 消息!"
@@ -706,21 +727,16 @@ msgstr "%s 的回复"
msgid "Repeats of %s"
msgstr "%s 的回复"
-#: actions/apitimelinetag.php:102 actions/tag.php:67
+#: actions/apitimelinetag.php:104 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
-#: actions/apitimelinetag.php:104 actions/tagrss.php:65
+#: actions/apitimelinetag.php:106 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
-#: actions/apiusershow.php:96
-#, fuzzy
-msgid "Not found."
-msgstr "未找到"
-
#: actions/attachment.php:73
#, fuzzy
msgid "No such attachment."
@@ -741,8 +757,9 @@ msgstr "没有大小。"
msgid "Invalid size."
msgstr "大小不正确。"
-#: actions/avatarsettings.php:67 actions/showgroup.php:229
-#: lib/accountsettingsaction.php:112
+#. TRANS: Link description in user account settings menu.
+#: actions/avatarsettings.php:67 actions/showgroup.php:230
+#: lib/accountsettingsaction.php:118
msgid "Avatar"
msgstr "头像"
@@ -752,9 +769,10 @@ msgid "You can upload your personal avatar. The maximum file size is %s."
msgstr "您可以在这里上传个人头像。"
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
-#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
-#: actions/userrss.php:106
-msgid "User without matching profile"
+#: actions/grouplogo.php:181 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:108
+#, fuzzy
+msgid "User without matching profile."
msgstr "找不到匹配的用户。"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
@@ -773,7 +791,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:655
+#: lib/deleteuserform.php:66 lib/noticelist.php:656
#, fuzzy
msgid "Delete"
msgstr "删除"
@@ -786,23 +804,28 @@ msgstr "上传"
msgid "Crop"
msgstr "剪裁"
-#: actions/avatarsettings.php:328
+#: actions/avatarsettings.php:305
+#, fuzzy
+msgid "No file uploaded."
+msgstr "没有收件人。"
+
+#: actions/avatarsettings.php:332
msgid "Pick a square area of the image to be your avatar"
msgstr "请选择一块方形区域作为你的头像"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:380
+#: actions/avatarsettings.php:347 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "文件数据丢失"
-#: actions/avatarsettings.php:366
+#: actions/avatarsettings.php:370
msgid "Avatar updated."
msgstr "头像已更新。"
-#: actions/avatarsettings.php:369
+#: actions/avatarsettings.php:373
msgid "Failed updating avatar."
msgstr "更新头像失败。"
-#: actions/avatarsettings.php:393
+#: actions/avatarsettings.php:397
#, fuzzy
msgid "Avatar deleted."
msgstr "头像已更新。"
@@ -812,7 +835,7 @@ msgstr "头像已更新。"
msgid "You already blocked that user."
msgstr "您已成功阻止该用户:"
-#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:158
#, fuzzy
msgid "Block user"
msgstr "阻止用户"
@@ -824,29 +847,46 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deleteapplication.php:153
-#: actions/deletenotice.php:145 actions/deleteuser.php:150
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:145 actions/deleteapplication.php:154
+#: actions/deletenotice.php:147 actions/deleteuser.php:152
#: actions/groupblock.php:178
+#, fuzzy
+msgctxt "BUTTON"
msgid "No"
msgstr "否"
-#: actions/block.php:143 actions/deleteuser.php:150
+#. TRANS: Submit button title for 'No' when blocking a user.
+#. TRANS: Submit button title for 'No' when deleting a user.
+#: actions/block.php:149 actions/deleteuser.php:156
#, fuzzy
msgid "Do not block this user"
msgstr "取消阻止次用户"
-#: actions/block.php:144 actions/deleteapplication.php:158
-#: actions/deletenotice.php:146 actions/deleteuser.php:151
-#: actions/groupblock.php:179 lib/repeatform.php:132
+#. TRANS: Button label on the user block form.
+#. TRANS: Button label on the delete application form.
+#. TRANS: Button label on the delete notice form.
+#. TRANS: Button label on the delete user form.
+#. TRANS: Button label on the form to block a user from a group.
+#: actions/block.php:152 actions/deleteapplication.php:161
+#: actions/deletenotice.php:154 actions/deleteuser.php:159
+#: actions/groupblock.php:185
+#, fuzzy
+msgctxt "BUTTON"
msgid "Yes"
msgstr "是"
-#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
+#. TRANS: Submit button title for 'Yes' when blocking a user.
+#: actions/block.php:156 actions/groupmembers.php:392 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "阻止该用户"
-#: actions/block.php:167
+#: actions/block.php:179
msgid "Failed to save block information."
msgstr "保存阻止信息失败。"
@@ -859,8 +899,8 @@ msgstr "保存阻止信息失败。"
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:212
-#: lib/command.php:260
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:166
+#: lib/command.php:368
msgid "No such group."
msgstr "没有这个组。"
@@ -893,9 +933,10 @@ msgstr "取消阻止"
msgid "Unblock this user"
msgstr "取消阻止次用户"
-#: actions/bookmarklet.php:50
-#, fuzzy
-msgid "Post to "
+#. TRANS: Title for mini-posting window loaded from bookmarklet.
+#: actions/bookmarklet.php:51
+#, fuzzy, php-format
+msgid "Post to %s"
msgstr "相片"
#: actions/confirmaddress.php:75
@@ -910,34 +951,44 @@ msgstr "未找到确认码。"
msgid "That confirmation code is not for you!"
msgstr "此确认码不适用!"
-#: actions/confirmaddress.php:90
-#, php-format
-msgid "Unrecognized address type %s"
+#. TRANS: Server error for an unknow address type, which can be 'email', 'jabber', or 'sms'.
+#: actions/confirmaddress.php:91
+#, fuzzy, php-format
+msgid "Unrecognized address type %s."
msgstr "不可识别的地址类型 %s"
-#: actions/confirmaddress.php:94
+#. TRANS: Client error for an already confirmed email/jabbel/sms address.
+#: actions/confirmaddress.php:96
msgid "That address has already been confirmed."
msgstr "此地址已被确认。"
-#: actions/confirmaddress.php:114 actions/emailsettings.php:296
-#: actions/emailsettings.php:427 actions/imsettings.php:258
-#: actions/imsettings.php:401 actions/othersettings.php:174
-#: actions/profilesettings.php:283 actions/smssettings.php:278
-#: actions/smssettings.php:420
+#. 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 thrown on database error updating SMS preferences.
+#. TRANS: Server error thrown on database error removing a registered SMS phone number.
+#: actions/confirmaddress.php:116 actions/emailsettings.php:327
+#: actions/emailsettings.php:473 actions/imsettings.php:280
+#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/profilesettings.php:283 actions/smssettings.php:308
+#: actions/smssettings.php:464
msgid "Couldn't update user."
msgstr "无法更新用户。"
-#: actions/confirmaddress.php:126 actions/emailsettings.php:391
-#: actions/imsettings.php:363 actions/smssettings.php:382
+#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
+#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
+#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
-#: actions/confirmaddress.php:144
+#: actions/confirmaddress.php:146
#, fuzzy
msgid "Confirm address"
msgstr "确认地址"
-#: actions/confirmaddress.php:159
+#: actions/confirmaddress.php:161
#, php-format
msgid "The address \"%s\" has been confirmed for your account."
msgstr "地址 \"%s\" 已确认。"
@@ -948,7 +999,7 @@ msgid "Conversation"
msgstr "确认码"
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:218 lib/searchgroupnav.php:82
+#: lib/profileaction.php:229 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "通告"
@@ -970,7 +1021,7 @@ msgstr "您未告知此个人信息"
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
-#: lib/action.php:1217
+#: lib/action.php:1253
#, fuzzy
msgid "There was a problem with your session token."
msgstr "会话标识有问题,请重试。"
@@ -986,18 +1037,22 @@ msgid ""
"about the application from the database, including all existing user "
"connections."
msgstr ""
+"你确定要删除这个组件吗?这将从数据库中清除有关这个组件的所有数据,包括所有的"
+"用户联系。"
-#: actions/deleteapplication.php:156
+#. TRANS: Submit button title for 'No' when deleting an application.
+#: actions/deleteapplication.php:158
#, fuzzy
msgid "Do not delete this application"
msgstr "无法删除通告。"
-#: actions/deleteapplication.php:160
+#. TRANS: Submit button title for 'Yes' when deleting an application.
+#: actions/deleteapplication.php:164
#, fuzzy
msgid "Delete this application"
msgstr "删除通告"
-#. TRANS: Client error message
+#. TRANS: Client error message thrown when trying to access the admin panel while not logged in.
#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
@@ -1027,12 +1082,14 @@ msgstr "删除通告"
msgid "Are you sure you want to delete this notice?"
msgstr "确定要删除这条消息吗?"
-#: actions/deletenotice.php:145
+#. TRANS: Submit button title for 'No' when deleting a notice.
+#: actions/deletenotice.php:151
#, fuzzy
msgid "Do not delete this notice"
msgstr "无法删除通告。"
-#: actions/deletenotice.php:146 lib/noticelist.php:655
+#. TRANS: Submit button title for 'Yes' when deleting a notice.
+#: actions/deletenotice.php:158 lib/noticelist.php:656
#, fuzzy
msgid "Delete this notice"
msgstr "删除通告"
@@ -1058,136 +1115,140 @@ msgid ""
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:151 lib/deleteuserform.php:77
+#. TRANS: Submit button title for 'Yes' when deleting a user.
+#: actions/deleteuser.php:163 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "删除通告"
-#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#. TRANS: Message used as title for design settings for the site.
+#. TRANS: Link description in user account settings menu.
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
#: lib/groupnav.php:119
msgid "Design"
msgstr ""
-#: actions/designadminpanel.php:73
+#: actions/designadminpanel.php:74
msgid "Design settings for this StatusNet site."
msgstr ""
-#: actions/designadminpanel.php:275
+#: actions/designadminpanel.php:276
#, fuzzy
msgid "Invalid logo URL."
msgstr "大小不正确。"
-#: actions/designadminpanel.php:279
+#: actions/designadminpanel.php:280
#, fuzzy, php-format
-msgid "Theme not available: %s"
+msgid "Theme not available: %s."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/designadminpanel.php:375
+#: actions/designadminpanel.php:376
#, fuzzy
msgid "Change logo"
msgstr "修改密码"
-#: actions/designadminpanel.php:380
+#: actions/designadminpanel.php:381
#, fuzzy
msgid "Site logo"
msgstr "邀请"
-#: actions/designadminpanel.php:387
+#: actions/designadminpanel.php:388
#, fuzzy
msgid "Change theme"
msgstr "修改"
-#: actions/designadminpanel.php:404
+#: actions/designadminpanel.php:405
#, fuzzy
msgid "Site theme"
msgstr "新通告"
-#: actions/designadminpanel.php:405
+#: actions/designadminpanel.php:406
#, fuzzy
msgid "Theme for the site."
msgstr "登出本站"
-#: actions/designadminpanel.php:417 lib/designsettings.php:101
+#: actions/designadminpanel.php:418 lib/designsettings.php:101
msgid "Change background image"
msgstr ""
-#: actions/designadminpanel.php:422 actions/designadminpanel.php:497
+#: actions/designadminpanel.php:423 actions/designadminpanel.php:500
#: lib/designsettings.php:178
msgid "Background"
msgstr ""
-#: actions/designadminpanel.php:427
+#: actions/designadminpanel.php:428
#, fuzzy, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
"$s."
msgstr "你可以给你的组上载一个logo图。"
-#: actions/designadminpanel.php:457 lib/designsettings.php:139
+#. TRANS: Used as radio button label to add a background image.
+#: actions/designadminpanel.php:459 lib/designsettings.php:139
msgid "On"
msgstr ""
-#: actions/designadminpanel.php:473 lib/designsettings.php:155
+#. TRANS: Used as radio button label to not add a background image.
+#: actions/designadminpanel.php:476 lib/designsettings.php:155
msgid "Off"
msgstr ""
-#: actions/designadminpanel.php:474 lib/designsettings.php:156
+#: actions/designadminpanel.php:477 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr ""
-#: actions/designadminpanel.php:479 lib/designsettings.php:161
+#: actions/designadminpanel.php:482 lib/designsettings.php:161
msgid "Tile background image"
msgstr ""
-#: actions/designadminpanel.php:488 lib/designsettings.php:170
+#: actions/designadminpanel.php:491 lib/designsettings.php:170
#, fuzzy
msgid "Change colours"
msgstr "修改密码"
-#: actions/designadminpanel.php:510 lib/designsettings.php:191
+#: actions/designadminpanel.php:513 lib/designsettings.php:191
#, fuzzy
msgid "Content"
msgstr "连接"
-#: actions/designadminpanel.php:523 lib/designsettings.php:204
+#: actions/designadminpanel.php:526 lib/designsettings.php:204
#, fuzzy
msgid "Sidebar"
msgstr "搜索"
-#: actions/designadminpanel.php:536 lib/designsettings.php:217
+#: actions/designadminpanel.php:539 lib/designsettings.php:217
msgid "Text"
msgstr "文本"
-#: actions/designadminpanel.php:549 lib/designsettings.php:230
+#: actions/designadminpanel.php:552 lib/designsettings.php:230
#, fuzzy
msgid "Links"
msgstr "登录"
-#: actions/designadminpanel.php:577 lib/designsettings.php:247
+#: actions/designadminpanel.php:580 lib/designsettings.php:247
msgid "Use defaults"
msgstr ""
-#: actions/designadminpanel.php:578 lib/designsettings.php:248
+#: actions/designadminpanel.php:581 lib/designsettings.php:248
msgid "Restore default designs"
msgstr ""
-#: actions/designadminpanel.php:584 lib/designsettings.php:254
+#: actions/designadminpanel.php:587 lib/designsettings.php:254
msgid "Reset back to default"
msgstr ""
-#: actions/designadminpanel.php:586 actions/emailsettings.php:195
-#: actions/imsettings.php:163 actions/othersettings.php:126
+#. TRANS: Submit button title
+#: actions/designadminpanel.php:589 actions/othersettings.php:126
#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/smssettings.php:181
-#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:208
-#: actions/tagother.php:154 actions/useradminpanel.php:294
-#: lib/applicationeditform.php:333 lib/applicationeditform.php:334
+#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
+#: actions/subscriptions.php:226 actions/tagother.php:154
+#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
#: lib/designsettings.php:256 lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:587 lib/designsettings.php:257
+#: actions/designadminpanel.php:590 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1304,11 +1365,16 @@ msgstr "使用这个表单来编辑组"
msgid "description is too long (max %d chars)."
msgstr "描述过长(不能超过140字符)。"
+#: actions/editgroup.php:228 actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "主页'%s'不正确"
+
#: actions/editgroup.php:258
msgid "Could not update group."
msgstr "无法更新组"
-#: actions/editgroup.php:264 classes/User_group.php:493
+#: actions/editgroup.php:264 classes/User_group.php:496
#, fuzzy
msgid "Could not create aliases."
msgstr "无法创建收藏。"
@@ -1317,32 +1383,45 @@ msgstr "无法创建收藏。"
msgid "Options saved."
msgstr "选项已保存。"
-#: actions/emailsettings.php:60
+#. TRANS: Title for e-mail settings.
+#: actions/emailsettings.php:61
#, fuzzy
msgid "Email settings"
msgstr "电子邮件设置"
-#: actions/emailsettings.php:71
+#. TRANS: E-mail settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/emailsettings.php:76
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "设置 %%site.name%% 发送的邮件。"
-#: actions/emailsettings.php:100 actions/imsettings.php:100
-#: actions/smssettings.php:104
-msgid "Address"
-msgstr "地址"
+#. 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
+#, fuzzy
+msgid "Email address"
+msgstr "电子邮件地址"
-#: actions/emailsettings.php:105
+#. TRANS: Form note in e-mail settings form.
+#: actions/emailsettings.php:112
msgid "Current confirmed email address."
msgstr "已确认的电子邮件。"
-#: actions/emailsettings.php:107 actions/emailsettings.php:140
-#: actions/imsettings.php:108 actions/smssettings.php:115
-#: actions/smssettings.php:158
+#. TRANS: Button label to remove a confirmed e-mail address.
+#. TRANS: Button label for removing a set sender e-mail address to post notices from.
+#. TRANS: Button label to remove a confirmed IM address.
+#. TRANS: Button label to remove a confirmed SMS address.
+#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
+#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/imsettings.php:116 actions/smssettings.php:124
+#: actions/smssettings.php:180
+#, fuzzy
+msgctxt "BUTTON"
msgid "Remove"
msgstr "移除"
-#: actions/emailsettings.php:113
+#: actions/emailsettings.php:122
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
@@ -1350,108 +1429,142 @@ msgstr ""
"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件,其中包含了进一步的"
"指示。"
-#: actions/emailsettings.php:117 actions/imsettings.php:120
-#: actions/smssettings.php:126 lib/applicationeditform.php:331
-#: lib/applicationeditform.php:332
+#. TRANS: Button label to cancel an e-mail address confirmation procedure.
+#. TRANS: Button label to cancel an IM address confirmation procedure.
+#. TRANS: Button label to cancel a SMS address confirmation procedure.
+#. TRANS: Button label
+#: actions/emailsettings.php:127 actions/imsettings.php:131
+#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#, fuzzy
+msgctxt "BUTTON"
msgid "Cancel"
msgstr "取消"
-#: actions/emailsettings.php:121
-#, fuzzy
-msgid "Email address"
-msgstr "电子邮件地址"
-
-#: actions/emailsettings.php:123
+#. TRANS: Instructions for e-mail address input form.
+#: actions/emailsettings.php:135
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件,类似 \"UserName@example.org\""
-#: actions/emailsettings.php:126 actions/imsettings.php:133
-#: actions/smssettings.php:145
+#. TRANS: Button label for adding an e-mail address in e-mail settings form.
+#. TRANS: Button label for adding an IM address in IM settings form.
+#. TRANS: Button label for adding a SMS phone number in SMS settings form.
+#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/smssettings.php:162
+#, fuzzy
+msgctxt "BUTTON"
msgid "Add"
msgstr "添加"
-#: actions/emailsettings.php:133 actions/smssettings.php:152
+#. TRANS: Form legend for incoming e-mail settings form.
+#. TRANS: Form legend for incoming SMS settings form.
+#: actions/emailsettings.php:147 actions/smssettings.php:171
msgid "Incoming email"
msgstr "发布用的电子邮件"
-#: actions/emailsettings.php:138 actions/smssettings.php:157
+#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
+#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
+#: actions/emailsettings.php:155 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "向这个电子邮件发信以发布新的通告。"
-#: actions/emailsettings.php:145 actions/smssettings.php:162
+#. TRANS: Instructions for incoming e-mail address input form.
+#. TRANS: Instructions for incoming SMS e-mail address input form.
+#: actions/emailsettings.php:164 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布信息;取消旧的。"
-#: actions/emailsettings.php:148 actions/smssettings.php:164
+#. TRANS: Button label for adding an e-mail address to send notices from.
+#. TRANS: Button label for adding an SMS e-mail address to send notices from.
+#: actions/emailsettings.php:168 actions/smssettings.php:189
+#, fuzzy
+msgctxt "BUTTON"
msgid "New"
msgstr "新建"
-#: actions/emailsettings.php:153 actions/imsettings.php:139
-#: actions/smssettings.php:169
-msgid "Preferences"
+#. TRANS: Form legend for e-mail preferences form.
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Email preferences"
msgstr "首选项"
-#: actions/emailsettings.php:158
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:180
msgid "Send me notices of new subscriptions through email."
msgstr "如果有新订阅,通过电子邮件告诉我。"
-#: actions/emailsettings.php:163
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:186
msgid "Send me email when someone adds my notice as a favorite."
msgstr "如果有人收藏我的通告,发邮件通知我。"
-#: actions/emailsettings.php:169
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:193
msgid "Send me email when someone sends me a private message."
msgstr "如果收到私人信息,发邮件通知我。"
-#: actions/emailsettings.php:174
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:199
#, fuzzy
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "如果收到私人信息,发邮件通知我。"
-#: actions/emailsettings.php:179
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:205
msgid "Allow friends to nudge me and send me an email."
msgstr "允许朋友们呼叫并给我发送邮件。"
-#: actions/emailsettings.php:185
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:212
msgid "I want to post notices by email."
msgstr "我希望通过邮件发布信息。"
-#: actions/emailsettings.php:191
+#. TRANS: Checkbox label in e-mail preferences form.
+#: actions/emailsettings.php:219
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
-#: actions/emailsettings.php:302 actions/imsettings.php:264
-#: actions/othersettings.php:180 actions/smssettings.php:284
-msgid "Preferences saved."
-msgstr "首选项已保存。"
+#. TRANS: Confirmation message for successful e-mail preferences save.
+#: actions/emailsettings.php:334
+#, fuzzy
+msgid "Email preferences saved."
+msgstr "同步选项已保存。"
-#: actions/emailsettings.php:320
+#. TRANS: Message given saving e-mail address without having provided one.
+#: actions/emailsettings.php:353
msgid "No email address."
msgstr "没有电子邮件地址。"
-#: actions/emailsettings.php:327
+#. TRANS: Message given saving e-mail address that cannot be normalised.
+#: actions/emailsettings.php:361
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
-#: actions/emailsettings.php:331 actions/register.php:201
+#. TRANS: Message given saving e-mail address that not valid.
+#: actions/emailsettings.php:366 actions/register.php:201
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
-#: actions/emailsettings.php:334
+#. TRANS: Message given saving e-mail address that is already set.
+#: actions/emailsettings.php:370
msgid "That is already your email address."
msgstr "您已登记此电子邮件。"
-#: actions/emailsettings.php:337
+#. TRANS: Message given saving e-mail address that is already set for another user.
+#: actions/emailsettings.php:374
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
-#: actions/emailsettings.php:353 actions/imsettings.php:319
-#: actions/smssettings.php:337
+#. TRANS: Server error thrown on database error adding e-mail confirmation code.
+#. TRANS: Server error thrown on database error adding IM confirmation code.
+#. TRANS: Server error thrown on database error adding SMS confirmation code.
+#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "无法插入验证码。"
-#: actions/emailsettings.php:359
+#. TRANS: Message given saving valid e-mail address that is to be confirmed.
+#: actions/emailsettings.php:398
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."
@@ -1459,43 +1572,56 @@ msgstr ""
"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱),找到验证码并按要求"
"使用它。"
-#: actions/emailsettings.php:379 actions/imsettings.php:351
-#: actions/smssettings.php:370
+#. TRANS: Message given canceling e-mail address confirmation that is not pending.
+#. TRANS: Message given canceling IM address confirmation that is not pending.
+#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
+#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
-#: actions/emailsettings.php:383 actions/imsettings.php:355
-msgid "That is the wrong IM address."
+#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
+#: actions/emailsettings.php:424
+#, fuzzy
+msgid "That is the wrong email address."
msgstr "即时通讯帐号错误。"
-#: actions/emailsettings.php:395 actions/imsettings.php:367
-#: actions/smssettings.php:386
-msgid "Confirmation cancelled."
+#. TRANS: Message given after successfully canceling e-mail address confirmation.
+#: actions/emailsettings.php:438
+#, fuzzy
+msgid "Email confirmation cancelled."
msgstr "已取消确认。"
-#: actions/emailsettings.php:413
+#. TRANS: Message given trying to remove an e-mail address that is not
+#. TRANS: registered for the active user.
+#: actions/emailsettings.php:458
msgid "That is not your email address."
msgstr "这是他人的电子邮件。"
-#: actions/emailsettings.php:432 actions/imsettings.php:408
-#: actions/smssettings.php:425
-msgid "The address was removed."
+#. TRANS: Message given after successfully removing a registered e-mail address.
+#: actions/emailsettings.php:479
+#, fuzzy
+msgid "The email address was removed."
msgstr "地址被移除。"
-#: actions/emailsettings.php:446 actions/smssettings.php:518
+#: actions/emailsettings.php:493 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
-#: actions/emailsettings.php:456 actions/emailsettings.php:478
-#: actions/smssettings.php:528 actions/smssettings.php:552
+#. TRANS: Server error thrown on database error removing incoming e-mail address.
+#. TRANS: Server error thrown on database error adding incoming e-mail address.
+#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
-#: actions/emailsettings.php:459 actions/smssettings.php:531
+#. TRANS: Message given after successfully removing an incoming e-mail address.
+#: actions/emailsettings.php:508 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被移除。"
-#: actions/emailsettings.php:481 actions/smssettings.php:555
+#. TRANS: Message given after successfully adding an incoming e-mail address.
+#: actions/emailsettings.php:532 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
@@ -1619,8 +1745,9 @@ msgstr "无法将请求标记转换为访问令牌。"
msgid "Remote service uses unknown version of OMB protocol."
msgstr "此OMB协议版本无效。"
-#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
-msgid "Error updating remote profile"
+#: actions/finishremotesubscribe.php:138
+#, fuzzy
+msgid "Error updating remote profile."
msgstr "更新远程的个人信息时出错"
#: actions/getfile.php:79
@@ -1686,12 +1813,12 @@ msgstr "用户没有个人信息。"
msgid "User is not a member of group."
msgstr "您未告知此个人信息"
-#: actions/groupblock.php:136 actions/groupmembers.php:323
+#: actions/groupblock.php:134 actions/groupmembers.php:360
#, fuzzy
msgid "Block user from group"
msgstr "阻止用户"
-#: actions/groupblock.php:162
+#: actions/groupblock.php:160
#, php-format
msgid ""
"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They "
@@ -1699,17 +1826,19 @@ msgid ""
"the group in the future."
msgstr ""
-#: actions/groupblock.php:178
+#. TRANS: Submit button title for 'No' when blocking a user from a group.
+#: actions/groupblock.php:182
#, fuzzy
msgid "Do not block this user from this group"
msgstr "该组成员列表。"
-#: actions/groupblock.php:179
+#. TRANS: Submit button title for 'Yes' when blocking a user from a group.
+#: actions/groupblock.php:189
#, fuzzy
msgid "Block this user from this group"
msgstr "该组成员列表。"
-#: actions/groupblock.php:196
+#: actions/groupblock.php:206
msgid "Database error blocking user from group."
msgstr ""
@@ -1755,11 +1884,6 @@ msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr "你可以给你的组上载一个logo图。"
-#: actions/grouplogo.php:181
-#, fuzzy
-msgid "User without matching profile."
-msgstr "找不到匹配的用户。"
-
#: actions/grouplogo.php:365
#, fuzzy
msgid "Pick a square area of the image to be the logo."
@@ -1792,36 +1916,40 @@ msgstr "该组成员列表。"
msgid "Admin"
msgstr "admin管理员"
-#: actions/groupmembers.php:355 lib/blockform.php:69
+#: actions/groupmembers.php:392 lib/blockform.php:69
msgid "Block"
msgstr "阻止"
-#: actions/groupmembers.php:450
+#: actions/groupmembers.php:487
#, fuzzy
msgid "Make user an admin of the group"
msgstr "只有admin才能编辑这个组"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:519
#, fuzzy
msgid "Make Admin"
msgstr "admin管理员"
-#: actions/groupmembers.php:482
+#: actions/groupmembers.php:519
msgid "Make this user an admin"
msgstr ""
-#: actions/grouprss.php:138 actions/userrss.php:93
-#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
+#. TRANS: Message is used as link title. %s is a user nickname.
+#. TRANS: Title in atom group notice feed. %s is a group name.
+#. TRANS: Title in atom user notice feed. %s is a user name.
+#: actions/grouprss.php:139 actions/userrss.php:94
+#: lib/atomgroupnoticefeed.php:62 lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s 时间表"
-#: actions/grouprss.php:140
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#: actions/grouprss.php:142
#, fuzzy, php-format
msgid "Updates from members of %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
-#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
+#: actions/groups.php:62 lib/profileaction.php:223 lib/profileaction.php:249
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "组"
@@ -1841,7 +1969,7 @@ msgid ""
"%%%%)"
msgstr ""
-#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#: actions/groups.php:107 actions/usergroups.php:126 lib/groupeditform.php:122
#, fuzzy
msgid "Create a new group"
msgstr "创建新组"
@@ -1893,12 +2021,16 @@ msgstr "用户没有个人信息。"
msgid "Error removing the block."
msgstr "保存用户时出错。"
-#: actions/imsettings.php:59
+#. TRANS: Title for instance messaging settings.
+#: actions/imsettings.php:60
#, fuzzy
msgid "IM settings"
msgstr "IM 设置"
-#: actions/imsettings.php:70
+#. 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
#, php-format
msgid ""
"You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -1907,16 +2039,26 @@ msgstr ""
"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
"们。"
-#: actions/imsettings.php:89
+#. TRANS: Message given in the IM settings if XMPP is not enabled on the site.
+#: actions/imsettings.php:94
#, fuzzy
msgid "IM is not available."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/imsettings.php:106
+#. 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
+#, fuzzy
+msgid "IM address"
+msgstr "IM 帐号"
+
+#: actions/imsettings.php:113
msgid "Current confirmed Jabber/GTalk address."
msgstr "已确认的Jabber/GTalk帐号。"
-#: actions/imsettings.php:114
+#. TRANS: Form note in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:124
#, php-format
msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
@@ -1925,12 +2067,9 @@ msgstr ""
"正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。"
"(你是否已经添加 %s为你的好友?)"
-#: actions/imsettings.php:124
-#, fuzzy
-msgid "IM address"
-msgstr "IM 帐号"
-
-#: actions/imsettings.php:126
+#. TRANS: IM address input field instructions in IM settings form.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:140
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1939,53 +2078,100 @@ msgstr ""
"Jabber 或 GTalk 帐号,类似\"UserName@example.org\"。首先,必须在即时聊天工具"
"或GTalk中将 %s 加为好友。"
-#: actions/imsettings.php:143
+#. TRANS: Form legend for IM preferences form.
+#: actions/imsettings.php:155
+#, fuzzy
+msgid "IM preferences"
+msgstr "首选项"
+
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:160
msgid "Send me notices through Jabber/GTalk."
msgstr "通过Jabber/GTalk发送通告。"
-#: actions/imsettings.php:148
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:166
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
-#: actions/imsettings.php:153
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:172
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "如果我尚未订阅的用户回我消息,使用Jabber/GTalk通知我。"
-#: actions/imsettings.php:159
+#. TRANS: Checkbox label in IM preferences form.
+#: actions/imsettings.php:179
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "公开Jabber/GTalk帐号的 MicroID。"
-#: actions/imsettings.php:285
+#. TRANS: Confirmation message for successful IM preferences save.
+#: actions/imsettings.php:287 actions/othersettings.php:180
+msgid "Preferences saved."
+msgstr "首选项已保存。"
+
+#. TRANS: Message given saving IM address without having provided one.
+#: actions/imsettings.php:309
msgid "No Jabber ID."
msgstr "没有 Jabber ID。"
-#: actions/imsettings.php:292
+#. TRANS: Message given saving IM address that cannot be normalised.
+#: actions/imsettings.php:317
msgid "Cannot normalize that Jabber ID"
msgstr "无法识别此Jabber ID"
-#: actions/imsettings.php:296
+#. TRANS: Message given saving IM address that not valid.
+#: actions/imsettings.php:322
msgid "Not a valid Jabber ID"
msgstr "不是有效的 Jabber ID"
-#: actions/imsettings.php:299
+#. TRANS: Message given saving IM address that is already set.
+#: actions/imsettings.php:326
msgid "That is already your Jabber ID."
msgstr "您已登记此Jabber帐号。"
-#: actions/imsettings.php:302
+#. TRANS: Message given saving IM address that is already set for another user.
+#: actions/imsettings.php:330
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID 属于另一用户。"
-#: actions/imsettings.php:327
+#. TRANS: Message given saving valid IM address that is to be confirmed.
+#. TRANS: %s is the IM address set for the site.
+#: actions/imsettings.php:358
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
"s for sending messages to you."
msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
-#: actions/imsettings.php:387
+#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
+#: actions/imsettings.php:388
+msgid "That is the wrong IM address."
+msgstr "即时通讯帐号错误。"
+
+#. TRANS: Server error thrown on database error canceling IM address confirmation.
+#: actions/imsettings.php:397
+#, fuzzy
+msgid "Couldn't delete IM confirmation."
+msgstr "无法删除电子邮件确认。"
+
+#. TRANS: Message given after successfully canceling IM address confirmation.
+#: actions/imsettings.php:402
+#, fuzzy
+msgid "IM confirmation cancelled."
+msgstr "已取消确认。"
+
+#. TRANS: Message given trying to remove an IM address that is not
+#. TRANS: registered for the active user.
+#: actions/imsettings.php:424
msgid "That is not your Jabber ID."
msgstr "这不是您的Jabber帐号。"
+#. TRANS: Message given after successfully removing a registered IM address.
+#: actions/imsettings.php:447
+#, fuzzy
+msgid "The IM address was removed."
+msgstr "地址被移除。"
+
#: actions/inbox.php:59
#, fuzzy, php-format
msgid "Inbox for %1$s - page %2$d"
@@ -2005,8 +2191,8 @@ msgid "Invites have been disabled."
msgstr ""
#: actions/invite.php:41
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
+#, fuzzy, php-format
+msgid "You must be logged in to invite other users to use %s."
msgstr "您必须登录才能邀请其他人使用 %s"
#: actions/invite.php:72
@@ -2026,7 +2212,9 @@ msgstr "邀请新用户"
msgid "You are already subscribed to these users:"
msgstr "您已订阅这些用户:"
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306
+#. TRANS: Whois output.
+#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:414
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2074,12 +2262,14 @@ msgctxt "BUTTON"
msgid "Send"
msgstr "发送"
-#: actions/invite.php:227
+#. TRANS: Subject for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:228
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s 邀请您加入 %2$s"
-#: actions/invite.php:229
+#. TRANS: Body text for invitation email. Note that 'them' is correct as a gender-neutral singular 3rd-person pronoun in English.
+#: actions/invite.php:231
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2140,7 +2330,9 @@ msgstr "您必须登录才能加入组。"
msgid "No nickname or ID."
msgstr "没有昵称。"
-#: actions/joingroup.php:141
+#. 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.
+#: actions/joingroup.php:141 lib/command.php:346
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s 加入 %s 组"
@@ -2150,12 +2342,14 @@ msgstr "%s 加入 %s 组"
msgid "You must be logged in to leave a group."
msgstr "您必须登录才能邀请其他人使用 %s"
-#: actions/leavegroup.php:100 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:373
#, fuzzy
msgid "You are not a member of that group."
msgstr "您未告知此个人信息"
-#: actions/leavegroup.php:137
+#. 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.
+#: actions/leavegroup.php:137 lib/command.php:392
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s 离开群 %s"
@@ -2200,10 +2394,14 @@ msgid ""
msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
#: actions/login.php:270
+#, fuzzy
+msgid "Login with your username and password."
+msgstr "输入用户名和密码以登录。"
+
+#: actions/login.php:273
#, fuzzy, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account."
+"Don't have a username yet? [Register](%%action.register%%) a new account."
msgstr ""
"请使用你的帐号和密码登入。没有帐号?[注册](%%action.register%%) 一个新帐号, "
"或使用 [OpenID](%%action.openidlogin%%). "
@@ -2228,7 +2426,8 @@ msgid "Can't make %1$s an admin for group %2$s."
msgstr "只有admin才能编辑这个组"
#: actions/microsummary.php:69
-msgid "No current status"
+#, fuzzy
+msgid "No current status."
msgstr "没有当前状态"
#: actions/newapplication.php:52
@@ -2267,12 +2466,12 @@ msgstr "使用此表格创建组。"
msgid "New message"
msgstr "新消息"
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:481
msgid "You can't send a message to this user."
msgstr "无法向此用户发送消息。"
-#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342
-#: lib/command.php:475
+#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:463
+#: lib/command.php:555
msgid "No content!"
msgstr "没有内容!"
@@ -2280,7 +2479,7 @@ msgstr "没有内容!"
msgid "No recipient specified."
msgstr "没有收件人。"
-#: actions/newmessage.php:164 lib/command.php:361
+#: actions/newmessage.php:164 lib/command.php:484
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
@@ -2295,7 +2494,7 @@ msgstr "新消息"
msgid "Direct message to %s sent."
msgstr "已向 %s 发送消息"
-#: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170
+#: actions/newmessage.php:210 actions/newnotice.php:251 lib/channel.php:189
msgid "Ajax Error"
msgstr "Ajax错误"
@@ -2303,7 +2502,7 @@ msgstr "Ajax错误"
msgid "New notice"
msgstr "新通告"
-#: actions/newnotice.php:211
+#: actions/newnotice.php:217
msgid "Notice posted"
msgstr "消息已发布。"
@@ -2395,11 +2594,11 @@ msgid "You are not a user of that application."
msgstr "您未告知此个人信息"
#: actions/oauthconnectionssettings.php:186
-msgid "Unable to revoke access for app: "
+#, php-format
+msgid "Unable to revoke access for app: %s."
msgstr ""
#: actions/oauthconnectionssettings.php:198
-#, php-format
msgid "You have not authorized any applications to use your account."
msgstr ""
@@ -2408,25 +2607,30 @@ msgid "Developers can edit the registration settings for their applications "
msgstr ""
#: actions/oembed.php:79 actions/shownotice.php:100
-msgid "Notice has no profile"
+#, fuzzy
+msgid "Notice has no profile."
msgstr "通告没有关联个人信息"
-#: actions/oembed.php:86 actions/shownotice.php:180
+#: actions/oembed.php:86 actions/shownotice.php:175
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s 的 %2$s 状态"
-#: actions/oembed.php:157
-#, fuzzy
-msgid "content type "
+#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
+#: actions/oembed.php:158
+#, fuzzy, php-format
+msgid "Content type %s not supported."
msgstr "连接"
-#: actions/oembed.php:160
-msgid "Only "
+#. TRANS: Error message displaying attachments. %s is the site's base URL.
+#: actions/oembed.php:162
+#, php-format
+msgid "Only %s URLs over plain HTTP please."
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
-#: lib/apiaction.php:1070 lib/apiaction.php:1179
+#. TRANS: Client error on an API request with an unsupported data format.
+#: actions/oembed.php:183 actions/oembed.php:202 lib/apiaction.php:1131
+#: lib/apiaction.php:1160 lib/apiaction.php:1277
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -2539,7 +2743,7 @@ msgid "6 or more characters"
msgstr "6 个或更多字符"
#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
-#: actions/register.php:433 actions/smssettings.php:134
+#: actions/register.php:433
msgid "Confirm"
msgstr "确认"
@@ -2567,7 +2771,7 @@ msgstr "旧密码不正确"
msgid "Error saving user; invalid."
msgstr "保存用户时出错;不正确。"
-#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:381
msgid "Can't save new password."
msgstr "无法保存新密码。"
@@ -2576,7 +2780,7 @@ msgid "Password saved."
msgstr "密码已保存。"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:383
msgid "Paths"
msgstr ""
@@ -2586,23 +2790,23 @@ msgstr ""
#: actions/pathsadminpanel.php:157
#, fuzzy, php-format
-msgid "Theme directory not readable: %s"
+msgid "Theme directory not readable: %s."
msgstr "这个页面不提供您想要的媒体类型"
#: actions/pathsadminpanel.php:163
-#, php-format
-msgid "Avatar directory not writable: %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Avatar directory not writable: %s."
+msgstr "这个页面不提供您想要的媒体类型"
#: actions/pathsadminpanel.php:169
-#, php-format
-msgid "Background directory not writable: %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Background directory not writable: %s."
+msgstr "这个页面不提供您想要的媒体类型"
#: actions/pathsadminpanel.php:177
-#, php-format
-msgid "Locales directory not readable: %s"
-msgstr ""
+#, fuzzy, php-format
+msgid "Locales directory not readable: %s."
+msgstr "这个页面不提供您想要的媒体类型"
#: actions/pathsadminpanel.php:183
msgid "Invalid SSL server. The maximum length is 255 characters."
@@ -2753,18 +2957,19 @@ msgstr ""
msgid "People search"
msgstr "搜索用户"
-#: actions/peopletag.php:70
+#: actions/peopletag.php:68
#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
+msgid "Not a valid people tag: %s."
msgstr "不是有效的电子邮件"
-#: actions/peopletag.php:144
+#: actions/peopletag.php:142
#, fuzzy, php-format
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "用户自加标签 %s - 第 %d 页"
#: actions/postnotice.php:95
-msgid "Invalid notice content"
+#, fuzzy
+msgid "Invalid notice content."
msgstr "通告内容不正确"
#: actions/postnotice.php:101
@@ -2791,13 +2996,14 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
#: actions/profilesettings.php:111 actions/register.php:448
-#: actions/showgroup.php:255 actions/tagother.php:104
-#: lib/groupeditform.php:157 lib/userprofile.php:149
+#: actions/showgroup.php:256 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:150
msgid "Full name"
msgstr "全名"
+#. TRANS: Form input field label.
#: actions/profilesettings.php:115 actions/register.php:453
-#: lib/applicationeditform.php:228 lib/groupeditform.php:161
+#: lib/applicationeditform.php:244 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
@@ -2820,9 +3026,9 @@ msgid "Bio"
msgstr "自述"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/showgroup.php:265 actions/tagother.php:112
#: actions/userauthorization.php:166 lib/groupeditform.php:177
-#: lib/userprofile.php:164
+#: lib/userprofile.php:165
msgid "Location"
msgstr "位置"
@@ -2836,7 +3042,7 @@ msgstr ""
#: actions/profilesettings.php:145 actions/tagother.php:149
#: actions/tagother.php:209 lib/subscriptionlist.php:106
-#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+#: lib/subscriptionlist.php:108 lib/userprofile.php:210
msgid "Tags"
msgstr "标签"
@@ -2909,7 +3115,7 @@ msgstr "设置已保存。"
#: actions/public.php:83
#, php-format
-msgid "Beyond the page limit (%s)"
+msgid "Beyond the page limit (%s)."
msgstr ""
#: actions/public.php:92
@@ -3069,7 +3275,7 @@ msgstr "重置密码"
msgid "Recover password"
msgstr "恢复密码"
-#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:335
msgid "Password recovery requested"
msgstr "请求恢复密码"
@@ -3089,41 +3295,41 @@ msgstr "重置"
msgid "Enter a nickname or email address."
msgstr "输入昵称或电子邮件。"
-#: actions/recoverpassword.php:272
+#: actions/recoverpassword.php:282
msgid "No user with that email address or username."
msgstr "没有拥有这个用户名或电子邮件的用户。"
-#: actions/recoverpassword.php:287
+#: actions/recoverpassword.php:299
msgid "No registered email address for that user."
msgstr "用户没有注册电子邮件。"
-#: actions/recoverpassword.php:301
+#: actions/recoverpassword.php:313
msgid "Error saving address confirmation."
msgstr "保存地址确认时出错。"
-#: actions/recoverpassword.php:325
+#: actions/recoverpassword.php:338
msgid ""
"Instructions for recovering your password have been sent to the email "
"address registered to your account."
msgstr "恢复密码的指示已被发送到您的注册邮箱。"
-#: actions/recoverpassword.php:344
+#: actions/recoverpassword.php:357
msgid "Unexpected password reset."
msgstr "未预料的密码重置。"
-#: actions/recoverpassword.php:352
+#: actions/recoverpassword.php:365
msgid "Password must be 6 chars or more."
msgstr "密码必须是 6 个字符或更多。"
-#: actions/recoverpassword.php:356
+#: actions/recoverpassword.php:369
msgid "Password and confirmation do not match."
msgstr "密码和确认不匹配。"
-#: actions/recoverpassword.php:375 actions/register.php:248
+#: actions/recoverpassword.php:388 actions/register.php:248
msgid "Error setting user."
msgstr "保存用户设置时出错。"
-#: actions/recoverpassword.php:382
+#: actions/recoverpassword.php:395
msgid "New password successfully saved. You are now logged in."
msgstr "新密码已保存,您现在已登录。"
@@ -3140,7 +3346,7 @@ msgstr "验证码出错。"
msgid "Registration successful"
msgstr "注册成功。"
-#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:507 lib/logingroupnav.php:85
msgid "Register"
msgstr "注册"
@@ -3162,7 +3368,7 @@ msgstr "用户名或密码不正确。"
#: actions/register.php:343
msgid ""
-"With this form you can create a new account. You can then post notices and "
+"With this form you can create a new account. You can then post notices and "
"link up to friends and colleagues. "
msgstr ""
@@ -3178,8 +3384,9 @@ msgstr "6 个或更多字符。此项必填。"
msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
+#. TRANS: Link description in user account settings menu.
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
msgid "Email"
msgstr "电子邮件"
@@ -3192,21 +3399,13 @@ msgid "Longer name, preferably your \"real\" name"
msgstr "长名字,最好是“实名”"
#: actions/register.php:494
-msgid "My text and files are available under "
-msgstr "我的文字和文件采用的授权方式为"
-
-#: actions/register.php:496
-msgid "Creative Commons Attribution 3.0"
-msgstr ""
-
-#: actions/register.php:497
-#, fuzzy
+#, fuzzy, php-format
msgid ""
-" except this private data: password, email address, IM address, and phone "
-"number."
+"My text and files are available under %s except this private data: password, "
+"email address, IM address, and phone number."
msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
-#: actions/register.php:538
+#: actions/register.php:542
#, fuzzy, php-format
msgid ""
"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -3237,7 +3436,7 @@ msgstr ""
"\n"
"感谢您的注册,希望您喜欢这个服务。"
-#: actions/register.php:562
+#: actions/register.php:566
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -3280,7 +3479,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:394
+#: lib/userprofile.php:406
msgid "Subscribe"
msgstr "订阅"
@@ -3323,7 +3522,7 @@ msgstr "您必须同意此授权方可注册。"
msgid "You already repeated that notice."
msgstr "您已成功阻止该用户:"
-#: actions/repeat.php:114 lib/noticelist.php:674
+#: actions/repeat.php:114 lib/noticelist.php:675
#, fuzzy
msgid "Repeated"
msgstr "创建"
@@ -3412,7 +3611,7 @@ msgstr "用户没有个人信息。"
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:391
msgid "Sessions"
msgstr ""
@@ -3452,29 +3651,33 @@ msgstr "您必须登录才能邀请其他人使用 %s"
msgid "Application profile"
msgstr "通告没有关联个人信息"
-#: actions/showapplication.php:159 lib/applicationeditform.php:180
+#. TRANS: Form input field label for application icon.
+#: actions/showapplication.php:159 lib/applicationeditform.php:182
msgid "Icon"
msgstr ""
+#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:195
-#: lib/applicationeditform.php:195
+#: lib/applicationeditform.php:199
#, fuzzy
msgid "Name"
msgstr "昵称"
-#: actions/showapplication.php:178 lib/applicationeditform.php:222
+#. TRANS: Form input field label.
+#: actions/showapplication.php:178 lib/applicationeditform.php:235
#, fuzzy
msgid "Organization"
msgstr "分页"
+#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:198
-#: lib/applicationeditform.php:209 lib/groupeditform.php:172
+#: lib/applicationeditform.php:216 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
msgstr "描述"
-#: actions/showapplication.php:192 actions/showgroup.php:438
-#: lib/profileaction.php:176
+#: actions/showapplication.php:192 actions/showgroup.php:444
+#: lib/profileaction.php:187
msgid "Statistics"
msgstr "统计"
@@ -3585,71 +3788,71 @@ msgstr "%s 组"
msgid "%1$s group, page %2$d"
msgstr "%s 组成员, 第 %d 页"
-#: actions/showgroup.php:226
+#: actions/showgroup.php:227
#, fuzzy
msgid "Group profile"
msgstr "组资料"
-#: actions/showgroup.php:271 actions/tagother.php:118
-#: actions/userauthorization.php:175 lib/userprofile.php:177
+#: actions/showgroup.php:272 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:178
msgid "URL"
msgstr "URL 互联网地址"
-#: actions/showgroup.php:282 actions/tagother.php:128
-#: actions/userauthorization.php:187 lib/userprofile.php:194
+#: actions/showgroup.php:283 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:195
#, fuzzy
msgid "Note"
msgstr "通告"
-#: actions/showgroup.php:292 lib/groupeditform.php:184
+#: actions/showgroup.php:293 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:301
+#: actions/showgroup.php:302
msgid "Group actions"
msgstr "组动作"
-#: actions/showgroup.php:337
+#: actions/showgroup.php:338
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:343
+#: actions/showgroup.php:344
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:349
+#: actions/showgroup.php:350
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s 的通告聚合"
-#: actions/showgroup.php:354
+#: actions/showgroup.php:355
#, php-format
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
-#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:453 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "注册于"
-#: actions/showgroup.php:395 lib/profileaction.php:117
-#: lib/profileaction.php:150 lib/profileaction.php:238 lib/section.php:95
-#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71
+#: actions/showgroup.php:398 lib/profileaction.php:117
+#: lib/profileaction.php:152 lib/profileaction.php:255 lib/section.php:95
+#: lib/subscriptionlist.php:127 lib/tagcloudsection.php:71
msgid "(None)"
msgstr "(没有)"
-#: actions/showgroup.php:401
+#: actions/showgroup.php:404
msgid "All members"
msgstr "所有成员"
-#: actions/showgroup.php:441
+#: actions/showgroup.php:447
#, fuzzy
msgid "Created"
msgstr "创建"
-#: actions/showgroup.php:457
+#: actions/showgroup.php:463
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3659,7 +3862,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:463
+#: actions/showgroup.php:469
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3670,7 +3873,7 @@ msgstr ""
"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showgroup.php:491
+#: actions/showgroup.php:497
#, fuzzy
msgid "Admins"
msgstr "admin管理员"
@@ -3804,11 +4007,11 @@ msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Minimum text limit is 140 characters."
+msgid "Minimum text limit is 0 (unlimited)."
msgstr ""
#: actions/siteadminpanel.php:171
-msgid "Dupe limit must 1 or more seconds."
+msgid "Dupe limit must be one or more seconds."
msgstr ""
#: actions/siteadminpanel.php:221
@@ -3903,7 +4106,7 @@ msgid "Unable to save site notice."
msgstr "无法保存 Twitter 设置!"
#: actions/sitenoticeadminpanel.php:113
-msgid "Max length for the site-wide notice is 255 chars"
+msgid "Max length for the site-wide notice is 255 chars."
msgstr ""
#: actions/sitenoticeadminpanel.php:176
@@ -3920,69 +4123,110 @@ msgstr ""
msgid "Save site notice"
msgstr "新通告"
-#: actions/smssettings.php:58
+#. TRANS: Title for SMS settings.
+#: actions/smssettings.php:59
#, fuzzy
msgid "SMS settings"
msgstr "SMS短信设置"
-#: actions/smssettings.php:69
+#. TRANS: SMS settings page instructions.
+#. TRANS: %%site.name%% is the name of the site.
+#: actions/smssettings.php:74
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
-#: actions/smssettings.php:91
+#. TRANS: Message given in the SMS settings if SMS is not enabled on the site.
+#: actions/smssettings.php:97
#, fuzzy
msgid "SMS is not available."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/smssettings.php:112
+#. TRANS: Form legend for SMS settings form.
+#: actions/smssettings.php:111
+#, fuzzy
+msgid "SMS address"
+msgstr "IM 帐号"
+
+#. TRANS: Form guide in SMS settings form.
+#: actions/smssettings.php:120
msgid "Current confirmed SMS-enabled phone number."
msgstr "已确认的可以发送SMS短消息的电话号码。"
-#: actions/smssettings.php:123
+#. TRANS: Form guide in IM settings form.
+#: actions/smssettings.php:133
msgid "Awaiting confirmation on this phone number."
msgstr "等待确认此电话号码。"
-#: actions/smssettings.php:130
+#. TRANS: Field label for SMS address input in SMS settings form.
+#: actions/smssettings.php:142
msgid "Confirmation code"
msgstr "确认码"
-#: actions/smssettings.php:131
+#. TRANS: Form field instructions in SMS settings form.
+#: actions/smssettings.php:144
msgid "Enter the code you received on your phone."
msgstr "输入手机收到的验证码。"
-#: actions/smssettings.php:138
+#. TRANS: Button label to confirm SMS confirmation code in SMS settings.
+#: actions/smssettings.php:148
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Confirm"
+msgstr "确认"
+
+#. TRANS: Field label for SMS phone number input in SMS settings form.
+#: actions/smssettings.php:153
#, fuzzy
msgid "SMS phone number"
msgstr "SMS短信电话号码"
-#: actions/smssettings.php:140
+#. TRANS: SMS phone number input field instructions in SMS settings form.
+#: actions/smssettings.php:156
msgid "Phone number, no punctuation or spaces, with area code"
msgstr "电话号码,不带标点或空格,包含地区代码"
-#: actions/smssettings.php:174
+#. TRANS: Form legend for SMS preferences form.
+#: actions/smssettings.php:195
+#, fuzzy
+msgid "SMS preferences"
+msgstr "首选项"
+
+#. TRANS: Checkbox label in SMS preferences form.
+#: actions/smssettings.php:201
msgid ""
"Send me notices through SMS; I understand I may incur exorbitant charges "
"from my carrier."
msgstr "通过SMS短信将通告发给我;我了解这样也许会给我带来不菲的开支。"
-#: actions/smssettings.php:306
+#. TRANS: Confirmation message for successful SMS preferences save.
+#: actions/smssettings.php:315
+#, fuzzy
+msgid "SMS preferences saved."
+msgstr "首选项已保存。"
+
+#. TRANS: Message given saving SMS phone number without having provided one.
+#: actions/smssettings.php:338
msgid "No phone number."
msgstr "没有电话号码。"
-#: actions/smssettings.php:311
+#. TRANS: Message given saving SMS phone number without having selected a carrier.
+#: actions/smssettings.php:344
msgid "No carrier selected."
msgstr "未选择运营商。"
-#: actions/smssettings.php:318
+#. TRANS: Message given saving SMS phone number that is already set.
+#: actions/smssettings.php:352
msgid "That is already your phone number."
msgstr "您已登记此电话号码。"
-#: actions/smssettings.php:321
+#. TRANS: Message given saving SMS phone number that is already set for another user.
+#: actions/smssettings.php:356
msgid "That phone number already belongs to another user."
msgstr "这个电话号码属于另一个用户。"
-#: actions/smssettings.php:347
+#. TRANS: Message given saving valid SMS phone number that is to be confirmed.
+#: actions/smssettings.php:384
#, fuzzy
msgid ""
"A confirmation code was sent to the phone number you added. Check your phone "
@@ -3991,24 +4235,43 @@ msgstr ""
"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱),找到验证码并按要求"
"使用它。"
-#: actions/smssettings.php:374
+#. TRANS: Message given canceling SMS phone number confirmation for the wrong phone number.
+#: actions/smssettings.php:413
msgid "That is the wrong confirmation number."
msgstr "确认码错误。"
-#: actions/smssettings.php:405
+#. TRANS: Message given after successfully canceling SMS phone number confirmation.
+#: actions/smssettings.php:427
+#, fuzzy
+msgid "SMS confirmation cancelled."
+msgstr "已取消确认。"
+
+#. TRANS: Message given trying to remove an SMS phone number that is not
+#. TRANS: registered for the active user.
+#: actions/smssettings.php:448
msgid "That is not your phone number."
msgstr "这是他人的电话号码。"
-#: actions/smssettings.php:465
+#. TRANS: Message given after successfully removing a registered SMS phone number.
+#: actions/smssettings.php:470
+#, fuzzy
+msgid "The SMS phone number was removed."
+msgstr "SMS短信电话号码"
+
+#. TRANS: Label for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:511
#, fuzzy
msgid "Mobile carrier"
msgstr "选择运营商"
-#: actions/smssettings.php:469
+#. TRANS: Default option for mobile carrier dropdown menu in SMS settings.
+#: actions/smssettings.php:516
msgid "Select a carrier"
msgstr "选择运营商"
-#: actions/smssettings.php:476
+#. 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
#, php-format
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -4017,13 +4280,14 @@ msgstr ""
"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信,而这里尚未列出,请联"
"系 %s 以告知。"
-#: actions/smssettings.php:498
+#. TRANS: Message given saving SMS phone number confirmation code without having provided one.
+#: actions/smssettings.php:548
msgid "No code entered"
msgstr "没有输入验证码"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:407
msgid "Snapshots"
msgstr ""
@@ -4045,7 +4309,7 @@ msgid "Invalid snapshot report URL."
msgstr ""
#: actions/snapshotadminpanel.php:200
-msgid "Randomly during Web hit"
+msgid "Randomly during web hit"
msgstr ""
#: actions/snapshotadminpanel.php:201
@@ -4086,8 +4350,7 @@ msgstr "头像设置"
msgid "You are not subscribed to that profile."
msgstr "您未告知此个人信息"
-#: actions/subedit.php:83 classes/Subscription.php:89
-#: classes/Subscription.php:116
+#: actions/subedit.php:83 classes/Subscription.php:132
#, fuzzy
msgid "Could not save subscription."
msgstr "无法删除订阅。"
@@ -4182,12 +4445,12 @@ msgstr ""
msgid "%s is not listening to anyone."
msgstr "%1$s 开始关注您的 %2$s 信息。"
-#: actions/subscriptions.php:199
+#: actions/subscriptions.php:208
#, fuzzy
msgid "Jabber"
msgstr "没有 Jabber ID。"
-#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMS短信"
@@ -4221,13 +4484,13 @@ msgstr "没有这份文档。"
msgid "Tag %s"
msgstr "标签"
-#: actions/tagother.php:77 lib/userprofile.php:75
+#: actions/tagother.php:77 lib/userprofile.php:76
#, fuzzy
msgid "User profile"
msgstr "用户没有个人信息。"
#: actions/tagother.php:81 actions/userauthorization.php:132
-#: lib/userprofile.php:102
+#: lib/userprofile.php:103
msgid "Photo"
msgstr "相片"
@@ -4283,7 +4546,7 @@ msgstr "用户没有个人信息。"
#: actions/unsubscribe.php:77
#, fuzzy
-msgid "No profile id in request."
+msgid "No profile ID in request."
msgstr "服务器没有返回个人信息URL。"
#: actions/unsubscribe.php:98
@@ -4321,7 +4584,8 @@ msgstr ""
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
+#. TRANS: Link description in user account settings menu.
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信息"
@@ -4488,28 +4752,34 @@ msgstr ""
msgid "Enjoy your hotdog!"
msgstr ""
-#: actions/usergroups.php:64
+#. TRANS: Message is used as a page title. %1$s is a nick name, %2$d is a page number.
+#: actions/usergroups.php:66
#, fuzzy, php-format
msgid "%1$s groups, page %2$d"
msgstr "%s 组成员, 第 %d 页"
-#: actions/usergroups.php:130
+#: actions/usergroups.php:132
#, fuzzy
msgid "Search for more groups"
msgstr "检索人或文字"
-#: actions/usergroups.php:157
+#: actions/usergroups.php:159
#, fuzzy, php-format
msgid "%s is not a member of any group."
msgstr "您未告知此个人信息"
-#: actions/usergroups.php:162
+#: actions/usergroups.php:164
#, php-format
msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
msgstr ""
-#: actions/userrss.php:95 lib/atomgroupnoticefeed.php:66
-#: lib/atomusernoticefeed.php:72
+#. TRANS: Message is used as link description. %1$s is a username, %2$s is a site name.
+#. TRANS: Message is used as a subtitle in atom group notice feed.
+#. TRANS: %1$s is a group name, %2$s is a site name.
+#. 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:69
+#: lib/atomusernoticefeed.php:75
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
@@ -4557,7 +4827,8 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:767
+#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
+#: actions/version.php:196 lib/action.php:779
#, fuzzy
msgid "Version"
msgstr "个人"
@@ -4566,19 +4837,19 @@ msgstr "个人"
msgid "Author(s)"
msgstr ""
-#: classes/File.php:144
+#: classes/File.php:169
#, php-format
msgid ""
"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
"to upload a smaller version."
msgstr ""
-#: classes/File.php:154
+#: classes/File.php:179
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr ""
-#: classes/File.php:161
+#: classes/File.php:186
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr ""
@@ -4621,267 +4892,286 @@ msgstr "无法添加信息。"
msgid "Could not update message with new URI."
msgstr "无法添加新URI的信息。"
-#: classes/Notice.php:172
-#, php-format
-msgid "DB error inserting hashtag: %s"
+#. TRANS: Server exception. %s are the error details.
+#: classes/Notice.php:176
+#, fuzzy, php-format
+msgid "Database error inserting hashtag: %s"
msgstr "添加标签时数据库出错:%s"
-#: classes/Notice.php:241
+#: classes/Notice.php:245
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "保存通告时出错。"
-#: classes/Notice.php:245
+#: classes/Notice.php:249
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "保存通告时出错。"
-#: classes/Notice.php:250
+#: classes/Notice.php:254
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:256
+#: classes/Notice.php:260
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
-#: classes/Notice.php:262
+#: classes/Notice.php:266
msgid "You are banned from posting notices on this site."
msgstr "在这个网站你被禁止发布消息。"
-#: classes/Notice.php:328 classes/Notice.php:354
+#: classes/Notice.php:332 classes/Notice.php:358
msgid "Problem saving notice."
msgstr "保存通告时出错。"
-#: classes/Notice.php:927
+#: classes/Notice.php:967
#, fuzzy
msgid "Problem saving group inbox."
msgstr "保存通告时出错。"
-#: classes/Notice.php:1459
+#. 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:1535
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/Subscription.php:66 lib/oauthstore.php:465
+#: classes/Subscription.php:74 lib/oauthstore.php:465
#, fuzzy
msgid "You have been banned from subscribing."
msgstr "那个用户阻止了你的订阅。"
-#: classes/Subscription.php:70
+#: classes/Subscription.php:78
msgid "Already subscribed!"
msgstr ""
-#: classes/Subscription.php:74
+#: classes/Subscription.php:82
#, fuzzy
msgid "User has blocked you."
msgstr "用户没有个人信息。"
-#: classes/Subscription.php:157
+#: classes/Subscription.php:167
#, fuzzy
msgid "Not subscribed!"
msgstr "未订阅!"
-#: classes/Subscription.php:163
+#: classes/Subscription.php:173
#, fuzzy
msgid "Couldn't delete self-subscription."
msgstr "无法删除订阅。"
-#: classes/Subscription.php:190
+#: classes/Subscription.php:200
#, fuzzy
msgid "Couldn't delete subscription OMB token."
msgstr "无法删除订阅。"
-#: classes/Subscription.php:201 lib/subs.php:69
+#: classes/Subscription.php:211
msgid "Couldn't delete subscription."
msgstr "无法删除订阅。"
-#: classes/User.php:373
+#: classes/User.php:363
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
-#: classes/User_group.php:477
+#: classes/User_group.php:480
msgid "Could not create group."
msgstr "无法创建组。"
-#: classes/User_group.php:486
+#: classes/User_group.php:489
#, fuzzy
msgid "Could not set group URI."
msgstr "无法删除订阅。"
-#: classes/User_group.php:507
+#: classes/User_group.php:510
#, fuzzy
msgid "Could not set group membership."
msgstr "无法删除订阅。"
-#: classes/User_group.php:521
+#: classes/User_group.php:524
#, fuzzy
msgid "Could not save local group info."
msgstr "无法删除订阅。"
-#: lib/accountsettingsaction.php:108
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:109
msgid "Change your profile settings"
msgstr "修改您的个人信息"
-#: lib/accountsettingsaction.php:112
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:116
msgid "Upload an avatar"
msgstr "上载一个头像。"
-#: lib/accountsettingsaction.php:116
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:123
msgid "Change your password"
msgstr "修改密码"
-#: lib/accountsettingsaction.php:120
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:130
msgid "Change email handling"
msgstr "修改电子邮件"
-#: lib/accountsettingsaction.php:124
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:137
#, fuzzy
msgid "Design your profile"
msgstr "用户没有个人信息。"
-#: lib/accountsettingsaction.php:128
-msgid "Other"
-msgstr "其他"
-
-#: lib/accountsettingsaction.php:128
+#. TRANS: Link title attribute in user account settings menu.
+#: lib/accountsettingsaction.php:144
msgid "Other options"
msgstr "其他选项"
-#: lib/action.php:144
+#. TRANS: Link description in user account settings menu.
+#: lib/accountsettingsaction.php:146
+msgid "Other"
+msgstr "其他"
+
+#. TRANS: Page title. %1$s is the title, %2$s is the site name.
+#: lib/action.php:145
#, fuzzy, php-format
msgid "%1$s - %2$s"
msgstr "%1$s (%2$s)"
-#: lib/action.php:159
+#. TRANS: Page title for a page without a title set.
+#: lib/action.php:161
msgid "Untitled page"
msgstr "无标题页"
-#: lib/action.php:424
+#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
+#: lib/action.php:426
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:430
+#: lib/action.php:432
#, fuzzy
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友年表"
-#: lib/action.php:433
+#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
+#: lib/action.php:435
#, fuzzy
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:435
+#: lib/action.php:437
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改资料"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:440
+#: lib/action.php:442
#, fuzzy
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "无法重定向到服务器:%s"
-#: lib/action.php:443
+#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
+#: lib/action.php:445
msgid "Connect"
msgstr "连接"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:446
+#: lib/action.php:448
#, fuzzy
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "主站导航"
-#: lib/action.php:449
+#. TRANS: Main menu option when logged in and site admin for access to site configuration
+#: lib/action.php:451
#, fuzzy
msgctxt "MENU"
msgid "Admin"
msgstr "admin管理员"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:453
+#: lib/action.php:455
#, fuzzy, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "使用这个表单来邀请好友和同事加入。"
-#: lib/action.php:456
+#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
+#: lib/action.php:458
#, fuzzy
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:462
+#: lib/action.php:464
#, fuzzy
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "登出本站"
-#: lib/action.php:465
+#. TRANS: Main menu option when logged in to log out the current user
+#: lib/action.php:467
#, fuzzy
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:470
+#: lib/action.php:472
#, fuzzy
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建新帐号"
-#: lib/action.php:473
+#. TRANS: Main menu option when not logged in to register a new account
+#: lib/action.php:475
#, fuzzy
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:476
+#: lib/action.php:478
#, fuzzy
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登入本站"
-#: lib/action.php:479
+#: lib/action.php:481
#, fuzzy
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:482
+#: lib/action.php:484
#, fuzzy
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助"
-#: lib/action.php:485
+#: lib/action.php:487
#, fuzzy
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:488
+#: lib/action.php:490
#, fuzzy
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "检索人或文字"
-#: lib/action.php:491
+#: lib/action.php:493
#, fuzzy
msgctxt "MENU"
msgid "Search"
@@ -4889,77 +5179,91 @@ msgstr "搜索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:513 lib/adminpanelaction.php:398
+#: lib/action.php:515 lib/adminpanelaction.php:399
#, fuzzy
msgid "Site notice"
msgstr "新通告"
-#: lib/action.php:579
+#. TRANS: DT element for local views block. String is hidden in default CSS.
+#: lib/action.php:582
msgid "Local views"
msgstr "本地显示"
-#: lib/action.php:645
+#. TRANS: DT element for page notice. String is hidden in default CSS.
+#: lib/action.php:649
#, fuzzy
msgid "Page notice"
msgstr "新通告"
-#: lib/action.php:747
+#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
+#: lib/action.php:752
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项站导航"
-#: lib/action.php:752
+#. TRANS: Secondary navigation menu option leading to help on StatusNet.
+#: lib/action.php:758
msgid "Help"
msgstr "帮助"
-#: lib/action.php:754
+#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
+#: lib/action.php:761
msgid "About"
msgstr "关于"
-#: lib/action.php:756
+#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
+#: lib/action.php:764
msgid "FAQ"
msgstr "常见问题FAQ"
-#: lib/action.php:760
+#. TRANS: Secondary navigation menu option leading to Terms of Service.
+#: lib/action.php:769
msgid "TOS"
msgstr ""
-#: lib/action.php:763
+#. TRANS: Secondary navigation menu option leading to privacy policy.
+#: lib/action.php:773
msgid "Privacy"
msgstr "隐私"
-#: lib/action.php:765
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:776
msgid "Source"
msgstr "来源"
-#: lib/action.php:769
+#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
+#: lib/action.php:782
msgid "Contact"
msgstr "联系人"
-#: lib/action.php:771
+#: lib/action.php:784
#, fuzzy
msgid "Badge"
msgstr "呼叫"
-#: lib/action.php:799
+#. TRANS: DT element for StatusNet software license.
+#: lib/action.php:813
msgid "StatusNet software license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:802
-#, php-format
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
+#: lib/action.php:817
+#, fuzzy, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"broughtby%%](%%site.broughtbyurl%%)."
msgstr ""
"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)。"
-#: lib/action.php:804
+#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
+#: lib/action.php:820
#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
+msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 是一个微博客服务。"
-#: lib/action.php:806
+#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
+#: lib/action.php:824
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4970,72 +5274,86 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"授权。"
-#: lib/action.php:821
+#. TRANS: DT element for StatusNet site content license.
+#: lib/action.php:840
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注册证"
-#: lib/action.php:826
+#. TRANS: Content license displayed when license is set to 'private'.
+#. TRANS: %1$s is the site name.
+#: lib/action.php:847
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:831
+#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
+#. TRANS: %1$s is the copyright owner.
+#: lib/action.php:854
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:834
+#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
+#: lib/action.php:858
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:847
-msgid "All "
-msgstr "全部"
-
-#: lib/action.php:853
-msgid "license."
-msgstr "注册证"
+#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:871
+#, php-format
+msgid "All %1$s content and data are available under the %2$s license."
+msgstr ""
-#: lib/action.php:1152
+#. TRANS: DT element for pagination (previous/next, etc.).
+#: lib/action.php:1182
msgid "Pagination"
msgstr "分页"
-#: lib/action.php:1161
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: present than the currently displayed information.
+#: lib/action.php:1193
#, fuzzy
msgid "After"
msgstr "« 之后"
-#: lib/action.php:1169
+#. TRANS: Pagination message to go to a page displaying information more in the
+#. TRANS: past than the currently displayed information.
+#: lib/action.php:1203
#, fuzzy
msgid "Before"
msgstr "之前 »"
-#: lib/activity.php:453
+#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
+#: lib/activity.php:121
+msgid "Expecting a root feed element but got a whole XML document."
+msgstr ""
+
+#: lib/activityutils.php:208
msgid "Can't handle remote content yet."
msgstr ""
-#: lib/activity.php:481
+#: lib/activityutils.php:236
msgid "Can't handle embedded XML content yet."
msgstr ""
-#: lib/activity.php:485
+#: lib/activityutils.php:240
msgid "Can't handle embedded Base64 content yet."
msgstr ""
-#. TRANS: Client error message
+#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
#: lib/adminpanelaction.php:98
#, fuzzy
msgid "You cannot make changes to this site."
msgstr "无法向此用户发送消息。"
-#. TRANS: Client error message
+#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
#: lib/adminpanelaction.php:110
#, fuzzy
msgid "Changes to that panel are not allowed."
msgstr "不允许注册。"
-#. TRANS: Client error message
+#. TRANS: Client error message.
#: lib/adminpanelaction.php:229
#, fuzzy
msgid "showForm() not implemented."
@@ -5047,167 +5365,205 @@ msgstr "命令尚未实现。"
msgid "saveSettings() not implemented."
msgstr "命令尚未实现。"
-#. TRANS: Client error message
-#: lib/adminpanelaction.php:283
+#. TRANS: Client error message thrown if design settings could not be deleted in
+#. TRANS: the admin panel Design.
+#: lib/adminpanelaction.php:284
#, fuzzy
msgid "Unable to delete design setting."
msgstr "无法保存 Twitter 设置!"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:348
+#: lib/adminpanelaction.php:349
#, fuzzy
msgid "Basic site configuration"
msgstr "电子邮件地址确认"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:351
#, fuzzy
msgctxt "MENU"
msgid "Site"
msgstr "邀请"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:356
+#: lib/adminpanelaction.php:357
#, fuzzy
msgid "Design configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:359
#, fuzzy
msgctxt "MENU"
msgid "Design"
msgstr "个人"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:364
+#: lib/adminpanelaction.php:365
#, fuzzy
msgid "User configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:367 lib/personalgroupnav.php:115
msgid "User"
msgstr "用户"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:372
+#: lib/adminpanelaction.php:373
#, fuzzy
msgid "Access configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:380
+#: lib/adminpanelaction.php:381
#, fuzzy
msgid "Paths configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:388
+#: lib/adminpanelaction.php:389
#, fuzzy
msgid "Sessions configuration"
msgstr "SMS短信确认"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:396
+#: lib/adminpanelaction.php:397
#, fuzzy
msgid "Edit site notice"
msgstr "新通告"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:404
+#: lib/adminpanelaction.php:405
#, fuzzy
msgid "Snapshots configuration"
msgstr "SMS短信确认"
-#: lib/apiauth.php:94
+#. TRANS: Client error 401.
+#: lib/apiauth.php:113
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:272
-#, php-format
-msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
-msgstr ""
-
-#: lib/applicationeditform.php:136
+#. TRANS: Form legend.
+#: lib/applicationeditform.php:137
msgid "Edit application"
msgstr ""
-#: lib/applicationeditform.php:184
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:187
msgid "Icon for this application"
msgstr ""
-#: lib/applicationeditform.php:204
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:209
#, fuzzy, php-format
msgid "Describe your application in %d characters"
msgstr "用不超过140个字符描述您自己和您的爱好"
-#: lib/applicationeditform.php:207
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:213
#, fuzzy
msgid "Describe your application"
msgstr "用不超过140个字符描述您自己和您的爱好"
-#: lib/applicationeditform.php:216
-#, fuzzy
-msgid "Source URL"
-msgstr "来源"
-
-#: lib/applicationeditform.php:218
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:224
#, fuzzy
msgid "URL of the homepage of this application"
msgstr "您的主页、博客或在其他站点的URL"
-#: lib/applicationeditform.php:224
+#. TRANS: Form input field label.
+#: lib/applicationeditform.php:226
+#, fuzzy
+msgid "Source URL"
+msgstr "来源"
+
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:233
msgid "Organization responsible for this application"
msgstr ""
-#: lib/applicationeditform.php:230
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:242
#, fuzzy
msgid "URL for the homepage of the organization"
msgstr "您的主页、博客或在其他站点的URL"
-#: lib/applicationeditform.php:236
+#. TRANS: Form input field instructions.
+#: lib/applicationeditform.php:251
msgid "URL to redirect to after authentication"
msgstr ""
-#: lib/applicationeditform.php:258
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:278
msgid "Browser"
msgstr ""
-#: lib/applicationeditform.php:274
+#. TRANS: Radio button label for application type
+#: lib/applicationeditform.php:295
msgid "Desktop"
msgstr ""
-#: lib/applicationeditform.php:275
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:297
msgid "Type of application, browser or desktop"
msgstr ""
-#: lib/applicationeditform.php:297
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:320
msgid "Read-only"
msgstr ""
-#: lib/applicationeditform.php:315
+#. TRANS: Radio button label for access type.
+#: lib/applicationeditform.php:339
msgid "Read-write"
msgstr ""
-#: lib/applicationeditform.php:316
+#. TRANS: Form guide.
+#: lib/applicationeditform.php:341
msgid "Default access for this application: read-only, or read-write"
msgstr ""
-#: lib/applicationlist.php:154
+#. TRANS: Submit button title
+#: lib/applicationeditform.php:359
+msgid "Cancel"
+msgstr "取消"
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:136
+msgid "read-write"
+msgstr ""
+
+#. TRANS: Application access type
+#: lib/applicationlist.php:138
+msgid "read-only"
+msgstr ""
+
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
+#: lib/applicationlist.php:144
+#, php-format
+msgid "Approved %1$s - \"%2$s\" access."
+msgstr ""
+
+#. TRANS: Button label
+#: lib/applicationlist.php:159
#, fuzzy
+msgctxt "BUTTON"
msgid "Revoke"
msgstr "移除"
-#: lib/attachmentlist.php:87
+#. TRANS: DT element label in attachment list.
+#: lib/attachmentlist.php:88
msgid "Attachments"
msgstr ""
+#. TRANS: DT element label in attachment list item.
#: lib/attachmentlist.php:265
msgid "Author"
msgstr ""
-#: lib/attachmentlist.php:278
+#. TRANS: DT element label in attachment list item.
+#: lib/attachmentlist.php:279
#, fuzzy
msgid "Provider"
msgstr "个人信息"
@@ -5230,37 +5586,57 @@ msgstr "密码已保存。"
msgid "Password changing is not allowed"
msgstr "密码已保存。"
-#: lib/channel.php:138 lib/channel.php:158
+#: lib/channel.php:157 lib/channel.php:177
msgid "Command results"
msgstr "执行结果"
-#: lib/channel.php:210 lib/mailhandler.php:142
+#: lib/channel.php:229 lib/mailhandler.php:142
msgid "Command complete"
msgstr "执行完毕"
-#: lib/channel.php:221
+#: lib/channel.php:240
msgid "Command failed"
msgstr "执行失败"
-#: lib/command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "对不起,这个命令还没有实现。"
+#: lib/command.php:83 lib/command.php:105
+#, fuzzy
+msgid "Notice with that id does not exist"
+msgstr "没有找到此ID的信息。"
+
+#: lib/command.php:99 lib/command.php:596
+msgid "User has no last notice"
+msgstr "用户没有通告。"
-#: lib/command.php:88
+#. TRANS: Message given requesting a profile for a non-existing user.
+#. TRANS: %s is the nickname of the user for which the profile could not be found.
+#: lib/command.php:127
#, fuzzy, php-format
msgid "Could not find a user with nickname %s"
msgstr "无法更新已确认的电子邮件。"
-#: lib/command.php:92
+#. TRANS: Message given getting a non-existing user.
+#. TRANS: %s is the nickname of the user that could not be found.
+#: lib/command.php:147
+#, fuzzy, php-format
+msgid "Could not find a local user with nickname %s"
+msgstr "无法更新已确认的电子邮件。"
+
+#: lib/command.php:180
+msgid "Sorry, this command is not yet implemented."
+msgstr "对不起,这个命令还没有实现。"
+
+#: lib/command.php:225
msgid "It does not make a lot of sense to nudge yourself!"
msgstr ""
-#: lib/command.php:99
+#. TRANS: Message given having nudged another user.
+#. TRANS: %s is the nickname of the user that was nudged.
+#: lib/command.php:234
#, fuzzy, php-format
msgid "Nudge sent to %s"
msgstr "振铃呼叫发出。"
-#: lib/command.php:126
+#: lib/command.php:260
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5268,200 +5644,204 @@ msgid ""
"Notices: %3$s"
msgstr ""
-#: lib/command.php:152 lib/command.php:390 lib/command.php:451
-#, fuzzy
-msgid "Notice with that id does not exist"
-msgstr "没有找到此ID的信息。"
-
-#: lib/command.php:168 lib/command.php:406 lib/command.php:467
-#: lib/command.php:523
-msgid "User has no last notice"
-msgstr "用户没有通告。"
-
-#: lib/command.php:190
+#: lib/command.php:302
msgid "Notice marked as fave."
msgstr "通告被标记为收藏。"
-#: lib/command.php:217
+#: lib/command.php:323
msgid "You are already a member of that group"
msgstr "您已经是该组成员"
-#: lib/command.php:231
+#. 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.
+#: lib/command.php:339
#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
+msgid "Could not join user %1$s to group %2$s"
msgstr "无法把 %s 用户添加到 %s 组"
-#: lib/command.php:236
+#. 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.
+#: lib/command.php:385
#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s 加入 %s 组"
-
-#: lib/command.php:275
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
+msgid "Could not remove user %1$s from group %2$s"
msgstr "无法订阅用户:未找到。"
-#: lib/command.php:280
-#, php-format
-msgid "%s left group %s"
-msgstr "%s 离开群 %s"
-
-#: lib/command.php:309
+#. TRANS: Whois output. %s is the full name of the queried user.
+#: lib/command.php:418
#, php-format
msgid "Fullname: %s"
msgstr "全名:%s"
-#: lib/command.php:312 lib/mail.php:258
+#. TRANS: Whois output. %s is the location of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:422 lib/mail.php:263
#, php-format
msgid "Location: %s"
msgstr "位置:%s"
-#: lib/command.php:315 lib/mail.php:260
+#. TRANS: Whois output. %s is the homepage of the queried user.
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/command.php:426 lib/mail.php:266
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
-#: lib/command.php:318
+#. TRANS: Whois output. %s is the bio information of the queried user.
+#: lib/command.php:430
#, php-format
msgid "About: %s"
msgstr "关于:%s"
-#: lib/command.php:349
+#: lib/command.php:457
+#, php-format
+msgid ""
+"%s is a remote profile; you can only send direct messages to users on the "
+"same server."
+msgstr ""
+
+#. TRANS: Message given if content is too long.
+#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
+#: lib/command.php:472
#, fuzzy, php-format
-msgid "Message too long - maximum is %d characters, you sent %d"
+msgid "Message too long - maximum is %1$d characters, you sent %2$d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:367
+#. TRANS: Message given have sent a direct message to another user.
+#. TRANS: %s is the name of the other user.
+#: lib/command.php:492
#, php-format
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: lib/command.php:369
+#: lib/command.php:494
msgid "Error sending direct message."
msgstr "发送消息出错。"
-#: lib/command.php:413
+#: lib/command.php:514
#, fuzzy
msgid "Cannot repeat your own notice"
msgstr "无法开启通告。"
-#: lib/command.php:418
+#: lib/command.php:519
#, fuzzy
msgid "Already repeated that notice"
msgstr "删除通告"
-#: lib/command.php:426
+#. 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:529
#, fuzzy, php-format
msgid "Notice from %s repeated"
msgstr "消息已发布。"
-#: lib/command.php:428
+#: lib/command.php:531
#, fuzzy
msgid "Error repeating notice."
msgstr "保存通告时出错。"
-#: lib/command.php:482
+#: lib/command.php:562
#, fuzzy, php-format
msgid "Notice too long - maximum is %d characters, you sent %d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: lib/command.php:491
+#: lib/command.php:571
#, fuzzy, php-format
msgid "Reply to %s sent"
msgstr "无法删除通告。"
-#: lib/command.php:493
+#: lib/command.php:573
#, fuzzy
msgid "Error saving notice."
msgstr "保存通告时出错。"
-#: lib/command.php:547
+#: lib/command.php:620
msgid "Specify the name of the user to subscribe to"
msgstr "指定要订阅的用户名"
-#: lib/command.php:554 lib/command.php:589
-msgid "No such user"
-msgstr "没有这个用户。"
+#: lib/command.php:628
+#, fuzzy
+msgid "Can't subscribe to OMB profiles by command."
+msgstr "您未告知此个人信息"
-#: lib/command.php:561
+#: lib/command.php:634
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: lib/command.php:582 lib/command.php:685
+#: lib/command.php:655 lib/command.php:754
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定要取消订阅的用户名"
-#: lib/command.php:595
+#: lib/command.php:664
#, php-format
msgid "Unsubscribed from %s"
msgstr "取消订阅 %s"
-#: lib/command.php:613 lib/command.php:636
+#: lib/command.php:682 lib/command.php:705
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: lib/command.php:616
+#: lib/command.php:685
msgid "Notification off."
msgstr "通告关闭。"
-#: lib/command.php:618
+#: lib/command.php:687
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: lib/command.php:639
+#: lib/command.php:708
msgid "Notification on."
msgstr "通告开启。"
-#: lib/command.php:641
+#: lib/command.php:710
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: lib/command.php:654
+#: lib/command.php:723
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:665
+#: lib/command.php:734
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:692
+#: lib/command.php:761
#, fuzzy, php-format
msgid "Unsubscribed %s"
msgstr "取消订阅 %s"
-#: lib/command.php:709
+#: lib/command.php:778
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "您未告知此个人信息"
-#: lib/command.php:711
+#: lib/command.php:780
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "您已订阅这些用户:"
-#: lib/command.php:731
+#: lib/command.php:800
#, fuzzy
msgid "No one is subscribed to you."
msgstr "无法订阅他人更新。"
-#: lib/command.php:733
+#: lib/command.php:802
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "无法订阅他人更新。"
-#: lib/command.php:753
+#: lib/command.php:822
#, fuzzy
msgid "You are not a member of any groups."
msgstr "您未告知此个人信息"
-#: lib/command.php:755
+#: lib/command.php:824
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "您未告知此个人信息"
-#: lib/command.php:769
+#: lib/command.php:838
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5503,20 +5883,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:148
+#: lib/common.php:135
#, fuzzy
msgid "No configuration file found. "
msgstr "没有验证码"
-#: lib/common.php:149
+#: lib/common.php:136
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:151
+#: lib/common.php:138
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:152
+#: lib/common.php:139
#, fuzzy
msgid "Go to the installer."
msgstr "登入本站"
@@ -5700,54 +6080,55 @@ msgstr "消息最多的群"
msgid "Tags in %s group's notices"
msgstr "这个组所发布的消息的标签"
-#: lib/htmloutputter.php:103
+#. TRANS: Client exception 406
+#: lib/htmloutputter.php:104
msgid "This page is not available in a media type you accept"
msgstr "这个页面不提供您想要的媒体类型"
-#: lib/imagefile.php:75
+#: lib/imagefile.php:72
+msgid "Unsupported image file format."
+msgstr "不支持这种图像格式。"
+
+#: lib/imagefile.php:88
#, fuzzy, php-format
msgid "That file is too big. The maximum file size is %s."
msgstr "你可以给你的组上载一个logo图。"
-#: lib/imagefile.php:80
+#: lib/imagefile.php:93
msgid "Partial upload."
msgstr "部分上传。"
-#: lib/imagefile.php:88 lib/mediafile.php:170
+#: lib/imagefile.php:101 lib/mediafile.php:170
msgid "System error uploading file."
msgstr "上传文件时出错。"
-#: lib/imagefile.php:96
+#: lib/imagefile.php:109
msgid "Not an image or corrupt file."
msgstr "不是图片文件或文件已损坏。"
-#: lib/imagefile.php:109
-msgid "Unsupported image file format."
-msgstr "不支持这种图像格式。"
-
#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "没有这份通告。"
-#: lib/imagefile.php:166 lib/imagefile.php:231
+#: lib/imagefile.php:163 lib/imagefile.php:224
msgid "Unknown file type"
msgstr "未知文件类型"
-#: lib/imagefile.php:251
+#: lib/imagefile.php:244
msgid "MB"
msgstr ""
-#: lib/imagefile.php:253
+#: lib/imagefile.php:246
msgid "kB"
msgstr ""
-#: lib/jabber.php:220
+#: lib/jabber.php:387
#, php-format
msgid "[%s]"
msgstr ""
-#: lib/jabber.php:400
+#: lib/jabber.php:567
#, php-format
msgid "Unknown inbox source %d."
msgstr ""
@@ -5772,11 +6153,13 @@ msgstr "输入用户名和密码以登录。"
msgid "Sign up for a new account"
msgstr "创建新帐号"
-#: lib/mail.php:173
+#. TRANS: Subject for address confirmation email
+#: lib/mail.php:174
msgid "Email address confirmation"
msgstr "电子邮件地址确认"
-#: lib/mail.php:175
+#. TRANS: Body for address confirmation email.
+#: lib/mail.php:177
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5793,12 +6176,14 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:240
+#. TRANS: Subject of new-subscriber notification e-mail
+#: lib/mail.php:243
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s 信息。"
-#: lib/mail.php:245
+#. TRANS: Main body of new-subscriber notification e-mail
+#: lib/mail.php:249
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5818,19 +6203,22 @@ msgstr ""
"\n"
"为您效力的 %4$s\n"
-#: lib/mail.php:262
+#. TRANS: Profile info line in new-subscriber notification e-mail
+#: lib/mail.php:269
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"自传Bio: %s\n"
"\n"
-#: lib/mail.php:290
+#. TRANS: Subject of notification mail for new posting email address
+#: lib/mail.php:298
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电子邮件地址,用于发布 %s 信息"
-#: lib/mail.php:293
+#. TRANS: Body of notification mail for new posting email address
+#: lib/mail.php:302
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5850,21 +6238,31 @@ msgstr ""
"\n"
"为您效力的 %4$s"
-#: lib/mail.php:417
+#. TRANS: Subject line for SMS-by-email notification messages
+#: lib/mail.php:427
#, php-format
msgid "%s status"
msgstr "%s 状态"
-#: lib/mail.php:443
+#. TRANS: Subject line for SMS-by-email address confirmation message
+#: lib/mail.php:454
msgid "SMS confirmation"
msgstr "SMS短信确认"
-#: lib/mail.php:467
+#. TRANS: Main body heading for SMS-by-email address confirmation message
+#: lib/mail.php:457
+#, fuzzy, php-format
+msgid "%s: confirm you own this phone number with this code:"
+msgstr "等待确认此电话号码。"
+
+#. TRANS: Subject for 'nudge' notification email
+#: lib/mail.php:478
#, php-format
msgid "You've been nudged by %s"
msgstr "%s 振铃呼叫你"
-#: lib/mail.php:471
+#. TRANS: Body for 'nudge' notification email
+#: lib/mail.php:483
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5880,12 +6278,14 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:517
+#. TRANS: Subject for direct-message notification email
+#: lib/mail.php:530
#, php-format
msgid "New private message from %s"
msgstr "%s 发送了新的私人信息"
-#: lib/mail.php:521
+#. TRANS: Body for direct-message notification email
+#: lib/mail.php:535
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5904,12 +6304,14 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:568
+#. TRANS: Subject for favorite notification email
+#: lib/mail.php:583
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s 收藏了您的通告"
-#: lib/mail.php:570
+#. TRANS: Body for favorite notification email
+#: lib/mail.php:586
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5930,12 +6332,22 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:635
+#. TRANS: Line in @-reply notification e-mail. %s is conversation URL.
+#: lib/mail.php:645
+#, php-format
+msgid ""
+"The full conversation can be read here:\n"
+"\n"
+"\t%s"
+msgstr ""
+
+#: lib/mail.php:651
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:637
+#. TRANS: Body of @-reply notification e-mail.
+#: lib/mail.php:654
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5948,6 +6360,18 @@ msgid ""
"\n"
"\t%4$s\n"
"\n"
+"%5$sYou can reply back here:\n"
+"\n"
+"\t%6$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%7$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %8$s\n"
msgstr ""
#: lib/mailbox.php:89
@@ -5960,7 +6384,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:482
+#: lib/mailbox.php:227 lib/noticelist.php:494
#, fuzzy
msgid "from"
msgstr " 从 "
@@ -6093,53 +6517,57 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:429
-#, php-format
-msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-msgstr ""
-
+#. TRANS: Used in coordinates as abbreviation of north
#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "否"
-#: lib/noticelist.php:430
+#. TRANS: Used in coordinates as abbreviation of south
+#: lib/noticelist.php:432
msgid "S"
msgstr ""
-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of east
+#: lib/noticelist.php:434
msgid "E"
msgstr ""
-#: lib/noticelist.php:431
+#. TRANS: Used in coordinates as abbreviation of west
+#: lib/noticelist.php:436
msgid "W"
msgstr ""
#: lib/noticelist.php:438
+#, php-format
+msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
+msgstr ""
+
+#: lib/noticelist.php:447
msgid "at"
msgstr ""
-#: lib/noticelist.php:566
+#: lib/noticelist.php:567
#, fuzzy
msgid "in context"
msgstr "没有内容!"
-#: lib/noticelist.php:601
+#: lib/noticelist.php:602
#, fuzzy
msgid "Repeated by"
msgstr "创建"
-#: lib/noticelist.php:628
+#: lib/noticelist.php:629
#, fuzzy
msgid "Reply to this notice"
msgstr "无法删除通告。"
-#: lib/noticelist.php:629
+#: lib/noticelist.php:630
#, fuzzy
msgid "Reply"
msgstr "回复"
-#: lib/noticelist.php:673
+#: lib/noticelist.php:674
#, fuzzy
msgid "Notice repeated"
msgstr "消息已发布。"
@@ -6165,6 +6593,10 @@ msgstr "添加个人信息出错"
msgid "Error inserting avatar"
msgstr "添加头像出错"
+#: lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "更新远程的个人信息时出错"
+
#: lib/oauthstore.php:311
msgid "Error inserting remote profile"
msgstr "添加远程的个人信息出错"
@@ -6216,7 +6648,7 @@ msgstr "%s's 的消息的标签"
msgid "Unknown"
msgstr "未知动作"
-#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:205 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "订阅"
@@ -6224,34 +6656,34 @@ msgstr "订阅"
msgid "All subscriptions"
msgstr "所有订阅"
-#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
+#: lib/profileaction.php:144 lib/profileaction.php:214 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "订阅者"
-#: lib/profileaction.php:159
+#: lib/profileaction.php:161
#, fuzzy
msgid "All subscribers"
msgstr "订阅者"
-#: lib/profileaction.php:180
+#: lib/profileaction.php:191
#, fuzzy
msgid "User ID"
msgstr "用户"
-#: lib/profileaction.php:185
+#: lib/profileaction.php:196
msgid "Member since"
msgstr "用户始于"
-#: lib/profileaction.php:247
+#. TRANS: Average count of posts made per day since account registration
+#: lib/profileaction.php:235
+msgid "Daily average"
+msgstr ""
+
+#: lib/profileaction.php:264
msgid "All groups"
msgstr "所有组"
-#: lib/profileformaction.php:123
-#, fuzzy
-msgid "No return-to arguments."
-msgstr "没有这份文档。"
-
-#: lib/profileformaction.php:137
+#: lib/profileformaction.php:114
msgid "Unimplemented method."
msgstr ""
@@ -6277,12 +6709,21 @@ msgstr "特征"
msgid "Popular"
msgstr "用户"
+#: lib/redirectingaction.php:94
+#, fuzzy
+msgid "No return-to arguments."
+msgstr "没有这份文档。"
+
#: lib/repeatform.php:107
#, fuzzy
msgid "Repeat this notice?"
msgstr "无法删除通告。"
#: lib/repeatform.php:132
+msgid "Yes"
+msgstr "是"
+
+#: lib/repeatform.php:132
#, fuzzy
msgid "Repeat this notice"
msgstr "无法删除通告。"
@@ -6292,7 +6733,7 @@ msgstr "无法删除通告。"
msgid "Revoke the \"%s\" role from this user"
msgstr "该组成员列表。"
-#: lib/router.php:671
+#: lib/router.php:704
msgid "No single user defined for single-user mode."
msgstr ""
@@ -6347,7 +6788,7 @@ msgstr "无标题章节"
#: lib/section.php:106
msgid "More..."
-msgstr ""
+msgstr "更多..."
#: lib/silenceform.php:67
#, fuzzy
@@ -6430,96 +6871,115 @@ msgstr "取消订阅 %s"
msgid "Unsubscribe"
msgstr "退订"
-#: lib/userprofile.php:116
+#: lib/usernoprofileexception.php:58
+#, fuzzy, php-format
+msgid "User %s (%d) has no profile record."
+msgstr "用户没有个人信息。"
+
+#: lib/userprofile.php:117
#, fuzzy
msgid "Edit Avatar"
msgstr "头像"
-#: lib/userprofile.php:236
+#: lib/userprofile.php:234 lib/userprofile.php:248
#, fuzzy
msgid "User actions"
msgstr "未知动作"
-#: lib/userprofile.php:251
+#: lib/userprofile.php:237
+msgid "User deletion in progress..."
+msgstr ""
+
+#: lib/userprofile.php:263
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
-#: lib/userprofile.php:252
+#: lib/userprofile.php:264
msgid "Edit"
-msgstr ""
+msgstr "编辑"
-#: lib/userprofile.php:275
+#: lib/userprofile.php:287
#, fuzzy
msgid "Send a direct message to this user"
msgstr "无法向此用户发送消息。"
-#: lib/userprofile.php:276
+#: lib/userprofile.php:288
#, fuzzy
msgid "Message"
msgstr "新消息"
-#: lib/userprofile.php:314
+#: lib/userprofile.php:326
msgid "Moderate"
msgstr ""
-#: lib/userprofile.php:352
+#: lib/userprofile.php:364
#, fuzzy
msgid "User role"
msgstr "用户没有个人信息。"
-#: lib/userprofile.php:354
+#: lib/userprofile.php:366
#, fuzzy
msgctxt "role"
msgid "Administrator"
msgstr "admin管理员"
-#: lib/userprofile.php:355
+#: lib/userprofile.php:367
msgctxt "role"
msgid "Moderator"
msgstr ""
-#: lib/util.php:1015
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1083
msgid "a few seconds ago"
msgstr "几秒前"
-#: lib/util.php:1017
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1086
msgid "about a minute ago"
msgstr "一分钟前"
-#: lib/util.php:1019
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1090
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: lib/util.php:1021
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1093
msgid "about an hour ago"
msgstr "一小时前"
-#: lib/util.php:1023
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1097
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: lib/util.php:1025
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1100
msgid "about a day ago"
msgstr "一天前"
-#: lib/util.php:1027
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1104
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: lib/util.php:1029
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1107
msgid "about a month ago"
msgstr "一个月前"
-#: lib/util.php:1031
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1111
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: lib/util.php:1033
+#. TRANS: Used in notices to indicate when the notice was made compared to now.
+#: lib/util.php:1114
msgid "about a year ago"
msgstr "一年前"
@@ -6533,7 +6993,7 @@ msgstr "主页的URL不正确。"
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr ""
-#: lib/xmppmanager.php:402
+#: lib/xmppmanager.php:403
#, fuzzy, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"