X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=inline;f=locale%2Fzh_CN%2FLC_MESSAGES%2Fstatusnet.po;h=cc176161695678fe0428ffc3d3b236be41e1d18c;hb=7277b59734cf0e39c8c77e01b13e8d997533bacf;hp=7023936339dfe5e83cea094292bdc0e2f68f98ef;hpb=c14ac57b1935a124dd4205e0f02d939086b5867e;p=quix0rs-gnu-social.git
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 7023936339..cc17616169 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,82 +10,89 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-01-30 23:41+0000\n"
-"PO-Revision-Date: 2010-01-30 23:42:59+0000\n"
+"POT-Creation-Date: 2010-03-06 23:49+0000\n"
+"PO-Revision-Date: 2010-03-06 23:51:13+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha (r61734); Translate extension (2010-01-16)\n"
+"X-Generator: MediaWiki 1.17alpha (r63350); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: actions/accessadminpanel.php:54 lib/adminpanelaction.php:326
+#. TRANS: Page title
+#. TRANS: Menu item for site administration
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:374
#, fuzzy
msgid "Access"
msgstr "æ¥å"
-#: actions/accessadminpanel.php:65
+#. TRANS: Page notice
+#: actions/accessadminpanel.php:67
#, fuzzy
msgid "Site access settings"
msgstr "头å设置"
-#: actions/accessadminpanel.php:158
+#. TRANS: Form legend for registration form.
+#: actions/accessadminpanel.php:161
#, fuzzy
msgid "Registration"
msgstr "注å"
-#: actions/accessadminpanel.php:161
+#. TRANS: Checkbox instructions for admin setting "Private"
+#: actions/accessadminpanel.php:165
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
+
+#. TRANS: Checkbox label for prohibiting anonymous users from viewing site.
+#: actions/accessadminpanel.php:167
#, fuzzy
+msgctxt "LABEL"
msgid "Private"
msgstr "éç§"
-#: actions/accessadminpanel.php:163
-msgid "Prohibit anonymous users (not logged in) from viewing site?"
+#. TRANS: Checkbox instructions for admin setting "Invite only"
+#: actions/accessadminpanel.php:174
+msgid "Make registration invitation only."
msgstr ""
-#: actions/accessadminpanel.php:167
+#. TRANS: Checkbox label for configuring site as invite only.
+#: actions/accessadminpanel.php:176
#, fuzzy
msgid "Invite only"
msgstr "é请"
-#: actions/accessadminpanel.php:169
-msgid "Make registration invitation only."
+#. TRANS: Checkbox instructions for admin setting "Closed" (no new registrations)
+#: actions/accessadminpanel.php:183
+msgid "Disable new registrations."
msgstr ""
-#: actions/accessadminpanel.php:173
+#. TRANS: Checkbox label for disabling new user registrations.
+#: actions/accessadminpanel.php:185
#, fuzzy
msgid "Closed"
msgstr "é»æ¢"
-#: actions/accessadminpanel.php:175
-msgid "Disable new registrations."
-msgstr ""
-
-#: actions/accessadminpanel.php:189 actions/designadminpanel.php:586
-#: actions/emailsettings.php:195 actions/imsettings.php:163
-#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
-#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
-#: actions/siteadminpanel.php:336 actions/smssettings.php:181
-#: actions/subscriptions.php:203 actions/tagother.php:154
-#: actions/useradminpanel.php:293 lib/applicationeditform.php:333
-#: lib/applicationeditform.php:334 lib/designsettings.php:256
-#: lib/groupeditform.php:202
-msgid "Save"
-msgstr "ä¿å"
-
-#: actions/accessadminpanel.php:189
+#. TRANS: Title / tooltip for button to save access settings in site admin panel
+#: actions/accessadminpanel.php:202
#, fuzzy
msgid "Save access settings"
msgstr "头å设置"
-#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
-#: actions/showfavorites.php:137 actions/tag.php:51
+#: actions/accessadminpanel.php:203
+#, fuzzy
+msgctxt "BUTTON"
+msgid "Save"
+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"
msgstr "没æ该页é¢"
-#: actions/all.php:74 actions/allrss.php:68
+#: actions/all.php:75 actions/allrss.php:68
#: actions/apiaccountupdatedeliverydevice.php:113
#: actions/apiaccountupdateprofile.php:105
#: actions/apiaccountupdateprofilebackgroundimage.php:116
@@ -99,79 +106,88 @@ msgstr "没æ该页é¢"
#: 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
-#: actions/microsummary.php:62 actions/newmessage.php:116 actions/otp.php:76
-#: actions/remotesubscribe.php:145 actions/remotesubscribe.php:154
-#: actions/replies.php:73 actions/repliesrss.php:38
-#: actions/showfavorites.php:105 actions/userbyid.php:74
-#: actions/usergroups.php:91 actions/userrss.php:38 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
-#: lib/subs.php:34 lib/subs.php:125
+#: actions/hcard.php:67 actions/microsummary.php:62 actions/newmessage.php:116
+#: actions/otp.php:76 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/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
msgid "No such user."
msgstr "没æè¿ä¸ªç¨æ·ã"
-#: actions/all.php:84
+#. TRANS: Page title. %1$s is user nickname, %2$d is page number
+#: actions/all.php:86
#, fuzzy, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%s å好å"
-#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#. 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
#: lib/personalgroupnav.php:100
#, php-format
msgid "%s and friends"
msgstr "%s å好å"
-#: actions/all.php:99
+#. TRANS: %1$s is user nickname
+#: actions/all.php:103
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
msgstr "%s 好åçèå(RSS 1.0)"
-#: actions/all.php:107
+#. TRANS: %1$s is user nickname
+#: actions/all.php:112
#, php-format
msgid "Feed for friends of %s (RSS 2.0)"
msgstr "%s 好åçèå(RSS 2.0)"
-#: actions/all.php:115
+#. TRANS: %1$s is user nickname
+#: actions/all.php:121
#, php-format
msgid "Feed for friends of %s (Atom)"
msgstr "%s 好åçèå(Atom)"
-#: actions/all.php:127
+#. TRANS: %1$s is user nickname
+#: actions/all.php:134
#, php-format
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr "è¿æ¯ %s å好åçæ¶é´çº¿ï¼ä½æ¯æ²¡æä»»ä½äººåå¸å
容ã"
-#: actions/all.php:132
+#: actions/all.php:139
#, php-format
msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-#: actions/all.php:134
+#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
+#: actions/all.php:142
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) from his profile or [post something to "
"his or her attention](%%%%action.newnotice%%%%?status_textarea=%3$s)."
msgstr ""
-#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
+#: actions/all.php:145 actions/replies.php:210 actions/showstream.php:211
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
-#: actions/all.php:165
+#. TRANS: H1 text
+#: actions/all.php:178
#, fuzzy
msgid "You and friends"
msgstr "%s å好å"
-#: actions/allrss.php:119 actions/apitimelinefriends.php:121
-#: actions/apitimelinehome.php:122
+#: actions/allrss.php:119 actions/apitimelinefriends.php:119
+#: actions/apitimelinehome.php:120
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "æ¥èª%2$s ä¸ %1$s å好åçæ´æ°ï¼"
@@ -181,21 +197,22 @@ msgstr "æ¥èª%2$s ä¸ %1$s å好åçæ´æ°ï¼"
#: actions/apiaccountupdateprofile.php:97
#: actions/apiaccountupdateprofilebackgroundimage.php:94
#: actions/apiaccountupdateprofilecolors.php:118
-#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
-#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
-#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:128
-#: actions/apigroupcreate.php:136 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/apigroupshow.php:115
-#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
-#: actions/apistatusesretweets.php:112 actions/apistatusesshow.php:108
-#: actions/apistatusnetconfig.php:133 actions/apistatusnetversion.php:93
-#: actions/apisubscriptions.php:111 actions/apitimelinefavorites.php:146
-#: actions/apitimelinefriends.php:155 actions/apitimelinegroup.php:150
-#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151
-#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedtome.php:121
-#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141
+#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
+#: actions/apifavoritecreate.php:99 actions/apifavoritedestroy.php:100
+#: 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/apigroupshow.php:115 actions/apihelptest.php:88
+#: actions/apistatusesdestroy.php:102 actions/apistatusesretweets.php:112
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:135
+#: 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/apitimelineretweetedtome.php:121
+#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166
#: actions/apitimelineuser.php:165 actions/apiusershow.php:101
#, fuzzy
msgid "API method not found."
@@ -230,8 +247,9 @@ msgstr "æ æ³æ´æ°ç¨æ·ã"
#: actions/apiaccountupdateprofilebackgroundimage.php:194
#: actions/apiaccountupdateprofilecolors.php:185
#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
-#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
-#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
+#: actions/replies.php:80 actions/usergroups.php:98 lib/galleryaction.php:66
+#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
@@ -256,7 +274,7 @@ msgstr ""
#: actions/apiaccountupdateprofilebackgroundimage.php:146
#: actions/apiaccountupdateprofilecolors.php:164
#: actions/apiaccountupdateprofilecolors.php:174
-#: actions/groupdesignsettings.php:287 actions/groupdesignsettings.php:297
+#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
#, fuzzy
@@ -375,68 +393,68 @@ msgstr "æ æ³è·åæ¶èçéåã"
msgid "Could not find target user."
msgstr "æ¾ä¸å°ä»»ä½ä¿¡æ¯ã"
-#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/apigroupcreate.php:166 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "æµç§°åªè½ä½¿ç¨å°ååæ¯åæ°åï¼ä¸å
å«ç©ºæ ¼ã"
-#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/apigroupcreate.php:175 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "æµç§°å·²è¢«ä½¿ç¨ï¼æ¢ä¸ä¸ªå§ã"
-#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/apigroupcreate.php:182 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:210
msgid "Not a valid nickname."
msgstr "ä¸æ¯ææçæµç§°ã"
-#: actions/apigroupcreate.php:196 actions/editapplication.php:212
-#: actions/editgroup.php:195 actions/newapplication.php:200
+#: actions/apigroupcreate.php:198 actions/editapplication.php:215
+#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "主页çURLä¸æ£ç¡®ã"
-#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/apigroupcreate.php:207 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "å
¨åè¿é¿(ä¸è½è¶
è¿ 255 个å符)ã"
-#: actions/apigroupcreate.php:213 actions/editapplication.php:187
-#: actions/newapplication.php:169
+#: actions/apigroupcreate.php:215 actions/editapplication.php:190
+#: actions/newapplication.php:172
#, fuzzy, php-format
msgid "Description is too long (max %d chars)."
msgstr "æè¿°è¿é¿(ä¸è½è¶
è¿140å符)ã"
-#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/apigroupcreate.php:226 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "ä½ç½®è¿é¿(ä¸è½è¶
è¿255个å符)ã"
-#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/apigroupcreate.php:245 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
-#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/apigroupcreate.php:266 actions/editgroup.php:228
#: actions/newgroup.php:168
#, fuzzy, php-format
msgid "Invalid alias: \"%s\""
msgstr "主页'%s'ä¸æ£ç¡®"
-#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/apigroupcreate.php:275 actions/editgroup.php:232
#: actions/newgroup.php:172
#, fuzzy, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "æµç§°å·²è¢«ä½¿ç¨ï¼æ¢ä¸ä¸ªå§ã"
-#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/apigroupcreate.php:288 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
@@ -448,16 +466,16 @@ msgstr ""
msgid "Group not found!"
msgstr "API æ¹æ³æªå®ç°ï¼"
-#: actions/apigroupjoin.php:110 actions/joingroup.php:90
+#: actions/apigroupjoin.php:110 actions/joingroup.php:100
#, fuzzy
msgid "You are already a member of that group."
msgstr "æ¨å·²ç»æ¯è¯¥ç»æå"
-#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+#: actions/apigroupjoin.php:119 actions/joingroup.php:105 lib/command.php:221
msgid "You have been blocked from that group by the admin."
msgstr ""
-#: actions/apigroupjoin.php:138 actions/joingroup.php:124
+#: actions/apigroupjoin.php:138 actions/joingroup.php:134
#, fuzzy, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "æ æ³æ %s ç¨æ·æ·»å å° %s ç»"
@@ -467,7 +485,7 @@ msgstr "æ æ³æ %s ç¨æ·æ·»å å° %s ç»"
msgid "You are not a member of this group."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/apigroupleave.php:124 actions/leavegroup.php:119
+#: actions/apigroupleave.php:124 actions/leavegroup.php:129
#, fuzzy, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "æ æ³è®¢é
ç¨æ·ï¼æªæ¾å°ã"
@@ -487,98 +505,112 @@ msgstr "%s 群ç»"
msgid "groups on %s"
msgstr "ç»å¨ä½"
-#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
-msgid "Bad request."
+#: actions/apioauthauthorize.php:101
+msgid "No oauth_token parameter provided."
msgstr ""
-#: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268
+#: actions/apioauthauthorize.php:106
+#, fuzzy
+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:50
-#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/emailsettings.php:238 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/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:139
+#: 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/register.php:165 actions/remotesubscribe.php:77
#: actions/repeat.php:83 actions/smssettings.php:228 actions/subedit.php:38
-#: actions/subscribe.php:46 actions/tagother.php:166
+#: actions/subscribe.php:86 actions/tagother.php:166
#: actions/unsubscribe.php:69 actions/userauthorization.php:52
#: lib/designsettings.php:294
msgid "There was a problem with your session token. Try again, please."
msgstr "ä¼è¯æ è¯æé®é¢ï¼è¯·éè¯ã"
-#: actions/apioauthauthorize.php:146
+#: actions/apioauthauthorize.php:135
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "ç¨æ·åæå¯ç ä¸æ£ç¡®ã"
-#: actions/apioauthauthorize.php:170
+#: actions/apioauthauthorize.php:159
#, fuzzy
msgid "Database error deleting OAuth application user."
msgstr "ä¿åç¨æ·è®¾ç½®æ¶åºéã"
-#: actions/apioauthauthorize.php:196
+#: actions/apioauthauthorize.php:185
#, fuzzy
msgid "Database error inserting OAuth application user."
msgstr "æ·»å æ ç¾æ¶æ°æ®åºåºéï¼%s"
-#: actions/apioauthauthorize.php:231
+#: actions/apioauthauthorize.php:214
#, php-format
msgid ""
"The request token %s has been authorized. Please exchange it for an access "
"token."
msgstr ""
-#: actions/apioauthauthorize.php:241
+#: actions/apioauthauthorize.php:227
#, php-format
-msgid "The request token %s has been denied."
+msgid "The request token %s has been denied and revoked."
msgstr ""
-#: actions/apioauthauthorize.php:246 actions/avatarsettings.php:281
+#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:103 actions/editapplication.php:139
-#: actions/emailsettings.php:256 actions/grouplogo.php:319
+#: actions/emailsettings.php:256 actions/grouplogo.php:322
#: actions/imsettings.php:220 actions/newapplication.php:121
-#: actions/oauthconnectionssettings.php:151 actions/recoverpassword.php:44
+#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:248 lib/designsettings.php:304
msgid "Unexpected form submission."
msgstr "æªé¢æç表åæ交ã"
-#: actions/apioauthauthorize.php:273
+#: actions/apioauthauthorize.php:259
msgid "An application would like to connect to your account"
msgstr ""
-#: actions/apioauthauthorize.php:290
+#: actions/apioauthauthorize.php:276
msgid "Allow or deny access"
msgstr ""
-#: actions/apioauthauthorize.php:320 lib/action.php:441
+#: actions/apioauthauthorize.php:292
+#, php-format
+msgid ""
+"The application %1$s by %2$s would like "
+"the ability to %3$s your %4$s account data. You should only "
+"give access to your %4$s account to third parties you trust."
+msgstr ""
+
+#: actions/apioauthauthorize.php:310 lib/action.php:438
msgid "Account"
msgstr "å¸å·"
-#: actions/apioauthauthorize.php:323 actions/login.php:230
+#: actions/apioauthauthorize.php:313 actions/login.php:230
#: actions/profilesettings.php:106 actions/register.php:424
-#: actions/showgroup.php:236 actions/tagother.php:94 lib/groupeditform.php:152
+#: actions/showgroup.php:244 actions/tagother.php:94
+#: actions/userauthorization.php:145 lib/groupeditform.php:152
#: lib/userprofile.php:131
msgid "Nickname"
msgstr "æµç§°"
-#: actions/apioauthauthorize.php:326 actions/login.php:233
+#: actions/apioauthauthorize.php:316 actions/login.php:233
#: actions/register.php:429 lib/accountsettingsaction.php:116
msgid "Password"
msgstr "å¯ç "
-#: actions/apioauthauthorize.php:338
+#: actions/apioauthauthorize.php:328
msgid "Deny"
msgstr ""
-#: actions/apioauthauthorize.php:344
+#: actions/apioauthauthorize.php:334
#, fuzzy
msgid "Allow"
msgstr "å
¨é¨"
-#: actions/apioauthauthorize.php:361
+#: actions/apioauthauthorize.php:351
msgid "Allow or deny access to your account information."
msgstr ""
@@ -639,23 +671,11 @@ msgstr "ä¸æ¯æè¿ç§å¾åæ ¼å¼ã"
msgid "%1$s / Favorites from %2$s"
msgstr "%s çæ¶è / %s"
-#: actions/apitimelinefavorites.php:120
+#: actions/apitimelinefavorites.php:117
#, fuzzy, php-format
msgid "%1$s updates favorited by %2$s / %2$s."
msgstr "%s æ¶èäº %s ç %s éåã"
-#: actions/apitimelinegroup.php:109 actions/apitimelineuser.php:118
-#: actions/grouprss.php:131 actions/userrss.php:90
-#, php-format
-msgid "%s timeline"
-msgstr "%s æ¶é´è¡¨"
-
-#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126
-#: actions/userrss.php:92
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "%2$s ä¸ %1$s çæ´æ°ï¼"
-
#: actions/apitimelinementions.php:117
#, fuzzy, php-format
msgid "%1$s / Updates mentioning %2$s"
@@ -681,17 +701,17 @@ msgstr "æ¥èªææ人ç %s æ¶æ¯ï¼"
msgid "Repeated to %s"
msgstr "%s çåå¤"
-#: actions/apitimelineretweetsofme.php:112
+#: actions/apitimelineretweetsofme.php:114
#, fuzzy, php-format
msgid "Repeats of %s"
msgstr "%s çåå¤"
-#: actions/apitimelinetag.php:102 actions/tag.php:66
+#: actions/apitimelinetag.php:102 actions/tag.php:67
#, php-format
msgid "Notices tagged with %s"
msgstr "带 %s æ ç¾çéå"
-#: actions/apitimelinetag.php:108 actions/tagrss.php:64
+#: actions/apitimelinetag.php:104 actions/tagrss.php:65
#, fuzzy, php-format
msgid "Updates tagged with %1$s on %2$s!"
msgstr "%2$s ä¸ %1$s çæ´æ°ï¼"
@@ -709,8 +729,7 @@ msgstr "没æè¿ä»½ææ¡£ã"
#: actions/avatarbynickname.php:59 actions/blockedfromgroup.php:73
#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
#: actions/grouplogo.php:86 actions/groupmembers.php:76
-#: actions/grouprss.php:91 actions/joingroup.php:76 actions/leavegroup.php:76
-#: actions/showgroup.php:121
+#: actions/grouprss.php:91 actions/showgroup.php:121
msgid "No nickname."
msgstr "没ææµç§°ã"
@@ -722,7 +741,7 @@ msgstr "没æ大å°ã"
msgid "Invalid size."
msgstr "大å°ä¸æ£ç¡®ã"
-#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: actions/avatarsettings.php:67 actions/showgroup.php:229
#: lib/accountsettingsaction.php:112
msgid "Avatar"
msgstr "头å"
@@ -734,36 +753,36 @@ msgstr "æ¨å¯ä»¥å¨è¿éä¸ä¼ 个人头åã"
#: actions/avatarsettings.php:106 actions/avatarsettings.php:185
#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
-#: actions/userrss.php:103
+#: actions/userrss.php:106
msgid "User without matching profile"
msgstr "æ¾ä¸å°å¹é
çç¨æ·ã"
#: actions/avatarsettings.php:119 actions/avatarsettings.php:197
-#: actions/grouplogo.php:251
+#: actions/grouplogo.php:254
msgid "Avatar settings"
msgstr "头å设置"
#: actions/avatarsettings.php:127 actions/avatarsettings.php:205
-#: actions/grouplogo.php:199 actions/grouplogo.php:259
+#: actions/grouplogo.php:202 actions/grouplogo.php:262
msgid "Original"
msgstr "åæ¥ç"
#: actions/avatarsettings.php:142 actions/avatarsettings.php:217
-#: actions/grouplogo.php:210 actions/grouplogo.php:271
+#: actions/grouplogo.php:213 actions/grouplogo.php:274
msgid "Preview"
msgstr "é¢è§"
-#: actions/avatarsettings.php:149 lib/deleteuserform.php:66
-#: lib/noticelist.php:608
+#: actions/avatarsettings.php:149 actions/showapplication.php:252
+#: lib/deleteuserform.php:66 lib/noticelist.php:655
#, fuzzy
msgid "Delete"
msgstr "å é¤"
-#: actions/avatarsettings.php:166 actions/grouplogo.php:233
+#: actions/avatarsettings.php:166 actions/grouplogo.php:236
msgid "Upload"
msgstr "ä¸ä¼ "
-#: actions/avatarsettings.php:231 actions/grouplogo.php:286
+#: actions/avatarsettings.php:231 actions/grouplogo.php:289
msgid "Crop"
msgstr "åªè£"
@@ -771,7 +790,7 @@ msgstr "åªè£"
msgid "Pick a square area of the image to be your avatar"
msgstr "请éæ©ä¸åæ¹å½¢åºåä½ä¸ºä½ ç头å"
-#: actions/avatarsettings.php:343 actions/grouplogo.php:377
+#: actions/avatarsettings.php:343 actions/grouplogo.php:380
msgid "Lost our file data."
msgstr "æ件æ°æ®ä¸¢å¤±"
@@ -805,23 +824,24 @@ msgid ""
"will not be notified of any @-replies from them."
msgstr ""
-#: actions/block.php:143 actions/deletenotice.php:145
-#: actions/deleteuser.php:147 actions/groupblock.php:178
+#: actions/block.php:143 actions/deleteapplication.php:153
+#: actions/deletenotice.php:145 actions/deleteuser.php:150
+#: actions/groupblock.php:178
msgid "No"
msgstr "å¦"
-#: actions/block.php:143 actions/deleteuser.php:147
+#: actions/block.php:143 actions/deleteuser.php:150
#, fuzzy
msgid "Do not block this user"
msgstr "åæ¶é»æ¢æ¬¡ç¨æ·"
-#: actions/block.php:144 actions/deletenotice.php:146
-#: actions/deleteuser.php:148 actions/groupblock.php:179
-#: lib/repeatform.php:132
+#: actions/block.php:144 actions/deleteapplication.php:158
+#: actions/deletenotice.php:146 actions/deleteuser.php:151
+#: actions/groupblock.php:179 lib/repeatform.php:132
msgid "Yes"
msgstr "æ¯"
-#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#: actions/block.php:144 actions/groupmembers.php:355 lib/blockform.php:80
#, fuzzy
msgid "Block this user"
msgstr "é»æ¢è¯¥ç¨æ·"
@@ -830,41 +850,45 @@ msgstr "é»æ¢è¯¥ç¨æ·"
msgid "Failed to save block information."
msgstr "ä¿åé»æ¢ä¿¡æ¯å¤±è´¥ã"
-#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
-#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
-#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
-#: actions/grouplogo.php:99 actions/groupmembers.php:83
-#: actions/grouprss.php:98 actions/groupunblock.php:86
-#: actions/joingroup.php:83 actions/leavegroup.php:83 actions/makeadmin.php:86
-#: actions/showgroup.php:137 lib/command.php:212 lib/command.php:260
+#: actions/blockedfromgroup.php:80 actions/blockedfromgroup.php:87
+#: actions/editgroup.php:100 actions/foafgroup.php:44 actions/foafgroup.php:62
+#: actions/foafgroup.php:69 actions/groupblock.php:86 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:100 actions/grouplogo.php:102
+#: actions/groupmembers.php:83 actions/groupmembers.php:90
+#: actions/grouprss.php:98 actions/grouprss.php:105
+#: 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
msgid "No such group."
msgstr "没æè¿ä¸ªç»ã"
-#: actions/blockedfromgroup.php:90
+#: actions/blockedfromgroup.php:97
#, fuzzy, php-format
msgid "%s blocked profiles"
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
-#: actions/blockedfromgroup.php:93
+#: actions/blockedfromgroup.php:100
#, fuzzy, php-format
msgid "%1$s blocked profiles, page %2$d"
msgstr "%s å好å"
-#: actions/blockedfromgroup.php:108
+#: actions/blockedfromgroup.php:115
#, fuzzy
msgid "A list of the users blocked from joining this group."
msgstr "该ç»æåå表ã"
-#: actions/blockedfromgroup.php:281
+#: actions/blockedfromgroup.php:288
#, fuzzy
msgid "Unblock user from group"
msgstr "åæ¶é»æ¢ç¨æ·å¤±è´¥ã"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
msgid "Unblock"
msgstr "åæ¶é»æ¢"
-#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
#, fuzzy
msgid "Unblock this user"
msgstr "åæ¶é»æ¢æ¬¡ç¨æ·"
@@ -924,16 +948,62 @@ msgid "Conversation"
msgstr "确认ç "
#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
-#: lib/profileaction.php:216 lib/searchgroupnav.php:82
+#: lib/profileaction.php:218 lib/searchgroupnav.php:82
msgid "Notices"
msgstr "éå"
+#: actions/deleteapplication.php:63
+#, fuzzy
+msgid "You must be logged in to delete an application."
+msgstr "æ¨å¿
é¡»ç»å½æè½å建å°ç»ã"
+
+#: actions/deleteapplication.php:71
+#, fuzzy
+msgid "Application not found."
+msgstr "éå没æå
³è个人信æ¯"
+
+#: actions/deleteapplication.php:78 actions/editapplication.php:77
+#: actions/showapplication.php:94
+#, fuzzy
+msgid "You are not the owner of this application."
+msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
+
+#: actions/deleteapplication.php:102 actions/editapplication.php:127
+#: actions/newapplication.php:110 actions/showapplication.php:118
+#: lib/action.php:1217
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "ä¼è¯æ è¯æé®é¢ï¼è¯·éè¯ã"
+
+#: actions/deleteapplication.php:123 actions/deleteapplication.php:147
+#, fuzzy
+msgid "Delete application"
+msgstr "没æè¿ä»½éåã"
+
+#: actions/deleteapplication.php:149
+msgid ""
+"Are you sure you want to delete this application? This will clear all data "
+"about the application from the database, including all existing user "
+"connections."
+msgstr ""
+
+#: actions/deleteapplication.php:156
+#, fuzzy
+msgid "Do not delete this application"
+msgstr "æ æ³å é¤éåã"
+
+#: actions/deleteapplication.php:160
+#, fuzzy
+msgid "Delete this application"
+msgstr "å é¤éå"
+
+#. TRANS: Client error message
#: 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
-#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:72 lib/profileformaction.php:63
+#: lib/adminpanelaction.php:73 lib/profileformaction.php:63
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "æªç»å½ã"
@@ -962,7 +1032,7 @@ msgstr "ç¡®å®è¦å é¤è¿æ¡æ¶æ¯åï¼"
msgid "Do not delete this notice"
msgstr "æ æ³å é¤éåã"
-#: actions/deletenotice.php:146 lib/noticelist.php:608
+#: actions/deletenotice.php:146 lib/noticelist.php:655
#, fuzzy
msgid "Delete this notice"
msgstr "å é¤éå"
@@ -982,19 +1052,19 @@ msgstr "æ¨ä¸è½å é¤å
¶ä»ç¨æ·çç¶æã"
msgid "Delete user"
msgstr "å é¤"
-#: actions/deleteuser.php:135
+#: actions/deleteuser.php:136
msgid ""
"Are you sure you want to delete this user? This will clear all data about "
"the user from the database, without a backup."
msgstr ""
-#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+#: actions/deleteuser.php:151 lib/deleteuserform.php:77
#, fuzzy
msgid "Delete this user"
msgstr "å é¤éå"
#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
-#: lib/adminpanelaction.php:316 lib/groupnav.php:119
+#: lib/groupnav.php:119
msgid "Design"
msgstr ""
@@ -1105,6 +1175,18 @@ msgstr ""
msgid "Reset back to default"
msgstr ""
+#: actions/designadminpanel.php:586 actions/emailsettings.php:195
+#: actions/imsettings.php:163 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
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "ä¿å"
+
#: actions/designadminpanel.php:587 lib/designsettings.php:257
msgid "Save design"
msgstr ""
@@ -1117,7 +1199,7 @@ msgstr "æ¤éåæªè¢«æ¶èï¼"
msgid "Add to favorites"
msgstr "å å
¥æ¶è"
-#: actions/doc.php:155
+#: actions/doc.php:158
#, fuzzy, php-format
msgid "No such document \"%s\""
msgstr "没æè¿ä»½ææ¡£ã"
@@ -1132,23 +1214,12 @@ msgstr "å
¶ä»é项"
msgid "You must be logged in to edit an application."
msgstr "æ¨å¿
é¡»ç»å½æè½å建å°ç»ã"
-#: actions/editapplication.php:77 actions/showapplication.php:94
-#, fuzzy
-msgid "You are not the owner of this application."
-msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-
-#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163
+#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166
#: actions/showapplication.php:87
#, fuzzy
msgid "No such application."
msgstr "没æè¿ä»½éåã"
-#: actions/editapplication.php:127 actions/newapplication.php:110
-#: actions/showapplication.php:118 lib/action.php:1195
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "ä¼è¯æ è¯æé®é¢ï¼è¯·éè¯ã"
-
#: actions/editapplication.php:161
#, fuzzy
msgid "Use this form to edit your application."
@@ -1159,47 +1230,52 @@ msgstr "使ç¨è¿ä¸ªè¡¨åæ¥ç¼è¾ç»"
msgid "Name is required."
msgstr "ç¸åçå¯ç ãæ¤é¡¹å¿
å¡«ã"
-#: actions/editapplication.php:180 actions/newapplication.php:162
+#: actions/editapplication.php:180 actions/newapplication.php:165
#, fuzzy
msgid "Name is too long (max 255 chars)."
msgstr "å
¨åè¿é¿(ä¸è½è¶
è¿ 255 个å符)ã"
-#: actions/editapplication.php:183 actions/newapplication.php:165
+#: actions/editapplication.php:183 actions/newapplication.php:162
+#, fuzzy
+msgid "Name already in use. Try another one."
+msgstr "æµç§°å·²è¢«ä½¿ç¨ï¼æ¢ä¸ä¸ªå§ã"
+
+#: actions/editapplication.php:186 actions/newapplication.php:168
#, fuzzy
msgid "Description is required."
msgstr "æè¿°"
-#: actions/editapplication.php:191
+#: actions/editapplication.php:194
msgid "Source URL is too long."
msgstr ""
-#: actions/editapplication.php:197 actions/newapplication.php:182
+#: actions/editapplication.php:200 actions/newapplication.php:185
#, fuzzy
msgid "Source URL is not valid."
msgstr "主页çURLä¸æ£ç¡®ã"
-#: actions/editapplication.php:200 actions/newapplication.php:185
+#: actions/editapplication.php:203 actions/newapplication.php:188
msgid "Organization is required."
msgstr ""
-#: actions/editapplication.php:203 actions/newapplication.php:188
+#: actions/editapplication.php:206 actions/newapplication.php:191
#, fuzzy
msgid "Organization is too long (max 255 chars)."
msgstr "ä½ç½®è¿é¿(ä¸è½è¶
è¿255个å符)ã"
-#: actions/editapplication.php:206 actions/newapplication.php:191
+#: actions/editapplication.php:209 actions/newapplication.php:194
msgid "Organization homepage is required."
msgstr ""
-#: actions/editapplication.php:215 actions/newapplication.php:203
+#: actions/editapplication.php:218 actions/newapplication.php:206
msgid "Callback is too long."
msgstr ""
-#: actions/editapplication.php:222 actions/newapplication.php:212
+#: actions/editapplication.php:225 actions/newapplication.php:215
msgid "Callback URL is not valid."
msgstr ""
-#: actions/editapplication.php:255
+#: actions/editapplication.php:258
#, fuzzy
msgid "Could not update application."
msgstr "æ æ³æ´æ°ç»"
@@ -1213,31 +1289,31 @@ msgstr "ç¼è¾ %s ç»"
msgid "You must be logged in to create a group."
msgstr "æ¨å¿
é¡»ç»å½æè½å建å°ç»ã"
-#: actions/editgroup.php:103 actions/editgroup.php:168
-#: actions/groupdesignsettings.php:104 actions/grouplogo.php:106
+#: actions/editgroup.php:107 actions/editgroup.php:172
+#: actions/groupdesignsettings.php:107 actions/grouplogo.php:109
#, fuzzy
msgid "You must be an admin to edit the group."
msgstr "åªæadminæè½ç¼è¾è¿ä¸ªç»"
-#: actions/editgroup.php:154
+#: actions/editgroup.php:158
msgid "Use this form to edit the group."
msgstr "使ç¨è¿ä¸ªè¡¨åæ¥ç¼è¾ç»"
-#: actions/editgroup.php:201 actions/newgroup.php:145
+#: actions/editgroup.php:205 actions/newgroup.php:145
#, fuzzy, php-format
msgid "description is too long (max %d chars)."
msgstr "æè¿°è¿é¿(ä¸è½è¶
è¿140å符)ã"
-#: actions/editgroup.php:253
+#: actions/editgroup.php:258
msgid "Could not update group."
msgstr "æ æ³æ´æ°ç»"
-#: actions/editgroup.php:259 classes/User_group.php:390
+#: actions/editgroup.php:264 classes/User_group.php:493
#, fuzzy
msgid "Could not create aliases."
msgstr "æ æ³å建æ¶èã"
-#: actions/editgroup.php:269
+#: actions/editgroup.php:280
msgid "Options saved."
msgstr "é项已ä¿åã"
@@ -1358,7 +1434,7 @@ msgid "Cannot normalize that email address"
msgstr "æ æ³è¯å«æ¤çµåé®ä»¶"
#: actions/emailsettings.php:331 actions/register.php:201
-#: actions/siteadminpanel.php:143
+#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "ä¸æ¯ææççµåé®ä»¶ã"
@@ -1432,7 +1508,7 @@ msgstr "å·²æ¶èæ¤éåï¼"
msgid "Disfavor favorite"
msgstr "åæ¶æ¶è"
-#: actions/favorited.php:65 lib/popularnoticesection.php:88
+#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
#, fuzzy
msgid "Popular notices"
@@ -1557,6 +1633,25 @@ msgstr "没æè¿ä»½éåã"
msgid "Cannot read file."
msgstr "没æè¿ä»½éåã"
+#: actions/grantrole.php:62 actions/revokerole.php:62
+#, fuzzy
+msgid "Invalid role."
+msgstr "大å°ä¸æ£ç¡®ã"
+
+#: actions/grantrole.php:66 actions/revokerole.php:66
+msgid "This role is reserved and cannot be set."
+msgstr ""
+
+#: actions/grantrole.php:75
+#, fuzzy
+msgid "You cannot grant user roles on this site."
+msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
+
+#: actions/grantrole.php:82
+#, fuzzy
+msgid "User already has this role."
+msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
+
#: actions/groupblock.php:71 actions/groupunblock.php:71
#: actions/makeadmin.php:71 actions/subedit.php:46
#: lib/profileformaction.php:70
@@ -1591,7 +1686,7 @@ msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
msgid "User is not a member of group."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/groupblock.php:136 actions/groupmembers.php:314
+#: actions/groupblock.php:136 actions/groupmembers.php:323
#, fuzzy
msgid "Block user from group"
msgstr "é»æ¢ç¨æ·"
@@ -1628,99 +1723,105 @@ msgstr "没æID"
msgid "You must be logged in to edit a group."
msgstr "æ¨å¿
é¡»ç»å½æè½å建å°ç»ã"
-#: actions/groupdesignsettings.php:141
+#: actions/groupdesignsettings.php:144
#, fuzzy
msgid "Group design"
msgstr "ç»"
-#: actions/groupdesignsettings.php:152
+#: actions/groupdesignsettings.php:155
msgid ""
"Customize the way your group looks with a background image and a colour "
"palette of your choice."
msgstr ""
-#: actions/groupdesignsettings.php:263 actions/userdesignsettings.php:186
+#: actions/groupdesignsettings.php:266 actions/userdesignsettings.php:186
#: lib/designsettings.php:391 lib/designsettings.php:413
#, fuzzy
msgid "Couldn't update your design."
msgstr "æ æ³æ´æ°ç¨æ·ã"
-#: actions/groupdesignsettings.php:308 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:311 actions/userdesignsettings.php:231
#, fuzzy
msgid "Design preferences saved."
msgstr "åæ¥é项已ä¿åã"
-#: actions/grouplogo.php:139 actions/grouplogo.php:192
+#: actions/grouplogo.php:142 actions/grouplogo.php:195
msgid "Group logo"
msgstr "ç»logo"
-#: actions/grouplogo.php:150
+#: actions/grouplogo.php:153
#, fuzzy, php-format
msgid ""
"You can upload a logo image for your group. The maximum file size is %s."
msgstr "ä½ å¯ä»¥ç»ä½ çç»ä¸è½½ä¸ä¸ªlogoå¾ã"
-#: actions/grouplogo.php:178
+#: actions/grouplogo.php:181
#, fuzzy
msgid "User without matching profile."
msgstr "æ¾ä¸å°å¹é
çç¨æ·ã"
-#: actions/grouplogo.php:362
+#: actions/grouplogo.php:365
#, fuzzy
msgid "Pick a square area of the image to be the logo."
msgstr "请éæ©ä¸åæ¹å½¢åºåä½ä¸ºä½ ç头å"
-#: actions/grouplogo.php:396
+#: actions/grouplogo.php:399
msgid "Logo updated."
msgstr "logoå·²æ´æ°ã"
-#: actions/grouplogo.php:398
+#: actions/grouplogo.php:401
#, fuzzy
msgid "Failed updating logo."
msgstr "æ´æ°logo失败ã"
-#: actions/groupmembers.php:93 lib/groupnav.php:92
+#: actions/groupmembers.php:100 lib/groupnav.php:92
#, php-format
msgid "%s group members"
msgstr "%s ç»æå"
-#: actions/groupmembers.php:96
+#: actions/groupmembers.php:103
#, fuzzy, php-format
msgid "%1$s group members, page %2$d"
msgstr "%s ç»æå, 第 %d 页"
-#: actions/groupmembers.php:111
+#: actions/groupmembers.php:118
msgid "A list of the users in this group."
msgstr "该ç»æåå表ã"
-#: actions/groupmembers.php:175 lib/action.php:448 lib/groupnav.php:107
+#: actions/groupmembers.php:182 lib/groupnav.php:107
msgid "Admin"
msgstr "admin管çå"
-#: actions/groupmembers.php:346 lib/blockform.php:69
+#: actions/groupmembers.php:355 lib/blockform.php:69
msgid "Block"
msgstr "é»æ¢"
-#: actions/groupmembers.php:441
+#: actions/groupmembers.php:450
#, fuzzy
msgid "Make user an admin of the group"
msgstr "åªæadminæè½ç¼è¾è¿ä¸ªç»"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:482
#, fuzzy
msgid "Make Admin"
msgstr "admin管çå"
-#: actions/groupmembers.php:473
+#: actions/groupmembers.php:482
msgid "Make this user an admin"
msgstr ""
-#: actions/grouprss.php:133
+#: actions/grouprss.php:138 actions/userrss.php:93
+#: lib/atomgroupnoticefeed.php:61 lib/atomusernoticefeed.php:67
+#, php-format
+msgid "%s timeline"
+msgstr "%s æ¶é´è¡¨"
+
+#: actions/grouprss.php:140
#, 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:210 lib/profileaction.php:230
+#: actions/groups.php:62 lib/profileaction.php:212 lib/profileaction.php:232
#: lib/publicgroupnav.php:81 lib/searchgroupnav.php:84 lib/subgroupnav.php:98
msgid "Groups"
msgstr "ç»"
@@ -1966,16 +2067,19 @@ msgstr "个人æ¶æ¯"
msgid "Optionally add a personal message to the invitation."
msgstr "å¨é请ä¸å å å¥è¯(å¯é)ã"
-#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236
+#. TRANS: Send button for inviting friends
+#: actions/invite.php:198
+#, fuzzy
+msgctxt "BUTTON"
msgid "Send"
msgstr "åé"
-#: actions/invite.php:226
+#: actions/invite.php:227
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s é请æ¨å å
¥ %2$s"
-#: actions/invite.php:228
+#: actions/invite.php:229
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -2031,7 +2135,12 @@ msgstr ""
msgid "You must be logged in to join a group."
msgstr "æ¨å¿
é¡»ç»å½æè½å å
¥ç»ã"
-#: actions/joingroup.php:131
+#: actions/joingroup.php:88 actions/leavegroup.php:88
+#, fuzzy
+msgid "No nickname or ID."
+msgstr "没ææµç§°ã"
+
+#: actions/joingroup.php:141
#, fuzzy, php-format
msgid "%1$s joined group %2$s"
msgstr "%s å å
¥ %s ç»"
@@ -2041,12 +2150,12 @@ msgstr "%s å å
¥ %s ç»"
msgid "You must be logged in to leave a group."
msgstr "æ¨å¿
é¡»ç»å½æè½é请å
¶ä»äººä½¿ç¨ %s"
-#: actions/leavegroup.php:90 lib/command.php:265
+#: actions/leavegroup.php:100 lib/command.php:265
#, fuzzy
msgid "You are not a member of that group."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/leavegroup.php:127
+#: actions/leavegroup.php:137
#, fuzzy, php-format
msgid "%1$s left group %2$s"
msgstr "%s 离å¼ç¾¤ %s"
@@ -2064,8 +2173,7 @@ msgstr "ç¨æ·åæå¯ç ä¸æ£ç¡®ã"
msgid "Error setting user. You are probably not authorized."
msgstr "æªè®¤è¯ã"
-#: actions/login.php:188 actions/login.php:241 lib/action.php:466
-#: lib/logingroupnav.php:79
+#: actions/login.php:188 actions/login.php:241 lib/logingroupnav.php:79
msgid "Login"
msgstr "ç»å½"
@@ -2100,21 +2208,21 @@ msgstr ""
"请使ç¨ä½ çå¸å·åå¯ç ç»å
¥ã没æå¸å·ï¼[注å](%%action.register%%) ä¸ä¸ªæ°å¸å·, "
"æä½¿ç¨ [OpenID](%%action.openidlogin%%). "
-#: actions/makeadmin.php:91
+#: actions/makeadmin.php:92
msgid "Only an admin can make another user an admin."
msgstr ""
-#: actions/makeadmin.php:95
+#: actions/makeadmin.php:96
#, fuzzy, php-format
msgid "%1$s is already an admin for group \"%2$s\"."
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
-#: actions/makeadmin.php:132
+#: actions/makeadmin.php:133
#, fuzzy, php-format
msgid "Can't get membership record for %1$s in group %2$s."
msgstr "æ æ³è®¢é
ç¨æ·ï¼æªæ¾å°ã"
-#: actions/makeadmin.php:145
+#: actions/makeadmin.php:146
#, fuzzy, php-format
msgid "Can't make %1$s an admin for group %2$s."
msgstr "åªæadminæè½ç¼è¾è¿ä¸ªç»"
@@ -2138,11 +2246,11 @@ msgstr "æ¨å¿
é¡»ç»å½æè½å建å°ç»ã"
msgid "Use this form to register a new application."
msgstr "使ç¨æ¤è¡¨æ ¼å建ç»ã"
-#: actions/newapplication.php:173
+#: actions/newapplication.php:176
msgid "Source URL is required."
msgstr ""
-#: actions/newapplication.php:255 actions/newapplication.php:264
+#: actions/newapplication.php:258 actions/newapplication.php:267
#, fuzzy
msgid "Could not create application."
msgstr "æ æ³å建æ¶èã"
@@ -2273,29 +2381,29 @@ msgstr ""
msgid "You have not registered any applications yet."
msgstr ""
-#: actions/oauthconnectionssettings.php:71
+#: actions/oauthconnectionssettings.php:72
msgid "Connected applications"
msgstr ""
-#: actions/oauthconnectionssettings.php:87
+#: actions/oauthconnectionssettings.php:83
msgid "You have allowed the following applications to access you account."
msgstr ""
-#: actions/oauthconnectionssettings.php:170
+#: actions/oauthconnectionssettings.php:175
#, fuzzy
msgid "You are not a user of that application."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/oauthconnectionssettings.php:180
+#: actions/oauthconnectionssettings.php:186
msgid "Unable to revoke access for app: "
msgstr ""
-#: actions/oauthconnectionssettings.php:192
+#: actions/oauthconnectionssettings.php:198
#, php-format
msgid "You have not authorized any applications to use your account."
msgstr ""
-#: actions/oauthconnectionssettings.php:205
+#: actions/oauthconnectionssettings.php:211
msgid "Developers can edit the registration settings for their applications "
msgstr ""
@@ -2317,8 +2425,8 @@ msgstr "è¿æ¥"
msgid "Only "
msgstr ""
-#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1039
-#: lib/api.php:1067 lib/api.php:1177
+#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1042
+#: lib/apiaction.php:1070 lib/apiaction.php:1179
msgid "Not a supported data format."
msgstr "ä¸æ¯æçæ°æ®æ ¼å¼ã"
@@ -2467,7 +2575,8 @@ msgstr "æ æ³ä¿åæ°å¯ç ã"
msgid "Password saved."
msgstr "å¯ç å·²ä¿åã"
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:331
+#. TRANS: Menu item for site administration
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:382
msgid "Paths"
msgstr ""
@@ -2500,7 +2609,6 @@ msgid "Invalid SSL server. The maximum length is 255 characters."
msgstr ""
#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58
-#: lib/adminpanelaction.php:311
#, fuzzy
msgid "Site"
msgstr "é请"
@@ -2596,7 +2704,7 @@ msgstr ""
msgid "SSL"
msgstr "SMSçä¿¡"
-#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294
+#: actions/pathsadminpanel.php:323 actions/snapshotadminpanel.php:202
#, fuzzy
msgid "Never"
msgstr "æ¢å¤"
@@ -2655,11 +2763,11 @@ msgstr "ä¸æ¯ææççµåé®ä»¶"
msgid "Users self-tagged with %1$s - page %2$d"
msgstr "ç¨æ·èªå æ ç¾ %s - 第 %d 页"
-#: actions/postnotice.php:84
+#: actions/postnotice.php:95
msgid "Invalid notice content"
msgstr "éåå
容ä¸æ£ç¡®"
-#: actions/postnotice.php:90
+#: actions/postnotice.php:101
#, php-format
msgid "Notice license â%1$sâ is not compatible with site license â%2$sâ."
msgstr ""
@@ -2683,7 +2791,7 @@ 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:247 actions/tagother.php:104
+#: actions/showgroup.php:255 actions/tagother.php:104
#: lib/groupeditform.php:157 lib/userprofile.php:149
msgid "Full name"
msgstr "å
¨å"
@@ -2712,8 +2820,8 @@ msgid "Bio"
msgstr "èªè¿°"
#: actions/profilesettings.php:132 actions/register.php:471
-#: actions/showgroup.php:256 actions/tagother.php:112
-#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: actions/showgroup.php:264 actions/tagother.php:112
+#: actions/userauthorization.php:166 lib/groupeditform.php:177
#: lib/userprofile.php:164
msgid "Location"
msgstr "ä½ç½®"
@@ -2737,7 +2845,7 @@ msgid ""
"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
msgstr "ä½ çæ ç¾ (åæ¯letters, æ°ånumbers, -, ., å _), 以éå·æç©ºæ ¼åé"
-#: actions/profilesettings.php:151 actions/siteadminpanel.php:280
+#: actions/profilesettings.php:151
msgid "Language"
msgstr "è¯è¨"
@@ -2763,7 +2871,7 @@ msgstr "èªå¨è®¢é
ä»»ä½è®¢é
æçæ´æ°ç人(è¿ä¸ªé项æéåæºå¨
msgid "Bio is too long (max %d chars)."
msgstr "èªè¿°è¿é¿(ä¸è½è¶
è¿140å符)ã"
-#: actions/profilesettings.php:235 actions/siteadminpanel.php:150
+#: actions/profilesettings.php:235 actions/siteadminpanel.php:151
msgid "Timezone not selected."
msgstr "æªéæ©æ¶åºã"
@@ -2776,25 +2884,26 @@ msgstr "è¯è¨è¿é¿(ä¸è½è¶
è¿50个å符)ã"
msgid "Invalid tag: \"%s\""
msgstr "主页'%s'ä¸æ£ç¡®"
-#: actions/profilesettings.php:302
+#: actions/profilesettings.php:306
msgid "Couldn't update user for autosubscribe."
msgstr "æ æ³æ´æ°ç¨æ·çèªå¨è®¢é
é项ã"
-#: actions/profilesettings.php:359
+#: actions/profilesettings.php:363
#, fuzzy
msgid "Couldn't save location prefs."
msgstr "æ æ³ä¿å个人信æ¯ã"
-#: actions/profilesettings.php:371
+#: actions/profilesettings.php:375
msgid "Couldn't save profile."
msgstr "æ æ³ä¿å个人信æ¯ã"
-#: actions/profilesettings.php:379
+#: actions/profilesettings.php:383
#, fuzzy
msgid "Couldn't save tags."
msgstr "æ æ³ä¿å个人信æ¯ã"
-#: actions/profilesettings.php:387 lib/adminpanelaction.php:137
+#. TRANS: Message after successful saving of administrative settings.
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
msgid "Settings saved."
msgstr "设置已ä¿åã"
@@ -2808,48 +2917,48 @@ msgstr ""
msgid "Could not retrieve public stream."
msgstr "æ æ³è·åæ¶èçéåã"
-#: actions/public.php:129
+#: actions/public.php:130
#, fuzzy, php-format
msgid "Public timeline, page %d"
msgstr "å
¬å¼çæ¶é´è¡¨"
-#: actions/public.php:131 lib/publicgroupnav.php:79
+#: actions/public.php:132 lib/publicgroupnav.php:79
msgid "Public timeline"
msgstr "å
¬å¼çæ¶é´è¡¨"
-#: actions/public.php:151
+#: actions/public.php:160
#, fuzzy
msgid "Public Stream Feed (RSS 1.0)"
msgstr "å
¬å¼çèå"
-#: actions/public.php:155
+#: actions/public.php:164
#, fuzzy
msgid "Public Stream Feed (RSS 2.0)"
msgstr "å
¬å¼çèå"
-#: actions/public.php:159
+#: actions/public.php:168
#, fuzzy
msgid "Public Stream Feed (Atom)"
msgstr "å
¬å¼çèå"
-#: actions/public.php:179
+#: actions/public.php:188
#, php-format
msgid ""
"This is the public timeline for %%site.name%% but no one has posted anything "
"yet."
msgstr ""
-#: actions/public.php:182
+#: actions/public.php:191
msgid "Be the first to post!"
msgstr ""
-#: actions/public.php:186
+#: actions/public.php:195
#, php-format
msgid ""
"Why not [register an account](%%action.register%%) and be the first to post!"
msgstr ""
-#: actions/public.php:233
+#: actions/public.php:242
#, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2858,7 +2967,7 @@ msgid ""
"friends, family, and colleagues! ([Read more](%%doc.help%%))"
msgstr ""
-#: actions/public.php:238
+#: actions/public.php:247
#, fuzzy, php-format
msgid ""
"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
@@ -2894,7 +3003,7 @@ msgid ""
"one!"
msgstr ""
-#: actions/publictagcloud.php:131
+#: actions/publictagcloud.php:134
msgid "Tag cloud"
msgstr "æ ç¾äºèé"
@@ -3031,8 +3140,7 @@ msgstr "éªè¯ç åºéã"
msgid "Registration successful"
msgstr "注åæåã"
-#: actions/register.php:114 actions/register.php:503 lib/action.php:463
-#: lib/logingroupnav.php:85
+#: actions/register.php:114 actions/register.php:503 lib/logingroupnav.php:85
msgid "Register"
msgstr "注å"
@@ -3071,7 +3179,7 @@ msgid "Same as password above. Required."
msgstr "ç¸åçå¯ç ãæ¤é¡¹å¿
å¡«ã"
#: actions/register.php:438 actions/register.php:442
-#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:120
msgid "Email"
msgstr "çµåé®ä»¶"
@@ -3172,7 +3280,7 @@ msgid "URL of your profile on another compatible microblogging service"
msgstr "æ¨å¨å
¶ä»å
¼å®¹çå¾®å客æå¡ç个人信æ¯URL"
#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
-#: lib/userprofile.php:365
+#: lib/userprofile.php:394
msgid "Subscribe"
msgstr "订é
"
@@ -3215,7 +3323,7 @@ msgstr "æ¨å¿
é¡»åææ¤æææ¹å¯æ³¨åã"
msgid "You already repeated that notice."
msgstr "æ¨å·²æåé»æ¢è¯¥ç¨æ·ï¼"
-#: actions/repeat.php:114 lib/noticelist.php:626
+#: actions/repeat.php:114 lib/noticelist.php:674
#, fuzzy
msgid "Repeated"
msgstr "å建"
@@ -3225,47 +3333,47 @@ msgstr "å建"
msgid "Repeated!"
msgstr "å建"
-#: actions/replies.php:125 actions/repliesrss.php:68
+#: actions/replies.php:126 actions/repliesrss.php:68
#: lib/personalgroupnav.php:105
#, php-format
msgid "Replies to %s"
msgstr "%s çåå¤"
-#: actions/replies.php:127
+#: actions/replies.php:128
#, fuzzy, php-format
msgid "Replies to %1$s, page %2$d"
msgstr "åéç» %1$s ç %2$s æ¶æ¯"
-#: actions/replies.php:144
+#: actions/replies.php:145
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 1.0)"
msgstr "%s çéåèå"
-#: actions/replies.php:151
+#: actions/replies.php:152
#, fuzzy, php-format
msgid "Replies feed for %s (RSS 2.0)"
msgstr "%s çéåèå"
-#: actions/replies.php:158
+#: actions/replies.php:159
#, fuzzy, php-format
msgid "Replies feed for %s (Atom)"
msgstr "%s çéåèå"
-#: actions/replies.php:198
+#: actions/replies.php:199
#, fuzzy, php-format
msgid ""
"This is the timeline showing replies to %1$s but %2$s hasn't received a "
"notice to his attention yet."
msgstr "è¿æ¯ %s å好åçæ¶é´çº¿ï¼ä½æ¯æ²¡æä»»ä½äººåå¸å
容ã"
-#: actions/replies.php:203
+#: actions/replies.php:204
#, php-format
msgid ""
"You can engage other users in a conversation, subscribe to more people or "
"[join groups](%%action.groups%%)."
msgstr ""
-#: actions/replies.php:205
+#: actions/replies.php:206
#, php-format
msgid ""
"You can try to [nudge %1$s](../%2$s) or [post something to his or her "
@@ -3277,6 +3385,21 @@ msgstr ""
msgid "Replies to %1$s on %2$s!"
msgstr "åéç» %1$s ç %2$s æ¶æ¯"
+#: actions/revokerole.php:75
+#, fuzzy
+msgid "You cannot revoke user roles on this site."
+msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
+
+#: actions/revokerole.php:82
+#, fuzzy
+msgid "User doesn't have this role."
+msgstr "æ¾ä¸å°å¹é
çç¨æ·ã"
+
+#: actions/rsd.php:146 actions/version.php:157
+#, fuzzy
+msgid "StatusNet"
+msgstr "头åå·²æ´æ°ã"
+
#: actions/sandbox.php:65 actions/unsandbox.php:65
#, fuzzy
msgid "You cannot sandbox users on this site."
@@ -3287,8 +3410,9 @@ msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
msgid "User is already sandboxed."
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
+#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:336
+#: lib/adminpanelaction.php:390
msgid "Sessions"
msgstr ""
@@ -3312,8 +3436,8 @@ msgstr ""
msgid "Turn on debugging output for sessions."
msgstr ""
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336
-#: actions/useradminpanel.php:293
+#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
+#: actions/useradminpanel.php:294
#, fuzzy
msgid "Save site settings"
msgstr "头å设置"
@@ -3323,80 +3447,85 @@ msgstr "头å设置"
msgid "You must be logged in to view an application."
msgstr "æ¨å¿
é¡»ç»å½æè½é请å
¶ä»äººä½¿ç¨ %s"
-#: actions/showapplication.php:158
+#: actions/showapplication.php:157
#, fuzzy
msgid "Application profile"
msgstr "éå没æå
³è个人信æ¯"
-#: actions/showapplication.php:160 lib/applicationeditform.php:180
+#: actions/showapplication.php:159 lib/applicationeditform.php:180
msgid "Icon"
msgstr ""
-#: actions/showapplication.php:170 actions/version.php:195
+#: actions/showapplication.php:169 actions/version.php:195
#: lib/applicationeditform.php:195
#, fuzzy
msgid "Name"
msgstr "æµç§°"
-#: actions/showapplication.php:179 lib/applicationeditform.php:222
+#: actions/showapplication.php:178 lib/applicationeditform.php:222
#, fuzzy
msgid "Organization"
msgstr "å页"
-#: actions/showapplication.php:188 actions/version.php:198
+#: actions/showapplication.php:187 actions/version.php:198
#: lib/applicationeditform.php:209 lib/groupeditform.php:172
#, fuzzy
msgid "Description"
msgstr "æè¿°"
-#: actions/showapplication.php:193 actions/showgroup.php:429
-#: lib/profileaction.php:174
+#: actions/showapplication.php:192 actions/showgroup.php:438
+#: lib/profileaction.php:176
msgid "Statistics"
msgstr "ç»è®¡"
-#: actions/showapplication.php:204
+#: actions/showapplication.php:203
#, php-format
-msgid "created by %1$s - %2$s access by default - %3$d users"
+msgid "Created by %1$s - %2$s access by default - %3$d users"
msgstr ""
-#: actions/showapplication.php:214
+#: actions/showapplication.php:213
msgid "Application actions"
msgstr ""
-#: actions/showapplication.php:233
+#: actions/showapplication.php:236
msgid "Reset key & secret"
msgstr ""
-#: actions/showapplication.php:241
+#: actions/showapplication.php:261
msgid "Application info"
msgstr ""
-#: actions/showapplication.php:243
+#: actions/showapplication.php:263
msgid "Consumer key"
msgstr ""
-#: actions/showapplication.php:248
+#: actions/showapplication.php:268
msgid "Consumer secret"
msgstr ""
-#: actions/showapplication.php:253
+#: actions/showapplication.php:273
msgid "Request token URL"
msgstr ""
-#: actions/showapplication.php:258
+#: actions/showapplication.php:278
msgid "Access token URL"
msgstr ""
-#: actions/showapplication.php:263
+#: actions/showapplication.php:283
msgid "Authorize URL"
msgstr ""
-#: actions/showapplication.php:268
+#: actions/showapplication.php:288
msgid ""
"Note: We support HMAC-SHA1 signatures. We do not support the plaintext "
"signature method."
msgstr ""
+#: actions/showapplication.php:309
+#, fuzzy
+msgid "Are you sure you want to reset your consumer key and secret?"
+msgstr "ç¡®å®è¦å é¤è¿æ¡æ¶æ¯åï¼"
+
#: actions/showfavorites.php:79
#, fuzzy, php-format
msgid "%1$s's favorite notices, page %2$d"
@@ -3406,35 +3535,35 @@ msgstr "%s æ¶èçéå"
msgid "Could not retrieve favorite notices."
msgstr "æ æ³è·åæ¶èçéåã"
-#: actions/showfavorites.php:170
+#: actions/showfavorites.php:171
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
msgstr "%s 好åçèå"
-#: actions/showfavorites.php:177
+#: actions/showfavorites.php:178
#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "%s 好åçèå"
-#: actions/showfavorites.php:184
+#: actions/showfavorites.php:185
#, php-format
msgid "Feed for favorites of %s (Atom)"
msgstr "%s 好åçèå"
-#: actions/showfavorites.php:205
+#: actions/showfavorites.php:206
msgid ""
"You haven't chosen any favorite notices yet. Click the fave button on "
"notices you like to bookmark them for later or shed a spotlight on them."
msgstr ""
-#: actions/showfavorites.php:207
+#: actions/showfavorites.php:208
#, php-format
msgid ""
"%s hasn't added any notices to his favorites yet. Post something interesting "
"they would add to their favorites :)"
msgstr ""
-#: actions/showfavorites.php:211
+#: actions/showfavorites.php:212
#, php-format
msgid ""
"%s hasn't added any notices to his favorites yet. Why not [register an "
@@ -3442,7 +3571,7 @@ msgid ""
"would add to their favorites :)"
msgstr ""
-#: actions/showfavorites.php:242
+#: actions/showfavorites.php:243
msgid "This is a way to share what you like."
msgstr ""
@@ -3456,71 +3585,71 @@ msgstr "%s ç»"
msgid "%1$s group, page %2$d"
msgstr "%s ç»æå, 第 %d 页"
-#: actions/showgroup.php:218
+#: actions/showgroup.php:226
#, fuzzy
msgid "Group profile"
msgstr "ç»èµæ"
-#: actions/showgroup.php:263 actions/tagother.php:118
-#: actions/userauthorization.php:167 lib/userprofile.php:177
+#: actions/showgroup.php:271 actions/tagother.php:118
+#: actions/userauthorization.php:175 lib/userprofile.php:177
msgid "URL"
msgstr "URL äºèç½å°å"
-#: actions/showgroup.php:274 actions/tagother.php:128
-#: actions/userauthorization.php:179 lib/userprofile.php:194
+#: actions/showgroup.php:282 actions/tagother.php:128
+#: actions/userauthorization.php:187 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "éå"
-#: actions/showgroup.php:284 lib/groupeditform.php:184
+#: actions/showgroup.php:292 lib/groupeditform.php:184
msgid "Aliases"
msgstr ""
-#: actions/showgroup.php:293
+#: actions/showgroup.php:301
msgid "Group actions"
msgstr "ç»å¨ä½"
-#: actions/showgroup.php:328
+#: actions/showgroup.php:337
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 1.0)"
msgstr "%s çéåèå"
-#: actions/showgroup.php:334
+#: actions/showgroup.php:343
#, fuzzy, php-format
msgid "Notice feed for %s group (RSS 2.0)"
msgstr "%s çéåèå"
-#: actions/showgroup.php:340
+#: actions/showgroup.php:349
#, fuzzy, php-format
msgid "Notice feed for %s group (Atom)"
msgstr "%s çéåèå"
-#: actions/showgroup.php:345
+#: actions/showgroup.php:354
#, php-format
msgid "FOAF for %s group"
msgstr "%s çå件箱"
-#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
+#: actions/showgroup.php:390 actions/showgroup.php:447 lib/groupnav.php:91
#, fuzzy
msgid "Members"
msgstr "注åäº"
-#: actions/showgroup.php:386 lib/profileaction.php:117
-#: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95
+#: 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
msgid "(None)"
msgstr "ï¼æ²¡æï¼"
-#: actions/showgroup.php:392
+#: actions/showgroup.php:401
msgid "All members"
msgstr "æææå"
-#: actions/showgroup.php:432
+#: actions/showgroup.php:441
#, fuzzy
msgid "Created"
msgstr "å建"
-#: actions/showgroup.php:448
+#: actions/showgroup.php:457
#, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3530,7 +3659,7 @@ msgid ""
"of this group and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showgroup.php:454
+#: actions/showgroup.php:463
#, fuzzy, php-format
msgid ""
"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3541,7 +3670,7 @@ msgstr ""
"**%s** æ¯ä¸ä¸ª %%%%site.name%%%% çç¨æ·ç»,ä¸ä¸ªå¾®å客æå¡ [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showgroup.php:482
+#: actions/showgroup.php:491
#, fuzzy
msgid "Admins"
msgstr "admin管çå"
@@ -3604,25 +3733,25 @@ msgstr "%s çéåèå"
msgid "FOAF for %s"
msgstr "%s çå件箱"
-#: actions/showstream.php:191
+#: actions/showstream.php:200
#, fuzzy, php-format
msgid "This is the timeline for %1$s but %2$s hasn't posted anything yet."
msgstr "è¿æ¯ %s å好åçæ¶é´çº¿ï¼ä½æ¯æ²¡æä»»ä½äººåå¸å
容ã"
-#: actions/showstream.php:196
+#: actions/showstream.php:205
msgid ""
"Seen anything interesting recently? You haven't posted any notices yet, now "
"would be a good time to start :)"
msgstr ""
-#: actions/showstream.php:198
+#: actions/showstream.php:207
#, php-format
msgid ""
"You can try to nudge %1$s or [post something to his or her attention](%%%%"
"action.newnotice%%%%?status_textarea=%2$s)."
msgstr ""
-#: actions/showstream.php:234
+#: actions/showstream.php:243
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3631,7 +3760,7 @@ msgid ""
"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
msgstr ""
-#: actions/showstream.php:239
+#: actions/showstream.php:248
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -3641,7 +3770,7 @@ msgstr ""
"**%s** æä¸ä¸ªå¸å·å¨ %%%%site.name%%%%, ä¸ä¸ªå¾®å客æå¡ [micro-blogging]"
"(http://en.wikipedia.org/wiki/Micro-blogging)"
-#: actions/showstream.php:296
+#: actions/showstream.php:305
#, fuzzy, php-format
msgid "Repeat of %s"
msgstr "%s çåå¤"
@@ -3657,150 +3786,139 @@ msgid "User is already silenced."
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
#: actions/siteadminpanel.php:69
-msgid "Basic settings for this StatusNet site."
+msgid "Basic settings for this StatusNet site"
msgstr ""
-#: actions/siteadminpanel.php:132
+#: actions/siteadminpanel.php:133
msgid "Site name must have non-zero length."
msgstr ""
-#: actions/siteadminpanel.php:140
+#: actions/siteadminpanel.php:141
#, fuzzy
msgid "You must have a valid contact email address."
msgstr "ä¸æ¯ææççµåé®ä»¶"
-#: actions/siteadminpanel.php:158
+#: actions/siteadminpanel.php:159
#, php-format
msgid "Unknown language \"%s\"."
msgstr ""
#: actions/siteadminpanel.php:165
-msgid "Invalid snapshot report URL."
-msgstr ""
-
-#: actions/siteadminpanel.php:171
-msgid "Invalid snapshot run value."
-msgstr ""
-
-#: actions/siteadminpanel.php:177
-msgid "Snapshot frequency must be a number."
-msgstr ""
-
-#: actions/siteadminpanel.php:183
msgid "Minimum text limit is 140 characters."
msgstr ""
-#: actions/siteadminpanel.php:189
+#: actions/siteadminpanel.php:171
msgid "Dupe limit must 1 or more seconds."
msgstr ""
-#: actions/siteadminpanel.php:239
+#: actions/siteadminpanel.php:221
msgid "General"
msgstr ""
-#: actions/siteadminpanel.php:242
+#: actions/siteadminpanel.php:224
#, fuzzy
msgid "Site name"
msgstr "æ°éå"
-#: actions/siteadminpanel.php:243
+#: actions/siteadminpanel.php:225
msgid "The name of your site, like \"Yourcompany Microblog\""
msgstr ""
-#: actions/siteadminpanel.php:247
+#: actions/siteadminpanel.php:229
msgid "Brought by"
msgstr ""
-#: actions/siteadminpanel.php:248
+#: actions/siteadminpanel.php:230
msgid "Text used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:252
+#: actions/siteadminpanel.php:234
msgid "Brought by URL"
msgstr ""
-#: actions/siteadminpanel.php:253
+#: actions/siteadminpanel.php:235
msgid "URL used for credits link in footer of each page"
msgstr ""
-#: actions/siteadminpanel.php:257
+#: actions/siteadminpanel.php:239
#, fuzzy
msgid "Contact email address for your site"
msgstr "æ°ççµåé®ä»¶å°åï¼ç¨äºåå¸ %s ä¿¡æ¯"
-#: actions/siteadminpanel.php:263
+#: actions/siteadminpanel.php:245
#, fuzzy
msgid "Local"
msgstr "æ¬å°æ¾ç¤º"
-#: actions/siteadminpanel.php:274
+#: actions/siteadminpanel.php:256
msgid "Default timezone"
msgstr ""
-#: actions/siteadminpanel.php:275
+#: actions/siteadminpanel.php:257
msgid "Default timezone for the site; usually UTC."
msgstr ""
-#: actions/siteadminpanel.php:281
+#: actions/siteadminpanel.php:262
#, fuzzy
-msgid "Default site language"
+msgid "Default language"
msgstr "é¦éè¯è¨"
-#: actions/siteadminpanel.php:289
-msgid "Snapshots"
-msgstr ""
-
-#: actions/siteadminpanel.php:292
-msgid "Randomly during Web hit"
+#: actions/siteadminpanel.php:263
+msgid "Site language when autodetection from browser settings is not available"
msgstr ""
-#: actions/siteadminpanel.php:293
-msgid "In a scheduled job"
+#: actions/siteadminpanel.php:271
+msgid "Limits"
msgstr ""
-#: actions/siteadminpanel.php:295
-msgid "Data snapshots"
+#: actions/siteadminpanel.php:274
+msgid "Text limit"
msgstr ""
-#: actions/siteadminpanel.php:296
-msgid "When to send statistical data to status.net servers"
+#: actions/siteadminpanel.php:274
+msgid "Maximum number of characters for notices."
msgstr ""
-#: actions/siteadminpanel.php:301
-msgid "Frequency"
+#: actions/siteadminpanel.php:278
+msgid "Dupe limit"
msgstr ""
-#: actions/siteadminpanel.php:302
-msgid "Snapshots will be sent once every N web hits"
+#: actions/siteadminpanel.php:278
+msgid "How long users must wait (in seconds) to post the same thing again."
msgstr ""
-#: actions/siteadminpanel.php:307
-msgid "Report URL"
-msgstr ""
+#: actions/sitenoticeadminpanel.php:56
+#, fuzzy
+msgid "Site Notice"
+msgstr "æ°éå"
-#: actions/siteadminpanel.php:308
-msgid "Snapshots will be sent to this URL"
-msgstr ""
+#: actions/sitenoticeadminpanel.php:67
+#, fuzzy
+msgid "Edit site-wide message"
+msgstr "æ°æ¶æ¯"
-#: actions/siteadminpanel.php:315
-msgid "Limits"
-msgstr ""
+#: actions/sitenoticeadminpanel.php:103
+#, fuzzy
+msgid "Unable to save site notice."
+msgstr "æ æ³ä¿å Twitter 设置ï¼"
-#: actions/siteadminpanel.php:318
-msgid "Text limit"
+#: actions/sitenoticeadminpanel.php:113
+msgid "Max length for the site-wide notice is 255 chars"
msgstr ""
-#: actions/siteadminpanel.php:318
-msgid "Maximum number of characters for notices."
-msgstr ""
+#: actions/sitenoticeadminpanel.php:176
+#, fuzzy
+msgid "Site notice text"
+msgstr "æ°éå"
-#: actions/siteadminpanel.php:322
-msgid "Dupe limit"
+#: actions/sitenoticeadminpanel.php:178
+msgid "Site-wide notice text (255 chars max; HTML okay)"
msgstr ""
-#: actions/siteadminpanel.php:322
-msgid "How long users must wait (in seconds) to post the same thing again."
-msgstr ""
+#: actions/sitenoticeadminpanel.php:198
+#, fuzzy
+msgid "Save site notice"
+msgstr "æ°éå"
#: actions/smssettings.php:58
#, fuzzy
@@ -3903,22 +4021,92 @@ msgstr ""
msgid "No code entered"
msgstr "没æè¾å
¥éªè¯ç "
+#. TRANS: Menu item for site administration
+#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
+#: lib/adminpanelaction.php:406
+msgid "Snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:65
+#, fuzzy
+msgid "Manage snapshot configuration"
+msgstr "主ç«å¯¼èª"
+
+#: actions/snapshotadminpanel.php:127
+msgid "Invalid snapshot run value."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:133
+msgid "Snapshot frequency must be a number."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:144
+msgid "Invalid snapshot report URL."
+msgstr ""
+
+#: actions/snapshotadminpanel.php:200
+msgid "Randomly during Web hit"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:201
+msgid "In a scheduled job"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:206
+msgid "Data snapshots"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:208
+msgid "When to send statistical data to status.net servers"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:217
+msgid "Frequency"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:218
+msgid "Snapshots will be sent once every N web hits"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:226
+msgid "Report URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:227
+msgid "Snapshots will be sent to this URL"
+msgstr ""
+
+#: actions/snapshotadminpanel.php:248
+#, fuzzy
+msgid "Save snapshot settings"
+msgstr "头å设置"
+
#: actions/subedit.php:70
#, fuzzy
msgid "You are not subscribed to that profile."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/subedit.php:83
+#: actions/subedit.php:83 classes/Subscription.php:89
+#: classes/Subscription.php:116
#, fuzzy
msgid "Could not save subscription."
msgstr "æ æ³å é¤è®¢é
ã"
-#: actions/subscribe.php:55
+#: actions/subscribe.php:77
+msgid "This action only accepts POST requests."
+msgstr ""
+
+#: actions/subscribe.php:107
#, fuzzy
-msgid "Not a local user."
-msgstr "没æè¿ä¸ªç¨æ·ã"
+msgid "No such profile."
+msgstr "没æè¿ä»½éåã"
-#: actions/subscribe.php:69
+#: actions/subscribe.php:117
+#, fuzzy
+msgid "You cannot subscribe to an OMB 0.1 remote profile with this action."
+msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
+
+#: actions/subscribe.php:145
#, fuzzy
msgid "Subscribed"
msgstr "订é
"
@@ -3979,7 +4167,7 @@ msgstr "è¿æ¯æ¨è®¢é
çç¨æ·ã"
msgid "These are the people whose notices %s listens to."
msgstr "è¿æ¯ %s 订é
çç¨æ·ã"
-#: actions/subscriptions.php:121
+#: actions/subscriptions.php:126
#, php-format
msgid ""
"You're not listening to anyone's notices right now, try subscribing to "
@@ -3989,36 +4177,36 @@ msgid ""
"automatically subscribe to people you already follow there."
msgstr ""
-#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#: actions/subscriptions.php:128 actions/subscriptions.php:132
#, fuzzy, php-format
msgid "%s is not listening to anyone."
msgstr "%1$s å¼å§å
³æ³¨æ¨ç %2$s ä¿¡æ¯ã"
-#: actions/subscriptions.php:194
+#: actions/subscriptions.php:199
#, fuzzy
msgid "Jabber"
msgstr "没æ Jabber IDã"
-#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:204 lib/connectsettingsaction.php:115
msgid "SMS"
msgstr "SMSçä¿¡"
-#: actions/tag.php:68
+#: actions/tag.php:69
#, fuzzy, php-format
msgid "Notices tagged with %1$s, page %2$d"
msgstr "ç¨æ·èªå æ ç¾ %s - 第 %d 页"
-#: actions/tag.php:86
+#: actions/tag.php:87
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 1.0)"
msgstr "%s çéåèå"
-#: actions/tag.php:92
+#: actions/tag.php:93
#, fuzzy, php-format
msgid "Notice feed for tag %s (RSS 2.0)"
msgstr "%s çéåèå"
-#: actions/tag.php:98
+#: actions/tag.php:99
#, fuzzy, php-format
msgid "Notice feed for tag %s (Atom)"
msgstr "%s çéåèå"
@@ -4038,7 +4226,8 @@ msgstr "æ ç¾"
msgid "User profile"
msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
-#: actions/tagother.php:81 lib/userprofile.php:102
+#: actions/tagother.php:81 actions/userauthorization.php:132
+#: lib/userprofile.php:102
msgid "Photo"
msgstr "ç¸ç"
@@ -4073,7 +4262,7 @@ msgstr "使ç¨è¿ä¸ªè¡¨æ ¼ç»ä½ çå
³æ³¨è
æä½ ç订é
å 注æ ç¾ã"
msgid "No such tag."
msgstr "æªæ¾å°æ¤æ¶æ¯ã"
-#: actions/twitapitrends.php:87
+#: actions/twitapitrends.php:85
msgid "API method under construction."
msgstr "API æ¹æ³å°æªå®ç°ã"
@@ -4102,81 +4291,83 @@ msgstr "æå¡å¨æ²¡æè¿å个人信æ¯URLã"
msgid "Unsubscribed"
msgstr "é订"
-#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#: actions/updateprofile.php:64 actions/userauthorization.php:337
#, php-format
msgid ""
"Listenee stream license â%1$sâ is not compatible with site license â%2$sâ."
msgstr ""
-#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321
-#: lib/personalgroupnav.php:115
+#. TRANS: User admin panel title
+#: actions/useradminpanel.php:59
+#, fuzzy
+msgctxt "TITLE"
msgid "User"
msgstr "ç¨æ·"
-#: actions/useradminpanel.php:69
+#: actions/useradminpanel.php:70
msgid "User settings for this StatusNet site."
msgstr ""
-#: actions/useradminpanel.php:148
+#: actions/useradminpanel.php:149
msgid "Invalid bio limit. Must be numeric."
msgstr ""
-#: actions/useradminpanel.php:154
+#: actions/useradminpanel.php:155
msgid "Invalid welcome text. Max length is 255 characters."
msgstr ""
-#: actions/useradminpanel.php:164
+#: actions/useradminpanel.php:165
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr ""
-#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108
+#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信æ¯"
-#: actions/useradminpanel.php:221
+#: actions/useradminpanel.php:222
msgid "Bio Limit"
msgstr ""
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Maximum length of a profile bio in characters."
msgstr ""
-#: actions/useradminpanel.php:230
+#: actions/useradminpanel.php:231
#, fuzzy
msgid "New users"
msgstr "é请æ°ç¨æ·"
-#: actions/useradminpanel.php:234
+#: actions/useradminpanel.php:235
msgid "New user welcome"
msgstr ""
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "Welcome text for new users (Max 255 chars)."
msgstr ""
-#: actions/useradminpanel.php:240
+#: actions/useradminpanel.php:241
#, fuzzy
msgid "Default subscription"
msgstr "ææ订é
"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
#, fuzzy
msgid "Automatically subscribe new users to this user."
msgstr "èªå¨è®¢é
ä»»ä½è®¢é
æçæ´æ°ç人(è¿ä¸ªé项æéåæºå¨äºº)"
-#: actions/useradminpanel.php:250
+#: actions/useradminpanel.php:251
#, fuzzy
msgid "Invitations"
msgstr "å·²åéé请"
-#: actions/useradminpanel.php:255
+#: actions/useradminpanel.php:256
#, fuzzy
msgid "Invitations enabled"
msgstr "å·²åéé请"
-#: actions/useradminpanel.php:257
+#: actions/useradminpanel.php:258
msgid "Whether to allow users to invite new users."
msgstr ""
@@ -4194,39 +4385,39 @@ msgstr ""
"请æ£æ¥è¯¦ç»ä¿¡æ¯ï¼ç¡®è®¤å¸æ订é
æ¤ç¨æ·çéåãå¦ææ¨åæ没æè¦æ±è®¢é
ä»»ä½äººçé"
"åï¼è¯·ç¹å»\"åæ¶\"ã"
-#: actions/userauthorization.php:188 actions/version.php:165
+#: actions/userauthorization.php:196 actions/version.php:165
#, fuzzy
msgid "License"
msgstr "注åè¯"
-#: actions/userauthorization.php:209
+#: actions/userauthorization.php:217
msgid "Accept"
msgstr "æ¥å"
-#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: actions/userauthorization.php:218 lib/subscribeform.php:115
#: lib/subscribeform.php:139
#, fuzzy
msgid "Subscribe to this user"
msgstr "订é
%s"
-#: actions/userauthorization.php:211
+#: actions/userauthorization.php:219
msgid "Reject"
msgstr "æç»"
-#: actions/userauthorization.php:212
+#: actions/userauthorization.php:220
#, fuzzy
msgid "Reject this subscription"
msgstr "ææ订é
"
-#: actions/userauthorization.php:225
+#: actions/userauthorization.php:232
msgid "No authorization request!"
msgstr "æªæ¶å°è®¤è¯è¯·æ±ï¼"
-#: actions/userauthorization.php:247
+#: actions/userauthorization.php:254
msgid "Subscription authorized"
msgstr "订é
已确认"
-#: actions/userauthorization.php:249
+#: actions/userauthorization.php:256
#, fuzzy
msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
@@ -4235,11 +4426,11 @@ msgid ""
msgstr ""
"订é
已确认ï¼ä½æ¯æ²¡æåä¼ URLã请å°æ¤ç½ç«æ¥çå¦ä½ç¡®è®¤è®¢é
ãæ¨ç订é
æ è¯æ¯ï¼"
-#: actions/userauthorization.php:259
+#: actions/userauthorization.php:266
msgid "Subscription rejected"
msgstr "订é
被æç»"
-#: actions/userauthorization.php:261
+#: actions/userauthorization.php:268
#, fuzzy
msgid ""
"The subscription has been rejected, but no callback URL was passed. Check "
@@ -4247,37 +4438,37 @@ msgid ""
"subscription."
msgstr "订é
已被æç»ï¼ä½æ¯æ²¡æåä¼ URLã请å°æ¤ç½ç«æ¥çå¦ä½æç»è®¢é
ã"
-#: actions/userauthorization.php:296
+#: actions/userauthorization.php:303
#, php-format
msgid "Listener URI â%sâ not found here."
msgstr ""
-#: actions/userauthorization.php:301
+#: actions/userauthorization.php:308
#, php-format
msgid "Listenee URI â%sâ is too long."
msgstr ""
-#: actions/userauthorization.php:307
+#: actions/userauthorization.php:314
#, php-format
msgid "Listenee URI â%sâ is a local user."
msgstr ""
-#: actions/userauthorization.php:322
+#: actions/userauthorization.php:329
#, php-format
msgid "Profile URL â%sâ is for a local user."
msgstr ""
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:345
#, php-format
msgid "Avatar URL â%sâ is not valid."
msgstr ""
-#: actions/userauthorization.php:343
+#: actions/userauthorization.php:350
#, fuzzy, php-format
msgid "Canât read avatar URL â%sâ."
msgstr "æ æ³è®¿é®å¤´åURL '%s'"
-#: actions/userauthorization.php:348
+#: actions/userauthorization.php:355
#, fuzzy, php-format
msgid "Wrong image type for avatar URL â%sâ."
msgstr "'%s' å¾åæ ¼å¼é误"
@@ -4307,16 +4498,22 @@ msgstr "%s ç»æå, 第 %d 页"
msgid "Search for more groups"
msgstr "æ£ç´¢äººææå"
-#: actions/usergroups.php:153
+#: actions/usergroups.php:157
#, fuzzy, php-format
msgid "%s is not a member of any group."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: actions/usergroups.php:158
+#: actions/usergroups.php:162
#, 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
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s ä¸ %1$s çæ´æ°ï¼"
+
#: actions/version.php:73
#, fuzzy, php-format
msgid "StatusNet %s"
@@ -4329,11 +4526,6 @@ msgid ""
"Inc. and contributors."
msgstr ""
-#: actions/version.php:157
-#, fuzzy
-msgid "StatusNet"
-msgstr "头åå·²æ´æ°ã"
-
#: actions/version.php:161
msgid "Contributors"
msgstr ""
@@ -4365,7 +4557,7 @@ msgstr ""
msgid "Plugins"
msgstr ""
-#: actions/version.php:196 lib/action.php:747
+#: actions/version.php:196 lib/action.php:767
#, fuzzy
msgid "Version"
msgstr "个人"
@@ -4406,6 +4598,11 @@ msgstr "æ æ³æ´æ°ç»"
msgid "Group leave failed."
msgstr "ç»èµæ"
+#: classes/Local_group.php:41
+#, fuzzy
+msgid "Could not update local group."
+msgstr "æ æ³æ´æ°ç»"
+
#: classes/Login_token.php:76
#, fuzzy, php-format
msgid "Could not create login token for %s"
@@ -4424,70 +4621,108 @@ msgstr "æ æ³æ·»å ä¿¡æ¯ã"
msgid "Could not update message with new URI."
msgstr "æ æ³æ·»å æ°URIçä¿¡æ¯ã"
-#: classes/Notice.php:157
+#: classes/Notice.php:172
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "æ·»å æ ç¾æ¶æ°æ®åºåºéï¼%s"
-#: classes/Notice.php:214
+#: classes/Notice.php:241
#, fuzzy
msgid "Problem saving notice. Too long."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:218
+#: classes/Notice.php:245
#, fuzzy
msgid "Problem saving notice. Unknown user."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:223
+#: classes/Notice.php:250
msgid ""
"Too many notices too fast; take a breather and post again in a few minutes."
msgstr "ä½ å¨çæ¶é´éåå¸äºè¿å¤çæ¶æ¯ï¼è¯·æ·±å¼å¸ï¼è¿å åéååæ¶æ¯ã"
-#: classes/Notice.php:229
+#: classes/Notice.php:256
#, fuzzy
msgid ""
"Too many duplicate messages too quickly; take a breather and post again in a "
"few minutes."
msgstr "ä½ å¨çæ¶é´éåå¸äºè¿å¤çæ¶æ¯ï¼è¯·æ·±å¼å¸ï¼è¿å åéååæ¶æ¯ã"
-#: classes/Notice.php:235
+#: classes/Notice.php:262
msgid "You are banned from posting notices on this site."
msgstr "å¨è¿ä¸ªç½ç«ä½ 被ç¦æ¢åå¸æ¶æ¯ã"
-#: classes/Notice.php:294 classes/Notice.php:319
+#: classes/Notice.php:328 classes/Notice.php:354
msgid "Problem saving notice."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:790
+#: classes/Notice.php:927
#, fuzzy
msgid "Problem saving group inbox."
msgstr "ä¿åéåæ¶åºéã"
-#: classes/Notice.php:850
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "æ·»å åå¤æ¶æ°æ®åºåºéï¼%s"
-
-#: classes/Notice.php:1233
+#: classes/Notice.php:1459
#, fuzzy, php-format
msgid "RT @%1$s %2$s"
msgstr "%1$s (%2$s)"
-#: classes/User.php:382
+#: classes/Subscription.php:66 lib/oauthstore.php:465
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "é£ä¸ªç¨æ·é»æ¢äºä½ ç订é
ã"
+
+#: classes/Subscription.php:70
+msgid "Already subscribed!"
+msgstr ""
+
+#: classes/Subscription.php:74
+#, fuzzy
+msgid "User has blocked you."
+msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
+
+#: classes/Subscription.php:157
+#, fuzzy
+msgid "Not subscribed!"
+msgstr "æªè®¢é
ï¼"
+
+#: classes/Subscription.php:163
+#, fuzzy
+msgid "Couldn't delete self-subscription."
+msgstr "æ æ³å é¤è®¢é
ã"
+
+#: classes/Subscription.php:190
+#, fuzzy
+msgid "Couldn't delete subscription OMB token."
+msgstr "æ æ³å é¤è®¢é
ã"
+
+#: classes/Subscription.php:201 lib/subs.php:69
+msgid "Couldn't delete subscription."
+msgstr "æ æ³å é¤è®¢é
ã"
+
+#: classes/User.php:373
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "åéç» %1$s ç %2$s æ¶æ¯"
-#: classes/User_group.php:380
+#: classes/User_group.php:477
msgid "Could not create group."
msgstr "æ æ³å建ç»ã"
-#: classes/User_group.php:409
+#: classes/User_group.php:486
+#, fuzzy
+msgid "Could not set group URI."
+msgstr "æ æ³å é¤è®¢é
ã"
+
+#: classes/User_group.php:507
#, fuzzy
msgid "Could not set group membership."
msgstr "æ æ³å é¤è®¢é
ã"
+#: classes/User_group.php:521
+#, fuzzy
+msgid "Could not save local group info."
+msgstr "æ æ³å é¤è®¢é
ã"
+
#: lib/accountsettingsaction.php:108
msgid "Change your profile settings"
msgstr "ä¿®æ¹æ¨ç个人信æ¯"
@@ -4526,133 +4761,191 @@ msgstr "%1$s (%2$s)"
msgid "Untitled page"
msgstr "æ æ é¢é¡µ"
-#: lib/action.php:433
+#: lib/action.php:424
msgid "Primary site navigation"
msgstr "主ç«å¯¼èª"
-#: lib/action.php:439
-msgid "Home"
-msgstr "主页"
-
-#: lib/action.php:439
+#. TRANS: Tooltip for main menu option "Personal"
+#: lib/action.php:430
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "个人èµæåæå年表"
-#: lib/action.php:441
+#: lib/action.php:433
#, fuzzy
+msgctxt "MENU"
+msgid "Personal"
+msgstr "个人"
+
+#. TRANS: Tooltip for main menu option "Account"
+#: lib/action.php:435
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "ä¿®æ¹èµæ"
-#: lib/action.php:444
-msgid "Connect"
-msgstr "è¿æ¥"
-
-#: lib/action.php:444
+#. TRANS: Tooltip for main menu option "Services"
+#: lib/action.php:440
#, fuzzy
+msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "æ æ³éå®åå°æå¡å¨ï¼%s"
-#: lib/action.php:448
+#: lib/action.php:443
+msgid "Connect"
+msgstr "è¿æ¥"
+
+#. TRANS: Tooltip for menu option "Admin"
+#: lib/action.php:446
#, fuzzy
+msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "主ç«å¯¼èª"
-#: lib/action.php:452 lib/subgroupnav.php:105
-msgid "Invite"
-msgstr "é请"
+#: lib/action.php:449
+#, fuzzy
+msgctxt "MENU"
+msgid "Admin"
+msgstr "admin管çå"
-#: lib/action.php:453 lib/subgroupnav.php:106
+#. TRANS: Tooltip for main menu option "Invite"
+#: lib/action.php:453
#, fuzzy, php-format
+msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "使ç¨è¿ä¸ªè¡¨åæ¥é请好åååäºå å
¥ã"
-#: lib/action.php:458
-msgid "Logout"
-msgstr "ç»åº"
+#: lib/action.php:456
+#, fuzzy
+msgctxt "MENU"
+msgid "Invite"
+msgstr "é请"
-#: lib/action.php:458
+#. TRANS: Tooltip for main menu option "Logout"
+#: lib/action.php:462
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "ç»åºæ¬ç«"
-#: lib/action.php:463
+#: lib/action.php:465
#, fuzzy
+msgctxt "MENU"
+msgid "Logout"
+msgstr "ç»åº"
+
+#. TRANS: Tooltip for main menu option "Register"
+#: lib/action.php:470
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "å建æ°å¸å·"
-#: lib/action.php:466
+#: lib/action.php:473
+#, fuzzy
+msgctxt "MENU"
+msgid "Register"
+msgstr "注å"
+
+#. TRANS: Tooltip for main menu option "Login"
+#: lib/action.php:476
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "ç»å
¥æ¬ç«"
-#: lib/action.php:469 lib/action.php:732
-msgid "Help"
-msgstr "帮å©"
+#: lib/action.php:479
+#, fuzzy
+msgctxt "MENU"
+msgid "Login"
+msgstr "ç»å½"
-#: lib/action.php:469
+#. TRANS: Tooltip for main menu option "Help"
+#: lib/action.php:482
#, fuzzy
+msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮å©"
-#: lib/action.php:472 lib/searchaction.php:127
-msgid "Search"
-msgstr "æç´¢"
+#: lib/action.php:485
+#, fuzzy
+msgctxt "MENU"
+msgid "Help"
+msgstr "帮å©"
-#: lib/action.php:472
+#. TRANS: Tooltip for main menu option "Search"
+#: lib/action.php:488
+#, fuzzy
+msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "æ£ç´¢äººææå"
-#: lib/action.php:493
+#: lib/action.php:491
+#, fuzzy
+msgctxt "MENU"
+msgid "Search"
+msgstr "æç´¢"
+
+#. TRANS: DT element for site notice. String is hidden in default CSS.
+#. TRANS: Menu item for site administration
+#: lib/action.php:513 lib/adminpanelaction.php:398
#, fuzzy
msgid "Site notice"
msgstr "æ°éå"
-#: lib/action.php:559
+#: lib/action.php:579
msgid "Local views"
msgstr "æ¬å°æ¾ç¤º"
-#: lib/action.php:625
+#: lib/action.php:645
#, fuzzy
msgid "Page notice"
msgstr "æ°éå"
-#: lib/action.php:727
+#: lib/action.php:747
#, fuzzy
msgid "Secondary site navigation"
msgstr "次项ç«å¯¼èª"
-#: lib/action.php:734
+#: lib/action.php:752
+msgid "Help"
+msgstr "帮å©"
+
+#: lib/action.php:754
msgid "About"
msgstr "å
³äº"
-#: lib/action.php:736
+#: lib/action.php:756
msgid "FAQ"
msgstr "常è§é®é¢FAQ"
-#: lib/action.php:740
+#: lib/action.php:760
msgid "TOS"
msgstr ""
-#: lib/action.php:743
+#: lib/action.php:763
msgid "Privacy"
msgstr "éç§"
-#: lib/action.php:745
+#: lib/action.php:765
msgid "Source"
msgstr "æ¥æº"
-#: lib/action.php:749
+#: lib/action.php:769
msgid "Contact"
msgstr "è系人"
-#: lib/action.php:751
+#: lib/action.php:771
#, fuzzy
msgid "Badge"
msgstr "å¼å«"
-#: lib/action.php:779
+#: lib/action.php:799
msgid "StatusNet software license"
msgstr "StatusNet软件注åè¯"
-#: lib/action.php:782
+#: lib/action.php:802
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -4661,12 +4954,12 @@ msgstr ""
"**%%site.name%%** æ¯ä¸ä¸ªå¾®å客æå¡ï¼æä¾è
为 [%%site.broughtby%%](%%site."
"broughtbyurl%%)ã"
-#: lib/action.php:784
+#: lib/action.php:804
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** æ¯ä¸ä¸ªå¾®å客æå¡ã"
-#: lib/action.php:786
+#: lib/action.php:806
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -4677,107 +4970,161 @@ msgstr ""
"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
"ææã"
-#: lib/action.php:801
+#: lib/action.php:821
#, fuzzy
msgid "Site content license"
msgstr "StatusNet软件注åè¯"
-#: lib/action.php:806
+#: lib/action.php:826
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr ""
-#: lib/action.php:811
+#: lib/action.php:831
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr ""
-#: lib/action.php:814
+#: lib/action.php:834
msgid "Content and data copyright by contributors. All rights reserved."
msgstr ""
-#: lib/action.php:826
+#: lib/action.php:847
msgid "All "
msgstr "å
¨é¨"
-#: lib/action.php:831
+#: lib/action.php:853
msgid "license."
msgstr "注åè¯"
-#: lib/action.php:1130
+#: lib/action.php:1152
msgid "Pagination"
msgstr "å页"
-#: lib/action.php:1139
+#: lib/action.php:1161
#, fuzzy
msgid "After"
msgstr "« ä¹å"
-#: lib/action.php:1147
+#: lib/action.php:1169
#, fuzzy
msgid "Before"
msgstr "ä¹å »"
-#: lib/adminpanelaction.php:96
+#: lib/activity.php:453
+msgid "Can't handle remote content yet."
+msgstr ""
+
+#: lib/activity.php:481
+msgid "Can't handle embedded XML content yet."
+msgstr ""
+
+#: lib/activity.php:485
+msgid "Can't handle embedded Base64 content yet."
+msgstr ""
+
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:98
#, fuzzy
msgid "You cannot make changes to this site."
msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
-#: lib/adminpanelaction.php:107
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:110
#, fuzzy
msgid "Changes to that panel are not allowed."
msgstr "ä¸å
许注åã"
-#: lib/adminpanelaction.php:206
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:229
#, fuzzy
msgid "showForm() not implemented."
msgstr "å½ä»¤å°æªå®ç°ã"
-#: lib/adminpanelaction.php:235
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:259
#, fuzzy
msgid "saveSettings() not implemented."
msgstr "å½ä»¤å°æªå®ç°ã"
-#: lib/adminpanelaction.php:258
+#. TRANS: Client error message
+#: lib/adminpanelaction.php:283
#, fuzzy
msgid "Unable to delete design setting."
msgstr "æ æ³ä¿å Twitter 设置ï¼"
-#: lib/adminpanelaction.php:312
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:348
#, fuzzy
msgid "Basic site configuration"
msgstr "çµåé®ä»¶å°å确认"
-#: lib/adminpanelaction.php:317
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:350
+#, fuzzy
+msgctxt "MENU"
+msgid "Site"
+msgstr "é请"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:356
#, fuzzy
msgid "Design configuration"
msgstr "SMSç信确认"
-#: lib/adminpanelaction.php:322
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:358
+#, fuzzy
+msgctxt "MENU"
+msgid "Design"
+msgstr "个人"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:364
#, fuzzy
msgid "User configuration"
msgstr "SMSç信确认"
-#: lib/adminpanelaction.php:327
+#. TRANS: Menu item for site administration
+#: lib/adminpanelaction.php:366 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "ç¨æ·"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:372
#, fuzzy
msgid "Access configuration"
msgstr "SMSç信确认"
-#: lib/adminpanelaction.php:332
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:380
#, fuzzy
msgid "Paths configuration"
msgstr "SMSç信确认"
-#: lib/adminpanelaction.php:337
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:388
#, fuzzy
msgid "Sessions configuration"
msgstr "SMSç信确认"
-#: lib/apiauth.php:99
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:396
+#, fuzzy
+msgid "Edit site notice"
+msgstr "æ°éå"
+
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:404
+#, fuzzy
+msgid "Snapshots configuration"
+msgstr "SMSç信确认"
+
+#: lib/apiauth.php:94
msgid "API resource requires read-write access, but you only have read access."
msgstr ""
-#: lib/apiauth.php:279
+#: lib/apiauth.php:272
#, php-format
msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s"
msgstr ""
@@ -4873,12 +5220,12 @@ msgstr ""
msgid "Tags for this attachment"
msgstr ""
-#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223
+#: lib/authenticationplugin.php:220 lib/authenticationplugin.php:225
#, fuzzy
msgid "Password changing failed"
msgstr "å¯ç å·²ä¿åã"
-#: lib/authenticationplugin.php:233
+#: lib/authenticationplugin.php:235
#, fuzzy
msgid "Password changing is not allowed"
msgstr "å¯ç å·²ä¿åã"
@@ -4964,12 +5311,12 @@ msgstr "%s 离å¼ç¾¤ %s"
msgid "Fullname: %s"
msgstr "å
¨åï¼%s"
-#: lib/command.php:312 lib/mail.php:254
+#: lib/command.php:312 lib/mail.php:258
#, php-format
msgid "Location: %s"
msgstr "ä½ç½®ï¼%s"
-#: lib/command.php:315 lib/mail.php:256
+#: lib/command.php:315 lib/mail.php:260
#, php-format
msgid "Homepage: %s"
msgstr "主页ï¼%s"
@@ -5032,80 +5379,89 @@ msgstr "ä¿åéåæ¶åºéã"
msgid "Specify the name of the user to subscribe to"
msgstr "æå®è¦è®¢é
çç¨æ·å"
-#: lib/command.php:554
+#: lib/command.php:554 lib/command.php:589
+msgid "No such user"
+msgstr "没æè¿ä¸ªç¨æ·ã"
+
+#: lib/command.php:561
#, php-format
msgid "Subscribed to %s"
msgstr "订é
%s"
-#: lib/command.php:575
+#: lib/command.php:582 lib/command.php:685
msgid "Specify the name of the user to unsubscribe from"
msgstr "æå®è¦åæ¶è®¢é
çç¨æ·å"
-#: lib/command.php:582
+#: lib/command.php:595
#, php-format
msgid "Unsubscribed from %s"
msgstr "åæ¶è®¢é
%s"
-#: lib/command.php:600 lib/command.php:623
+#: lib/command.php:613 lib/command.php:636
msgid "Command not yet implemented."
msgstr "å½ä»¤å°æªå®ç°ã"
-#: lib/command.php:603
+#: lib/command.php:616
msgid "Notification off."
msgstr "éåå
³éã"
-#: lib/command.php:605
+#: lib/command.php:618
msgid "Can't turn off notification."
msgstr "æ æ³å
³ééåã"
-#: lib/command.php:626
+#: lib/command.php:639
msgid "Notification on."
msgstr "éåå¼å¯ã"
-#: lib/command.php:628
+#: lib/command.php:641
msgid "Can't turn on notification."
msgstr "æ æ³å¼å¯éåã"
-#: lib/command.php:641
+#: lib/command.php:654
msgid "Login command is disabled"
msgstr ""
-#: lib/command.php:652
+#: lib/command.php:665
#, php-format
msgid "This link is useable only once, and is good for only 2 minutes: %s"
msgstr ""
-#: lib/command.php:668
+#: lib/command.php:692
+#, fuzzy, php-format
+msgid "Unsubscribed %s"
+msgstr "åæ¶è®¢é
%s"
+
+#: lib/command.php:709
#, fuzzy
msgid "You are not subscribed to anyone."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: lib/command.php:670
+#: lib/command.php:711
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "æ¨å·²è®¢é
è¿äºç¨æ·ï¼"
-#: lib/command.php:690
+#: lib/command.php:731
#, fuzzy
msgid "No one is subscribed to you."
msgstr "æ æ³è®¢é
ä»äººæ´æ°ã"
-#: lib/command.php:692
+#: lib/command.php:733
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "æ æ³è®¢é
ä»äººæ´æ°ã"
-#: lib/command.php:712
+#: lib/command.php:753
#, fuzzy
msgid "You are not a member of any groups."
msgstr "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: lib/command.php:714
+#: lib/command.php:755
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "æ¨æªåç¥æ¤ä¸ªäººä¿¡æ¯"
-#: lib/command.php:728
+#: lib/command.php:769
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5119,6 +5475,7 @@ msgid ""
"d - direct message to user\n"
"get - get last notice from user\n"
"whois - get profile info on user\n"
+"lose - force user to stop following you\n"
"fav - add user's last notice as a 'fave'\n"
"fav # - add notice with the given id as a 'fave'\n"
"repeat # - repeat a notice with a given id\n"
@@ -5146,20 +5503,20 @@ msgid ""
"tracking - not yet implemented.\n"
msgstr ""
-#: lib/common.php:131
+#: lib/common.php:148
#, fuzzy
msgid "No configuration file found. "
msgstr "没æéªè¯ç "
-#: lib/common.php:132
+#: lib/common.php:149
msgid "I looked for configuration files in the following places: "
msgstr ""
-#: lib/common.php:134
+#: lib/common.php:151
msgid "You may wish to run the installer to fix this."
msgstr ""
-#: lib/common.php:135
+#: lib/common.php:152
#, fuzzy
msgid "Go to the installer."
msgstr "ç»å
¥æ¬ç«"
@@ -5265,6 +5622,11 @@ msgstr "éæ©æ ç¾ç¼©å°æ¸
å"
msgid "Go"
msgstr "æ§è¡"
+#: lib/grantroleform.php:91
+#, php-format
+msgid "Grant this user the \"%s\" role"
+msgstr ""
+
#: lib/groupeditform.php:163
#, fuzzy
msgid "URL of the homepage or blog of the group or topic"
@@ -5359,24 +5721,24 @@ msgstr "ä¸ä¼ æ件æ¶åºéã"
msgid "Not an image or corrupt file."
msgstr "ä¸æ¯å¾çæ件ææ件已æåã"
-#: lib/imagefile.php:105
+#: lib/imagefile.php:109
msgid "Unsupported image file format."
msgstr "ä¸æ¯æè¿ç§å¾åæ ¼å¼ã"
-#: lib/imagefile.php:118
+#: lib/imagefile.php:122
#, fuzzy
msgid "Lost our file."
msgstr "没æè¿ä»½éåã"
-#: lib/imagefile.php:150 lib/imagefile.php:197
+#: lib/imagefile.php:166 lib/imagefile.php:231
msgid "Unknown file type"
msgstr "æªç¥æ件类å"
-#: lib/imagefile.php:217
+#: lib/imagefile.php:251
msgid "MB"
msgstr ""
-#: lib/imagefile.php:219
+#: lib/imagefile.php:253
msgid "kB"
msgstr ""
@@ -5410,11 +5772,11 @@ msgstr "è¾å
¥ç¨æ·ååå¯ç 以ç»å½ã"
msgid "Sign up for a new account"
msgstr "å建æ°å¸å·"
-#: lib/mail.php:172
+#: lib/mail.php:173
msgid "Email address confirmation"
msgstr "çµåé®ä»¶å°å确认"
-#: lib/mail.php:174
+#: lib/mail.php:175
#, php-format
msgid ""
"Hey, %s.\n"
@@ -5431,12 +5793,12 @@ msgid ""
"%s\n"
msgstr ""
-#: lib/mail.php:236
+#: lib/mail.php:240
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s å¼å§å
³æ³¨æ¨ç %2$s ä¿¡æ¯ã"
-#: lib/mail.php:241
+#: lib/mail.php:245
#, fuzzy, php-format
msgid ""
"%1$s is now listening to your notices on %2$s.\n"
@@ -5456,19 +5818,19 @@ msgstr ""
"\n"
"为æ¨æåç %4$s\n"
-#: lib/mail.php:258
+#: lib/mail.php:262
#, fuzzy, php-format
msgid "Bio: %s"
msgstr ""
"èªä¼ Bio: %s\n"
"\n"
-#: lib/mail.php:286
+#: lib/mail.php:290
#, php-format
msgid "New email address for posting to %s"
msgstr "æ°ççµåé®ä»¶å°åï¼ç¨äºåå¸ %s ä¿¡æ¯"
-#: lib/mail.php:289
+#: lib/mail.php:293
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
@@ -5488,21 +5850,21 @@ msgstr ""
"\n"
"为æ¨æåç %4$s"
-#: lib/mail.php:413
+#: lib/mail.php:417
#, php-format
msgid "%s status"
msgstr "%s ç¶æ"
-#: lib/mail.php:439
+#: lib/mail.php:443
msgid "SMS confirmation"
msgstr "SMSç信确认"
-#: lib/mail.php:463
+#: lib/mail.php:467
#, php-format
msgid "You've been nudged by %s"
msgstr "%s æ¯éå¼å«ä½ "
-#: lib/mail.php:467
+#: lib/mail.php:471
#, php-format
msgid ""
"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
@@ -5518,12 +5880,12 @@ msgid ""
"%4$s\n"
msgstr ""
-#: lib/mail.php:510
+#: lib/mail.php:517
#, php-format
msgid "New private message from %s"
msgstr "%s åéäºæ°çç§äººä¿¡æ¯"
-#: lib/mail.php:514
+#: lib/mail.php:521
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
@@ -5542,12 +5904,12 @@ msgid ""
"%5$s\n"
msgstr ""
-#: lib/mail.php:559
+#: lib/mail.php:568
#, fuzzy, php-format
msgid "%s (@%s) added your notice as a favorite"
msgstr "%s æ¶èäºæ¨çéå"
-#: lib/mail.php:561
+#: lib/mail.php:570
#, php-format
msgid ""
"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
@@ -5568,12 +5930,12 @@ msgid ""
"%6$s\n"
msgstr ""
-#: lib/mail.php:624
+#: lib/mail.php:635
#, php-format
msgid "%s (@%s) sent a notice to your attention"
msgstr ""
-#: lib/mail.php:626
+#: lib/mail.php:637
#, php-format
msgid ""
"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
@@ -5598,7 +5960,7 @@ msgid ""
"users in conversation. People can send you messages for your eyes only."
msgstr ""
-#: lib/mailbox.php:227 lib/noticelist.php:477
+#: lib/mailbox.php:227 lib/noticelist.php:482
#, fuzzy
msgid "from"
msgstr " ä» "
@@ -5691,6 +6053,12 @@ msgstr "å°"
msgid "Available characters"
msgstr "6 个ææ´å¤å符"
+#: lib/messageform.php:178 lib/noticeform.php:236
+#, fuzzy
+msgctxt "Send button for sending notice"
+msgid "Send"
+msgstr "åé"
+
#: lib/noticeform.php:160
#, fuzzy
msgid "Send a notice"
@@ -5725,53 +6093,53 @@ msgid ""
"try again later"
msgstr ""
-#: lib/noticelist.php:428
+#: lib/noticelist.php:429
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr ""
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
#, fuzzy
msgid "N"
msgstr "å¦"
-#: lib/noticelist.php:429
+#: lib/noticelist.php:430
msgid "S"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "E"
msgstr ""
-#: lib/noticelist.php:430
+#: lib/noticelist.php:431
msgid "W"
msgstr ""
-#: lib/noticelist.php:436
+#: lib/noticelist.php:438
msgid "at"
msgstr ""
-#: lib/noticelist.php:531
+#: lib/noticelist.php:566
#, fuzzy
msgid "in context"
msgstr "没æå
容ï¼"
-#: lib/noticelist.php:556
+#: lib/noticelist.php:601
#, fuzzy
msgid "Repeated by"
msgstr "å建"
-#: lib/noticelist.php:582
+#: lib/noticelist.php:628
#, fuzzy
msgid "Reply to this notice"
msgstr "æ æ³å é¤éåã"
-#: lib/noticelist.php:583
+#: lib/noticelist.php:629
#, fuzzy
msgid "Reply"
msgstr "åå¤"
-#: lib/noticelist.php:625
+#: lib/noticelist.php:673
#, fuzzy
msgid "Notice repeated"
msgstr "æ¶æ¯å·²åå¸ã"
@@ -5806,12 +6174,7 @@ msgstr "æ·»å è¿ç¨ç个人信æ¯åºé"
msgid "Duplicate notice"
msgstr "å é¤éå"
-#: lib/oauthstore.php:466 lib/subs.php:48
-#, fuzzy
-msgid "You have been banned from subscribing."
-msgstr "é£ä¸ªç¨æ·é»æ¢äºä½ ç订é
ã"
-
-#: lib/oauthstore.php:491
+#: lib/oauthstore.php:490
msgid "Couldn't insert new subscription."
msgstr "æ æ³æ·»å æ°ç订é
ã"
@@ -5853,7 +6216,7 @@ msgstr "%s's çæ¶æ¯çæ ç¾"
msgid "Unknown"
msgstr "æªç¥å¨ä½"
-#: lib/profileaction.php:109 lib/profileaction.php:192 lib/subgroupnav.php:82
+#: lib/profileaction.php:109 lib/profileaction.php:194 lib/subgroupnav.php:82
msgid "Subscriptions"
msgstr "订é
"
@@ -5861,25 +6224,25 @@ msgstr "订é
"
msgid "All subscriptions"
msgstr "ææ订é
"
-#: lib/profileaction.php:140 lib/profileaction.php:201 lib/subgroupnav.php:90
+#: lib/profileaction.php:142 lib/profileaction.php:203 lib/subgroupnav.php:90
msgid "Subscribers"
msgstr "订é
è
"
-#: lib/profileaction.php:157
+#: lib/profileaction.php:159
#, fuzzy
msgid "All subscribers"
msgstr "订é
è
"
-#: lib/profileaction.php:178
+#: lib/profileaction.php:180
#, fuzzy
msgid "User ID"
msgstr "ç¨æ·"
-#: lib/profileaction.php:183
+#: lib/profileaction.php:185
msgid "Member since"
msgstr "ç¨æ·å§äº"
-#: lib/profileaction.php:245
+#: lib/profileaction.php:247
msgid "All groups"
msgstr "ææç»"
@@ -5924,6 +6287,15 @@ msgstr "æ æ³å é¤éåã"
msgid "Repeat this notice"
msgstr "æ æ³å é¤éåã"
+#: lib/revokeroleform.php:91
+#, fuzzy, php-format
+msgid "Revoke the \"%s\" role from this user"
+msgstr "该ç»æåå表ã"
+
+#: lib/router.php:671
+msgid "No single user defined for single-user mode."
+msgstr ""
+
#: lib/sandboxform.php:67
#, fuzzy
msgid "Sandbox"
@@ -5943,6 +6315,10 @@ msgstr "æç´¢"
msgid "Keyword(s)"
msgstr ""
+#: lib/searchaction.php:127
+msgid "Search"
+msgstr "æç´¢"
+
#: lib/searchaction.php:162
#, fuzzy
msgid "Search help"
@@ -5998,36 +6374,14 @@ msgstr "订é
%s"
msgid "Groups %s is a member of"
msgstr "%s ç»æ¯æåç»æäº"
-#: lib/subs.php:52
-msgid "Already subscribed!"
-msgstr ""
-
-#: lib/subs.php:56
-#, fuzzy
-msgid "User has blocked you."
-msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
-
-#: lib/subs.php:63
-msgid "Could not subscribe."
-msgstr "æ æ³è®¢é
ã"
-
-#: lib/subs.php:82
-msgid "Could not subscribe other to you."
-msgstr "æ æ³è®¢é
ä»äººæ´æ°ã"
-
-#: lib/subs.php:137
-#, fuzzy
-msgid "Not subscribed!"
-msgstr "æªè®¢é
ï¼"
-
-#: lib/subs.php:142
-#, fuzzy
-msgid "Couldn't delete self-subscription."
-msgstr "æ æ³å é¤è®¢é
ã"
+#: lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "é请"
-#: lib/subs.php:158
-msgid "Couldn't delete subscription."
-msgstr "æ æ³å é¤è®¢é
ã"
+#: lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "使ç¨è¿ä¸ªè¡¨åæ¥é请好åååäºå å
¥ã"
#: lib/subscriberspeopleselftagcloudsection.php:48
#: lib/subscriptionspeopleselftagcloudsection.php:48
@@ -6086,70 +6440,86 @@ msgstr "头å"
msgid "User actions"
msgstr "æªç¥å¨ä½"
-#: lib/userprofile.php:248
+#: lib/userprofile.php:251
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
-#: lib/userprofile.php:249
+#: lib/userprofile.php:252
msgid "Edit"
msgstr ""
-#: lib/userprofile.php:272
+#: lib/userprofile.php:275
#, fuzzy
msgid "Send a direct message to this user"
msgstr "æ æ³åæ¤ç¨æ·åéæ¶æ¯ã"
-#: lib/userprofile.php:273
+#: lib/userprofile.php:276
#, fuzzy
msgid "Message"
msgstr "æ°æ¶æ¯"
-#: lib/userprofile.php:311
+#: lib/userprofile.php:314
msgid "Moderate"
msgstr ""
-#: lib/util.php:868
+#: lib/userprofile.php:352
+#, fuzzy
+msgid "User role"
+msgstr "ç¨æ·æ²¡æ个人信æ¯ã"
+
+#: lib/userprofile.php:354
+#, fuzzy
+msgctxt "role"
+msgid "Administrator"
+msgstr "admin管çå"
+
+#: lib/userprofile.php:355
+msgctxt "role"
+msgid "Moderator"
+msgstr ""
+
+#: lib/util.php:1015
msgid "a few seconds ago"
msgstr "å ç§å"
-#: lib/util.php:870
+#: lib/util.php:1017
msgid "about a minute ago"
msgstr "ä¸åéå"
-#: lib/util.php:872
+#: lib/util.php:1019
#, php-format
msgid "about %d minutes ago"
msgstr "%d åéå"
-#: lib/util.php:874
+#: lib/util.php:1021
msgid "about an hour ago"
msgstr "ä¸å°æ¶å"
-#: lib/util.php:876
+#: lib/util.php:1023
#, php-format
msgid "about %d hours ago"
msgstr "%d å°æ¶å"
-#: lib/util.php:878
+#: lib/util.php:1025
msgid "about a day ago"
msgstr "ä¸å¤©å"
-#: lib/util.php:880
+#: lib/util.php:1027
#, php-format
msgid "about %d days ago"
msgstr "%d 天å"
-#: lib/util.php:882
+#: lib/util.php:1029
msgid "about a month ago"
msgstr "ä¸ä¸ªæå"
-#: lib/util.php:884
+#: lib/util.php:1031
#, php-format
msgid "about %d months ago"
msgstr "%d 个æå"
-#: lib/util.php:886
+#: lib/util.php:1033
msgid "about a year ago"
msgstr "ä¸å¹´å"