X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=locale%2Fzh_CN%2FLC_MESSAGES%2Fstatusnet.po;h=f0a466f28ed4146c28ec78f0363dc7fc8a2de65f;hb=bafd7b3399edfd735df1ed013a586aee106dbef8;hp=1d970800dd25e4f72c052bb8a5fd305495041919;hpb=954335fa5e18b003e20cd43e71fb690181095101;p=quix0rs-gnu-social.git diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 1d970800dd..f0a466f28e 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,17 +10,76 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-09 23:44+0000\n" -"PO-Revision-Date: 2010-01-09 23:46:27+0000\n" +"POT-Creation-Date: 2010-02-27 17:32+0000\n" +"PO-Revision-Date: 2010-02-27 17:34:49+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 (r60878); Translate extension (2010-01-04)\n" +"X-Generator: MediaWiki 1.17alpha (r63052); 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:337 +#, fuzzy +msgid "Access" +msgstr "接受" + +#: actions/accessadminpanel.php:65 +#, fuzzy +msgid "Site access settings" +msgstr "头像设置" + +#: actions/accessadminpanel.php:158 +#, fuzzy +msgid "Registration" +msgstr "注册" + +#: actions/accessadminpanel.php:161 +#, fuzzy +msgid "Private" +msgstr "隐私" + +#: actions/accessadminpanel.php:163 +msgid "Prohibit anonymous users (not logged in) from viewing site?" +msgstr "" + +#: actions/accessadminpanel.php:167 +#, fuzzy +msgid "Invite only" +msgstr "邀请" + +#: actions/accessadminpanel.php:169 +msgid "Make registration invitation only." +msgstr "" + +#: actions/accessadminpanel.php:173 +#, 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:208 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 +#, 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 msgid "No such page" @@ -35,30 +94,30 @@ msgstr "没有该页面" #: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112 #: actions/apigroupismember.php:90 actions/apigroupjoin.php:99 #: actions/apigroupleave.php:99 actions/apigrouplist.php:90 -#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87 -#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79 +#: actions/apistatusesupdate.php:148 actions/apisubscriptions.php:87 +#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:78 #: 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/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:311 lib/command.php:364 -#: lib/command.php:410 lib/command.php:471 lib/command.php:527 -#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77 -#: lib/subs.php:34 lib/subs.php:116 +#: 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: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 msgid "No such user." msgstr "没有这个用户。" #: actions/all.php:84 -#, php-format -msgid "%s and friends, page %d" -msgstr "%s 及好友，页面 %d" +#, 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 -#: actions/apitimelinefriends.php:115 actions/apitimelinehome.php:115 +#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: lib/personalgroupnav.php:100 #, php-format msgid "%s and friends" @@ -95,11 +154,11 @@ msgstr "" #: actions/all.php:134 #, php-format msgid "" -"You can try to [nudge %s](../%s) from his profile or [post something to his " -"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)." +"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:137 actions/replies.php:209 actions/showstream.php:211 #, php-format msgid "" "Why not [register an account](%%%%action.register%%%%) and then nudge %s or " @@ -111,8 +170,8 @@ msgstr "" msgid "You and friends" msgstr "%s 及好友" -#: actions/allrss.php:119 actions/apitimelinefriends.php:122 -#: 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 和好友的更新！" @@ -122,6 +181,23 @@ msgstr "来自%2$s 上 %1$s 和好友的更新！" #: actions/apiaccountupdateprofile.php:97 #: actions/apiaccountupdateprofilebackgroundimage.php:94 #: actions/apiaccountupdateprofilecolors.php:118 +#: 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:185 actions/apitimelinehome.php:184 +#: actions/apitimelinementions.php:175 actions/apitimelinepublic.php:152 +#: actions/apitimelineretweetedtome.php:121 +#: actions/apitimelineretweetsofme.php:152 actions/apitimelinetag.php:166 +#: actions/apitimelineuser.php:196 actions/apiusershow.php:101 #, fuzzy msgid "API method not found." msgstr "API 方法未实现！" @@ -136,7 +212,7 @@ msgstr "API 方法未实现！" #: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91 #: actions/apigroupcreate.php:104 actions/apigroupjoin.php:91 #: actions/apigroupleave.php:91 actions/apistatusesretweet.php:65 -#: actions/apistatusesupdate.php:114 +#: actions/apistatusesupdate.php:118 msgid "This method requires a POST." msgstr "此方法接受POST请求。" @@ -155,8 +231,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 "用户没有个人信息。" @@ -167,8 +244,9 @@ msgstr "无法保存个人信息。" #: actions/apiaccountupdateprofilebackgroundimage.php:108 #: actions/apiaccountupdateprofileimage.php:97 -#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:257 -#: actions/designadminpanel.php:122 actions/newnotice.php:94 +#: actions/apistatusesupdate.php:131 actions/avatarsettings.php:257 +#: actions/designadminpanel.php:122 actions/editapplication.php:118 +#: actions/newapplication.php:101 actions/newnotice.php:94 #: lib/designsettings.php:283 #, php-format msgid "" @@ -180,6 +258,9 @@ msgstr "" #: actions/apiaccountupdateprofilebackgroundimage.php:146 #: actions/apiaccountupdateprofilecolors.php:164 #: actions/apiaccountupdateprofilecolors.php:174 +#: 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 msgid "Unable to save your design settings." msgstr "无法保存 Twitter 设置！" @@ -223,26 +304,6 @@ msgstr "发给 %s 的直接消息" msgid "All the direct messages sent to %s" msgstr "发给 %s 的直接消息" -#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99 -#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100 -#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129 -#: 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:105 -#: 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:156 actions/apitimelinegroup.php:150 -#: actions/apitimelinehome.php:156 actions/apitimelinementions.php:151 -#: actions/apitimelinepublic.php:131 actions/apitimelineretweetedbyme.php:122 -#: actions/apitimelineretweetedtome.php:121 -#: actions/apitimelineretweetsofme.php:122 actions/apitimelinetag.php:141 -#: actions/apitimelineuser.php:165 actions/apiusershow.php:101 -msgid "API method not found!" -msgstr "API 方法未实现！" - #: actions/apidirectmessagenew.php:126 msgid "No message text!" msgstr "消息没有正文！" @@ -267,7 +328,7 @@ msgstr "没有找到此ID的信息。" #: actions/apifavoritecreate.php:119 #, fuzzy -msgid "This status is already a favorite!" +msgid "This status is already a favorite." msgstr "已收藏此通告！" #: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176 @@ -276,7 +337,7 @@ msgstr "无法创建收藏。" #: actions/apifavoritedestroy.php:122 #, fuzzy -msgid "That status is not a favorite!" +msgid "That status is not a favorite." msgstr "此通告未被收藏！" #: actions/apifavoritedestroy.php:134 actions/disfavor.php:87 @@ -298,106 +359,109 @@ msgid "Could not unfollow user: User not found." msgstr "无法订阅用户：未找到。" #: actions/apifriendshipsdestroy.php:120 -msgid "You cannot unfollow yourself!" -msgstr "" +#, fuzzy +msgid "You cannot unfollow yourself." +msgstr "无法更新用户。" #: actions/apifriendshipsexists.php:94 msgid "Two user ids or screen_names must be supplied." msgstr "必须提供两个用户帐号或昵称。" -#: actions/apifriendshipsshow.php:135 +#: actions/apifriendshipsshow.php:134 #, fuzzy msgid "Could not determine source user." msgstr "无法获取收藏的通告。" -#: actions/apifriendshipsshow.php:143 +#: actions/apifriendshipsshow.php:142 #, fuzzy 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/editgroup.php:195 +#: 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/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 "" #: actions/apigroupismember.php:95 actions/apigroupjoin.php:104 #: actions/apigroupleave.php:104 actions/apigroupmembership.php:91 -#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91 +#: actions/apigroupshow.php:82 actions/apitimelinegroup.php:91 #, fuzzy msgid "Group not found!" msgstr "API 方法未实现！" -#: actions/apigroupjoin.php:110 +#: 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/apigroupjoin.php:138 actions/joingroup.php:134 #, fuzzy, php-format -msgid "Could not join user %s to group %s." +msgid "Could not join user %1$s to group %2$s." msgstr "无法把 %s 用户添加到 %s 组" #: actions/apigroupleave.php:114 @@ -405,9 +469,9 @@ msgstr "无法把 %s 用户添加到 %s 组" msgid "You are not a member of this group." msgstr "您未告知此个人信息" -#: actions/apigroupleave.php:124 +#: actions/apigroupleave.php:124 actions/leavegroup.php:129 #, fuzzy, php-format -msgid "Could not remove user %s from group %s." +msgid "Could not remove user %1$s from group %2$s." msgstr "无法订阅用户：未找到。" #: actions/apigrouplist.php:95 @@ -415,11 +479,6 @@ msgstr "无法订阅用户：未找到。" msgid "%s's groups" msgstr "%s 群组" -#: actions/apigrouplist.php:103 -#, fuzzy, php-format -msgid "Groups %s is a member of on %s." -msgstr "%s 组是成员组成了" - #: actions/apigrouplistall.php:90 actions/usergroups.php:62 #, php-format msgid "%s groups" @@ -430,6 +489,115 @@ msgstr "%s 群组" msgid "groups on %s" msgstr "组动作" +#: actions/apioauthauthorize.php:101 +msgid "No oauth_token parameter provided." +msgstr "" + +#: 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: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: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: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:135 +#, fuzzy +msgid "Invalid nickname / password!" +msgstr "用户名或密码不正确。" + +#: actions/apioauthauthorize.php:159 +#, fuzzy +msgid "Database error deleting OAuth application user." +msgstr "保存用户设置时出错。" + +#: actions/apioauthauthorize.php:185 +#, fuzzy +msgid "Database error inserting OAuth application user." +msgstr "添加标签时数据库出错：%s" + +#: 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:227 +#, php-format +msgid "The request token %s has been denied and revoked." +msgstr "" + +#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281 +#: actions/designadminpanel.php:103 actions/editapplication.php:139 +#: actions/emailsettings.php:256 actions/grouplogo.php:322 +#: actions/imsettings.php:220 actions/newapplication.php:121 +#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44 +#: actions/smssettings.php:248 lib/designsettings.php:304 +msgid "Unexpected form submission." +msgstr "未预料的表单提交。" + +#: actions/apioauthauthorize.php:259 +msgid "An application would like to connect to your account" +msgstr "" + +#: actions/apioauthauthorize.php:276 +msgid "Allow or deny access" +msgstr "" + +#: 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:441 +msgid "Account" +msgstr "帐号" + +#: actions/apioauthauthorize.php:313 actions/login.php:230 +#: actions/profilesettings.php:106 actions/register.php:424 +#: actions/showgroup.php:244 actions/tagother.php:94 +#: actions/userauthorization.php:145 lib/groupeditform.php:152 +#: lib/userprofile.php:131 +msgid "Nickname" +msgstr "昵称" + +#: actions/apioauthauthorize.php:316 actions/login.php:233 +#: actions/register.php:429 lib/accountsettingsaction.php:116 +msgid "Password" +msgstr "密码" + +#: actions/apioauthauthorize.php:328 +msgid "Deny" +msgstr "" + +#: actions/apioauthauthorize.php:334 +#, fuzzy +msgid "Allow" +msgstr "全部" + +#: actions/apioauthauthorize.php:351 +msgid "Allow or deny access to your account information." +msgstr "" + #: actions/apistatusesdestroy.php:107 msgid "This method requires a POST or DELETE." msgstr "此方法接受POST或DELETE请求。" @@ -462,17 +630,17 @@ msgstr "头像已更新。" msgid "No status with that ID found." msgstr "没有找到此ID的信息。" -#: actions/apistatusesupdate.php:157 actions/newnotice.php:155 +#: actions/apistatusesupdate.php:161 actions/newnotice.php:155 #: lib/mailhandler.php:60 #, fuzzy, php-format msgid "That's too long. Max notice size is %d chars." msgstr "超出长度限制。不能超过 140 个字符。" -#: actions/apistatusesupdate.php:198 +#: actions/apistatusesupdate.php:202 msgid "Not found" msgstr "未找到" -#: actions/apistatusesupdate.php:221 actions/newnotice.php:178 +#: actions/apistatusesupdate.php:225 actions/newnotice.php:178 #, php-format msgid "Max notice size is %d chars, including attachment URL." msgstr "" @@ -483,22 +651,22 @@ msgid "Unsupported format." msgstr "不支持这种图像格式。" #: actions/apitimelinefavorites.php:108 -#, php-format -msgid "%s / Favorites from %s" +#, fuzzy, php-format +msgid "%1$s / Favorites from %2$s" msgstr "%s 的收藏 / %s" -#: actions/apitimelinefavorites.php:120 -#, php-format -msgid "%s updates favorited by %s / %s." +#: 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 +#: actions/grouprss.php:138 actions/userrss.php:90 #, php-format msgid "%s timeline" msgstr "%s 时间表" -#: actions/apitimelinegroup.php:117 actions/apitimelineuser.php:126 +#: actions/apitimelinegroup.php:112 actions/apitimelineuser.php:124 #: actions/userrss.php:92 #, php-format msgid "Updates from %1$s on %2$s!" @@ -514,27 +682,22 @@ msgstr "%1$s / 回复 %2$s 的消息" msgid "%1$s updates that reply to updates from %2$s / %3$s." msgstr "回复 %2$s / %3$s 的 %1$s 更新。" -#: actions/apitimelinepublic.php:107 actions/publicrss.php:103 +#: actions/apitimelinepublic.php:111 actions/publicrss.php:103 #, php-format msgid "%s public timeline" msgstr "%s 公众时间表" -#: actions/apitimelinepublic.php:111 actions/publicrss.php:105 +#: actions/apitimelinepublic.php:115 actions/publicrss.php:105 #, php-format msgid "%s updates from everyone!" msgstr "来自所有人的 %s 消息！" -#: actions/apitimelineretweetedbyme.php:112 -#, php-format -msgid "Repeated by %s" -msgstr "" - #: actions/apitimelineretweetedtome.php:111 #, fuzzy, php-format msgid "Repeated to %s" msgstr "%s 的回复" -#: actions/apitimelineretweetsofme.php:112 +#: actions/apitimelineretweetsofme.php:114 #, fuzzy, php-format msgid "Repeats of %s" msgstr "%s 的回复" @@ -544,7 +707,7 @@ msgstr "%s 的回复" msgid "Notices tagged with %s" msgstr "带 %s 标签的通告" -#: actions/apitimelinetag.php:108 actions/tagrss.php:64 +#: actions/apitimelinetag.php:104 actions/tagrss.php:64 #, fuzzy, php-format msgid "Updates tagged with %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -559,8 +722,10 @@ msgstr "未找到" msgid "No such attachment." msgstr "没有这份文档。" -#: actions/avatarbynickname.php:59 actions/grouprss.php:91 -#: actions/leavegroup.php:76 +#: 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/showgroup.php:121 msgid "No nickname." msgstr "没有昵称。" @@ -572,7 +737,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 "头像" @@ -583,68 +748,45 @@ msgid "You can upload your personal avatar. The maximum file size is %s." msgstr "您可以在这里上传个人头像。" #: actions/avatarsettings.php:106 actions/avatarsettings.php:185 -#: actions/grouplogo.php:178 actions/remotesubscribe.php:191 -#: actions/userauthorization.php:72 actions/userrss.php:103 +#: actions/remotesubscribe.php:191 actions/userauthorization.php:72 +#: actions/userrss.php:103 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:611 +#: actions/avatarsettings.php:149 actions/showapplication.php:252 +#: lib/deleteuserform.php:66 lib/noticelist.php:637 #, 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 "剪裁" -#: actions/avatarsettings.php:268 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/groupunblock.php:66 actions/imsettings.php:206 -#: actions/invite.php:56 actions/login.php:135 actions/makeadmin.php:66 -#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: 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/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/avatarsettings.php:281 actions/designadminpanel.php:103 -#: actions/emailsettings.php:256 actions/grouplogo.php:319 -#: actions/imsettings.php:220 actions/recoverpassword.php:44 -#: actions/smssettings.php:248 lib/designsettings.php:304 -msgid "Unexpected form submission." -msgstr "未预料的表单提交。" - #: actions/avatarsettings.php:328 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 "文件数据丢失" @@ -678,23 +820,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 "阻止该用户" @@ -703,46 +846,45 @@ msgstr "阻止该用户" msgid "Failed to save block information." msgstr "保存阻止信息失败。" -#: actions/blockedfromgroup.php:73 actions/editgroup.php:84 -#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86 -#: actions/groupmembers.php:76 actions/joingroup.php:76 -#: actions/showgroup.php:121 -#, fuzzy -msgid "No nickname" -msgstr "没有昵称。" - -#: actions/blockedfromgroup.php:80 actions/editgroup.php:96 -#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97 -#: actions/grouplogo.php:99 actions/groupmembers.php:83 -#: actions/joingroup.php:83 actions/showgroup.php:137 -msgid "No such group" -msgstr "没有这个组" +#: 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 "%s blocked profiles, page %d" +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 "取消阻止次用户" @@ -787,7 +929,8 @@ msgid "Couldn't delete email confirmation." msgstr "无法删除电子邮件确认。" #: actions/confirmaddress.php:144 -msgid "Confirm Address" +#, fuzzy +msgid "Confirm address" msgstr "确认地址" #: actions/confirmaddress.php:159 @@ -805,10 +948,55 @@ msgstr "确认码" 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:1197 +#, 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 "删除通告" + #: 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/settingsaction.php:72 @@ -839,16 +1027,11 @@ msgstr "确定要删除这条消息吗？" msgid "Do not delete this notice" msgstr "无法删除通告。" -#: actions/deletenotice.php:146 lib/noticelist.php:611 +#: actions/deletenotice.php:146 lib/noticelist.php:637 #, fuzzy msgid "Delete this notice" msgstr "删除通告" -#: actions/deletenotice.php:157 -#, fuzzy -msgid "There was a problem with your session token. Try again, please." -msgstr "会话标识有问题，请重试。" - #: actions/deleteuser.php:67 #, fuzzy msgid "You cannot delete users." @@ -864,19 +1047,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/adminpanelaction.php:327 lib/groupnav.php:119 msgid "Design" msgstr "" @@ -987,16 +1170,6 @@ 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:324 actions/profilesettings.php:174 -#: actions/siteadminpanel.php:388 actions/smssettings.php:181 -#: actions/subscriptions.php:203 actions/tagother.php:154 -#: actions/useradminpanel.php:313 lib/designsettings.php:256 -#: lib/groupeditform.php:202 -msgid "Save" -msgstr "保存" - #: actions/designadminpanel.php:587 lib/designsettings.php:257 msgid "Save design" msgstr "" @@ -1009,10 +1182,87 @@ msgstr "此通告未被收藏！" msgid "Add to favorites" msgstr "加入收藏" -#: actions/doc.php:69 -msgid "No such document." +#: actions/doc.php:158 +#, fuzzy, php-format +msgid "No such document \"%s\"" msgstr "没有这份文档。" +#: actions/editapplication.php:54 +#, fuzzy +msgid "Edit Application" +msgstr "其他选项" + +#: actions/editapplication.php:66 +#, fuzzy +msgid "You must be logged in to edit an application." +msgstr "您必须登录才能创建小组。" + +#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:166 +#: actions/showapplication.php:87 +#, fuzzy +msgid "No such application." +msgstr "没有这份通告。" + +#: actions/editapplication.php:161 +#, fuzzy +msgid "Use this form to edit your application." +msgstr "使用这个表单来编辑组" + +#: actions/editapplication.php:177 actions/newapplication.php:159 +#, fuzzy +msgid "Name is required." +msgstr "相同的密码。此项必填。" + +#: 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: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:194 +msgid "Source URL is too long." +msgstr "" + +#: actions/editapplication.php:200 actions/newapplication.php:185 +#, fuzzy +msgid "Source URL is not valid." +msgstr "主页的URL不正确。" + +#: actions/editapplication.php:203 actions/newapplication.php:188 +msgid "Organization is required." +msgstr "" + +#: actions/editapplication.php:206 actions/newapplication.php:191 +#, fuzzy +msgid "Organization is too long (max 255 chars)." +msgstr "位置过长(不能超过255个字符)。" + +#: actions/editapplication.php:209 actions/newapplication.php:194 +msgid "Organization homepage is required." +msgstr "" + +#: actions/editapplication.php:218 actions/newapplication.php:206 +msgid "Callback is too long." +msgstr "" + +#: actions/editapplication.php:225 actions/newapplication.php:215 +msgid "Callback URL is not valid." +msgstr "" + +#: actions/editapplication.php:258 +#, fuzzy +msgid "Could not update application." +msgstr "无法更新组" + #: actions/editgroup.php:56 #, php-format msgid "Edit %s group" @@ -1022,35 +1272,37 @@ 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 -msgid "You must be an admin to edit the group" +#: 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:478 #, fuzzy msgid "Could not create aliases." msgstr "无法创建收藏。" -#: actions/editgroup.php:269 +#: actions/editgroup.php:280 msgid "Options saved." msgstr "选项已保存。" #: actions/emailsettings.php:60 -msgid "Email Settings" +#, fuzzy +msgid "Email settings" msgstr "电子邮件设置" #: actions/emailsettings.php:71 @@ -1082,12 +1334,14 @@ msgstr "" "指示。" #: actions/emailsettings.php:117 actions/imsettings.php:120 -#: actions/smssettings.php:126 +#: actions/smssettings.php:126 lib/applicationeditform.php:331 +#: lib/applicationeditform.php:332 msgid "Cancel" msgstr "取消" #: actions/emailsettings.php:121 -msgid "Email Address" +#, fuzzy +msgid "Email address" msgstr "电子邮件地址" #: actions/emailsettings.php:123 @@ -1162,9 +1416,10 @@ msgstr "没有电子邮件地址。" msgid "Cannot normalize that email address" msgstr "无法识别此电子邮件" -#: actions/emailsettings.php:331 actions/siteadminpanel.php:157 -msgid "Not a valid email address" -msgstr "不是有效的电子邮件" +#: actions/emailsettings.php:331 actions/register.php:201 +#: actions/siteadminpanel.php:143 +msgid "Not a valid email address." +msgstr "不是有效的电子邮件。" #: actions/emailsettings.php:334 msgid "That is already your email address." @@ -1174,7 +1429,7 @@ msgstr "您已登记此电子邮件。" msgid "That email address already belongs to another user." msgstr "此电子邮件属于其他用户。" -#: actions/emailsettings.php:353 actions/imsettings.php:317 +#: actions/emailsettings.php:353 actions/imsettings.php:319 #: actions/smssettings.php:337 msgid "Couldn't insert confirmation code." msgstr "无法插入验证码。" @@ -1236,7 +1491,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" @@ -1351,13 +1606,6 @@ msgstr "此OMB协议版本无效。" msgid "Error updating remote profile" msgstr "更新远程的个人信息时出错" -#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86 -#: actions/grouprss.php:98 actions/groupunblock.php:86 -#: actions/leavegroup.php:83 actions/makeadmin.php:86 lib/command.php:212 -#: lib/command.php:263 -msgid "No such group." -msgstr "没有这个组。" - #: actions/getfile.php:79 #, fuzzy msgid "No such file." @@ -1377,7 +1625,7 @@ msgstr "没有收件人。" #: actions/groupblock.php:76 actions/groupunblock.php:76 #: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46 -#: lib/profileformaction.php:77 +#: actions/unsubscribe.php:84 lib/profileformaction.php:77 #, fuzzy msgid "No profile with that ID." msgstr "没有找到此ID的信息。" @@ -1402,7 +1650,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 "阻止用户" @@ -1410,9 +1658,9 @@ msgstr "阻止用户" #: actions/groupblock.php:162 #, php-format msgid "" -"Are you sure you want to block user \"%s\" from the group \"%s\"? They will " -"be removed from the group, unable to post, and unable to subscribe to the " -"group in the future." +"Are you sure you want to block user \"%1$s\" from the group \"%2$s\"? They " +"will be removed from the group, unable to post, and unable to subscribe to " +"the group in the future." msgstr "" #: actions/groupblock.php:178 @@ -1429,8 +1677,9 @@ msgstr "该组成员列表。" msgid "Database error blocking user from group." msgstr "" -#: actions/groupbyid.php:74 -msgid "No ID" +#: actions/groupbyid.php:74 actions/userbyid.php:70 +#, fuzzy +msgid "No ID." msgstr "没有ID" #: actions/groupdesignsettings.php:68 @@ -1438,96 +1687,94 @@ 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:287 actions/groupdesignsettings.php:297 -#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220 -#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273 -#, fuzzy -msgid "Unable to save your design settings!" -msgstr "无法保存 Twitter 设置！" - -#: 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:362 +#: actions/grouplogo.php:181 +#, fuzzy +msgid "User without matching profile." +msgstr "找不到匹配的用户。" + +#: actions/grouplogo.php:365 #, fuzzy msgid "Pick a square area of the image to be the logo." 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 -#, php-format -msgid "%s group members, page %d" +#: 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:442 lib/groupnav.php:107 +#: actions/groupmembers.php:182 lib/action.php:448 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:140 #, fuzzy, php-format msgid "Updates from members of %1$s on %2$s!" msgstr "%2$s 上 %1$s 的更新！" @@ -1605,7 +1852,8 @@ msgid "Error removing the block." msgstr "保存用户时出错。" #: actions/imsettings.php:59 -msgid "IM Settings" +#, fuzzy +msgid "IM settings" msgstr "IM 设置" #: actions/imsettings.php:70 @@ -1636,7 +1884,8 @@ msgstr "" "（你是否已经添加 %s为你的好友？）" #: actions/imsettings.php:124 -msgid "IM Address" +#, fuzzy +msgid "IM address" msgstr "IM 帐号" #: actions/imsettings.php:126 @@ -1696,9 +1945,9 @@ msgid "That is not your Jabber ID." msgstr "这不是您的Jabber帐号。" #: actions/inbox.php:59 -#, php-format -msgid "Inbox for %s - page %d" -msgstr "%s 的收件箱 - 第 %d 页" +#, fuzzy, php-format +msgid "Inbox for %1$s - page %2$d" +msgstr "%s 的收件箱" #: actions/inbox.php:62 #, php-format @@ -1735,10 +1984,10 @@ msgstr "邀请新用户" msgid "You are already subscribed to these users:" msgstr "您已订阅这些用户：" -#: actions/invite.php:131 actions/invite.php:139 +#: actions/invite.php:131 actions/invite.php:139 lib/command.php:306 #, php-format -msgid "%s (%s)" -msgstr "%s (%s)" +msgid "%1$s (%2$s)" +msgstr "%1$s (%2$s)" #: actions/invite.php:136 msgid "" @@ -1776,7 +2025,7 @@ msgstr "个人消息" msgid "Optionally add a personal message to the invitation." msgstr "在邀请中加几句话(可选)。" -#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:234 +#: actions/invite.php:197 lib/messageform.php:178 lib/noticeform.php:236 msgid "Send" msgstr "发送" @@ -1841,102 +2090,72 @@ msgstr "" msgid "You must be logged in to join a group." msgstr "您必须登录才能加入组。" -#: actions/joingroup.php:90 lib/command.php:217 -msgid "You are already a member of that group" -msgstr "您已经是该组成员" +#: actions/joingroup.php:88 actions/leavegroup.php:88 +#, fuzzy +msgid "No nickname or ID." +msgstr "没有昵称。" -#: actions/joingroup.php:128 lib/command.php:234 +#: actions/joingroup.php:141 #, fuzzy, php-format -msgid "Could not join user %s to group %s" -msgstr "无法把 %s 用户添加到 %s 组" - -#: actions/joingroup.php:135 lib/command.php:239 -#, fuzzy, php-format -msgid "%s joined group %s" -msgstr "%s 加入 %s 组" +msgid "%1$s joined group %2$s" +msgstr "%s 加入 %s 组" #: actions/leavegroup.php:60 #, fuzzy msgid "You must be logged in to leave a group." msgstr "您必须登录才能邀请其他人使用 %s" -#: actions/leavegroup.php:90 lib/command.php:268 +#: actions/leavegroup.php:100 lib/command.php:265 #, fuzzy msgid "You are not a member of that group." msgstr "您未告知此个人信息" -#: actions/leavegroup.php:119 lib/command.php:278 -#, fuzzy -msgid "Could not find membership record." -msgstr "无法更新用户记录。" - -#: actions/leavegroup.php:127 +#: actions/leavegroup.php:137 #, fuzzy, php-format -msgid "Could not remove user %s from group %s" -msgstr "无法订阅用户：未找到。" - -#: actions/leavegroup.php:134 lib/command.php:289 -#, php-format -msgid "%s left group %s" +msgid "%1$s left group %2$s" msgstr "%s 离开群 %s" -#: actions/login.php:83 actions/register.php:137 +#: actions/login.php:80 actions/otp.php:62 actions/register.php:137 msgid "Already logged in." msgstr "已登录。" -#: actions/login.php:114 actions/login.php:124 -#, fuzzy -msgid "Invalid or expired token." -msgstr "通告内容不正确" - -#: actions/login.php:147 +#: actions/login.php:126 msgid "Incorrect username or password." msgstr "用户名或密码不正确。" -#: actions/login.php:153 +#: actions/login.php:132 actions/otp.php:120 #, fuzzy msgid "Error setting user. You are probably not authorized." msgstr "未认证。" -#: actions/login.php:208 actions/login.php:261 lib/action.php:460 +#: actions/login.php:188 actions/login.php:241 lib/action.php:466 #: lib/logingroupnav.php:79 msgid "Login" msgstr "登录" -#: actions/login.php:247 +#: actions/login.php:227 msgid "Login to site" msgstr "登录" -#: actions/login.php:250 actions/profilesettings.php:106 -#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94 -#: lib/groupeditform.php:152 lib/userprofile.php:131 -msgid "Nickname" -msgstr "昵称" - -#: actions/login.php:253 actions/register.php:428 -#: lib/accountsettingsaction.php:116 -msgid "Password" -msgstr "密码" - -#: actions/login.php:256 actions/register.php:477 +#: actions/login.php:236 actions/register.php:478 msgid "Remember me" msgstr "记住登录状态" -#: actions/login.php:257 actions/register.php:479 +#: actions/login.php:237 actions/register.php:480 msgid "Automatically login in the future; not for shared computers!" msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！" -#: actions/login.php:267 +#: actions/login.php:247 msgid "Lost or forgotten password?" msgstr "忘记了密码？" -#: actions/login.php:286 +#: actions/login.php:266 msgid "" "For security reasons, please re-enter your user name and password before " "changing your settings." msgstr "由于安全原因，修改设置前需要输入用户名和密码。" -#: actions/login.php:290 +#: actions/login.php:270 #, fuzzy, php-format msgid "" "Login with your username and password. Don't have a username yet? [Register]" @@ -1945,29 +2164,53 @@ 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 -#, php-format -msgid "%s is already an admin for group \"%s\"." -msgstr "" +#: actions/makeadmin.php:96 +#, fuzzy, php-format +msgid "%1$s is already an admin for group \"%2$s\"." +msgstr "用户没有个人信息。" -#: actions/makeadmin.php:132 -#, php-format -msgid "Can't get membership record for %s in group %s" -msgstr "" +#: 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 -#, php-format -msgid "Can't make %s an admin for group %s" -msgstr "" +#: actions/makeadmin.php:146 +#, fuzzy, php-format +msgid "Can't make %1$s an admin for group %2$s." +msgstr "只有admin才能编辑这个组" #: actions/microsummary.php:69 msgid "No current status" msgstr "没有当前状态" +#: actions/newapplication.php:52 +#, fuzzy +msgid "New Application" +msgstr "没有这份通告。" + +#: actions/newapplication.php:64 +#, fuzzy +msgid "You must be logged in to register an application." +msgstr "您必须登录才能创建小组。" + +#: actions/newapplication.php:143 +#, fuzzy +msgid "Use this form to register a new application." +msgstr "使用此表格创建组。" + +#: actions/newapplication.php:176 +msgid "Source URL is required." +msgstr "" + +#: actions/newapplication.php:258 actions/newapplication.php:267 +#, fuzzy +msgid "Could not create application." +msgstr "无法创建收藏。" + #: actions/newgroup.php:53 msgid "New group" msgstr "新组" @@ -1980,12 +2223,12 @@ msgstr "使用此表格创建组。" msgid "New message" msgstr "新消息" -#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:367 +#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:358 msgid "You can't send a message to this user." msgstr "无法向此用户发送消息。" -#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:351 -#: lib/command.php:484 +#: actions/newmessage.php:144 actions/newnotice.php:136 lib/command.php:342 +#: lib/command.php:475 msgid "No content!" msgstr "没有内容！" @@ -1993,7 +2236,7 @@ msgstr "没有内容！" msgid "No recipient specified." msgstr "没有收件人。" -#: actions/newmessage.php:164 lib/command.php:370 +#: actions/newmessage.php:164 lib/command.php:361 msgid "" "Don't send a message to yourself; just say it to yourself quietly instead." msgstr "不要向自己发送消息；跟自己悄悄说就得了。" @@ -2003,9 +2246,9 @@ msgstr "不要向自己发送消息；跟自己悄悄说就得了。" msgid "Message sent" msgstr "新消息" -#: actions/newmessage.php:185 lib/command.php:376 -#, php-format -msgid "Direct message to %s sent" +#: actions/newmessage.php:185 +#, fuzzy, php-format +msgid "Direct message to %s sent." msgstr "已向 %s 发送消息" #: actions/newmessage.php:210 actions/newnotice.php:245 lib/channel.php:170 @@ -2035,7 +2278,7 @@ msgstr "搜索文本" #: actions/noticesearch.php:91 #, fuzzy, php-format -msgid "Search results for \"%s\" on %s" +msgid "Search results for \"%1$s\" on %2$s" msgstr "搜索有关\"%s\"的消息" #: actions/noticesearch.php:121 @@ -2075,6 +2318,51 @@ msgstr "振铃呼叫发出。" msgid "Nudge sent!" msgstr "振铃呼叫已经发出！" +#: actions/oauthappssettings.php:59 +#, fuzzy +msgid "You must be logged in to list your applications." +msgstr "您必须登录才能创建小组。" + +#: actions/oauthappssettings.php:74 +#, fuzzy +msgid "OAuth applications" +msgstr "其他选项" + +#: actions/oauthappssettings.php:85 +msgid "Applications you have registered" +msgstr "" + +#: actions/oauthappssettings.php:135 +#, php-format +msgid "You have not registered any applications yet." +msgstr "" + +#: actions/oauthconnectionssettings.php:72 +msgid "Connected applications" +msgstr "" + +#: actions/oauthconnectionssettings.php:83 +msgid "You have allowed the following applications to access you account." +msgstr "" + +#: actions/oauthconnectionssettings.php:175 +#, fuzzy +msgid "You are not a user of that application." +msgstr "您未告知此个人信息" + +#: actions/oauthconnectionssettings.php:186 +msgid "Unable to revoke access for app: " +msgstr "" + +#: actions/oauthconnectionssettings.php:198 +#, php-format +msgid "You have not authorized any applications to use your account." +msgstr "" + +#: actions/oauthconnectionssettings.php:211 +msgid "Developers can edit the registration settings for their applications " +msgstr "" + #: actions/oembed.php:79 actions/shownotice.php:100 msgid "Notice has no profile" msgstr "通告没有关联个人信息" @@ -2093,8 +2381,8 @@ msgstr "连接" msgid "Only " msgstr "" -#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:1031 -#: lib/api.php:1059 lib/api.php:1169 +#: actions/oembed.php:181 actions/oembed.php:200 lib/apiaction.php:1040 +#: lib/apiaction.php:1068 lib/apiaction.php:1177 msgid "Not a supported data format." msgstr "不支持的数据格式。" @@ -2108,7 +2396,7 @@ msgstr "搜索通告" #: actions/othersettings.php:60 #, fuzzy -msgid "Other Settings" +msgid "Other settings" msgstr "Twitter 设置" #: actions/othersettings.php:71 @@ -2141,10 +2429,35 @@ msgstr "" msgid "URL shortening service is too long (max 50 chars)." msgstr "URL缩短服务超长(最多50个字符)。" +#: actions/otp.php:69 +#, fuzzy +msgid "No user ID specified." +msgstr "没有收件人。" + +#: actions/otp.php:83 +#, fuzzy +msgid "No login token specified." +msgstr "没有收件人。" + +#: actions/otp.php:90 +#, fuzzy +msgid "No login token requested." +msgstr "服务器没有返回个人信息URL。" + +#: actions/otp.php:95 +#, fuzzy +msgid "Invalid login token specified." +msgstr "通告内容不正确" + +#: actions/otp.php:104 +#, fuzzy +msgid "Login token expired." +msgstr "登录" + #: actions/outbox.php:58 -#, php-format -msgid "Outbox for %s - page %d" -msgstr "%s 的发件箱 - 第 %d 页" +#, fuzzy, php-format +msgid "Outbox for %1$s - page %2$d" +msgstr "%s 的发件箱" #: actions/outbox.php:61 #, php-format @@ -2182,7 +2495,7 @@ msgid "6 or more characters" msgstr "6 个或更多字符" #: actions/passwordsettings.php:112 actions/recoverpassword.php:239 -#: actions/register.php:432 actions/smssettings.php:134 +#: actions/register.php:433 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" @@ -2218,7 +2531,7 @@ msgstr "无法保存新密码。" msgid "Password saved." msgstr "密码已保存。" -#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:326 +#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:342 msgid "Paths" msgstr "" @@ -2226,141 +2539,159 @@ msgstr "" msgid "Path and server settings for this StatusNet site." msgstr "" -#: actions/pathsadminpanel.php:140 +#: actions/pathsadminpanel.php:157 #, fuzzy, php-format msgid "Theme directory not readable: %s" msgstr "这个页面不提供您想要的媒体类型" -#: actions/pathsadminpanel.php:146 +#: actions/pathsadminpanel.php:163 #, php-format msgid "Avatar directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:152 +#: actions/pathsadminpanel.php:169 #, php-format msgid "Background directory not writable: %s" msgstr "" -#: actions/pathsadminpanel.php:160 +#: actions/pathsadminpanel.php:177 #, php-format msgid "Locales directory not readable: %s" msgstr "" -#: actions/pathsadminpanel.php:166 +#: actions/pathsadminpanel.php:183 msgid "Invalid SSL server. The maximum length is 255 characters." msgstr "" -#: actions/pathsadminpanel.php:217 actions/siteadminpanel.php:58 -#: lib/adminpanelaction.php:311 +#: actions/pathsadminpanel.php:234 actions/siteadminpanel.php:58 +#: lib/adminpanelaction.php:322 #, fuzzy msgid "Site" msgstr "邀请" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:238 +#, fuzzy +msgid "Server" +msgstr "恢复" + +#: actions/pathsadminpanel.php:238 +msgid "Site's server hostname." +msgstr "" + +#: actions/pathsadminpanel.php:242 msgid "Path" msgstr "" -#: actions/pathsadminpanel.php:221 +#: actions/pathsadminpanel.php:242 #, fuzzy msgid "Site path" msgstr "新通告" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Path to locales" msgstr "" -#: actions/pathsadminpanel.php:225 +#: actions/pathsadminpanel.php:246 msgid "Directory path to locales" msgstr "" -#: actions/pathsadminpanel.php:232 +#: actions/pathsadminpanel.php:250 +msgid "Fancy URLs" +msgstr "" + +#: actions/pathsadminpanel.php:252 +msgid "Use fancy (more readable and memorable) URLs?" +msgstr "" + +#: actions/pathsadminpanel.php:259 msgid "Theme" msgstr "" -#: actions/pathsadminpanel.php:237 +#: actions/pathsadminpanel.php:264 msgid "Theme server" msgstr "" -#: actions/pathsadminpanel.php:241 +#: actions/pathsadminpanel.php:268 msgid "Theme path" msgstr "" -#: actions/pathsadminpanel.php:245 +#: actions/pathsadminpanel.php:272 msgid "Theme directory" msgstr "" -#: actions/pathsadminpanel.php:252 +#: actions/pathsadminpanel.php:279 #, fuzzy msgid "Avatars" msgstr "头像" -#: actions/pathsadminpanel.php:257 +#: actions/pathsadminpanel.php:284 #, fuzzy msgid "Avatar server" msgstr "头像设置" -#: actions/pathsadminpanel.php:261 +#: actions/pathsadminpanel.php:288 #, fuzzy msgid "Avatar path" msgstr "头像已更新。" -#: actions/pathsadminpanel.php:265 +#: actions/pathsadminpanel.php:292 #, fuzzy msgid "Avatar directory" msgstr "头像已更新。" -#: actions/pathsadminpanel.php:274 +#: actions/pathsadminpanel.php:301 msgid "Backgrounds" msgstr "" -#: actions/pathsadminpanel.php:278 +#: actions/pathsadminpanel.php:305 msgid "Background server" msgstr "" -#: actions/pathsadminpanel.php:282 +#: actions/pathsadminpanel.php:309 msgid "Background path" msgstr "" -#: actions/pathsadminpanel.php:286 +#: actions/pathsadminpanel.php:313 msgid "Background directory" msgstr "" -#: actions/pathsadminpanel.php:293 +#: actions/pathsadminpanel.php:320 #, fuzzy msgid "SSL" msgstr "SMS短信" -#: actions/pathsadminpanel.php:296 actions/siteadminpanel.php:346 +#: actions/pathsadminpanel.php:323 actions/siteadminpanel.php:294 #, fuzzy msgid "Never" msgstr "恢复" -#: actions/pathsadminpanel.php:297 +#: actions/pathsadminpanel.php:324 #, fuzzy msgid "Sometimes" msgstr "通告" -#: actions/pathsadminpanel.php:298 +#: actions/pathsadminpanel.php:325 msgid "Always" msgstr "" -#: actions/pathsadminpanel.php:302 +#: actions/pathsadminpanel.php:329 msgid "Use SSL" msgstr "" -#: actions/pathsadminpanel.php:303 +#: actions/pathsadminpanel.php:330 msgid "When to use SSL" msgstr "" -#: actions/pathsadminpanel.php:308 -msgid "SSL Server" -msgstr "" +#: actions/pathsadminpanel.php:335 +#, fuzzy +msgid "SSL server" +msgstr "恢复" -#: actions/pathsadminpanel.php:309 +#: actions/pathsadminpanel.php:336 msgid "Server to direct SSL requests to" msgstr "" -#: actions/pathsadminpanel.php:325 +#: actions/pathsadminpanel.php:352 #, fuzzy msgid "Save paths" msgstr "新通告" @@ -2384,8 +2715,8 @@ msgid "Not a valid people tag: %s" msgstr "不是有效的电子邮件" #: actions/peopletag.php:144 -#, php-format -msgid "Users self-tagged with %s - page %d" +#, fuzzy, php-format +msgid "Users self-tagged with %1$s - page %2$d" msgstr "用户自加标签 %s - 第 %d 页" #: actions/postnotice.php:84 @@ -2394,7 +2725,7 @@ msgstr "通告内容不正确" #: actions/postnotice.php:90 #, php-format -msgid "Notice license ‘%s’ is not compatible with site license ‘%s’." +msgid "Notice license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" #: actions/profilesettings.php:60 @@ -2415,43 +2746,43 @@ msgstr "未知的帐号" msgid "1-64 lowercase letters or numbers, no punctuation or spaces" msgstr "1 到 64 个小写字母或数字，不包含标点及空白" -#: actions/profilesettings.php:111 actions/register.php:447 -#: actions/showgroup.php:247 actions/tagother.php:104 +#: actions/profilesettings.php:111 actions/register.php:448 +#: actions/showgroup.php:255 actions/tagother.php:104 #: lib/groupeditform.php:157 lib/userprofile.php:149 msgid "Full name" msgstr "全名" -#: actions/profilesettings.php:115 actions/register.php:452 -#: lib/groupeditform.php:161 +#: actions/profilesettings.php:115 actions/register.php:453 +#: lib/applicationeditform.php:228 lib/groupeditform.php:161 msgid "Homepage" msgstr "主页" -#: actions/profilesettings.php:117 actions/register.php:454 +#: actions/profilesettings.php:117 actions/register.php:455 msgid "URL of your homepage, blog, or profile on another site" msgstr "您的主页、博客或在其他站点的URL" -#: actions/profilesettings.php:122 actions/register.php:460 +#: actions/profilesettings.php:122 actions/register.php:461 #, fuzzy, php-format msgid "Describe yourself and your interests in %d chars" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:125 actions/register.php:463 +#: actions/profilesettings.php:125 actions/register.php:464 #, fuzzy msgid "Describe yourself and your interests" msgstr "用不超过140个字符描述您自己和您的爱好" -#: actions/profilesettings.php:127 actions/register.php:465 +#: actions/profilesettings.php:127 actions/register.php:466 msgid "Bio" msgstr "自述" -#: actions/profilesettings.php:132 actions/register.php:470 -#: actions/showgroup.php:256 actions/tagother.php:112 -#: actions/userauthorization.php:158 lib/groupeditform.php:177 +#: actions/profilesettings.php:132 actions/register.php:471 +#: actions/showgroup.php:264 actions/tagother.php:112 +#: actions/userauthorization.php:166 lib/groupeditform.php:177 #: lib/userprofile.php:164 msgid "Location" msgstr "位置" -#: actions/profilesettings.php:134 actions/register.php:472 +#: actions/profilesettings.php:134 actions/register.php:473 msgid "Where you are, like \"City, State (or Region), Country\"" msgstr "你的位置，格式类似\"城市，省份，国家\"" @@ -2470,7 +2801,7 @@ msgid "" "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated" msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔" -#: actions/profilesettings.php:151 actions/siteadminpanel.php:294 +#: actions/profilesettings.php:151 actions/siteadminpanel.php:280 msgid "Language" msgstr "语言" @@ -2496,7 +2827,7 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器 msgid "Bio is too long (max %d chars)." msgstr "自述过长(不能超过140字符)。" -#: actions/profilesettings.php:235 actions/siteadminpanel.php:164 +#: actions/profilesettings.php:235 actions/siteadminpanel.php:150 msgid "Timezone not selected." msgstr "未选择时区。" @@ -2509,25 +2840,25 @@ 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 +#: actions/profilesettings.php:391 lib/adminpanelaction.php:137 msgid "Settings saved." msgstr "设置已保存。" @@ -2550,39 +2881,39 @@ msgstr "公开的时间表" msgid "Public timeline" msgstr "公开的时间表" -#: actions/public.php:151 +#: actions/public.php:159 #, fuzzy msgid "Public Stream Feed (RSS 1.0)" msgstr "公开的聚合" -#: actions/public.php:155 +#: actions/public.php:163 #, fuzzy msgid "Public Stream Feed (RSS 2.0)" msgstr "公开的聚合" -#: actions/public.php:159 +#: actions/public.php:167 #, fuzzy msgid "Public Stream Feed (Atom)" msgstr "公开的聚合" -#: actions/public.php:179 +#: actions/public.php:187 #, 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:190 msgid "Be the first to post!" msgstr "" -#: actions/public.php:186 +#: actions/public.php:194 #, php-format msgid "" "Why not [register an account](%%action.register%%) and be the first to post!" msgstr "" -#: actions/public.php:233 +#: actions/public.php:241 #, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" @@ -2591,7 +2922,7 @@ msgid "" "friends, family, and colleagues! ([Read more](%%doc.help%%))" msgstr "" -#: actions/public.php:238 +#: actions/public.php:246 #, fuzzy, php-format msgid "" "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-" @@ -2627,7 +2958,7 @@ msgid "" "one!" msgstr "" -#: actions/publictagcloud.php:131 +#: actions/publictagcloud.php:134 msgid "Tag cloud" msgstr "标签云聚集" @@ -2751,7 +3082,7 @@ msgstr "保存用户设置时出错。" msgid "New password successfully saved. You are now logged in." msgstr "新密码已保存，您现在已登录。" -#: actions/register.php:85 actions/register.php:189 actions/register.php:404 +#: actions/register.php:85 actions/register.php:189 actions/register.php:405 msgid "Sorry, only invited people can register." msgstr "对不起，请邀请那些能注册的人。" @@ -2764,7 +3095,7 @@ msgstr "验证码出错。" msgid "Registration successful" msgstr "注册成功。" -#: actions/register.php:114 actions/register.php:502 lib/action.php:457 +#: actions/register.php:114 actions/register.php:503 lib/action.php:463 #: lib/logingroupnav.php:85 msgid "Register" msgstr "注册" @@ -2777,71 +3108,67 @@ msgstr "不允许注册。" msgid "You can't register if you don't agree to the license." msgstr "您必须同意此授权方可注册。" -#: actions/register.php:201 -msgid "Not a valid email address." -msgstr "不是有效的电子邮件。" - #: actions/register.php:212 msgid "Email address already exists." msgstr "电子邮件地址已存在。" -#: actions/register.php:243 actions/register.php:264 +#: actions/register.php:243 actions/register.php:265 msgid "Invalid username or password." msgstr "用户名或密码不正确。" -#: actions/register.php:342 +#: actions/register.php:343 msgid "" "With this form you can create a new account. You can then post notices and " "link up to friends and colleagues. " msgstr "" -#: actions/register.php:424 +#: actions/register.php:425 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required." msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。" -#: actions/register.php:429 +#: actions/register.php:430 msgid "6 or more characters. Required." msgstr "6 个或更多字符。此项必填。" -#: actions/register.php:433 +#: actions/register.php:434 msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" -#: actions/register.php:437 actions/register.php:441 -#: actions/siteadminpanel.php:270 lib/accountsettingsaction.php:120 +#: actions/register.php:438 actions/register.php:442 +#: actions/siteadminpanel.php:256 lib/accountsettingsaction.php:120 msgid "Email" msgstr "电子邮件" -#: actions/register.php:438 actions/register.php:442 +#: actions/register.php:439 actions/register.php:443 msgid "Used only for updates, announcements, and password recovery" msgstr "只用于更新、通告或密码恢复" -#: actions/register.php:449 +#: actions/register.php:450 msgid "Longer name, preferably your \"real\" name" msgstr "长名字，最好是“实名”" -#: actions/register.php:493 +#: actions/register.php:494 msgid "My text and files are available under " msgstr "我的文字和文件采用的授权方式为" -#: actions/register.php:495 +#: actions/register.php:496 msgid "Creative Commons Attribution 3.0" msgstr "" -#: actions/register.php:496 +#: actions/register.php:497 #, fuzzy msgid "" " except this private data: password, email address, IM address, and phone " "number." msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。" -#: actions/register.php:537 -#, php-format +#: actions/register.php:538 +#, fuzzy, php-format msgid "" -"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may " +"Congratulations, %1$s! And welcome to %%%%site.name%%%%. From here, you may " "want to...\n" "\n" -"* Go to [your profile](%s) and post your first message.\n" +"* Go to [your profile](%2$s) and post your first message.\n" "* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send " "notices through instant messages.\n" "* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that " @@ -2866,7 +3193,7 @@ msgstr "" "\n" "感谢您的注册，希望您喜欢这个服务。" -#: actions/register.php:561 +#: actions/register.php:562 msgid "" "(You should receive a message by email momentarily, with instructions on how " "to confirm your email address.)" @@ -2909,7 +3236,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:368 msgid "Subscribe" msgstr "订阅" @@ -2952,7 +3279,7 @@ msgstr "您必须同意此授权方可注册。" msgid "You already repeated that notice." msgstr "您已成功阻止该用户：" -#: actions/repeat.php:114 lib/noticelist.php:629 +#: actions/repeat.php:114 lib/noticelist.php:656 #, fuzzy msgid "Repeated" msgstr "创建" @@ -2970,8 +3297,8 @@ msgstr "%s 的回复" #: actions/replies.php:127 #, fuzzy, php-format -msgid "Replies to %s, page %d" -msgstr "%s 的回复，第 % 页" +msgid "Replies to %1$s, page %2$d" +msgstr "发送给 %1$s 的 %2$s 消息" #: actions/replies.php:144 #, fuzzy, php-format @@ -2989,11 +3316,11 @@ msgid "Replies feed for %s (Atom)" msgstr "%s 的通告聚合" #: actions/replies.php:198 -#, php-format +#, fuzzy, php-format msgid "" -"This is the timeline showing replies to %s but %s hasn't received a notice " -"to his attention yet." -msgstr "" +"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 #, php-format @@ -3005,8 +3332,8 @@ msgstr "" #: actions/replies.php:205 #, php-format msgid "" -"You can try to [nudge %s](../%s) or [post something to his or her attention]" -"(%%%%action.newnotice%%%%?status_textarea=%s)." +"You can try to [nudge %1$s](../%2$s) or [post something to his or her " +"attention](%%%%action.newnotice%%%%?status_textarea=%3$s)." msgstr "" #: actions/repliesrss.php:72 @@ -3014,6 +3341,11 @@ msgstr "" msgid "Replies to %1$s on %2$s!" msgstr "发送给 %1$s 的 %2$s 消息" +#: 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." @@ -3024,9 +3356,124 @@ msgstr "无法向此用户发送消息。" msgid "User is already sandboxed." msgstr "用户没有个人信息。" +#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170 +#: lib/adminpanelaction.php:347 +msgid "Sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:65 +msgid "Session settings for this StatusNet site." +msgstr "" + +#: actions/sessionsadminpanel.php:175 +msgid "Handle sessions" +msgstr "" + +#: actions/sessionsadminpanel.php:177 +msgid "Whether to handle sessions ourselves." +msgstr "" + +#: actions/sessionsadminpanel.php:181 +msgid "Session debugging" +msgstr "" + +#: actions/sessionsadminpanel.php:183 +msgid "Turn on debugging output for sessions." +msgstr "" + +#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:336 +#: actions/useradminpanel.php:293 +#, fuzzy +msgid "Save site settings" +msgstr "头像设置" + +#: actions/showapplication.php:82 +#, fuzzy +msgid "You must be logged in to view an application." +msgstr "您必须登录才能邀请其他人使用 %s" + +#: actions/showapplication.php:157 +#, fuzzy +msgid "Application profile" +msgstr "通告没有关联个人信息" + +#: actions/showapplication.php:159 lib/applicationeditform.php:180 +msgid "Icon" +msgstr "" + +#: actions/showapplication.php:169 actions/version.php:195 +#: lib/applicationeditform.php:195 +#, fuzzy +msgid "Name" +msgstr "昵称" + +#: actions/showapplication.php:178 lib/applicationeditform.php:222 +#, fuzzy +msgid "Organization" +msgstr "分页" + +#: actions/showapplication.php:187 actions/version.php:198 +#: lib/applicationeditform.php:209 lib/groupeditform.php:172 +#, fuzzy +msgid "Description" +msgstr "描述" + +#: actions/showapplication.php:192 actions/showgroup.php:437 +#: lib/profileaction.php:174 +msgid "Statistics" +msgstr "统计" + +#: actions/showapplication.php:203 +#, php-format +msgid "Created by %1$s - %2$s access by default - %3$d users" +msgstr "" + +#: actions/showapplication.php:213 +msgid "Application actions" +msgstr "" + +#: actions/showapplication.php:236 +msgid "Reset key & secret" +msgstr "" + +#: actions/showapplication.php:261 +msgid "Application info" +msgstr "" + +#: actions/showapplication.php:263 +msgid "Consumer key" +msgstr "" + +#: actions/showapplication.php:268 +msgid "Consumer secret" +msgstr "" + +#: actions/showapplication.php:273 +msgid "Request token URL" +msgstr "" + +#: actions/showapplication.php:278 +msgid "Access token URL" +msgstr "" + +#: actions/showapplication.php:283 +msgid "Authorize URL" +msgstr "" + +#: 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 "%s's favorite notices, page %d" +msgid "%1$s's favorite notices, page %2$d" msgstr "%s 收藏的通告" #: actions/showfavorites.php:132 @@ -3079,79 +3526,75 @@ msgid "%s group" msgstr "%s 组" #: actions/showgroup.php:84 -#, php-format -msgid "%s group, page %d" -msgstr "%s 组, 第 %d 页" +#, fuzzy, php-format +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:336 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 1.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:334 +#: actions/showgroup.php:342 #, fuzzy, php-format msgid "Notice feed for %s group (RSS 2.0)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:340 +#: actions/showgroup.php:348 #, fuzzy, php-format msgid "Notice feed for %s group (Atom)" msgstr "%s 的通告聚合" -#: actions/showgroup.php:345 +#: actions/showgroup.php:353 #, php-format msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 +#: actions/showgroup.php:389 actions/showgroup.php:446 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" -#: actions/showgroup.php:386 lib/profileaction.php:117 +#: actions/showgroup.php:394 lib/profileaction.php:117 #: lib/profileaction.php:148 lib/profileaction.php:236 lib/section.php:95 -#: lib/tagcloudsection.php:71 +#: lib/subscriptionlist.php:126 lib/tagcloudsection.php:71 msgid "(None)" msgstr "（没有）" -#: actions/showgroup.php:392 +#: actions/showgroup.php:400 msgid "All members" msgstr "所有成员" -#: actions/showgroup.php:429 lib/profileaction.php:174 -msgid "Statistics" -msgstr "统计" - -#: actions/showgroup.php:432 +#: actions/showgroup.php:440 #, fuzzy msgid "Created" msgstr "创建" -#: actions/showgroup.php:448 +#: actions/showgroup.php:456 #, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3161,7 +3604,7 @@ msgid "" "of this group and many more! ([Read more](%%%%doc.help%%%%))" msgstr "" -#: actions/showgroup.php:454 +#: actions/showgroup.php:462 #, fuzzy, php-format msgid "" "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en." @@ -3172,7 +3615,7 @@ msgstr "" "**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showgroup.php:482 +#: actions/showgroup.php:490 #, fuzzy msgid "Admins" msgstr "admin管理员" @@ -3207,12 +3650,12 @@ msgstr "带 %s 标签的通告" #: actions/showstream.php:79 #, fuzzy, php-format -msgid "%s, page %d" -msgstr "%s 的收件箱 - 第 %d 页" +msgid "%1$s, page %2$d" +msgstr "%s 及好友" #: actions/showstream.php:122 #, fuzzy, php-format -msgid "Notice feed for %s tagged %s (RSS 1.0)" +msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)" msgstr "%s 的通告聚合" #: actions/showstream.php:129 @@ -3235,25 +3678,25 @@ msgstr "%s 的通告聚合" msgid "FOAF for %s" msgstr "%s 的发件箱" -#: actions/showstream.php:191 -#, php-format -msgid "This is the timeline for %s but %s hasn't posted anything yet." -msgstr "" +#: 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 %s or [post something to his or her attention](%%%%" -"action.newnotice%%%%?status_textarea=%s)." +"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." @@ -3262,7 +3705,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." @@ -3272,7 +3715,7 @@ msgstr "" "**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]" "(http://en.wikipedia.org/wiki/Micro-blogging)" -#: actions/showstream.php:313 +#: actions/showstream.php:305 #, fuzzy, php-format msgid "Repeat of %s" msgstr "%s 的回复" @@ -3291,209 +3734,151 @@ msgstr "用户没有个人信息。" msgid "Basic settings for this StatusNet site." msgstr "" -#: actions/siteadminpanel.php:146 +#: actions/siteadminpanel.php:132 msgid "Site name must have non-zero length." msgstr "" -#: actions/siteadminpanel.php:154 +#: actions/siteadminpanel.php:140 #, fuzzy -msgid "You must have a valid contact email address" +msgid "You must have a valid contact email address." msgstr "不是有效的电子邮件" -#: actions/siteadminpanel.php:172 +#: actions/siteadminpanel.php:158 #, php-format -msgid "Unknown language \"%s\"" +msgid "Unknown language \"%s\"." msgstr "" -#: actions/siteadminpanel.php:179 +#: actions/siteadminpanel.php:165 msgid "Invalid snapshot report URL." msgstr "" -#: actions/siteadminpanel.php:185 +#: actions/siteadminpanel.php:171 msgid "Invalid snapshot run value." msgstr "" -#: actions/siteadminpanel.php:191 +#: actions/siteadminpanel.php:177 msgid "Snapshot frequency must be a number." msgstr "" -#: actions/siteadminpanel.php:197 +#: actions/siteadminpanel.php:183 msgid "Minimum text limit is 140 characters." msgstr "" -#: actions/siteadminpanel.php:203 +#: actions/siteadminpanel.php:189 msgid "Dupe limit must 1 or more seconds." msgstr "" -#: actions/siteadminpanel.php:253 +#: actions/siteadminpanel.php:239 msgid "General" msgstr "" -#: actions/siteadminpanel.php:256 +#: actions/siteadminpanel.php:242 #, fuzzy msgid "Site name" msgstr "新通告" -#: actions/siteadminpanel.php:257 +#: actions/siteadminpanel.php:243 msgid "The name of your site, like \"Yourcompany Microblog\"" msgstr "" -#: actions/siteadminpanel.php:261 +#: actions/siteadminpanel.php:247 msgid "Brought by" msgstr "" -#: actions/siteadminpanel.php:262 +#: actions/siteadminpanel.php:248 msgid "Text used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:266 +#: actions/siteadminpanel.php:252 msgid "Brought by URL" msgstr "" -#: actions/siteadminpanel.php:267 +#: actions/siteadminpanel.php:253 msgid "URL used for credits link in footer of each page" msgstr "" -#: actions/siteadminpanel.php:271 +#: actions/siteadminpanel.php:257 #, fuzzy msgid "Contact email address for your site" msgstr "新的电子邮件地址，用于发布 %s 信息" -#: actions/siteadminpanel.php:277 +#: actions/siteadminpanel.php:263 #, fuzzy msgid "Local" msgstr "本地显示" -#: actions/siteadminpanel.php:288 +#: actions/siteadminpanel.php:274 msgid "Default timezone" msgstr "" -#: actions/siteadminpanel.php:289 +#: actions/siteadminpanel.php:275 msgid "Default timezone for the site; usually UTC." msgstr "" -#: actions/siteadminpanel.php:295 +#: actions/siteadminpanel.php:281 #, fuzzy msgid "Default site language" msgstr "首选语言" -#: actions/siteadminpanel.php:303 -#, fuzzy -msgid "URLs" -msgstr "URL 互联网地址" - -#: actions/siteadminpanel.php:306 -#, fuzzy -msgid "Server" -msgstr "恢复" - -#: actions/siteadminpanel.php:306 -msgid "Site's server hostname." -msgstr "" - -#: actions/siteadminpanel.php:310 -msgid "Fancy URLs" -msgstr "" - -#: actions/siteadminpanel.php:312 -msgid "Use fancy (more readable and memorable) URLs?" -msgstr "" - -#: actions/siteadminpanel.php:318 -#, fuzzy -msgid "Access" -msgstr "接受" - -#: actions/siteadminpanel.php:321 -#, fuzzy -msgid "Private" -msgstr "隐私" - -#: actions/siteadminpanel.php:323 -msgid "Prohibit anonymous users (not logged in) from viewing site?" -msgstr "" - -#: actions/siteadminpanel.php:327 -#, fuzzy -msgid "Invite only" -msgstr "邀请" - -#: actions/siteadminpanel.php:329 -msgid "Make registration invitation only." -msgstr "" - -#: actions/siteadminpanel.php:333 -#, fuzzy -msgid "Closed" -msgstr "阻止" - -#: actions/siteadminpanel.php:335 -msgid "Disable new registrations." -msgstr "" - -#: actions/siteadminpanel.php:341 +#: actions/siteadminpanel.php:289 msgid "Snapshots" msgstr "" -#: actions/siteadminpanel.php:344 +#: actions/siteadminpanel.php:292 msgid "Randomly during Web hit" msgstr "" -#: actions/siteadminpanel.php:345 +#: actions/siteadminpanel.php:293 msgid "In a scheduled job" msgstr "" -#: actions/siteadminpanel.php:347 +#: actions/siteadminpanel.php:295 msgid "Data snapshots" msgstr "" -#: actions/siteadminpanel.php:348 +#: actions/siteadminpanel.php:296 msgid "When to send statistical data to status.net servers" msgstr "" -#: actions/siteadminpanel.php:353 +#: actions/siteadminpanel.php:301 msgid "Frequency" msgstr "" -#: actions/siteadminpanel.php:354 +#: actions/siteadminpanel.php:302 msgid "Snapshots will be sent once every N web hits" msgstr "" -#: actions/siteadminpanel.php:359 +#: actions/siteadminpanel.php:307 msgid "Report URL" msgstr "" -#: actions/siteadminpanel.php:360 +#: actions/siteadminpanel.php:308 msgid "Snapshots will be sent to this URL" msgstr "" -#: actions/siteadminpanel.php:367 +#: actions/siteadminpanel.php:315 msgid "Limits" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Text limit" msgstr "" -#: actions/siteadminpanel.php:370 +#: actions/siteadminpanel.php:318 msgid "Maximum number of characters for notices." msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "Dupe limit" msgstr "" -#: actions/siteadminpanel.php:374 +#: actions/siteadminpanel.php:322 msgid "How long users must wait (in seconds) to post the same thing again." msgstr "" -#: actions/siteadminpanel.php:388 actions/useradminpanel.php:313 -#, fuzzy -msgid "Save site settings" -msgstr "头像设置" - #: actions/smssettings.php:58 -msgid "SMS Settings" +#, fuzzy +msgid "SMS settings" msgstr "SMS短信设置" #: actions/smssettings.php:69 @@ -3523,7 +3908,8 @@ msgid "Enter the code you received on your phone." msgstr "输入手机收到的验证码。" #: actions/smssettings.php:138 -msgid "SMS Phone number" +#, fuzzy +msgid "SMS phone number" msgstr "SMS短信电话号码" #: actions/smssettings.php:140 @@ -3596,17 +3982,27 @@ msgstr "没有输入验证码" 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:117 +#, fuzzy +msgid "You cannot subscribe to an OMB 0.1 remote profile with this action." +msgstr "您未告知此个人信息" -#: actions/subscribe.php:69 +#: actions/subscribe.php:145 #, fuzzy msgid "Subscribed" msgstr "订阅" @@ -3617,8 +4013,8 @@ msgid "%s subscribers" msgstr "订阅者" #: actions/subscribers.php:52 -#, php-format -msgid "%s subscribers, page %d" +#, fuzzy, php-format +msgid "%1$s subscribers, page %2$d" msgstr "%s 订阅者, 第 %d 页" #: actions/subscribers.php:63 @@ -3655,7 +4051,7 @@ msgstr "所有订阅" #: actions/subscriptions.php:54 #, fuzzy, php-format -msgid "%s subscriptions, page %d" +msgid "%1$s subscriptions, page %2$d" msgstr "所有订阅" #: actions/subscriptions.php:65 @@ -3667,7 +4063,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 " @@ -3677,24 +4073,24 @@ 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 #, fuzzy, php-format -msgid "Notices tagged with %s, page %d" -msgstr "带 %s 标签的通告" +msgid "Notices tagged with %1$s, page %2$d" +msgstr "用户自加标签 %s - 第 %d 页" #: actions/tag.php:86 #, fuzzy, php-format @@ -3726,7 +4122,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 "相片" @@ -3761,7 +4158,7 @@ msgstr "使用这个表格给你的关注者或你的订阅加注标签。" msgid "No such tag." msgstr "未找到此消息。" -#: actions/twitapitrends.php:87 +#: actions/twitapitrends.php:85 msgid "API method under construction." msgstr "API 方法尚未实现。" @@ -3785,22 +4182,18 @@ msgstr "用户没有个人信息。" msgid "No profile id in request." msgstr "服务器没有返回个人信息URL。" -#: actions/unsubscribe.php:84 -#, fuzzy -msgid "No profile with that id." -msgstr "没有找到此ID的信息。" - #: actions/unsubscribe.php:98 #, fuzzy msgid "Unsubscribed" msgstr "退订" -#: actions/updateprofile.php:62 actions/userauthorization.php:330 +#: actions/updateprofile.php:62 actions/userauthorization.php:337 #, php-format -msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’." +msgid "" +"Listenee stream license ‘%1$s’ is not compatible with site license ‘%2$s’." msgstr "" -#: actions/useradminpanel.php:58 lib/adminpanelaction.php:321 +#: actions/useradminpanel.php:58 lib/adminpanelaction.php:332 #: lib/personalgroupnav.php:115 msgid "User" msgstr "用户" @@ -3809,89 +4202,69 @@ msgstr "用户" msgid "User settings for this StatusNet site." msgstr "" -#: actions/useradminpanel.php:149 +#: actions/useradminpanel.php:148 msgid "Invalid bio limit. Must be numeric." msgstr "" -#: actions/useradminpanel.php:155 +#: actions/useradminpanel.php:154 msgid "Invalid welcome text. Max length is 255 characters." msgstr "" -#: actions/useradminpanel.php:165 +#: actions/useradminpanel.php:164 #, php-format msgid "Invalid default subscripton: '%1$s' is not user." msgstr "" -#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:108 +#: actions/useradminpanel.php:217 lib/accountsettingsaction.php:108 #: lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" -#: actions/useradminpanel.php:222 +#: actions/useradminpanel.php:221 msgid "Bio Limit" msgstr "" -#: actions/useradminpanel.php:223 +#: actions/useradminpanel.php:222 msgid "Maximum length of a profile bio in characters." msgstr "" -#: actions/useradminpanel.php:231 +#: actions/useradminpanel.php:230 #, fuzzy msgid "New users" msgstr "邀请新用户" -#: actions/useradminpanel.php:235 +#: actions/useradminpanel.php:234 msgid "New user welcome" msgstr "" -#: actions/useradminpanel.php:236 +#: actions/useradminpanel.php:235 msgid "Welcome text for new users (Max 255 chars)." msgstr "" -#: actions/useradminpanel.php:241 +#: actions/useradminpanel.php:240 #, fuzzy msgid "Default subscription" msgstr "所有订阅" -#: actions/useradminpanel.php:242 +#: actions/useradminpanel.php:241 #, fuzzy msgid "Automatically subscribe new users to this user." msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)" -#: actions/useradminpanel.php:251 +#: actions/useradminpanel.php:250 #, fuzzy msgid "Invitations" msgstr "已发送邀请" -#: actions/useradminpanel.php:256 +#: actions/useradminpanel.php:255 #, fuzzy msgid "Invitations enabled" msgstr "已发送邀请" -#: actions/useradminpanel.php:258 +#: actions/useradminpanel.php:257 msgid "Whether to allow users to invite new users." msgstr "" -#: actions/useradminpanel.php:265 -msgid "Sessions" -msgstr "" - -#: actions/useradminpanel.php:270 -msgid "Handle sessions" -msgstr "" - -#: actions/useradminpanel.php:272 -msgid "Whether to handle sessions ourselves." -msgstr "" - -#: actions/useradminpanel.php:276 -msgid "Session debugging" -msgstr "" - -#: actions/useradminpanel.php:278 -msgid "Turn on debugging output for sessions." -msgstr "" - #: actions/userauthorization.php:105 msgid "Authorize subscription" msgstr "确认订阅" @@ -3906,39 +4279,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 " @@ -3947,11 +4320,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 " @@ -3959,46 +4332,41 @@ msgid "" "subscription." msgstr "订阅已被拒绝，但是没有回传URL。请到此网站查看如何拒绝订阅。" -#: actions/userauthorization.php:296 +#: actions/userauthorization.php:303 #, php-format -msgid "Listener URI ‘%s’ not found here" +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' 图像格式错误" -#: actions/userbyid.php:70 -#, fuzzy -msgid "No ID." -msgstr "没有ID" - #: actions/userdesignsettings.php:76 lib/designsettings.php:65 #, fuzzy msgid "Profile design" @@ -4015,9 +4383,9 @@ msgid "Enjoy your hotdog!" msgstr "" #: actions/usergroups.php:64 -#, php-format -msgid "%s groups, page %d" -msgstr "%s 群组, 第 %d 页" +#, fuzzy, php-format +msgid "%1$s groups, page %2$d" +msgstr "%s 组成员, 第 %d 页" #: actions/usergroups.php:130 #, fuzzy @@ -4042,15 +4410,10 @@ msgstr "统计" #: actions/version.php:153 #, php-format msgid "" -"This site is powered by %s version %s, Copyright 2008-2010 StatusNet, Inc. " -"and contributors." +"This site is powered by %1$s version %2$s, Copyright 2008-2010 StatusNet, " +"Inc. and contributors." msgstr "" -#: actions/version.php:157 -#, fuzzy -msgid "StatusNet" -msgstr "头像已更新。" - #: actions/version.php:161 msgid "Contributors" msgstr "" @@ -4082,12 +4445,7 @@ msgstr "" msgid "Plugins" msgstr "" -#: actions/version.php:195 -#, fuzzy -msgid "Name" -msgstr "昵称" - -#: actions/version.php:196 lib/action.php:741 +#: actions/version.php:196 lib/action.php:747 #, fuzzy msgid "Version" msgstr "个人" @@ -4096,28 +4454,48 @@ msgstr "个人" msgid "Author(s)" msgstr "" -#: actions/version.php:198 lib/groupeditform.php:172 -#, fuzzy -msgid "Description" -msgstr "描述" - -#: classes/File.php:137 +#: classes/File.php:144 #, php-format msgid "" "No file may be larger than %d bytes and the file you sent was %d bytes. Try " "to upload a smaller version." msgstr "" -#: classes/File.php:147 +#: classes/File.php:154 #, php-format msgid "A file this large would exceed your user quota of %d bytes." msgstr "" -#: classes/File.php:154 +#: classes/File.php:161 #, php-format msgid "A file this large would exceed your monthly quota of %d bytes." msgstr "" +#: classes/Group_member.php:41 +#, fuzzy +msgid "Group join failed." +msgstr "组资料" + +#: classes/Group_member.php:53 +#, fuzzy +msgid "Not part of group." +msgstr "无法更新组" + +#: classes/Group_member.php:60 +#, fuzzy +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" +msgstr "无法创建收藏。" + #: classes/Message.php:45 #, fuzzy msgid "You are banned from sending direct messages." @@ -4136,60 +4514,98 @@ msgstr "无法添加新URI的信息。" msgid "DB error inserting hashtag: %s" msgstr "添加标签时数据库出错：%s" -#: classes/Notice.php:226 +#: classes/Notice.php:239 #, fuzzy msgid "Problem saving notice. Too long." msgstr "保存通告时出错。" -#: classes/Notice.php:230 +#: classes/Notice.php:243 #, fuzzy msgid "Problem saving notice. Unknown user." msgstr "保存通告时出错。" -#: classes/Notice.php:235 +#: classes/Notice.php:248 msgid "" "Too many notices too fast; take a breather and post again in a few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:241 +#: classes/Notice.php:254 #, fuzzy msgid "" "Too many duplicate messages too quickly; take a breather and post again in a " "few minutes." msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。" -#: classes/Notice.php:247 +#: classes/Notice.php:260 msgid "You are banned from posting notices on this site." msgstr "在这个网站你被禁止发布消息。" -#: classes/Notice.php:309 classes/Notice.php:334 +#: classes/Notice.php:326 classes/Notice.php:352 msgid "Problem saving notice." msgstr "保存通告时出错。" -#: classes/Notice.php:1034 -#, php-format -msgid "DB error inserting reply: %s" -msgstr "添加回复时数据库出错：%s" +#: classes/Notice.php:911 +#, fuzzy +msgid "Problem saving group inbox." +msgstr "保存通告时出错。" -#: classes/Notice.php:1359 +#: classes/Notice.php:1437 #, fuzzy, php-format msgid "RT @%1$s %2$s" msgstr "%1$s (%2$s)" -#: classes/User.php:368 +#: 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:179 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:462 msgid "Could not create group." msgstr "无法创建组。" -#: classes/User_group.php:409 +#: classes/User_group.php:471 +#, fuzzy +msgid "Could not set group uri." +msgstr "无法删除订阅。" + +#: classes/User_group.php:492 #, fuzzy msgid "Could not set group membership." msgstr "无法删除订阅。" +#: classes/User_group.php:506 +#, fuzzy +msgid "Could not save local group info." +msgstr "无法删除订阅。" + #: lib/accountsettingsaction.php:108 msgid "Change your profile settings" msgstr "修改您的个人信息" @@ -4221,144 +4637,140 @@ msgstr "其他选项" #: lib/action.php:144 #, fuzzy, php-format -msgid "%s - %s" -msgstr "%s (%s)" +msgid "%1$s - %2$s" +msgstr "%1$s (%2$s)" #: lib/action.php:159 msgid "Untitled page" msgstr "无标题页" -#: lib/action.php:427 +#: lib/action.php:433 msgid "Primary site navigation" msgstr "主站导航" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Home" msgstr "主页" -#: lib/action.php:433 +#: lib/action.php:439 msgid "Personal profile and friends timeline" msgstr "个人资料及朋友年表" -#: lib/action.php:435 -msgid "Account" -msgstr "帐号" - -#: lib/action.php:435 +#: lib/action.php:441 #, fuzzy msgid "Change your email, avatar, password, profile" msgstr "修改资料" -#: lib/action.php:438 +#: lib/action.php:444 msgid "Connect" msgstr "连接" -#: lib/action.php:438 +#: lib/action.php:444 #, fuzzy msgid "Connect to services" msgstr "无法重定向到服务器：%s" -#: lib/action.php:442 +#: lib/action.php:448 #, fuzzy msgid "Change site configuration" msgstr "主站导航" -#: lib/action.php:446 lib/subgroupnav.php:105 +#: lib/action.php:452 lib/subgroupnav.php:105 msgid "Invite" msgstr "邀请" -#: lib/action.php:447 lib/subgroupnav.php:106 +#: lib/action.php:453 lib/subgroupnav.php:106 #, fuzzy, php-format msgid "Invite friends and colleagues to join you on %s" msgstr "使用这个表单来邀请好友和同事加入。" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout" msgstr "登出" -#: lib/action.php:452 +#: lib/action.php:458 msgid "Logout from the site" msgstr "登出本站" -#: lib/action.php:457 +#: lib/action.php:463 #, fuzzy msgid "Create an account" msgstr "创建新帐号" -#: lib/action.php:460 +#: lib/action.php:466 msgid "Login to the site" msgstr "登入本站" -#: lib/action.php:463 lib/action.php:726 +#: lib/action.php:469 lib/action.php:732 msgid "Help" msgstr "帮助" -#: lib/action.php:463 +#: lib/action.php:469 #, fuzzy msgid "Help me!" msgstr "帮助" -#: lib/action.php:466 lib/searchaction.php:127 +#: lib/action.php:472 lib/searchaction.php:127 msgid "Search" msgstr "搜索" -#: lib/action.php:466 +#: lib/action.php:472 msgid "Search for people or text" msgstr "检索人或文字" -#: lib/action.php:487 +#: lib/action.php:493 #, fuzzy msgid "Site notice" msgstr "新通告" -#: lib/action.php:553 +#: lib/action.php:559 msgid "Local views" msgstr "本地显示" -#: lib/action.php:619 +#: lib/action.php:625 #, fuzzy msgid "Page notice" msgstr "新通告" -#: lib/action.php:721 +#: lib/action.php:727 #, fuzzy msgid "Secondary site navigation" msgstr "次项站导航" -#: lib/action.php:728 +#: lib/action.php:734 msgid "About" msgstr "关于" -#: lib/action.php:730 +#: lib/action.php:736 msgid "FAQ" msgstr "常见问题FAQ" -#: lib/action.php:734 +#: lib/action.php:740 msgid "TOS" msgstr "" -#: lib/action.php:737 +#: lib/action.php:743 msgid "Privacy" msgstr "隐私" -#: lib/action.php:739 +#: lib/action.php:745 msgid "Source" msgstr "来源" -#: lib/action.php:743 +#: lib/action.php:749 msgid "Contact" msgstr "联系人" -#: lib/action.php:745 +#: lib/action.php:751 #, fuzzy msgid "Badge" msgstr "呼叫" -#: lib/action.php:773 +#: lib/action.php:779 msgid "StatusNet software license" msgstr "StatusNet软件注册证" -#: lib/action.php:776 +#: lib/action.php:782 #, php-format msgid "" "**%%site.name%%** is a microblogging service brought to you by [%%site." @@ -4367,12 +4779,12 @@ msgstr "" "**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site." "broughtbyurl%%)。" -#: lib/action.php:778 +#: lib/action.php:784 #, php-format msgid "**%%site.name%%** is a microblogging service. " msgstr "**%%site.name%%** 是一个微博客服务。" -#: lib/action.php:780 +#: lib/action.php:786 #, php-format msgid "" "It runs the [StatusNet](http://status.net/) microblogging software, version %" @@ -4383,37 +4795,58 @@ msgstr "" "General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)" "授权。" -#: lib/action.php:794 +#: lib/action.php:801 #, fuzzy msgid "Site content license" msgstr "StatusNet软件注册证" -#: lib/action.php:803 +#: lib/action.php:806 +#, php-format +msgid "Content and data of %1$s are private and confidential." +msgstr "" + +#: lib/action.php:811 +#, php-format +msgid "Content and data copyright by %1$s. All rights reserved." +msgstr "" + +#: lib/action.php:814 +msgid "Content and data copyright by contributors. All rights reserved." +msgstr "" + +#: lib/action.php:827 msgid "All " msgstr "全部" -#: lib/action.php:808 +#: lib/action.php:833 msgid "license." msgstr "注册证" -#: lib/action.php:1102 +#: lib/action.php:1132 msgid "Pagination" msgstr "分页" -#: lib/action.php:1111 +#: lib/action.php:1141 #, fuzzy msgid "After" msgstr "« 之后" -#: lib/action.php:1119 +#: lib/action.php:1149 #, fuzzy msgid "Before" msgstr "之前 »" -#: lib/action.php:1167 -#, fuzzy -msgid "There was a problem with your session token." -msgstr "会话标识有问题，请重试。" +#: lib/activity.php:449 +msgid "Can't handle remote content yet." +msgstr "" + +#: lib/activity.php:477 +msgid "Can't handle embedded XML content yet." +msgstr "" + +#: lib/activity.php:481 +msgid "Can't handle embedded Base64 content yet." +msgstr "" #: lib/adminpanelaction.php:96 #, fuzzy @@ -4440,21 +4873,115 @@ msgstr "命令尚未实现。" msgid "Unable to delete design setting." msgstr "无法保存 Twitter 设置！" -#: lib/adminpanelaction.php:312 +#: lib/adminpanelaction.php:323 #, fuzzy msgid "Basic site configuration" msgstr "电子邮件地址确认" -#: lib/adminpanelaction.php:317 +#: lib/adminpanelaction.php:328 #, fuzzy msgid "Design configuration" msgstr "SMS短信确认" -#: lib/adminpanelaction.php:322 lib/adminpanelaction.php:327 +#: lib/adminpanelaction.php:333 +#, fuzzy +msgid "User configuration" +msgstr "SMS短信确认" + +#: lib/adminpanelaction.php:338 +#, fuzzy +msgid "Access configuration" +msgstr "SMS短信确认" + +#: lib/adminpanelaction.php:343 #, fuzzy msgid "Paths configuration" msgstr "SMS短信确认" +#: lib/adminpanelaction.php:348 +#, fuzzy +msgid "Sessions configuration" +msgstr "SMS短信确认" + +#: lib/apiauth.php:94 +msgid "API resource requires read-write access, but you only have read access." +msgstr "" + +#: lib/apiauth.php:272 +#, php-format +msgid "Failed API auth attempt, nickname = %1$s, proxy = %2$s, ip = %3$s" +msgstr "" + +#: lib/applicationeditform.php:136 +msgid "Edit application" +msgstr "" + +#: lib/applicationeditform.php:184 +msgid "Icon for this application" +msgstr "" + +#: lib/applicationeditform.php:204 +#, fuzzy, php-format +msgid "Describe your application in %d characters" +msgstr "用不超过140个字符描述您自己和您的爱好" + +#: lib/applicationeditform.php:207 +#, fuzzy +msgid "Describe your application" +msgstr "用不超过140个字符描述您自己和您的爱好" + +#: lib/applicationeditform.php:216 +#, fuzzy +msgid "Source URL" +msgstr "来源" + +#: lib/applicationeditform.php:218 +#, fuzzy +msgid "URL of the homepage of this application" +msgstr "您的主页、博客或在其他站点的URL" + +#: lib/applicationeditform.php:224 +msgid "Organization responsible for this application" +msgstr "" + +#: lib/applicationeditform.php:230 +#, fuzzy +msgid "URL for the homepage of the organization" +msgstr "您的主页、博客或在其他站点的URL" + +#: lib/applicationeditform.php:236 +msgid "URL to redirect to after authentication" +msgstr "" + +#: lib/applicationeditform.php:258 +msgid "Browser" +msgstr "" + +#: lib/applicationeditform.php:274 +msgid "Desktop" +msgstr "" + +#: lib/applicationeditform.php:275 +msgid "Type of application, browser or desktop" +msgstr "" + +#: lib/applicationeditform.php:297 +msgid "Read-only" +msgstr "" + +#: lib/applicationeditform.php:315 +msgid "Read-write" +msgstr "" + +#: lib/applicationeditform.php:316 +msgid "Default access for this application: read-only, or read-write" +msgstr "" + +#: lib/applicationlist.php:154 +#, fuzzy +msgid "Revoke" +msgstr "移除" + #: lib/attachmentlist.php:87 msgid "Attachments" msgstr "" @@ -4476,12 +5003,12 @@ msgstr "" msgid "Tags for this attachment" msgstr "" -#: lib/authenticationplugin.php:182 lib/authenticationplugin.php:187 +#: lib/authenticationplugin.php:218 lib/authenticationplugin.php:223 #, fuzzy msgid "Password changing failed" msgstr "密码已保存。" -#: lib/authenticationplugin.php:197 +#: lib/authenticationplugin.php:233 #, fuzzy msgid "Password changing is not allowed" msgstr "密码已保存。" @@ -4490,7 +5017,7 @@ msgstr "密码已保存。" msgid "Command results" msgstr "执行结果" -#: lib/channel.php:210 +#: lib/channel.php:210 lib/mailhandler.php:142 msgid "Command complete" msgstr "执行完毕" @@ -4524,12 +5051,13 @@ msgid "" "Notices: %3$s" msgstr "" -#: lib/command.php:152 lib/command.php:399 lib/command.php:460 +#: lib/command.php:152 lib/command.php:390 lib/command.php:451 +#, fuzzy msgid "Notice with that id does not exist" -msgstr "" +msgstr "没有找到此ID的信息。" -#: lib/command.php:168 lib/command.php:415 lib/command.php:476 -#: lib/command.php:532 +#: lib/command.php:168 lib/command.php:406 lib/command.php:467 +#: lib/command.php:523 msgid "User has no last notice" msgstr "用户没有通告。" @@ -4537,163 +5065,186 @@ msgstr "用户没有通告。" msgid "Notice marked as fave." msgstr "通告被标记为收藏。" -#: lib/command.php:284 +#: lib/command.php:217 +msgid "You are already a member of that group" +msgstr "您已经是该组成员" + +#: lib/command.php:231 +#, fuzzy, php-format +msgid "Could not join user %s to group %s" +msgstr "无法把 %s 用户添加到 %s 组" + +#: lib/command.php:236 +#, fuzzy, php-format +msgid "%s joined group %s" +msgstr "%s 加入 %s 组" + +#: lib/command.php:275 #, fuzzy, php-format msgid "Could not remove user %s to group %s" msgstr "无法订阅用户：未找到。" -#: lib/command.php:315 +#: lib/command.php:280 #, php-format -msgid "%1$s (%2$s)" -msgstr "%1$s (%2$s)" +msgid "%s left group %s" +msgstr "%s 离开群 %s" -#: lib/command.php:318 +#: lib/command.php:309 #, php-format msgid "Fullname: %s" msgstr "全名：%s" -#: lib/command.php:321 +#: lib/command.php:312 lib/mail.php:254 #, php-format msgid "Location: %s" msgstr "位置：%s" -#: lib/command.php:324 +#: lib/command.php:315 lib/mail.php:256 #, php-format msgid "Homepage: %s" msgstr "主页：%s" -#: lib/command.php:327 +#: lib/command.php:318 #, php-format msgid "About: %s" msgstr "关于：%s" -#: lib/command.php:358 scripts/xmppdaemon.php:301 +#: lib/command.php:349 #, fuzzy, php-format msgid "Message too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:378 +#: lib/command.php:367 +#, php-format +msgid "Direct message to %s sent" +msgstr "已向 %s 发送消息" + +#: lib/command.php:369 msgid "Error sending direct message." msgstr "发送消息出错。" -#: lib/command.php:422 +#: lib/command.php:413 #, fuzzy msgid "Cannot repeat your own notice" msgstr "无法开启通告。" -#: lib/command.php:427 +#: lib/command.php:418 #, fuzzy msgid "Already repeated that notice" msgstr "删除通告" -#: lib/command.php:435 +#: lib/command.php:426 #, fuzzy, php-format msgid "Notice from %s repeated" msgstr "消息已发布。" -#: lib/command.php:437 +#: lib/command.php:428 #, fuzzy msgid "Error repeating notice." msgstr "保存通告时出错。" -#: lib/command.php:491 +#: lib/command.php:482 #, fuzzy, php-format msgid "Notice too long - maximum is %d characters, you sent %d" msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。" -#: lib/command.php:500 +#: lib/command.php:491 #, fuzzy, php-format msgid "Reply to %s sent" msgstr "无法删除通告。" -#: lib/command.php:502 +#: lib/command.php:493 #, fuzzy msgid "Error saving notice." msgstr "保存通告时出错。" -#: lib/command.php:556 +#: lib/command.php:547 msgid "Specify the name of the user to subscribe to" msgstr "指定要订阅的用户名" -#: lib/command.php:563 +#: 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:584 +#: lib/command.php:582 lib/command.php:685 msgid "Specify the name of the user to unsubscribe from" msgstr "指定要取消订阅的用户名" -#: lib/command.php:591 +#: lib/command.php:595 #, php-format msgid "Unsubscribed from %s" msgstr "取消订阅 %s" -#: lib/command.php:609 lib/command.php:632 +#: lib/command.php:613 lib/command.php:636 msgid "Command not yet implemented." msgstr "命令尚未实现。" -#: lib/command.php:612 +#: lib/command.php:616 msgid "Notification off." msgstr "通告关闭。" -#: lib/command.php:614 +#: lib/command.php:618 msgid "Can't turn off notification." msgstr "无法关闭通告。" -#: lib/command.php:635 +#: lib/command.php:639 msgid "Notification on." msgstr "通告开启。" -#: lib/command.php:637 +#: lib/command.php:641 msgid "Can't turn on notification." msgstr "无法开启通告。" -#: lib/command.php:650 +#: lib/command.php:654 msgid "Login command is disabled" msgstr "" -#: lib/command.php:664 -#, fuzzy, php-format -msgid "Could not create login token for %s" -msgstr "无法创建收藏。" - -#: lib/command.php:669 +#: 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:685 +#: 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:687 +#: lib/command.php:711 msgid "You are subscribed to this person:" msgid_plural "You are subscribed to these people:" msgstr[0] "您已订阅这些用户：" -#: lib/command.php:707 +#: lib/command.php:731 #, fuzzy msgid "No one is subscribed to you." msgstr "无法订阅他人更新。" -#: lib/command.php:709 +#: lib/command.php:733 msgid "This person is subscribed to you:" msgid_plural "These people are subscribed to you:" msgstr[0] "无法订阅他人更新。" -#: lib/command.php:729 +#: lib/command.php:753 #, fuzzy msgid "You are not a member of any groups." msgstr "您未告知此个人信息" -#: lib/command.php:731 +#: 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:745 +#: lib/command.php:769 msgid "" "Commands:\n" "on - turn on notifications\n" @@ -4707,6 +5258,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" @@ -4734,20 +5286,20 @@ msgid "" "tracking - not yet implemented.\n" msgstr "" -#: lib/common.php:199 +#: lib/common.php:136 #, fuzzy msgid "No configuration file found. " msgstr "没有验证码" -#: lib/common.php:200 +#: lib/common.php:137 msgid "I looked for configuration files in the following places: " msgstr "" -#: lib/common.php:201 +#: lib/common.php:139 msgid "You may wish to run the installer to fix this." msgstr "" -#: lib/common.php:202 +#: lib/common.php:140 #, fuzzy msgid "Go to the installer." msgstr "登入本站" @@ -4764,6 +5316,15 @@ msgstr "使用即时通讯工具(IM)更新" msgid "Updates by SMS" msgstr "使用SMS短信更新" +#: lib/connectsettingsaction.php:120 +#, fuzzy +msgid "Connections" +msgstr "连接" + +#: lib/connectsettingsaction.php:121 +msgid "Authorized connected applications" +msgstr "" + #: lib/dberroraction.php:60 msgid "Database error" msgstr "" @@ -4938,32 +5499,37 @@ 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 "" -#: lib/jabber.php:191 +#: lib/jabber.php:220 #, php-format msgid "[%s]" msgstr "" +#: lib/jabber.php:400 +#, php-format +msgid "Unknown inbox source %d." +msgstr "" + #: lib/joinform.php:114 #, fuzzy msgid "Join" @@ -5030,21 +5596,9 @@ msgstr "" "\n" "为您效力的 %4$s\n" -#: lib/mail.php:254 -#, fuzzy, php-format -msgid "Location: %s\n" -msgstr "位置：%s\n" - -#: lib/mail.php:256 -#, fuzzy, php-format -msgid "Homepage: %s\n" -msgstr "主页：%s\n" - #: lib/mail.php:258 -#, php-format -msgid "" -"Bio: %s\n" -"\n" +#, fuzzy, php-format +msgid "Bio: %s" msgstr "" "自传Bio: %s\n" "\n" @@ -5184,7 +5738,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 " 从 " @@ -5205,6 +5759,11 @@ msgstr "对不起，这个发布用的电子邮件属于其他用户。" msgid "Sorry, no incoming email allowed." msgstr "对不起，发布用的电子邮件无法使用。" +#: lib/mailhandler.php:228 +#, fuzzy, php-format +msgid "Unsupported message type: %s" +msgstr "不支持这种图像格式。" + #: lib/mediafile.php:98 lib/mediafile.php:123 msgid "There was a database error while saving your file. Please try again." msgstr "" @@ -5236,7 +5795,7 @@ msgid "File upload stopped by extension." msgstr "" #: lib/mediafile.php:179 lib/mediafile.php:216 -msgid "File exceeds user's quota!" +msgid "File exceeds user's quota." msgstr "" #: lib/mediafile.php:196 lib/mediafile.php:233 @@ -5244,7 +5803,8 @@ msgid "File could not be moved to destination directory." msgstr "" #: lib/mediafile.php:201 lib/mediafile.php:237 -msgid "Could not determine file's mime-type!" +#, fuzzy +msgid "Could not determine file's MIME type." msgstr "无法获取收藏的通告。" #: lib/mediafile.php:270 @@ -5254,7 +5814,7 @@ msgstr "" #: lib/mediafile.php:275 #, php-format -msgid "%s is not a supported filetype on this server." +msgid "%s is not a supported file type on this server." msgstr "" #: lib/messageform.php:120 @@ -5290,65 +5850,68 @@ msgid "Attach a file" msgstr "" #: lib/noticeform.php:212 +#, fuzzy msgid "Share my location" -msgstr "" +msgstr "无法保存个人信息。" -#: lib/noticeform.php:214 +#: lib/noticeform.php:215 #, fuzzy -msgid "Do not share my location." +msgid "Do not share my location" msgstr "无法保存个人信息。" -#: lib/noticeform.php:215 -msgid "Hide this info" +#: lib/noticeform.php:216 +msgid "" +"Sorry, retrieving your geo location is taking longer than expected, please " +"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:558 #, fuzzy msgid "in context" msgstr "没有内容！" -#: lib/noticelist.php:556 +#: lib/noticelist.php:583 #, fuzzy msgid "Repeated by" msgstr "创建" -#: lib/noticelist.php:585 +#: lib/noticelist.php:610 #, fuzzy msgid "Reply to this notice" msgstr "无法删除通告。" -#: lib/noticelist.php:586 +#: lib/noticelist.php:611 #, fuzzy msgid "Reply" msgstr "回复" -#: lib/noticelist.php:628 +#: lib/noticelist.php:655 #, fuzzy msgid "Notice repeated" msgstr "消息已发布。" @@ -5383,12 +5946,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 "无法添加新的订阅。" @@ -5404,19 +5962,19 @@ msgstr "回复" msgid "Favorites" msgstr "收藏夹" -#: lib/personalgroupnav.php:124 +#: lib/personalgroupnav.php:125 msgid "Inbox" msgstr "收件箱" -#: lib/personalgroupnav.php:125 +#: lib/personalgroupnav.php:126 msgid "Your incoming messages" msgstr "您接收的消息" -#: lib/personalgroupnav.php:129 +#: lib/personalgroupnav.php:130 msgid "Outbox" msgstr "发件箱" -#: lib/personalgroupnav.php:130 +#: lib/personalgroupnav.php:131 msgid "Your sent messages" msgstr "您发送的消息" @@ -5501,6 +6059,10 @@ msgstr "无法删除通告。" msgid "Repeat this notice" msgstr "无法删除通告。" +#: lib/router.php:668 +msgid "No single user defined for single-user mode." +msgstr "" + #: lib/sandboxform.php:67 #, fuzzy msgid "Sandbox" @@ -5575,37 +6137,6 @@ 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:60 -msgid "Could not subscribe." -msgstr "无法订阅。" - -#: lib/subs.php:79 -msgid "Could not subscribe other to you." -msgstr "无法订阅他人更新。" - -#: lib/subs.php:128 -#, fuzzy -msgid "Not subscribed!" -msgstr "未订阅！" - -#: lib/subs.php:133 -#, fuzzy -msgid "Couldn't delete self-subscription." -msgstr "无法删除订阅。" - -#: lib/subs.php:146 -msgid "Couldn't delete subscription." -msgstr "无法删除订阅。" - #: lib/subscriberspeopleselftagcloudsection.php:48 #: lib/subscriptionspeopleselftagcloudsection.php:48 msgid "People Tagcloud as self-tagged" @@ -5616,10 +6147,6 @@ msgstr "" msgid "People Tagcloud as tagged" msgstr "" -#: lib/subscriptionlist.php:126 -msgid "(none)" -msgstr "(none 没有)" - #: lib/tagcloudsection.php:56 #, fuzzy msgid "None" @@ -5667,70 +6194,70 @@ 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:837 +#: lib/util.php:952 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:839 +#: lib/util.php:954 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:841 +#: lib/util.php:956 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:843 +#: lib/util.php:958 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:845 +#: lib/util.php:960 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:847 +#: lib/util.php:962 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:849 +#: lib/util.php:964 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:851 +#: lib/util.php:966 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:853 +#: lib/util.php:968 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:855 +#: lib/util.php:970 msgid "about a year ago" msgstr "一年前" @@ -5743,3 +6270,8 @@ msgstr "主页的URL不正确。" #, php-format msgid "%s is not a valid color! Use 3 or 6 hex chars." msgstr "" + +#: lib/xmppmanager.php:402 +#, fuzzy, php-format +msgid "Message too long - maximum is %1$d characters, you sent %2$d." +msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"