summaryrefslogtreecommitdiff
path: root/locale/zh_CN
diff options
context:
space:
mode:
authorLaconica Pootle server <pootle@laconi.ca>2009-01-30 18:08:33 +0000
committerroot <root@fastmail.fm>2009-01-30 18:08:33 +0000
commit1c51263a83f5062345b87595a4e61f173d802c45 (patch)
tree70bd537e516d8f4e102f4fa04fb705ee62503ed7 /locale/zh_CN
parentaa1ad66ea9f7e05ae667d36a450ec624512a7a94 (diff)
merge from pootle
Diffstat (limited to 'locale/zh_CN')
-rw-r--r--locale/zh_CN/LC_MESSAGES/laconica.po2722
1 files changed, 2292 insertions, 430 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/laconica.po b/locale/zh_CN/LC_MESSAGES/laconica.po
index df5b877a8..bf064a138 100644
--- a/locale/zh_CN/LC_MESSAGES/laconica.po
+++ b/locale/zh_CN/LC_MESSAGES/laconica.po
@@ -6,8 +6,8 @@
msgid ""
msgstr ""
"Project-Id-Version: identi.ca\n"
-"Report-Msgid-Bugs-To: gouki@goukihq.org\n"
-"POT-Creation-Date: 2008-10-13 21:07+0100\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2009-01-25 16:24+0000\n"
"PO-Revision-Date: 2008-12-16 21:31+0800\n"
"Last-Translator: Yuan Yijun <bbbush.yuan@gmail.com>\n"
"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
@@ -16,15 +16,16 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
#: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
+#: actions/noticesearchrss.php:88
#, php-format
msgid " Search Stream for \"%s\""
msgstr "搜索有关\"%s\"的聚合"
#: ../actions/finishopenidlogin.php:82 ../actions/register.php:191
#: actions/finishopenidlogin.php:88 actions/register.php:205
+#: actions/finishopenidlogin.php:110
msgid ""
-" except this private data: password, email address, IM address, phone "
-"number."
+" except this private data: password, email address, IM address, phone number."
msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
#: ../actions/showstream.php:400 ../lib/stream.php:109
@@ -33,11 +34,12 @@ msgid " from "
msgstr " 从 "
#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
+#: actions/twitapistatuses.php:347
#, php-format
msgid "%1$s / Updates replying to %2$s"
msgstr "%1$s / 回复 %2$s 的消息"
-#: ../actions/invite.php:168 actions/invite.php:176
+#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
#, php-format
msgid "%1$s has invited you to join them on %2$s"
msgstr "%1$s 邀请您加入 %2$s"
@@ -72,59 +74,8 @@ msgid ""
"\n"
"Sincerely, %2$s\n"
msgstr ""
-"%1$s 邀请您加入 %2$s (%3$s)。\n"
-"\n"
-"%2$s "
-""
-""
-""
-""
-""
-""
-""
-""
-"微博客服务,您可以向朋友或关注您的人公布信息。\n"
-"\n"
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-"自己的新知新闻。您还可以与有共同爱好的人交流。\n"
-"\n"
-"%1$s 的话:\n\n%4$s\n\n您可以在这里看到 %1$s 的 %2$s 个人信息:\n\n%5$s\n\n如果您希望尝试这个服务,点击下面的链接,接受邀请。\n\n%6$s\n\n如果不希望,可以忽略这条消息。谢谢您的耐心和时间。\n\n为您效力的 %2$s\n"
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126
+#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
#, php-format
msgid "%1$s is now listening to your notices on %2$s."
msgstr "%1$s 开始关注您的 %2$s 信息。"
@@ -141,25 +92,30 @@ msgid ""
msgstr ""
"%1$s 开始关注您的 %2$s 信息。\n"
"\n"
-"\t%3$s\n\n为您效力的 %4$s\n"
+"\t%3$s\n"
+"\n"
+"为您效力的 %4$s\n"
#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
+#: actions/twitapistatuses.php:350
#, php-format
msgid "%1$s updates that reply to updates from %2$s / %3$s."
msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
#: ../actions/shownotice.php:45 actions/shownotice.php:45
+#: actions/shownotice.php:161
#, php-format
msgid "%1$s's status on %2$s"
msgstr "%1$s 的 %2$s 状态"
#: ../actions/invite.php:84 ../actions/invite.php:92 actions/invite.php:91
-#: actions/invite.php:99
+#: actions/invite.php:99 actions/invite.php:123 actions/invite.php:131
#, php-format
msgid "%s (%s)"
msgstr "%s (%s)"
#: ../actions/publicrss.php:62 actions/publicrss.php:48
+#: actions/publicrss.php:90
#, php-format
msgid "%s Public Stream"
msgstr "%s 公开聚合"
@@ -167,26 +123,31 @@ msgstr "%s 公开聚合"
#: ../actions/all.php:47 ../actions/allrss.php:60
#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
+#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
+#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
#, php-format
msgid "%s and friends"
msgstr "%s 及好友"
#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
+#: actions/twitapistatuses.php:33
#, php-format
msgid "%s public timeline"
msgstr "%s 公众时间表"
-#: ../lib/mail.php:206 lib/mail.php:212
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
#, php-format
msgid "%s status"
msgstr "%s 状态"
#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
+#: actions/twitapistatuses.php:199
#, php-format
msgid "%s timeline"
msgstr "%s 时间表"
#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
+#: actions/twitapistatuses.php:36
#, php-format
msgid "%s updates from everyone!"
msgstr "来自所有人的 %s 消息!"
@@ -197,16 +158,16 @@ msgid ""
"to confirm your email address.)"
msgstr "(您将收到一封邮件,包含了如何确认邮件地址的说明。)"
-#: ../lib/util.php:257 lib/util.php:273
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
#, php-format
msgid ""
-"**%%site.name%%** is a microblogging service brought to you by "
-"[%%site.broughtby%%](%%site.broughtbyurl%%). "
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
msgstr ""
-"**%%site.name%%** 是一个微博客服务,提供者为 "
-"[%%site.broughtby%%](%%site.broughtbyurl%%)。"
+"**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
+"broughtbyurl%%)。"
-#: ../lib/util.php:259 lib/util.php:275
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
#, php-format
msgid "**%%site.name%%** is a microblogging service. "
msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -217,6 +178,8 @@ msgstr "。贡献者应当有全名或昵称。"
#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
+#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
+#: lib/groupeditform.php:139
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
@@ -225,35 +188,42 @@ msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 到 64 个小写字母或数字,不包含标点及空白。此项必填。"
#: ../actions/password.php:42 actions/profilesettings.php:181
+#: actions/passwordsettings.php:102
msgid "6 or more characters"
msgstr "6 个或更多字符"
#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
+#: actions/recoverpassword.php:220
msgid "6 or more characters, and don't forget it!"
msgstr "6 个或更多字符,不能忘记!"
#: ../actions/register.php:154 actions/register.php:168
+#: actions/register.php:373
msgid "6 or more characters. Required."
msgstr "6 个或更多字符。此项必填。"
#: ../actions/imsettings.php:197 actions/imsettings.php:205
#, php-format
msgid ""
-"A confirmation code was sent to the IM address you added. You must approve "
-"%s for sending messages to you."
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
msgid ""
"A confirmation code was sent to the email address you added. Check your "
"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr "验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱),找到验证码并按要求使用它。"
+msgstr ""
+"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱),找到验证码并按要求"
+"使用它。"
#: ../actions/smssettings.php:216 actions/smssettings.php:224
msgid ""
"A confirmation code was sent to the phone number you added. Check your inbox "
"(and spam box!) for the code and instructions on how to use it."
-msgstr "验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱),找到验证码并按要求使用它。"
+msgstr ""
+"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱),找到验证码并按要求"
+"使用它。"
#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
@@ -265,7 +235,15 @@ msgstr "验证码已被发送到您新增的电话号码。请检查收件箱(
#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55
+#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
+#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
+#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
+#: actions/twitapihelp.php:44 actions/twitapilaconica.php:82
+#: actions/twitapilaconica.php:151 actions/twitapistatuses.php:79
+#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
+#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
+#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
+#: actions/twitapiusers.php:32
msgid "API method not found!"
msgstr "API 方法未实现!"
@@ -283,15 +261,21 @@ msgstr "API 方法未实现!"
#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690
+#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
+#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
+#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
+#: actions/twitapihelp.php:52 actions/twitapilaconica.php:172
+#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
+#: actions/twitapistatuses.php:562
msgid "API method under construction."
msgstr "API 方法尚未实现。"
-#: ../lib/util.php:324 lib/util.php:340
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
msgid "About"
msgstr "关于"
#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
+#: actions/userauthorization.php:143
msgid "Accept"
msgstr "接受"
@@ -299,38 +283,47 @@ msgstr "接受"
#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
#: actions/emailsettings.php:63 actions/imsettings.php:64
#: actions/openidsettings.php:58 actions/smssettings.php:71
-#: actions/twittersettings.php:85
+#: actions/twittersettings.php:85 actions/emailsettings.php:120
+#: actions/imsettings.php:127 actions/openidsettings.php:111
+#: actions/smssettings.php:133 actions/twittersettings.php:163
msgid "Add"
msgstr "添加"
#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
+#: actions/openidsettings.php:93
msgid "Add OpenID"
msgstr "添加 OpenID"
#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
+#: lib/accountsettingsaction.php:117
msgid "Add or remove OpenIDs"
msgstr "添加或移除 OpenID"
#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
#: ../actions/smssettings.php:39 actions/emailsettings.php:39
#: actions/imsettings.php:40 actions/smssettings.php:39
+#: actions/emailsettings.php:94 actions/imsettings.php:94
+#: actions/smssettings.php:92
msgid "Address"
msgstr "地址"
-#: ../actions/invite.php:131 actions/invite.php:139
+#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
msgid "Addresses of friends to invite (one per line)"
msgstr "要邀请的好友地址(每行一个)"
#: ../actions/showstream.php:273 actions/showstream.php:288
+#: actions/showstream.php:422
msgid "All subscriptions"
msgstr "所有订阅"
#: ../actions/publicrss.php:64 actions/publicrss.php:50
+#: actions/publicrss.php:92
#, php-format
msgid "All updates for %s"
msgstr "所有 %s 消息"
#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
+#: actions/noticesearchrss.php:90
#, php-format
msgid "All updates matching search term \"%s\""
msgstr "所有匹配搜索条件\"%s\"的消息"
@@ -339,18 +332,22 @@ msgstr "所有匹配搜索条件\"%s\"的消息"
#: ../actions/openidlogin.php:29 ../actions/register.php:30
#: actions/finishopenidlogin.php:29 actions/login.php:31
#: actions/openidlogin.php:29 actions/register.php:30
+#: actions/finishopenidlogin.php:34 actions/login.php:77
+#: actions/openidlogin.php:30 actions/register.php:92
msgid "Already logged in."
msgstr "已登录。"
-#: ../lib/subs.php:42 lib/subs.php:42
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
msgid "Already subscribed!."
msgstr "已订阅!"
#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
+#: actions/deletenotice.php:113
msgid "Are you sure you want to delete this notice?"
msgstr "确定要删除这条通告吗?"
#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
+#: actions/userauthorization.php:81
msgid "Authorize subscription"
msgstr "确认订阅"
@@ -361,16 +358,17 @@ msgstr "保持这台机器上的登录状态。不要在共用的机器上保持
#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
msgid ""
-"Automatically subscribe to whoever subscribes to me (best for "
-"non-humans)"
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
#: ../actions/avatar.php:32 ../lib/settingsaction.php:90
-#: actions/profilesettings.php:34
+#: actions/profilesettings.php:34 actions/avatarsettings.php:65
+#: actions/showgroup.php:209 lib/accountsettingsaction.php:107
msgid "Avatar"
msgstr "头像"
#: ../actions/avatar.php:113 actions/profilesettings.php:350
+#: actions/avatarsettings.php:395
msgid "Avatar updated."
msgstr "头像已更新。"
@@ -380,86 +378,98 @@ msgid ""
"Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
"message with further instructions. (Did you add %s to your buddy list?)"
msgstr ""
-""
-""
-""
-""
-"确认此地址。请查看您的Jabber/GTalk帐号是否收到了信息,其中包含了进一步的指示。(您必须预先将 %s 添加为好友,才能收到确认信息!)"
#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
msgid ""
"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
"a message with further instructions."
-msgstr "等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件,其中包含了进一步的指示。"
+msgstr ""
+"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件,其中包含了进一步的"
+"指示。"
#: ../actions/smssettings.php:58 actions/smssettings.php:58
+#: actions/smssettings.php:111
msgid "Awaiting confirmation on this phone number."
msgstr "等待确认此电话号码。"
#: ../lib/util.php:1318 lib/util.php:1452
+#, fuzzy
msgid "Before »"
msgstr "之前 »"
#: ../actions/profilesettings.php:49 ../actions/register.php:170
#: actions/profilesettings.php:82 actions/register.php:184
+#: actions/profilesettings.php:112 actions/register.php:402
msgid "Bio"
msgstr "个人小传"
#: ../actions/profilesettings.php:101 ../actions/register.php:82
#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
#: actions/register.php:89 actions/updateprofile.php:104
+#: actions/profilesettings.php:205 actions/register.php:174
+#: actions/updateprofile.php:107
msgid "Bio is too long (max 140 chars)."
msgstr "个人小传过长(不能超过140字符)。"
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41
+#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
msgid "Can't delete this notice."
msgstr "无法删除通告。"
#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
+#: actions/updateprofile.php:123
#, php-format
msgid "Can't read avatar URL '%s'"
msgstr "无法访问头像URL '%s'"
#: ../actions/password.php:85 ../actions/recoverpassword.php:300
#: actions/profilesettings.php:404 actions/recoverpassword.php:313
+#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
msgid "Can't save new password."
msgstr "无法保存新密码。"
#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
#: ../actions/smssettings.php:62 actions/emailsettings.php:58
#: actions/imsettings.php:59 actions/smssettings.php:62
+#: actions/emailsettings.php:111 actions/imsettings.php:114
+#: actions/smssettings.php:114
msgid "Cancel"
msgstr "取消"
-#: ../lib/openid.php:121 lib/openid.php:121
+#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
msgid "Cannot instantiate OpenID consumer object."
msgstr "无法创建 OpenID 用户对象。"
#: ../actions/imsettings.php:163 actions/imsettings.php:171
+#: actions/imsettings.php:286
msgid "Cannot normalize that Jabber ID"
msgstr "无法识别此Jabber ID"
#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
+#: actions/emailsettings.php:311
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
#: ../actions/password.php:45 actions/profilesettings.php:184
+#: actions/passwordsettings.php:110
msgid "Change"
msgstr "修改"
#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
+#: lib/accountsettingsaction.php:114
msgid "Change email handling"
msgstr "修改电子邮件"
#: ../actions/password.php:32 actions/profilesettings.php:36
+#: actions/passwordsettings.php:58
msgid "Change password"
msgstr "修改密码"
-#: ../lib/settingsaction.php:94
+#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
msgid "Change your password"
msgstr "修改密码"
#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
+#: lib/accountsettingsaction.php:105
msgid "Change your profile settings"
msgstr "修改您的个人信息"
@@ -467,24 +477,31 @@ msgstr "修改您的个人信息"
#: ../actions/register.php:155 ../actions/smssettings.php:65
#: actions/profilesettings.php:182 actions/recoverpassword.php:187
#: actions/register.php:169 actions/smssettings.php:65
+#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
+#: actions/register.php:376 actions/smssettings.php:122
msgid "Confirm"
msgstr "确认"
#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
+#: actions/confirmaddress.php:144
msgid "Confirm Address"
msgstr "确认地址"
#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
#: ../actions/smssettings.php:245 actions/emailsettings.php:256
#: actions/imsettings.php:230 actions/smssettings.php:253
+#: actions/emailsettings.php:379 actions/imsettings.php:361
+#: actions/smssettings.php:374
msgid "Confirmation cancelled."
msgstr "已取消确认。"
#: ../actions/smssettings.php:63 actions/smssettings.php:63
+#: actions/smssettings.php:118
msgid "Confirmation code"
msgstr "确认码"
#: ../actions/confirmaddress.php:38 actions/confirmaddress.php:38
+#: actions/confirmaddress.php:80
msgid "Confirmation code not found."
msgstr "未找到确认码。"
@@ -506,102 +523,68 @@ msgid ""
"\n"
"Thanks for signing up and we hope you enjoy using this service."
msgstr ""
-"祝贺您,%s!欢迎来到 "
-"%%%%site.name%%%%。在这里,您可以:\n"
-"\n"
-"* 转到[个人信息](%s)页面,发表第一条消息。\n"
-"* "
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-"["
-"J"
-"a"
-"b"
-"b"
-"e"
-"r"
-"/"
-"G"
-"T"
-"a"
-"l"
-"k"
-""
-""
-""
-""
-""
-""
-"]"
-"("
-"%"
-"%%%action.imsettings%%%%),以后通过即时通讯程序发布消息。\n* "
-"[搜索好友](%%%%action.peoplesearch%%%%)可以搜到您过去的好友或与您有共同爱好的人。\n* 更新您的[个人信息](%%%%action.profilesettings%%%%),添加更多内容。\n* 阅读[在线文档](%%%%doc.help%%%%),了解更多特性。\n\n感谢您注册帐号,希望您会喜欢这项服务。"
#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
+#: actions/finishopenidlogin.php:119 lib/action.php:330
msgid "Connect"
msgstr "连接"
#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
+#: actions/finishopenidlogin.php:114
msgid "Connect existing account"
msgstr "连接现有帐号"
-#: ../lib/util.php:332 lib/util.php:348
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
msgid "Contact"
msgstr "联系人"
-#: ../lib/openid.php:178 lib/openid.php:178
+#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
#, php-format
msgid "Could not create OpenID form: %s"
msgstr "无法创建 OpenID 表单:%s"
#: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
#: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
+#: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr "无法订阅用户:%s 已在订阅列表中。"
#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
+#: actions/twitapifriendships.php:41
msgid "Could not follow user: User not found."
msgstr "无法订阅用户:未找到。"
-#: ../lib/openid.php:160 lib/openid.php:160
+#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
#, php-format
msgid "Could not redirect to server: %s"
msgstr "无法重定向到服务器:%s"
#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
+#: actions/updateprofile.php:166
msgid "Could not save avatar info"
msgstr "无法保存头像"
#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
+#: actions/updateprofile.php:159
msgid "Could not save new profile info"
msgstr "无法保存个人信息"
-#: ../lib/subs.php:54 lib/subs.php:61
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
msgid "Could not subscribe other to you."
msgstr "无法订阅他人更新。"
-#: ../lib/subs.php:46 lib/subs.php:46
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
msgid "Could not subscribe."
msgstr "无法订阅。"
#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
+#: actions/recoverpassword.php:111
msgid "Could not update user with confirmed email address."
msgstr "无法更新已确认的电子邮件。"
#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101
+#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
msgid "Couldn't convert request tokens to access tokens."
msgstr "无法将请求标记转换为访问令牌。"
@@ -609,43 +592,52 @@ msgstr "无法将请求标记转换为访问令牌。"
#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
#: actions/confirmaddress.php:84 actions/emailsettings.php:252
#: actions/imsettings.php:226 actions/smssettings.php:249
+#: actions/confirmaddress.php:126 actions/emailsettings.php:375
+#: actions/imsettings.php:357 actions/smssettings.php:370
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
-#: ../lib/subs.php:103 lib/subs.php:116
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
msgid "Couldn't delete subscription."
msgstr "无法删除订阅。"
#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
+#: actions/twitapistatuses.php:84
msgid "Couldn't find any statuses."
msgstr "找不到任何信息。"
#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
+#: actions/remotesubscribe.php:178
msgid "Couldn't get a request token."
msgstr "无法获得一份请求标记。"
#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
#: ../actions/smssettings.php:206 actions/emailsettings.php:223
#: actions/imsettings.php:195 actions/smssettings.php:214
+#: actions/emailsettings.php:337 actions/imsettings.php:311
+#: actions/smssettings.php:325
msgid "Couldn't insert confirmation code."
msgstr "无法插入验证码。"
#: ../actions/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182
+#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
msgid "Couldn't insert new subscription."
msgstr "无法添加新的订阅。"
#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
+#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
msgid "Couldn't save profile."
msgstr "无法保存个人信息。"
#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
+#: actions/profilesettings.php:279
msgid "Couldn't update user for autosubscribe."
msgstr "无法更新用户的自动订阅选项。"
#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
#: actions/emailsettings.php:298 actions/emailsettings.php:312
+#: actions/emailsettings.php:440 actions/emailsettings.php:462
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
@@ -657,34 +649,46 @@ msgstr "无法更新用户记录。"
#: actions/emailsettings.php:277 actions/imsettings.php:146
#: actions/imsettings.php:251 actions/profilesettings.php:256
#: actions/smssettings.php:165 actions/smssettings.php:277
+#: actions/confirmaddress.php:114 actions/emailsettings.php:280
+#: actions/emailsettings.php:411 actions/imsettings.php:252
+#: actions/imsettings.php:395 actions/othersettings.php:162
+#: actions/profilesettings.php:259 actions/smssettings.php:266
+#: actions/smssettings.php:408
msgid "Couldn't update user."
msgstr "无法更新用户。"
#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
+#: actions/finishopenidlogin.php:112
msgid "Create"
msgstr "创建"
#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
+#: actions/finishopenidlogin.php:98
msgid "Create a new user with this nickname."
msgstr "创建使用此昵称的新用户。"
#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
+#: actions/finishopenidlogin.php:96
msgid "Create new account"
msgstr "创建新帐号"
#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
+#: actions/finishopenidlogin.php:231
msgid "Creating new account for OpenID that already has a user."
msgstr "为 OpenID 用户产生新的帐号。"
#: ../actions/imsettings.php:45 actions/imsettings.php:46
+#: actions/imsettings.php:100
msgid "Current confirmed Jabber/GTalk address."
msgstr "已确认的Jabber/GTalk帐号。"
#: ../actions/smssettings.php:46 actions/smssettings.php:46
+#: actions/smssettings.php:100
msgid "Current confirmed SMS-enabled phone number."
msgstr "已确认的可以发送SMS短消息的电话号码。"
#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
+#: actions/emailsettings.php:99
msgid "Current confirmed email address."
msgstr "已确认的电子邮件。"
@@ -692,164 +696,186 @@ msgstr "已确认的电子邮件。"
msgid "Currently"
msgstr "目前"
-#: ../classes/Notice.php:72 classes/Notice.php:86
+#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
#, php-format
msgid "DB error inserting hashtag: %s"
msgstr "添加标签时数据库出错:%s"
-#: ../lib/util.php:1061 lib/util.php:1110
+#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
#, php-format
msgid "DB error inserting reply: %s"
msgstr "添加回复时数据库出错:%s"
#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
+#: actions/deletenotice.php:79
msgid "Delete notice"
msgstr "删除通告"
#: ../actions/profilesettings.php:51 ../actions/register.php:172
#: actions/profilesettings.php:84 actions/register.php:186
+#: actions/profilesettings.php:114
msgid "Describe yourself and your interests in 140 chars"
msgstr "用不超过140个字符描述您自己和您的爱好"
#: ../actions/register.php:158 ../actions/register.php:161
#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87
+#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
+#: actions/register.php:385 lib/accountsettingsaction.php:113
msgid "Email"
msgstr "电子邮件"
#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
+#: actions/emailsettings.php:115
msgid "Email Address"
msgstr "电子邮件地址"
#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
+#: actions/emailsettings.php:60
msgid "Email Settings"
msgstr "电子邮件设置"
-#: ../actions/register.php:73 actions/register.php:80
+#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
msgid "Email address already exists."
msgstr "电子邮件地址已存在。"
-#: ../lib/mail.php:90 lib/mail.php:90
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
msgid "Email address confirmation"
msgstr "电子邮件地址确认"
#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
+#: actions/emailsettings.php:117
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件,类似 \"UserName@example.org\""
-#: ../actions/invite.php:129 actions/invite.php:137
+#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
msgid "Email addresses"
msgstr "电子邮件地址"
#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:231
msgid "Enter a nickname or email address."
msgstr "输入昵称或电子邮件。"
#: ../actions/smssettings.php:64 actions/smssettings.php:64
+#: actions/smssettings.php:119
msgid "Enter the code you received on your phone."
msgstr "输入手机收到的验证码。"
#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
+#: actions/userauthorization.php:161
msgid "Error authorizing token"
msgstr "无法认证令牌"
#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
+#: actions/finishopenidlogin.php:297
msgid "Error connecting user to OpenID."
msgstr "无法将用户与 OpenID 连接。"
#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
+#: actions/finishaddopenid.php:126
msgid "Error connecting user."
msgstr "无法连接用户。"
#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153
+#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
msgid "Error inserting avatar"
msgstr "添加头像出错"
#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145
+#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
msgid "Error inserting new profile"
msgstr "添加个人信息出错"
#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169
+#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
msgid "Error inserting remote profile"
msgstr "添加远程的个人信息出错"
#: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
+#: actions/recoverpassword.php:280
msgid "Error saving address confirmation."
msgstr "保存地址确认时出错。"
#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
+#: actions/userauthorization.php:164
msgid "Error saving remote profile"
msgstr "保存远程的个人信息时出错"
-#: ../lib/openid.php:226 lib/openid.php:226
+#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
msgid "Error saving the profile."
msgstr "保存个人信息时出错。"
-#: ../lib/openid.php:237 lib/openid.php:237
+#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
msgid "Error saving the user."
msgstr "保存用户时出错。"
#: ../actions/password.php:80 actions/profilesettings.php:399
+#: actions/passwordsettings.php:164
msgid "Error saving user; invalid."
msgstr "保存用户时出错;不正确。"
#: ../actions/login.php:47 ../actions/login.php:73
#: ../actions/recoverpassword.php:307 ../actions/register.php:98
#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108
+#: actions/register.php:108 actions/login.php:112 actions/login.php:138
+#: actions/recoverpassword.php:354 actions/register.php:198
msgid "Error setting user."
msgstr "保存用户设置时出错。"
#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
+#: actions/finishaddopenid.php:131
msgid "Error updating profile"
msgstr "更新个人信息时出错"
#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163
+#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
msgid "Error updating remote profile"
msgstr "更新远程的个人信息时出错"
#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
+#: actions/recoverpassword.php:86
msgid "Error with confirmation code."
msgstr "验证码出错。"
#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
+#: actions/finishopenidlogin.php:117
msgid "Existing nickname"
msgstr "昵称已被使用"
-#: ../lib/util.php:326 lib/util.php:342
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
msgid "FAQ"
msgstr "常见问题FAQ"
#: ../actions/avatar.php:115 actions/profilesettings.php:352
+#: actions/avatarsettings.php:397
msgid "Failed updating avatar."
msgstr "更新头像失败。"
#: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64
+#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
#, php-format
msgid "Feed for friends of %s"
msgstr "%s 好友的聚合"
#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66
+#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
+#: actions/repliesrss.php:71
#, php-format
msgid "Feed for replies to %s"
msgstr "%s 回复的聚合"
-#: ../actions/tag.php:55 actions/tag.php:55
+#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
#, php-format
msgid "Feed for tag %s"
msgstr "%s 标签的聚合"
#: ../lib/searchaction.php:105 lib/searchaction.php:105
+#: lib/searchgroupnav.php:83
msgid "Find content of notices"
msgstr "搜索通告内容"
#: ../lib/searchaction.php:101 lib/searchaction.php:101
+#: lib/searchgroupnav.php:81
msgid "Find people on this site"
msgstr "搜索用户信息"
@@ -861,50 +887,66 @@ msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
#: ../actions/profilesettings.php:44 ../actions/register.php:164
#: actions/profilesettings.php:77 actions/register.php:178
+#: actions/profilesettings.php:103 actions/register.php:391
+#: actions/showgroup.php:235 actions/showstream.php:262
+#: actions/tagother.php:105 lib/groupeditform.php:142
msgid "Full name"
msgstr "全名"
#: ../actions/profilesettings.php:98 ../actions/register.php:79
#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
#: actions/register.php:86 actions/updateprofile.php:94
+#: actions/editgroup.php:195 actions/newgroup.php:146
+#: actions/profilesettings.php:202 actions/register.php:171
+#: actions/updateprofile.php:97
msgid "Full name is too long (max 255 chars)."
msgstr "全名过长(不能超过 255 个字符)。"
-#: ../lib/util.php:322 lib/util.php:338
+#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
msgid "Help"
msgstr "帮助"
-#: ../lib/util.php:298 lib/util.php:314
+#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
+#: lib/facebookaction.php:200
msgid "Home"
msgstr "主页"
#: ../actions/profilesettings.php:46 ../actions/register.php:167
#: actions/profilesettings.php:79 actions/register.php:181
+#: actions/profilesettings.php:107 actions/register.php:396
+#: lib/groupeditform.php:146
msgid "Homepage"
msgstr "主页"
#: ../actions/profilesettings.php:95 ../actions/register.php:76
#: actions/profilesettings.php:210 actions/register.php:83
+#: actions/editgroup.php:192 actions/newgroup.php:143
+#: actions/profilesettings.php:199 actions/register.php:168
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
+#: actions/emailsettings.php:173
msgid "I want to post notices by email."
msgstr "我希望通过邮件发布信息。"
#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
+#: lib/connectsettingsaction.php:104
msgid "IM"
msgstr "即时通讯IM"
#: ../actions/imsettings.php:60 actions/imsettings.php:61
+#: actions/imsettings.php:118
msgid "IM Address"
msgstr "IM 帐号"
#: ../actions/imsettings.php:33 actions/imsettings.php:33
+#: actions/imsettings.php:59
msgid "IM Settings"
msgstr "IM 设置"
#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
+#: actions/finishopenidlogin.php:116
msgid ""
"If you already have an account, login with your username and password to "
"connect it to your OpenID."
@@ -924,18 +966,22 @@ msgstr "如果您忘记了密码,可以使用此邮箱收到新的密码。"
#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
#: actions/emailsettings.php:68 actions/smssettings.php:76
+#: actions/emailsettings.php:127 actions/smssettings.php:140
msgid "Incoming email"
msgstr "发布用的电子邮件"
#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
+#: actions/emailsettings.php:443
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被移除。"
#: ../actions/password.php:69 actions/profilesettings.php:388
+#: actions/passwordsettings.php:153
msgid "Incorrect old password"
msgstr "旧密码不正确"
-#: ../actions/login.php:67 actions/login.php:67
+#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
+#: actions/login.php:132
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
@@ -946,89 +992,102 @@ msgid ""
msgstr "恢复密码的指示已被发送到您的注册邮箱。"
#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
+#: actions/updateprofile.php:118
#, php-format
msgid "Invalid avatar URL '%s'"
msgstr "头像URL '%s'不正确"
-#: ../actions/invite.php:55 actions/invite.php:62
+#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
#, php-format
msgid "Invalid email address: %s"
msgstr "电子邮件地址 %s 不正确"
#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
+#: actions/updateprofile.php:102
#, php-format
msgid "Invalid homepage '%s'"
msgstr "主页'%s'不正确"
#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
+#: actions/updateprofile.php:86
#, php-format
msgid "Invalid license URL '%s'"
msgstr "授权方式URL '%s'不正确"
#: ../actions/postnotice.php:61 actions/postnotice.php:62
+#: actions/postnotice.php:66
msgid "Invalid notice content"
msgstr "通告内容不正确"
#: ../actions/postnotice.php:67 actions/postnotice.php:68
+#: actions/postnotice.php:72
msgid "Invalid notice uri"
msgstr "通告URI不正确"
#: ../actions/postnotice.php:72 actions/postnotice.php:73
+#: actions/postnotice.php:77
msgid "Invalid notice url"
msgstr "通告URL不正确"
#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
+#: actions/updateprofile.php:91
#, php-format
msgid "Invalid profile URL '%s'."
msgstr "个人信息URL '%s'不正确。"
#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:135
msgid "Invalid profile URL (bad format)"
msgstr "个人信息URL不正确(格式错误)"
#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79
+#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
msgid "Invalid profile URL returned by server."
msgstr "服务器返回的个人信息URL不正确。"
#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
+#: actions/avatarbynickname.php:69
msgid "Invalid size."
msgstr "大小不正确。"
#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
#: ../actions/register.php:111 actions/finishopenidlogin.php:241
#: actions/register.php:103 actions/register.php:121
+#: actions/finishopenidlogin.php:279 actions/register.php:193
+#: actions/register.php:211
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
-#: ../actions/invite.php:79 actions/invite.php:86
+#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
msgid "Invitation(s) sent"
msgstr "已发送邀请"
-#: ../actions/invite.php:97 actions/invite.php:104
+#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
msgid "Invitation(s) sent to the following people:"
msgstr "已发送邀请给这些人:"
-#: ../lib/util.php:306 lib/util.php:322
+#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
+#: lib/subgroupnav.php:103
msgid "Invite"
msgstr "邀请"
-#: ../actions/invite.php:123 actions/invite.php:130
+#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
msgid "Invite new users"
msgstr "邀请新用户"
-#: ../lib/util.php:261 lib/util.php:277
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
#, php-format
msgid ""
-"It runs the [Laconica](http://laconi.ca/) microblogging software, version "
-"%s, available under the [GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)."
+"It runs the [Laconica](http://laconi.ca/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
msgstr ""
-"它运行[Laconica](http://laconi.ca/)微博客服务,版本 "
-"%s,采用[GNU Affero General Public "
-"License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
+"它运行[Laconica](http://laconi.ca/)微博客服务,版本 %s,采用[GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"授权。"
#: ../actions/imsettings.php:173 actions/imsettings.php:181
+#: actions/imsettings.php:296
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID 属于另一用户。"
@@ -1038,35 +1097,49 @@ msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
"add %s to your buddy list in your IM client or on GTalk."
msgstr ""
-"Jabber 或 GTalk "
-"帐号,类似\"UserName@example.org\"。首先,必须在即时聊天工具或GTalk中将 %s 加为好友。"
+"Jabber 或 GTalk 帐号,类似\"UserName@example.org\"。首先,必须在即时聊天工具"
+"或GTalk中将 %s 加为好友。"
#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:128
msgid "Language"
msgstr "语言"
#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
+#: actions/profilesettings.php:217
msgid "Language is too long (max 50 chars)."
msgstr "语言过长(不能超过50个字符)。"
#: ../actions/profilesettings.php:52 ../actions/register.php:173
#: actions/profilesettings.php:85 actions/register.php:187
+#: actions/profilesettings.php:117 actions/register.php:408
+#: actions/showgroup.php:244 actions/showstream.php:271
+#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
+#: lib/profilelist.php:125
msgid "Location"
msgstr "位置"
#: ../actions/profilesettings.php:104 ../actions/register.php:85
#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
#: actions/register.php:92 actions/updateprofile.php:109
+#: actions/editgroup.php:201 actions/newgroup.php:152
+#: actions/profilesettings.php:208 actions/register.php:177
+#: actions/updateprofile.php:112
msgid "Location is too long (max 255 chars)."
msgstr "位置过长(不能超过255个字符)。"
#: ../actions/login.php:97 ../actions/login.php:106
#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
+#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
+#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75
+#, php-format
msgid "Login"
msgstr "登录"
#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
+#: actions/openidlogin.php:62
#, php-format
msgid "Login with an [OpenID](%%doc.openid%%) account."
msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
@@ -1074,34 +1147,22 @@ msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
#: ../actions/login.php:126
#, php-format
msgid ""
-"Login with your username and password. Don't have a username yet? "
-"[Register](%%action.register%%) a new account, or try "
-"[OpenID](%%action.openidlogin%%). "
-msgstr ""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-""
-"和密码登录。没有用户名?[注册](%%action.register%%)新帐号,或者使用[OpenID](%%action.openidlogin%%)。"
-
-#: ../lib/util.php:308 lib/util.php:324
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
+"%). "
+msgstr ""
+
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
msgid "Logout"
msgstr "登出"
#: ../actions/register.php:166 actions/register.php:180
+#: actions/register.php:393
msgid "Longer name, preferably your \"real\" name"
msgstr "长名字,最好是“实名”"
-#: ../actions/login.php:110 actions/login.php:110
+#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
+#: lib/facebookaction.php:320
msgid "Lost or forgotten password?"
msgstr "忘记了密码?"
@@ -1111,15 +1172,17 @@ msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布信息;取消旧的。"
#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
+#: actions/emailsettings.php:71
#, php-format
msgid "Manage how you get email from %%site.name%%."
msgstr "设置 %%site.name%% 发送的邮件。"
#: ../actions/showstream.php:300 actions/showstream.php:315
+#: actions/showstream.php:480
msgid "Member since"
msgstr "注册于"
-#: ../actions/userrss.php:70 actions/userrss.php:67
+#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
#, php-format
msgid "Microblog by %s"
msgstr "%s 的微博客服务"
@@ -1129,37 +1192,45 @@ msgstr "%s 的微博客服务"
msgid ""
"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
"email but isn't listed here, send email to let us know at %s."
-msgstr "电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信,而这里尚未列出,请联系 %s 以告知。"
+msgstr ""
+"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信,而这里尚未列出,请联"
+"系 %s 以告知。"
#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
#: actions/finishopenidlogin.php:85 actions/register.php:202
+#: actions/finishopenidlogin.php:107 actions/register.php:429
msgid "My text and files are available under "
msgstr "我的文字和文件采用的授权方式为"
#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
#: actions/emailsettings.php:83 actions/smssettings.php:91
+#: actions/emailsettings.php:142 actions/smssettings.php:152
msgid "New"
msgstr "新建"
-#: ../lib/mail.php:144 lib/mail.php:144
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
#, php-format
msgid "New email address for posting to %s"
msgstr "新的电子邮件地址,用于发布 %s 信息"
#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
+#: actions/emailsettings.php:465
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
+#: actions/finishopenidlogin.php:99
msgid "New nickname"
msgstr "新昵称"
#: ../actions/newnotice.php:87 actions/newnotice.php:96
+#: actions/newnotice.php:68
msgid "New notice"
msgstr "新通告"
#: ../actions/password.php:41 ../actions/recoverpassword.php:179
#: actions/profilesettings.php:180 actions/recoverpassword.php:185
+#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
msgid "New password"
msgstr "新密码"
@@ -1170,12 +1241,19 @@ msgstr "新密码已保存,您现在已登录。"
#: ../actions/login.php:101 ../actions/profilesettings.php:41
#: ../actions/register.php:151 actions/login.php:101
#: actions/profilesettings.php:74 actions/register.php:165
+#: actions/login.php:228 actions/profilesettings.php:98
+#: actions/register.php:367 actions/showgroup.php:224
+#: actions/showstream.php:251 actions/tagother.php:95
+#: lib/facebookaction.php:308 lib/groupeditform.php:137
msgid "Nickname"
msgstr "昵称"
#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
#: ../actions/register.php:69 actions/finishopenidlogin.php:181
#: actions/profilesettings.php:225 actions/register.php:76
+#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
+#: actions/newgroup.php:134 actions/profilesettings.php:214
+#: actions/register.php:159
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
@@ -1183,131 +1261,160 @@ msgstr "昵称已被使用,换一个吧。"
#: ../actions/register.php:67 ../actions/updateprofile.php:77
#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
#: actions/register.php:74 actions/updateprofile.php:78
+#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
+#: actions/updateprofile.php:81
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字,不包含空格。"
#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
+#: actions/finishopenidlogin.php:210
msgid "Nickname not allowed."
msgstr "不允许的昵称。"
#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
+#: actions/remotesubscribe.php:106
msgid "Nickname of the user you want to follow"
msgstr "希望订阅的用户的昵称"
#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
+#: actions/recoverpassword.php:186
msgid "Nickname or email"
msgstr "昵称或电子邮件"
#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
+#: actions/block.php:147 actions/deletenotice.php:118
msgid "No"
msgstr "否"
#: ../actions/imsettings.php:156 actions/imsettings.php:164
+#: actions/imsettings.php:279
msgid "No Jabber ID."
msgstr "没有 Jabber ID。"
#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
+#: actions/userauthorization.php:153
msgid "No authorization request!"
msgstr "未收到认证请求!"
#: ../actions/smssettings.php:181 actions/smssettings.php:189
+#: actions/smssettings.php:299
msgid "No carrier selected."
msgstr "未选择运营商。"
#: ../actions/smssettings.php:316 actions/smssettings.php:324
+#: actions/smssettings.php:486
msgid "No code entered"
msgstr "没有输入验证码"
#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
+#: actions/confirmaddress.php:75
msgid "No confirmation code."
msgstr "没有验证码"
#: ../actions/newnotice.php:44 actions/newmessage.php:53
-#: actions/newnotice.php:44 classes/Command.php:197
+#: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
+#: actions/newnotice.php:126 classes/Command.php:223
msgid "No content!"
msgstr "没有内容!"
#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
+#: actions/emailsettings.php:304
msgid "No email address."
msgstr "没有电子邮件地址。"
-#: ../actions/userbyid.php:32 actions/userbyid.php:32
+#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
msgid "No id."
msgstr "没有 id。"
#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
+#: actions/emailsettings.php:430
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67
+#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
msgid "No nickname provided by remote server."
msgstr "远程服务器没有昵称。"
#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
msgid "No nickname."
msgstr "没有昵称。"
#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
#: ../actions/smssettings.php:229 actions/emailsettings.php:240
#: actions/imsettings.php:214 actions/smssettings.php:237
+#: actions/emailsettings.php:363 actions/imsettings.php:345
+#: actions/smssettings.php:358
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
#: ../actions/smssettings.php:176 actions/smssettings.php:184
+#: actions/smssettings.php:294
msgid "No phone number."
msgstr "没有电话号码。"
#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74
+#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
msgid "No profile URL returned by server."
msgstr "服务器没有返回个人信息URL。"
#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
+#: actions/recoverpassword.php:266
msgid "No registered email address for that user."
msgstr "用户没有注册电子邮件。"
#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
+#: actions/userauthorization.php:57
msgid "No request found!"
msgstr "没有找到请求!"
#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
#: actions/noticesearch.php:69 actions/peoplesearch.php:69
+#: actions/groupsearch.php:81 actions/noticesearch.php:104
+#: actions/peoplesearch.php:85
msgid "No results"
msgstr "没有结果"
#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
+#: actions/avatarbynickname.php:64
msgid "No size."
msgstr "没有大小。"
#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520
+#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
+#: actions/twitapistatuses.php:446
msgid "No status found with that ID."
msgstr "没有找到此ID的信息。"
#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
+#: actions/twitapistatuses.php:418
msgid "No status with that ID found."
msgstr "没有找到此ID的信息。"
#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
+#: actions/openidsettings.php:222
msgid "No such OpenID."
msgstr "没有这个 OpenID。"
-#: ../actions/doc.php:29 actions/doc.php:29
+#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
msgid "No such document."
msgstr "没有这份文档。"
#: ../actions/shownotice.php:32 ../actions/shownotice.php:83
#: ../lib/deleteaction.php:30 actions/shownotice.php:32
-#: actions/shownotice.php:83 lib/deleteaction.php:30
+#: actions/shownotice.php:83 lib/deleteaction.php:30 actions/shownotice.php:87
+#: lib/deleteaction.php:51
msgid "No such notice."
msgstr "没有这份通告。"
#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
+#: actions/recoverpassword.php:62
msgid "No such recovery code."
msgstr "没有这个恢复码。"
#: ../actions/postnotice.php:56 actions/postnotice.php:57
+#: actions/postnotice.php:60
msgid "No such subscription"
msgstr "没有这个订阅"
@@ -1326,11 +1433,21 @@ msgstr "没有这个订阅"
#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95
+#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
+#: actions/foaf.php:41 actions/remotesubscribe.php:123
+#: actions/remotesubscribe.php:130 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/showstream.php:100 actions/userbyid.php:74
+#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
+#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
+#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
+#: lib/subs.php:34 lib/subs.php:109
msgid "No such user."
msgstr "没有这个用户。"
#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
+#: actions/recoverpassword.php:251
msgid "No user with that email address or username."
msgstr "没有拥有这个用户名或电子邮件的用户。"
@@ -1339,67 +1456,79 @@ msgid "Nobody to show!"
msgstr "不显示任何人!"
#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
+#: actions/recoverpassword.php:66
msgid "Not a recovery code."
msgstr "不是恢复码。"
#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
+#: scripts/maildaemon.php:53
msgid "Not a registered user."
msgstr "不是已注册用户。"
#: ../lib/twitterapi.php:226 ../lib/twitterapi.php:247
#: ../lib/twitterapi.php:332 lib/twitterapi.php:391 lib/twitterapi.php:418
-#: lib/twitterapi.php:502
+#: lib/twitterapi.php:502 lib/twitterapi.php:448 lib/twitterapi.php:476
+#: lib/twitterapi.php:566
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
#: ../actions/imsettings.php:167 actions/imsettings.php:175
+#: actions/imsettings.php:290
msgid "Not a valid Jabber ID"
msgstr "不是有效的 Jabber ID"
-#: ../lib/openid.php:131 lib/openid.php:131
+#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
msgid "Not a valid OpenID."
msgstr "不是有效的 OpenID。"
#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
+#: actions/emailsettings.php:315
msgid "Not a valid email address"
msgstr "不是有效的电子邮件"
-#: ../actions/register.php:63 actions/register.php:70
+#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
#: ../actions/profilesettings.php:91 ../actions/register.php:71
#: actions/profilesettings.php:206 actions/register.php:78
+#: actions/editgroup.php:186 actions/newgroup.php:137
+#: actions/profilesettings.php:195 actions/register.php:161
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
+#: actions/remotesubscribe.php:159
msgid "Not a valid profile URL (incorrect services)."
msgstr "不是有效的个人信息URL(不正确的服务)。"
#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
+#: actions/remotesubscribe.php:152
msgid "Not a valid profile URL (no XRDS defined)."
msgstr "不是有效的个人信息URL(未定义XRDS)。"
#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
+#: actions/remotesubscribe.php:143
msgid "Not a valid profile URL (no YADIS document)."
msgstr "不是有效的个人信息URL(没有YADIS数据)。"
#: ../actions/avatar.php:95 actions/profilesettings.php:332
+#: lib/imagefile.php:87
msgid "Not an image or corrupt file."
msgstr "不是图片文件或文件已损坏。"
#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53
+#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
msgid "Not authorized."
msgstr "未认证。"
#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38
+#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
msgid "Not expecting this response!"
msgstr "未预料的响应!"
#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
+#: actions/twitapistatuses.php:309
msgid "Not found"
msgstr "未找到"
@@ -1410,144 +1539,175 @@ msgstr "未找到"
#: actions/finishaddopenid.php:29 actions/logout.php:33
#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
#: actions/unsubscribe.php:25 lib/deleteaction.php:38
-#: lib/settingsaction.php:27
+#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
+#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
+#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
+#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
+#: actions/unsubscribe.php:27 lib/deleteaction.php:66
+#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
-#: ../lib/subs.php:91 lib/subs.php:104
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
msgid "Not subscribed!."
msgstr "未订阅!"
#: ../actions/opensearch.php:35 actions/opensearch.php:35
+#: actions/opensearch.php:67
msgid "Notice Search"
msgstr "搜索通告"
#: ../actions/showstream.php:82 actions/showstream.php:82
+#: actions/showstream.php:180 actions/showstream.php:187
+#: actions/showstream.php:192
#, php-format
msgid "Notice feed for %s"
msgstr "%s 的通告聚合"
#: ../actions/shownotice.php:39 actions/shownotice.php:39
+#: actions/shownotice.php:94
msgid "Notice has no profile"
msgstr "通告没有关联个人信息"
#: ../actions/showstream.php:316 actions/showstream.php:331
+#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
+#: lib/noticelist.php:87
msgid "Notices"
msgstr "通告"
#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81
+#: actions/tag.php:81 actions/tag.php:41
#, php-format
msgid "Notices tagged with %s"
msgstr "带 %s 标签的通告"
#: ../actions/password.php:39 actions/profilesettings.php:178
+#: actions/passwordsettings.php:97
msgid "Old password"
msgstr "旧密码"
#: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
-#: lib/util.php:330
+#: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
+#: lib/logingroupnav.php:81
msgid "OpenID"
msgstr "OpenID"
#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
+#: actions/finishopenidlogin.php:73
msgid "OpenID Account Setup"
msgstr "OpenID 帐号设置"
-#: ../lib/openid.php:180 lib/openid.php:180
+#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
msgid "OpenID Auto-Submit"
msgstr "OpenID 自动提交"
#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
+#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
msgid "OpenID Login"
msgstr "OpenID 登录"
#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
#: actions/openidlogin.php:74 actions/openidsettings.php:50
+#: actions/openidlogin.php:102 actions/openidsettings.php:101
msgid "OpenID URL"
msgstr "OpenID URL"
#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
+#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
msgid "OpenID authentication cancelled."
msgstr "OpenID 认证已取消。"
#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
+#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
#, php-format
msgid "OpenID authentication failed: %s"
msgstr "OpenID 认证失败:%s"
-#: ../lib/openid.php:133 lib/openid.php:133
+#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
#, php-format
msgid "OpenID failure: %s"
msgstr "OpenID 失败:%s"
#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
+#: actions/openidsettings.php:231
msgid "OpenID removed."
msgstr "OpenID 已移除。"
#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
+#: actions/openidsettings.php:59
msgid "OpenID settings"
msgstr "OpenID 设置"
-#: ../actions/invite.php:135 actions/invite.php:143
+#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
msgid "Optionally add a personal message to the invitation."
msgstr "在邀请中加几句话(可选)。"
#: ../actions/avatar.php:84 actions/profilesettings.php:321
+#: lib/imagefile.php:75
msgid "Partial upload."
msgstr "部分上传。"
#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
#: ../actions/register.php:153 ../lib/settingsaction.php:93
#: actions/finishopenidlogin.php:96 actions/login.php:102
-#: actions/register.php:167
+#: actions/register.php:167 actions/finishopenidlogin.php:118
+#: actions/login.php:231 actions/register.php:372
+#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
msgid "Password"
msgstr "密码"
#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
+#: actions/recoverpassword.php:335
msgid "Password and confirmation do not match."
msgstr "密码和确认不匹配。"
#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
+#: actions/recoverpassword.php:331
msgid "Password must be 6 chars or more."
msgstr "密码必须是 6 个字符或更多。"
#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
msgid "Password recovery requested"
msgstr "请求恢复密码"
#: ../actions/password.php:89 ../actions/recoverpassword.php:313
#: actions/profilesettings.php:408 actions/recoverpassword.php:326
+#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
msgid "Password saved."
msgstr "密码已保存。"
#: ../actions/password.php:61 ../actions/register.php:88
#: actions/profilesettings.php:380 actions/register.php:98
+#: actions/passwordsettings.php:145 actions/register.php:183
msgid "Passwords don't match."
msgstr "密码不匹配。"
#: ../lib/searchaction.php:100 lib/searchaction.php:100
+#: lib/searchgroupnav.php:80
msgid "People"
msgstr "用户"
#: ../actions/opensearch.php:33 actions/opensearch.php:33
+#: actions/opensearch.php:64
msgid "People Search"
msgstr "搜索用户"
#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
+#: actions/peoplesearch.php:58
msgid "People search"
msgstr "搜索用户"
-#: ../lib/stream.php:50 lib/personal.php:50
+#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
msgid "Personal"
msgstr "个人"
-#: ../actions/invite.php:133 actions/invite.php:141
+#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
msgid "Personal message"
msgstr "个人消息"
@@ -1560,69 +1720,84 @@ msgid ""
"Please check these details to make sure that you want to subscribe to this "
"user's notices. If you didn't just ask to subscribe to someone's notices, "
"click \"Cancel\"."
-msgstr "请检查详细信息,确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通告,请点击\"取消\"。"
+msgstr ""
+"请检查详细信息,确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
+"告,请点击\"取消\"。"
#: ../actions/imsettings.php:73 actions/imsettings.php:74
+#: actions/imsettings.php:142
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
#: ../actions/smssettings.php:94 actions/emailsettings.php:86
#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70
+#: actions/twittersettings.php:70 actions/emailsettings.php:147
+#: actions/imsettings.php:133 actions/smssettings.php:157
+#: actions/twittersettings.php:134
msgid "Preferences"
msgstr "首选项"
#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
#: ../actions/smssettings.php:163 actions/emailsettings.php:180
#: actions/imsettings.php:152 actions/smssettings.php:171
+#: actions/emailsettings.php:286 actions/imsettings.php:258
+#: actions/othersettings.php:168 actions/smssettings.php:272
msgid "Preferences saved."
msgstr "首选项已保存。"
#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
+#: actions/profilesettings.php:129
msgid "Preferred language"
msgstr "首选语言"
-#: ../lib/util.php:328 lib/util.php:344
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
msgid "Privacy"
msgstr "隐私"
#: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
-#: classes/Notice.php:119
+#: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
msgid "Problem saving notice."
msgstr "保存通告时出错。"
#: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
-#: lib/settingsaction.php:84
+#: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
+#: lib/personalgroupnav.php:108
msgid "Profile"
msgstr "个人信息"
#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
+#: actions/remotesubscribe.php:109
msgid "Profile URL"
msgstr "个人信息URL"
#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
+#: actions/profilesettings.php:58
msgid "Profile settings"
msgstr "个人设置"
#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
#: actions/postnotice.php:52 actions/updateprofile.php:53
+#: actions/postnotice.php:55 actions/updateprofile.php:56
msgid "Profile unknown"
msgstr "未知的帐号"
-#: ../actions/public.php:54 actions/public.php:54
+#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
msgid "Public Stream Feed"
msgstr "公开的聚合"
-#: ../actions/public.php:33 actions/public.php:33
+#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
+#: lib/publicgroupnav.php:77
msgid "Public timeline"
msgstr "公开的时间表"
#: ../actions/imsettings.php:79 actions/imsettings.php:80
+#: actions/imsettings.php:153
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "公开Jabber/GTalk帐号的 MicroID。"
#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
+#: actions/emailsettings.php:178
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
@@ -1632,44 +1807,55 @@ msgid "Recent Tags"
msgstr "最近的标签"
#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
+#: actions/recoverpassword.php:190
msgid "Recover"
msgstr "恢复"
#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
+#: actions/recoverpassword.php:198
msgid "Recover password"
msgstr "恢复密码"
#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
+#: actions/recoverpassword.php:73
msgid "Recovery code for unknown user."
msgstr "恢复码未知"
#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
#: actions/register.php:152 actions/register.php:207 lib/util.php:328
+#: actions/register.php:69 actions/register.php:436 lib/action.php:338
+#: lib/facebookaction.php:277 lib/logingroupnav.php:78
msgid "Register"
msgstr "注册"
#: ../actions/register.php:28 actions/register.php:28
+#: actions/finishopenidlogin.php:196 actions/register.php:90
msgid "Registration not allowed."
msgstr "不允许注册。"
#: ../actions/register.php:200 actions/register.php:214
+#: actions/register.php:67
msgid "Registration successful"
msgstr "注册成功。"
#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
+#: actions/userauthorization.php:144
msgid "Reject"
msgstr "拒绝"
#: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
-#: actions/register.php:190
+#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
+#: actions/register.php:414
msgid "Remember me"
msgstr "记住登录状态"
#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
+#: actions/updateprofile.php:74
msgid "Remote profile with no matching profile"
msgstr "没有匹配的远程个人信息"
#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
+#: actions/remotesubscribe.php:88
msgid "Remote subscribe"
msgstr "远程订阅"
@@ -1679,11 +1865,15 @@ msgstr "远程订阅"
#: actions/emailsettings.php:48 actions/emailsettings.php:76
#: actions/imsettings.php:49 actions/openidsettings.php:108
#: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59
+#: actions/twittersettings.php:59 actions/emailsettings.php:101
+#: actions/emailsettings.php:134 actions/imsettings.php:102
+#: actions/openidsettings.php:166 actions/smssettings.php:103
+#: actions/smssettings.php:146 actions/twittersettings.php:115
msgid "Remove"
msgstr "移除"
#: ../actions/openidsettings.php:68 actions/openidsettings.php:69
+#: actions/openidsettings.php:123
msgid "Remove OpenID"
msgstr "移除OpenID"
@@ -1693,45 +1883,54 @@ msgid ""
"remove it, add another OpenID first."
msgstr "移除唯一的OpenID可能使您无法登陆!如果需要移除它,请先添加一个新的。"
-#: ../lib/stream.php:55 lib/personal.php:55
+#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
msgid "Replies"
msgstr "回复"
#: ../actions/replies.php:47 ../actions/repliesrss.php:76 ../lib/stream.php:56
#: actions/replies.php:47 actions/repliesrss.php:62 lib/personal.php:56
+#: actions/replies.php:116 actions/repliesrss.php:67
+#: lib/personalgroupnav.php:104
#, php-format
msgid "Replies to %s"
msgstr "%s 的回复"
#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
+#: actions/recoverpassword.php:223
msgid "Reset"
msgstr "重置"
#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
+#: actions/recoverpassword.php:197
msgid "Reset password"
msgstr "重置密码"
#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
+#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
msgid "SMS"
msgstr "SMS短信"
#: ../actions/smssettings.php:67 actions/smssettings.php:67
+#: actions/smssettings.php:126
msgid "SMS Phone number"
msgstr "SMS短信电话号码"
#: ../actions/smssettings.php:33 actions/smssettings.php:33
+#: actions/smssettings.php:58
msgid "SMS Settings"
msgstr "SMS短信设置"
-#: ../lib/mail.php:219 lib/mail.php:225
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
msgid "SMS confirmation"
msgstr "SMS短信确认"
#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:222
msgid "Same as password above"
msgstr "相同的密码"
#: ../actions/register.php:156 actions/register.php:170
+#: actions/register.php:377
msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
@@ -1739,52 +1938,68 @@ msgstr "相同的密码。此项必填。"
#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
#: actions/emailsettings.php:104 actions/imsettings.php:82
#: actions/profilesettings.php:101 actions/smssettings.php:100
-#: actions/twittersettings.php:83
+#: actions/twittersettings.php:83 actions/emailsettings.php:182
+#: actions/facebooksettings.php:114 actions/imsettings.php:157
+#: actions/othersettings.php:117 actions/profilesettings.php:150
+#: actions/smssettings.php:169 actions/subscriptions.php:124
+#: actions/tagother.php:152 actions/twittersettings.php:161
+#: lib/groupeditform.php:171
msgid "Save"
msgstr "保存"
#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316
+#: lib/util.php:316 lib/action.php:325
msgid "Search"
msgstr "搜索"
#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
+#: actions/noticesearch.php:127
msgid "Search Stream Feed"
msgstr "搜索聚合"
#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
+#: actions/noticesearch.php:57
#, php-format
msgid ""
"Search for notices on %%site.name%% by their contents. Separate search terms "
"by spaces; they must be 3 characters or more."
-msgstr "在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符,多个搜索条件用空格分隔。"
+msgstr ""
+"在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符,多个搜索条件用"
+"空格分隔。"
#: ../actions/peoplesearch.php:28
#, php-format
msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
"Separate the terms by spaces; they must be 3 characters or more."
-msgstr "在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。搜索条件至少包含 3 个字符,多个搜索条件用空格分隔。"
+msgstr ""
+"在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符,多个搜索条件用空格分隔。"
#: ../actions/smssettings.php:296 actions/smssettings.php:304
+#: actions/smssettings.php:457
msgid "Select a carrier"
msgstr "选择运营商"
#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731
+#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
+#: lib/messageform.php:167 lib/noticeform.php:177
msgid "Send"
msgstr "发送"
#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
#: actions/emailsettings.php:74 actions/smssettings.php:82
+#: actions/emailsettings.php:132 actions/smssettings.php:145
msgid "Send email to this address to post new notices."
msgstr "向这个电子邮件发信以发布新的通告。"
#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
+#: actions/emailsettings.php:152
msgid "Send me notices of new subscriptions through email."
msgstr "如果有新订阅,通过电子邮件告诉我。"
#: ../actions/imsettings.php:70 actions/imsettings.php:71
+#: actions/imsettings.php:137
msgid "Send me notices through Jabber/GTalk."
msgstr "通过Jabber/GTalk发送通告。"
@@ -1798,11 +2013,12 @@ msgstr "通过SMS短信将通告发给我;我了解这样也许会给我带来
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "如果我尚未订阅的用户回我消息,使用Jabber/GTalk通知我。"
-#: ../lib/util.php:304 lib/util.php:320
+#: ../lib/util.php:304 lib/util.php:320 lib/facebookaction.php:215
msgid "Settings"
msgstr "设置"
#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
+#: actions/profilesettings.php:319
msgid "Settings saved."
msgstr "设置已保存。"
@@ -1811,66 +2027,83 @@ msgid "Showing most popular tags from the last week"
msgstr "显示上周以来最流行的标签"
#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
+#: actions/finishaddopenid.php:114
msgid "Someone else already has this OpenID."
msgstr "其他人已经使用了这个OpenID。"
#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
+#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
msgid "Something weird happened."
msgstr "发生了奇怪的错误……"
#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
+#: scripts/maildaemon.php:61
msgid "Sorry, no incoming email allowed."
msgstr "对不起,发布用的电子邮件无法使用。"
#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
+#: scripts/maildaemon.php:57
msgid "Sorry, that is not your incoming email address."
msgstr "对不起,这个发布用的电子邮件属于其他用户。"
-#: ../lib/util.php:330 lib/util.php:346
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
msgid "Source"
msgstr "来源"
#: ../actions/showstream.php:296 actions/showstream.php:311
+#: actions/showstream.php:476
msgid "Statistics"
msgstr "统计"
#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
+#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
msgid "Stored OpenID not found."
msgstr "未找到已有的OpenID。"
#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
#: actions/showstream.php:197 actions/showstream.php:206
+#: actions/remotesubscribe.php:113 actions/showstream.php:376
+#: lib/subscribeform.php:139
msgid "Subscribe"
msgstr "订阅"
#: ../actions/showstream.php:313 ../actions/subscribers.php:27
#: actions/showstream.php:328 actions/subscribers.php:27
+#: actions/showstream.php:436 actions/showstream.php:498
+#: lib/subgroupnav.php:88
msgid "Subscribers"
msgstr "订阅者"
#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
+#: actions/userauthorization.php:338
msgid "Subscription authorized"
msgstr "订阅已确认"
#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
+#: actions/userauthorization.php:349
msgid "Subscription rejected"
msgstr "订阅被拒绝"
#: ../actions/showstream.php:230 ../actions/showstream.php:307
#: ../actions/subscriptions.php:27 actions/showstream.php:240
#: actions/showstream.php:322 actions/subscriptions.php:27
+#: actions/showstream.php:407 actions/showstream.php:489
+#: lib/subgroupnav.php:80
msgid "Subscriptions"
msgstr "订阅"
#: ../actions/avatar.php:87 actions/profilesettings.php:324
+#: lib/imagefile.php:78
msgid "System error uploading file."
msgstr "上传文件时出错。"
#: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
-#: lib/util.php:317
+#: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
+#: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
+#: lib/profilelist.php:164
msgid "Tags"
msgstr "标签"
@@ -1879,18 +2112,22 @@ msgid "Text"
msgstr "文本"
#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
+#: actions/noticesearch.php:67
msgid "Text search"
msgstr "搜索文本"
#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
+#: actions/openidsettings.php:227
msgid "That OpenID does not belong to you."
msgstr "此OpenID属于他人。"
#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
+#: actions/confirmaddress.php:94
msgid "That address has already been confirmed."
msgstr "此地址已被确认。"
#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
+#: actions/confirmaddress.php:85
msgid "That confirmation code is not for you!"
msgstr "此确认码不适用!"
@@ -1899,52 +2136,64 @@ msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
#: ../actions/avatar.php:80 actions/profilesettings.php:317
+#: lib/imagefile.php:71
msgid "That file is too big."
msgstr "文件超出大小限制。"
#: ../actions/imsettings.php:170 actions/imsettings.php:178
+#: actions/imsettings.php:293
msgid "That is already your Jabber ID."
msgstr "您已登记此Jabber帐号。"
#: ../actions/emailsettings.php:188 actions/emailsettings.php:206
+#: actions/emailsettings.php:318
msgid "That is already your email address."
msgstr "您已登记此电子邮件。"
#: ../actions/smssettings.php:188 actions/smssettings.php:196
+#: actions/smssettings.php:306
msgid "That is already your phone number."
msgstr "您已登记此电话号码。"
#: ../actions/imsettings.php:233 actions/imsettings.php:241
+#: actions/imsettings.php:381
msgid "That is not your Jabber ID."
msgstr "这不是您的Jabber帐号。"
#: ../actions/emailsettings.php:249 actions/emailsettings.php:267
+#: actions/emailsettings.php:397
msgid "That is not your email address."
msgstr "这是他人的电子邮件。"
#: ../actions/smssettings.php:257 actions/smssettings.php:265
+#: actions/smssettings.php:393
msgid "That is not your phone number."
msgstr "这是他人的电话号码。"
#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
#: actions/emailsettings.php:244 actions/imsettings.php:218
+#: actions/emailsettings.php:367 actions/imsettings.php:349
msgid "That is the wrong IM address."
msgstr "即时通讯帐号错误。"
#: ../actions/smssettings.php:233 actions/smssettings.php:241
+#: actions/smssettings.php:362
msgid "That is the wrong confirmation number."
msgstr "确认码错误。"
#: ../actions/smssettings.php:191 actions/smssettings.php:199
+#: actions/smssettings.php:309
msgid "That phone number already belongs to another user."
msgstr "这个电话号码属于另一个用户。"
#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
#: actions/newnotice.php:49 actions/twitapistatuses.php:330
+#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
msgid "That's too long. Max notice size is 140 chars."
msgstr "超出长度限制。不能超过 140 个字符。"
#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
+#: actions/twitapiaccount.php:62
msgid "That's too long. Max notice size is 255 chars."
msgstr "超出长度限制。不能超过 255 个字符。"
@@ -1956,6 +2205,8 @@ msgstr "地址 \"%s\" 已确认。"
#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
#: ../actions/smssettings.php:274 actions/emailsettings.php:282
#: actions/imsettings.php:258 actions/smssettings.php:282
+#: actions/emailsettings.php:416 actions/imsettings.php:402
+#: actions/smssettings.php:413
msgid "The address was removed."
msgstr "地址被移除。"
@@ -1964,7 +2215,8 @@ msgid ""
"The subscription has been authorized, but no callback URL was passed. Check "
"with the site's instructions for details on how to authorize the "
"subscription. Your subscription token is:"
-msgstr "订阅已确认,但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是:"
+msgstr ""
+"订阅已确认,但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是:"
#: ../actions/userauthorization.php:322
msgid ""
@@ -1991,10 +2243,9 @@ msgstr "这是 %s 订阅的用户。"
msgid "These are the people whose notices you listen to."
msgstr "这是您订阅的用户。"
-#: ../actions/invite.php:89 actions/invite.php:96
+#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
msgid ""
-"These people are already users and you were automatically subscribed to "
-"them:"
+"These people are already users and you were automatically subscribed to them:"
msgstr "这些好友已注册,您已自动订阅这些用户。"
#: ../actions/recoverpassword.php:88
@@ -2008,23 +2259,29 @@ msgid ""
msgstr "此表单会自动提交。如果没有,点击“提交”以转向 OpenID 提供者。"
#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
+#: actions/finishopenidlogin.php:67
#, php-format
msgid ""
"This is the first time you've logged into %s so we must connect your OpenID "
"to a local account. You can either create a new account, or connect with "
"your existing account, if you have one."
-msgstr "这是您第一次登陆 %s,我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号,或者连接到已有的帐号。"
+msgstr ""
+"这是您第一次登陆 %s,我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号,或"
+"者连接到已有的帐号。"
#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511
+#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
+#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
msgid "This method requires a POST or DELETE."
msgstr "此方法接受POST或DELETE请求。"
#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303
+#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
+#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
+#: actions/twitapistatuses.php:244
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
@@ -2033,70 +2290,36 @@ msgid "This page is not available in a media type you accept"
msgstr "这个页面不提供您想要的媒体类型"
#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:138
msgid "Timezone"
msgstr "时区"
#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
+#: actions/profilesettings.php:211
msgid "Timezone not selected."
msgstr "未选择时区。"
#: ../actions/remotesubscribe.php:43
#, php-format
msgid ""
-"To subscribe, you can [login](%%action.login%%), or "
-"[register](%%action.register%%) a new account. If you already have an "
-"account on a [compatible microblogging site](%%doc.openmublog%%), enter "
-"your profile URL below."
-msgstr ""
-""
-""
-""
-"["
-""
-""
-""
-""
-""
-""
-"]"
-"("
-"%"
-"%"
-"a"
-"c"
-"t"
-"i"
-"o"
-"n"
-"."
-"l"
-"o"
-"g"
-"i"
-"n"
-"%"
-"%"
-")"
-""
-""
-""
-"["
-""
-""
-""
-""
-"](%%action.register%%)帐号以订阅。如果您已经有了[兼容的微博客站点](%%doc.openmublog%%)的帐号,请输入个人信息URL。"
+"To subscribe, you can [login](%%action.login%%), or [register](%%action."
+"register%%) a new account. If you already have an account on a [compatible "
+"microblogging site](%%doc.openmublog%%), enter your profile URL below."
+msgstr ""
#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
+#: actions/twitapifriendships.php:132
msgid "Two user ids or screen_names must be supplied."
msgstr "必须提供两个用户帐号或昵称。"
#: ../actions/profilesettings.php:48 ../actions/register.php:169
#: actions/profilesettings.php:81 actions/register.php:183
+#: actions/profilesettings.php:109
msgid "URL of your homepage, blog, or profile on another site"
msgstr "您的主页、博客或在其他站点的URL"
#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
+#: actions/remotesubscribe.php:110
msgid "URL of your profile on another compatible microblogging service"
msgstr "您在其他兼容的微博客服务的个人信息URL"
@@ -2104,20 +2327,24 @@ msgstr "您在其他兼容的微博客服务的个人信息URL"
#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
#: actions/emailsettings.php:144 actions/imsettings.php:118
#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108
+#: actions/twittersettings.php:108 actions/avatarsettings.php:258
+#: actions/emailsettings.php:242 actions/grouplogo.php:317
+#: actions/imsettings.php:214 actions/recoverpassword.php:44
+#: actions/smssettings.php:236 actions/twittersettings.php:302
msgid "Unexpected form submission."
msgstr "未预料的表单提交。"
#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
+#: actions/recoverpassword.php:323
msgid "Unexpected password reset."
msgstr "未预料的密码重置。"
-#: ../index.php:57 index.php:57
+#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
msgid "Unknown action"
msgstr "未知动作"
#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60
+#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
msgid "Unknown version of OMB protocol."
msgstr "此OMB协议版本无效。"
@@ -2128,42 +2355,51 @@ msgid ""
msgstr "除非另外说明,此站点的内容由贡献者版权所有,授权方式为"
#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
+#: actions/confirmaddress.php:90
#, php-format
msgid "Unrecognized address type %s"
msgstr "不可识别的地址类型 %s"
#: ../actions/showstream.php:209 actions/showstream.php:219
+#: lib/unsubscribeform.php:137
msgid "Unsubscribe"
msgstr "退订"
#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
#: actions/postnotice.php:45 actions/updateprofile.php:46
+#: actions/postnotice.php:48 actions/updateprofile.php:49
msgid "Unsupported OMB version"
msgstr "不支持此OMB版本"
#: ../actions/avatar.php:105 actions/profilesettings.php:342
+#: lib/imagefile.php:102
msgid "Unsupported image file format."
msgstr "不支持这种图像格式。"
#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
+#: lib/connectsettingsaction.php:108
msgid "Updates by SMS"
msgstr "使用SMS短信更新"
#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
+#: lib/connectsettingsaction.php:105
msgid "Updates by instant messenger (IM)"
msgstr "使用即时通讯工具(IM)更新"
#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
+#: actions/twitapistatuses.php:129
#, php-format
msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s 上 %1$s 和好友的更新!"
#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
+#: actions/twitapistatuses.php:202
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
#: ../actions/avatar.php:68 actions/profilesettings.php:161
+#: actions/avatarsettings.php:162 actions/grouplogo.php:232
msgid "Upload"
msgstr "上传"
@@ -2173,16 +2409,17 @@ msgid ""
"you upload it, so make sure it's more or less square. It must be under the "
"site license, also. Use a picture that belongs to you and that you want to "
"share."
-msgstr "在这里上传新的头像。上传后无法修改,请尽量使用正方形图片。图片必须使用与站点相同的授权。请使用您希望分享的属于您的图片。"
+msgstr ""
+"在这里上传新的头像。上传后无法修改,请尽量使用正方形图片。图片必须使用与站点"
+"相同的授权。请使用您希望分享的属于您的图片。"
#: ../lib/settingsaction.php:91
msgid "Upload a new profile image"
msgstr "上传个人信息头像"
-#: ../actions/invite.php:114 actions/invite.php:121
+#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
msgid ""
-"Use this form to invite your friends and colleagues to use this "
-"service."
+"Use this form to invite your friends and colleagues to use this service."
msgstr "使用这个表单来邀请好友和同事加入。"
#: ../actions/register.php:159 ../actions/register.php:162
@@ -2191,7 +2428,7 @@ msgid "Used only for updates, announcements, and password recovery"
msgstr "只用于更新、通告或密码恢复"
#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88
+#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
msgid "User being listened to doesn't exist."
msgstr "要查看的用户不存在。"
@@ -2205,10 +2442,16 @@ msgstr "要查看的用户不存在。"
#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
#: actions/twitapiusers.php:87 lib/mailbox.php:50
+#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
+#: actions/showstream.php:107 actions/twitapiaccount.php:70
+#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
+#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
+#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
msgid "User has no profile."
msgstr "用户没有个人信息。"
#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
+#: actions/remotesubscribe.php:105
msgid "User nickname"
msgstr "昵称"
@@ -2217,35 +2460,42 @@ msgid "User not found."
msgstr "未找到用户。"
#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
+#: actions/profilesettings.php:139
msgid "What timezone are you normally in?"
msgstr "您一般处于哪个时区?"
-#: ../lib/util.php:1159 lib/util.php:1293
+#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
#, php-format
msgid "What's up, %s?"
msgstr "怎么样,%s?"
#: ../actions/profilesettings.php:54 ../actions/register.php:175
#: actions/profilesettings.php:87 actions/register.php:189
+#: actions/profilesettings.php:119
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的位置,格式类似\"城市,省份,国家\""
#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
+#: actions/updateprofile.php:132
#, php-format
msgid "Wrong image type for '%s'"
msgstr "'%s' 图像格式错误"
#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
+#: actions/updateprofile.php:127
#, php-format
msgid "Wrong size image at '%s'"
msgstr "图像大小 '%s' 错误"
#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
#: actions/deletenotice.php:64 actions/deletenotice.php:79
+#: actions/block.php:148 actions/deletenotice.php:122
+#: actions/deletenotice.php:141
msgid "Yes"
msgstr "是"
#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
+#: actions/finishaddopenid.php:112
msgid "You already have this OpenID!"
msgstr "已登记此OpenID!"
@@ -2256,14 +2506,16 @@ msgid ""
msgstr "您选择了永久删除通告。这样做是无法恢复的。"
#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
+#: actions/recoverpassword.php:36
msgid "You are already logged in!"
msgstr "已登录!"
-#: ../actions/invite.php:81 actions/invite.php:88
+#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
msgid "You are already subscribed to these users:"
msgstr "您已订阅这些用户:"
#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:105
msgid "You are not friends with the specified user."
msgstr "您与此用户并非好友。"
@@ -2276,6 +2528,7 @@ msgid "You can create a new account to start posting notices."
msgstr "请创建新帐号,开始发布通告。"
#: ../actions/smssettings.php:28 actions/smssettings.php:28
+#: actions/smssettings.php:69
#, php-format
msgid "You can receive SMS messages through email from %%site.name%%."
msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
@@ -2289,27 +2542,32 @@ msgstr "您可以点击\"移除\"按钮,移除帐号的 OpenID。"
#: ../actions/imsettings.php:28 actions/imsettings.php:28
#, php-format
msgid ""
-"You can send and receive notices through Jabber/GTalk [instant "
-"messages](%%doc.im%%). Configure your address and settings below."
-msgstr "您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它们。"
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
+"们。"
#: ../actions/profilesettings.php:27
msgid ""
-"You can update your personal profile info here so people know more about "
-"you."
+"You can update your personal profile info here so people know more about you."
msgstr "在这里更新个人信息,让大家对您了解得更多。"
#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
+#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
+#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
msgid "You can use the local subscription!"
msgstr "您可以在这里订阅!"
#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
#: actions/finishopenidlogin.php:38 actions/register.php:68
+#: actions/finishopenidlogin.php:43
msgid "You can't register if you don't agree to the license."
msgstr "您必须同意此授权方可注册。"
#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
+#: actions/updateprofile.php:67
msgid "You did not send us that profile"
msgstr "您未告知此个人信息"
@@ -2327,18 +2585,23 @@ msgid ""
msgstr ""
"您的 %1$s 发布用地址已更新。\n"
"\n"
-"发送邮件到 %2$s 来发布新消息。\n\n更多电子邮件的帮助请见 %3$s。\n\n为您效力的 %4$s"
+"发送邮件到 %2$s 来发布新消息。\n"
+"\n"
+"更多电子邮件的帮助请见 %3$s。\n"
+"\n"
+"为您效力的 %4$s"
#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
+#: actions/twitapistatuses.php:463
msgid "You may not delete another user's status."
msgstr "您不能删除其他用户的状态。"
-#: ../actions/invite.php:31 actions/invite.php:31
+#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
#, php-format
msgid "You must be logged in to invite other users to use %s"
msgstr "您必须登录才能邀请其他人使用 %s"
-#: ../actions/invite.php:103 actions/invite.php:110
+#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
msgid ""
"You will be notified when your invitees accept the invitation and register "
"on the site. Thanks for growing the community!"
@@ -2349,6 +2612,7 @@ msgid "You've been identified. Enter a new password below. "
msgstr "您已得到确认。请输入新密码。"
#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
+#: actions/openidlogin.php:104
msgid "Your OpenID URL"
msgstr "您的OpenID URL"
@@ -2361,49 +2625,51 @@ msgstr "您在此服务器的昵称,或注册邮箱。"
msgid ""
"[OpenID](%%doc.openid%%) lets you log into many sites with the same user "
"account. Manage your associated OpenIDs from here."
-msgstr "[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已关联的 OpenID。"
+msgstr ""
+"[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
+"关联的 OpenID。"
-#: ../lib/util.php:943 lib/util.php:992
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
msgid "a few seconds ago"
msgstr "几秒前"
-#: ../lib/util.php:955 lib/util.php:1004
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
-#: ../lib/util.php:951 lib/util.php:1000
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
-#: ../lib/util.php:947 lib/util.php:996
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
-#: ../lib/util.php:959 lib/util.php:1008
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
-#: ../lib/util.php:953 lib/util.php:1002
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
msgid "about a day ago"
msgstr "一天前"
-#: ../lib/util.php:945 lib/util.php:994
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
msgid "about a minute ago"
msgstr "一分钟前"
-#: ../lib/util.php:957 lib/util.php:1006
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
msgid "about a month ago"
msgstr "一个月前"
-#: ../lib/util.php:961 lib/util.php:1010
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
msgid "about a year ago"
msgstr "一年前"
-#: ../lib/util.php:949 lib/util.php:998
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
msgid "about an hour ago"
msgstr "一小时前"
@@ -2414,25 +2680,28 @@ msgstr "删除"
#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84
+#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
msgid "in reply to..."
msgstr "先前……"
#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91
+#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
msgid "reply"
msgstr "回复"
#: ../actions/password.php:44 actions/profilesettings.php:183
+#: actions/passwordsettings.php:106
msgid "same as password above"
msgstr "相同的密码"
#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
+#: actions/twitapistatuses.php:555
msgid "unsupported file type"
msgstr "不支持这种类型的文件"
#: ../lib/util.php:1309 lib/util.php:1443
+#, fuzzy
msgid "« After"
msgstr "« 之后"
@@ -2445,18 +2714,22 @@ msgstr "« 之后"
#: actions/remotesubscribe.php:40 actions/smssettings.php:124
#: actions/subscribe.php:44 actions/twittersettings.php:97
#: actions/unsubscribe.php:41 actions/userauthorization.php:35
+#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
+#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
+#: actions/openidlogin.php:37 actions/recoverpassword.php:316
+#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
-#: actions/disfavor.php:55
+#: actions/disfavor.php:55 actions/disfavor.php:81
msgid "This notice is not a favorite!"
msgstr "此通告未被收藏!"
-#: actions/disfavor.php:63
+#: actions/disfavor.php:63 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "无法删除收藏。"
-#: actions/disfavor.php:72
+#: actions/disfavor.php:72 lib/favorform.php:140
msgid "Favor"
msgstr "收藏"
@@ -2464,16 +2737,18 @@ msgstr "收藏"
msgid "Send me email when someone adds my notice as a favorite."
msgstr "如果有人收藏我的通告,发邮件通知我。"
-#: actions/emailsettings.php:95
+#: actions/emailsettings.php:95 actions/emailsettings.php:163
msgid "Send me email when someone sends me a private message."
msgstr "如果收到私人信息,发邮件通知我。"
-#: actions/favor.php:53 actions/twitapifavorites.php:142
+#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
+#: actions/twitapifavorites.php:118
msgid "This notice is already a favorite!"
msgstr "已收藏此通告!"
#: actions/favor.php:60 actions/twitapifavorites.php:151
-#: classes/Command.php:132
+#: classes/Command.php:132 actions/favor.php:86
+#: actions/twitapifavorites.php:125 classes/Command.php:152
msgid "Could not create favorite."
msgstr "无法创建收藏。"
@@ -2482,86 +2757,93 @@ msgid "Disfavor"
msgstr "取消收藏"
#: actions/favoritesrss.php:60 actions/showfavorites.php:47
+#: actions/favoritesrss.php:100 actions/showfavorites.php:77
#, php-format
msgid "%s favorite notices"
msgstr "%s 收藏的通告"
-#: actions/favoritesrss.php:64
+#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
#, php-format
msgid "Feed of favorite notices of %s"
msgstr "%s 的收藏的聚合"
-#: actions/inbox.php:28
+#: actions/inbox.php:28 actions/inbox.php:59
#, php-format
msgid "Inbox for %s - page %d"
msgstr "%s 的收件箱 - 第 %d 页"
-#: actions/inbox.php:30
+#: actions/inbox.php:30 actions/inbox.php:62
#, php-format
msgid "Inbox for %s"
msgstr "%s 的收件箱"
-#: actions/inbox.php:53
+#: actions/inbox.php:53 actions/inbox.php:115
msgid "This is your inbox, which lists your incoming private messages."
msgstr "这是您的收件箱,包含发给您的私人消息。"
-#: actions/invite.php:178
+#: actions/invite.php:178 actions/invite.php:213
#, php-format
msgid ""
"%1$s has invited you to join them on %2$s (%3$s).\n"
"\n"
-msgstr "%1$s 邀请您加入 %2$s (%3$s)。\n\n"
+msgstr ""
+"%1$s 邀请您加入 %2$s (%3$s)。\n"
+"\n"
-#: actions/login.php:104
+#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
+#: actions/register.php:416
msgid "Automatically login in the future; "
msgstr "保持登录状态;"
-#: actions/login.php:122
+#: actions/login.php:122 actions/login.php:264
msgid "For security reasons, please re-enter your "
msgstr "由于安全原因,请重新输入"
-#: actions/login.php:126
+#: actions/login.php:126 actions/login.php:268
msgid "Login with your username and password. "
msgstr "输入用户名和密码以登录。"
#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
+#: actions/twitapidirect_messages.php:141
msgid "That's too long. Max message size is 140 chars."
msgstr "超出长度限制。不能超过 140 个字符。"
-#: actions/newmessage.php:65
+#: actions/newmessage.php:65 actions/newmessage.php:128
msgid "No recipient specified."
msgstr "没有收件人。"
#: actions/newmessage.php:68 actions/newmessage.php:113
-#: classes/Command.php:206
+#: classes/Command.php:206 actions/newmessage.php:131
+#: actions/newmessage.php:168 classes/Command.php:237
msgid "You can't send a message to this user."
msgstr "无法向此用户发送消息。"
#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209
+#: classes/Command.php:209 actions/twitapidirect_messages.php:158
+#: classes/Command.php:240
msgid ""
-"Don't send a message to yourself; just say it to yourself quietly "
-"instead."
+"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
-#: actions/newmessage.php:108
+#: actions/newmessage.php:108 actions/microsummary.php:62
+#: actions/newmessage.php:163
msgid "No such user"
msgstr "未找到用户"
-#: actions/newmessage.php:117
+#: actions/newmessage.php:117 actions/newmessage.php:67
msgid "New message"
msgstr "新消息"
-#: actions/noticesearch.php:95
+#: actions/noticesearch.php:95 actions/noticesearch.php:146
msgid "Notice without matching profile"
msgstr "找不到匹配的通告"
-#: actions/openidsettings.php:28
+#: actions/openidsettings.php:28 actions/openidsettings.php:70
#, php-format
msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
msgstr "[OpenID](%%doc.openid%%)允许您登录许多不同的站点"
-#: actions/openidsettings.php:46
+#: actions/openidsettings.php:46 actions/openidsettings.php:96
msgid "If you want to add an OpenID to your account, "
msgstr "如果您希望添加OpenID,"
@@ -2569,64 +2851,67 @@ msgstr "如果您希望添加OpenID,"
msgid "Removing your only OpenID would make it impossible to log in! "
msgstr "移除仅有的OpenID可能使您无法登陆!"
-#: actions/openidsettings.php:87
+#: actions/openidsettings.php:87 actions/openidsettings.php:143
msgid "You can remove an OpenID from your account "
msgstr "您可以移除一个OpenID"
-#: actions/outbox.php:28
+#: actions/outbox.php:28 actions/outbox.php:58
#, php-format
msgid "Outbox for %s - page %d"
msgstr "%s 的发件箱 - 第 %d 页"
-#: actions/outbox.php:30
+#: actions/outbox.php:30 actions/outbox.php:61
#, php-format
msgid "Outbox for %s"
msgstr "%s 的发件箱"
-#: actions/outbox.php:53
+#: actions/outbox.php:53 actions/outbox.php:116
msgid "This is your outbox, which lists private messages you have sent."
msgstr "这是您的发件箱,包含您发送的私人消息。"
-#: actions/peoplesearch.php:28
+#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
#, php-format
msgid ""
"Search for people on %%site.name%% by their name, location, or interests. "
msgstr "在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。"
-#: actions/profilesettings.php:27
+#: actions/profilesettings.php:27 actions/profilesettings.php:69
msgid "You can update your personal profile info here "
msgstr "您可以在这里更新个人信息。"
#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
#: actions/userauthorization.php:159 actions/userrss.php:76
+#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
+#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
+#: actions/userauthorization.php:176 actions/userrss.php:82
msgid "User without matching profile"
msgstr "找不到匹配的用户。"
-#: actions/recoverpassword.php:91
+#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
msgid "This confirmation code is too old. "
msgstr "验证码超时。"
-#: actions/recoverpassword.php:141
+#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
msgid "If you've forgotten or lost your"
msgstr "如果您忘记或丢失了您的"
-#: actions/recoverpassword.php:154
+#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
msgid "You've been identified. Enter a "
msgstr "您已得到确认。输入"
-#: actions/recoverpassword.php:169
+#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
msgid "Your nickname on this server, "
msgstr "您在服务器上的昵称,"
-#: actions/recoverpassword.php:271
+#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
msgid "Instructions for recovering your password "
msgstr "恢复密码的步骤"
-#: actions/recoverpassword.php:327
+#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
msgid "New password successfully saved. "
msgstr "新密码已保存。"
-#: actions/register.php:95
+#: actions/register.php:95 actions/register.php:180
msgid "Password must be 6 or more characters."
msgstr "密码必须包含 6 个或更多字符。"
@@ -2641,21 +2926,22 @@ msgstr "祝贺你,%s!欢迎来到 %%%%site.name%%%%。在这里,您可以
msgid "(You should receive a message by email momentarily, with "
msgstr "(您将立即收到一封电子邮件,含有"
-#: actions/remotesubscribe.php:51
+#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
#, php-format
msgid "To subscribe, you can [login](%%action.login%%),"
msgstr "要订阅,请先[登录](%%action.login%%),"
-#: actions/showfavorites.php:61
+#: actions/showfavorites.php:61 actions/showfavorites.php:145
#, php-format
msgid "Feed for favorites of %s"
msgstr "%s 的收藏的聚合"
#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
+#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
msgid "Could not retrieve favorite notices."
msgstr "无法获取收藏的通告。"
-#: actions/showmessage.php:33
+#: actions/showmessage.php:33 actions/showmessage.php:81
msgid "No such message."
msgstr "未找到此消息。"
@@ -2663,12 +2949,12 @@ msgstr "未找到此消息。"
msgid "Only the sender and recipient may read this message."
msgstr "只有发送和接受双方可以阅读此消息。"
-#: actions/showmessage.php:61
+#: actions/showmessage.php:61 actions/showmessage.php:108
#, php-format
msgid "Message to %1$s on %2$s"
msgstr "发送给 %1$s 的 %2$s 消息"
-#: actions/showmessage.php:66
+#: actions/showmessage.php:66 actions/showmessage.php:113
#, php-format
msgid "Message from %1$s on %2$s"
msgstr "来自 %1$s 的 %2$s 消息"
@@ -2677,78 +2963,85 @@ msgstr "来自 %1$s 的 %2$s 消息"
msgid "Send a message"
msgstr "发送消息"
-#: actions/smssettings.php:312
+#: actions/smssettings.php:312 actions/smssettings.php:464
#, php-format
msgid "Mobile carrier for your phone. "
msgstr "手机的运营商。"
-#: actions/twitapidirect_messages.php:76
+#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
#, php-format
msgid "Direct messages to %s"
msgstr "发给 %s 的直接消息"
-#: actions/twitapidirect_messages.php:77
+#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
#, php-format
msgid "All the direct messages sent to %s"
msgstr "发给 %s 的直接消息"
-#: actions/twitapidirect_messages.php:81
+#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
msgid "Direct Messages You've Sent"
msgstr "您已发送的直接消息"
-#: actions/twitapidirect_messages.php:82
+#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
#, php-format
msgid "All the direct messages sent from %s"
msgstr "%s 发送的直接消息"
#: actions/twitapidirect_messages.php:128
+#: actions/twitapidirect_messages.php:137
msgid "No message text!"
msgstr "消息没有正文!"
#: actions/twitapidirect_messages.php:138
+#: actions/twitapidirect_messages.php:150
msgid "Recipient user not found."
msgstr "未找到收件人。"
#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:153
msgid "Can't send direct messages to users who aren't your friend."
msgstr "无法向并非好友的用户发送直接消息。"
-#: actions/twitapifavorites.php:92
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
#, php-format
msgid "%s / Favorites from %s"
msgstr "%s 的收藏 / %s"
-#: actions/twitapifavorites.php:95
+#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
#, php-format
msgid "%s updates favorited by %s / %s."
msgstr "%s 收藏了 %s 的 %s 通告。"
#: actions/twitapifavorites.php:187 lib/mail.php:275
+#: actions/twitapifavorites.php:164 lib/mail.php:553
#, php-format
msgid "%s added your notice as a favorite"
msgstr "%s 收藏了您的通告"
#: actions/twitapifavorites.php:188 lib/mail.php:276
+#: actions/twitapifavorites.php:165
#, php-format
msgid ""
"%1$s just added your notice from %2$s as one of their favorites.\n"
"\n"
-msgstr "%1$s 收藏了您的 %2$s 通告。\n\n"
+msgstr ""
+"%1$s 收藏了您的 %2$s 通告。\n"
+"\n"
#: actions/twittersettings.php:27
msgid ""
"Add your Twitter account to automatically send your notices to Twitter, "
msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
-#: actions/twittersettings.php:41
+#: actions/twittersettings.php:41 actions/twittersettings.php:60
msgid "Twitter settings"
msgstr "Twitter 设置"
-#: actions/twittersettings.php:48
+#: actions/twittersettings.php:48 actions/twittersettings.php:105
msgid "Twitter Account"
msgstr "Twitter 帐号"
-#: actions/twittersettings.php:56
+#: actions/twittersettings.php:56 actions/twittersettings.php:113
msgid "Current verified Twitter account."
msgstr "已验证的 Twitter 帐号。"
@@ -2756,7 +3049,7 @@ msgstr "已验证的 Twitter 帐号。"
msgid "Twitter Username"
msgstr "Twitter 用户名"
-#: actions/twittersettings.php:65
+#: actions/twittersettings.php:65 actions/twittersettings.php:123
msgid "No spaces, please."
msgstr "请不要包含空格。"
@@ -2764,15 +3057,15 @@ msgstr "请不要包含空格。"
msgid "Twitter Password"
msgstr "Twitter 密码"
-#: actions/twittersettings.php:72
+#: actions/twittersettings.php:72 actions/twittersettings.php:139
msgid "Automatically send my notices to Twitter."
msgstr "自动将我的通告转发到 Twitter。"
-#: actions/twittersettings.php:75
+#: actions/twittersettings.php:75 actions/twittersettings.php:146
msgid "Send local \"@\" replies to Twitter."
msgstr "将这里的 \"@\" 回复发送到 Twitter。"
-#: actions/twittersettings.php:78
+#: actions/twittersettings.php:78 actions/twittersettings.php:153
msgid "Subscribe to my Twitter friends here."
msgstr "在这里订阅 Twitter 好友。"
@@ -2782,7 +3075,7 @@ msgid ""
"underscore (_). 15 chars max."
msgstr "用户名只能包含数字,大写和小写字母和下划线。不能超过 15 个字符。"
-#: actions/twittersettings.php:128
+#: actions/twittersettings.php:128 actions/twittersettings.php:334
msgid "Could not verify your Twitter credentials!"
msgstr "不能验证 Twitter 帐号!"
@@ -2792,160 +3085,166 @@ msgid "Unable to retrieve account information for \"%s\" from Twitter."
msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
#: actions/twittersettings.php:151 actions/twittersettings.php:170
+#: actions/twittersettings.php:348 actions/twittersettings.php:368
msgid "Unable to save your Twitter settings!"
msgstr "无法保存 Twitter 设置!"
-#: actions/twittersettings.php:174
+#: actions/twittersettings.php:174 actions/twittersettings.php:376
msgid "Twitter settings saved."
msgstr "Twitter 设置已保存。"
-#: actions/twittersettings.php:192
+#: actions/twittersettings.php:192 actions/twittersettings.php:395
msgid "That is not your Twitter account."
msgstr "此 Twitter 帐号属于他人。"
#: actions/twittersettings.php:200 actions/twittersettings.php:208
+#: actions/twittersettings.php:403
msgid "Couldn't remove Twitter user."
msgstr "无法移除 Twitter 用户。"
-#: actions/twittersettings.php:212
+#: actions/twittersettings.php:212 actions/twittersettings.php:407
msgid "Twitter account removed."
msgstr "Twitter 帐号已移除。"
#: actions/twittersettings.php:225 actions/twittersettings.php:239
+#: actions/twittersettings.php:428 actions/twittersettings.php:439
+#: actions/twittersettings.php:453
msgid "Couldn't save Twitter preferences."
msgstr "无法保存 Twitter 首选项。"
-#: actions/twittersettings.php:245
+#: actions/twittersettings.php:245 actions/twittersettings.php:461
msgid "Twitter preferences saved."
msgstr "Twitter 首选项已保存。"
-#: actions/userauthorization.php:84
+#: actions/userauthorization.php:84 actions/userauthorization.php:86
msgid "Please check these details to make sure "
msgstr "请检查详细信息"
-#: actions/userauthorization.php:324
+#: actions/userauthorization.php:324 actions/userauthorization.php:340
msgid "The subscription has been authorized, but no "
msgstr "订阅已确认,但是"
-#: actions/userauthorization.php:334
+#: actions/userauthorization.php:334 actions/userauthorization.php:351
msgid "The subscription has been rejected, but no "
msgstr "订阅已拒绝,但是"
-#: classes/Channel.php:113
+#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
msgid "Command results"
msgstr "执行结果"
-#: classes/Channel.php:148
+#: classes/Channel.php:148 classes/Channel.php:204
msgid "Command complete"
msgstr "执行完毕"
-#: classes/Channel.php:158
+#: classes/Channel.php:158 classes/Channel.php:215
msgid "Command failed"
msgstr "执行失败"
-#: classes/Command.php:39
+#: classes/Command.php:39 classes/Command.php:44
msgid "Sorry, this command is not yet implemented."
msgstr "对不起,这个命令还没有实现。"
-#: classes/Command.php:96
+#: classes/Command.php:96 classes/Command.php:113
#, php-format
msgid "Subscriptions: %1$s\n"
msgstr "订阅:%1$s\n"
-#: classes/Command.php:125 classes/Command.php:242
+#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
+#: classes/Command.php:276
msgid "User has no last notice"
msgstr "用户没有通告。"
-#: classes/Command.php:146
+#: classes/Command.php:146 classes/Command.php:166
msgid "Notice marked as fave."
msgstr "通告被标记为收藏。"
-#: classes/Command.php:166
+#: classes/Command.php:166 classes/Command.php:189
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
-#: classes/Command.php:169
+#: classes/Command.php:169 classes/Command.php:192
#, php-format
msgid "Fullname: %s"
msgstr "全名:%s"
-#: classes/Command.php:172
+#: classes/Command.php:172 classes/Command.php:195
#, php-format
msgid "Location: %s"
msgstr "位置:%s"
-#: classes/Command.php:175
+#: classes/Command.php:175 classes/Command.php:198
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
-#: classes/Command.php:178
+#: classes/Command.php:178 classes/Command.php:201
#, php-format
msgid "About: %s"
msgstr "关于:%s"
-#: classes/Command.php:200
+#: classes/Command.php:200 classes/Command.php:228
#, php-format
msgid "Message too long - maximum is 140 characters, you sent %d"
msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
-#: classes/Command.php:214
+#: classes/Command.php:214 classes/Command.php:245
#, php-format
msgid "Direct message to %s sent"
msgstr "已向 %s 发送消息"
-#: classes/Command.php:216
+#: classes/Command.php:216 classes/Command.php:247
msgid "Error sending direct message."
msgstr "发送消息出错。"
-#: classes/Command.php:263
+#: classes/Command.php:263 classes/Command.php:300
msgid "Specify the name of the user to subscribe to"
msgstr "指定要订阅的用户名"
-#: classes/Command.php:270
+#: classes/Command.php:270 classes/Command.php:307
#, php-format
msgid "Subscribed to %s"
msgstr "订阅 %s"
-#: classes/Command.php:288
+#: classes/Command.php:288 classes/Command.php:328
msgid "Specify the name of the user to unsubscribe from"
msgstr "指定要取消订阅的用户名"
-#: classes/Command.php:295
+#: classes/Command.php:295 classes/Command.php:335
#, php-format
msgid "Unsubscribed from %s"
msgstr "取消订阅 %s"
-#: classes/Command.php:310 classes/Command.php:330
+#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
+#: classes/Command.php:376
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
-#: classes/Command.php:313
+#: classes/Command.php:313 classes/Command.php:356
msgid "Notification off."
msgstr "通告关闭。"
-#: classes/Command.php:315
+#: classes/Command.php:315 classes/Command.php:358
msgid "Can't turn off notification."
msgstr "无法关闭通告。"
-#: classes/Command.php:333
+#: classes/Command.php:333 classes/Command.php:379
msgid "Notification on."
msgstr "通告开启。"
-#: classes/Command.php:335
+#: classes/Command.php:335 classes/Command.php:381
msgid "Can't turn on notification."
msgstr "无法开启通告。"
-#: classes/Command.php:344
+#: classes/Command.php:344 classes/Command.php:392
msgid "Commands:\n"
msgstr "命令:\n"
-#: classes/Message.php:53
+#: classes/Message.php:53 classes/Message.php:56
msgid "Could not insert message."
msgstr "无法添加信息。"
-#: classes/Message.php:63
+#: classes/Message.php:63 classes/Message.php:66
msgid "Could not update message with new URI."
msgstr "无法添加新URI的信息。"
@@ -2953,74 +3252,1637 @@ msgstr "无法添加新URI的信息。"
msgid "User without matching profile in system."
msgstr "系统中没有相应用户的信息。"
-#: lib/mail.php:147
+#: lib/mail.php:147 lib/mail.php:289
#, php-format
msgid ""
"You have a new posting address on %1$s.\n"
"\n"
-msgstr "您的新的发布用的地址是 %1$s。\n\n"
+msgstr ""
+"您的新的发布用的地址是 %1$s。\n"
+"\n"
-#: lib/mail.php:249
+#: lib/mail.php:249 lib/mail.php:508
#, php-format
msgid "New private message from %s"
msgstr "%s 发送了新的私人信息"
-#: lib/mail.php:253
+#: lib/mail.php:253 lib/mail.php:512
#, php-format
msgid ""
"%1$s (%2$s) sent you a private message:\n"
"\n"
-msgstr "%1$s (%2$s) 发送了新的私人信息:\n\n"
+msgstr ""
+"%1$s (%2$s) 发送了新的私人信息:\n"
+"\n"
-#: lib/mailbox.php:43
+#: lib/mailbox.php:43 lib/mailbox.php:89
msgid "Only the user can read their own mailboxes."
msgstr "只有用户自己可以访问邮箱。"
-#: lib/openid.php:195
+#: lib/openid.php:195 lib/openid.php:203
msgid "This form should automatically submit itself. "
msgstr "此表单会自动提交。"
-#: lib/personal.php:65
+#: lib/personal.php:65 lib/personalgroupnav.php:113
msgid "Favorites"
msgstr "收藏夹"
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
#, php-format
msgid "%s's favorite notices"
msgstr "%s 收藏的通告"
-#: lib/personal.php:66
+#: lib/personal.php:66 lib/personalgroupnav.php:114
msgid "User"
msgstr "用户"
-#: lib/personal.php:75
+#: lib/personal.php:75 lib/personalgroupnav.php:123
msgid "Inbox"
msgstr "收件箱"
-#: lib/personal.php:76
+#: lib/personal.php:76 lib/personalgroupnav.php:124
msgid "Your incoming messages"
msgstr "您接收的消息"
-#: lib/personal.php:80
+#: lib/personal.php:80 lib/personalgroupnav.php:128
msgid "Outbox"
msgstr "发件箱"
-#: lib/personal.php:81
+#: lib/personal.php:81 lib/personalgroupnav.php:129
msgid "Your sent messages"
msgstr "您发送的消息"
-#: lib/settingsaction.php:99
+#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
msgid "Twitter"
msgstr "Twitter"
-#: lib/settingsaction.php:100
+#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
msgid "Twitter integration options"
msgstr "Twitter 整合选项"
-#: lib/util.php:1718
+#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
msgid "To"
msgstr "到"
-#: scripts/maildaemon.php:45
+#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
msgid "Could not parse message."
msgstr "无法解析消息。"
+
+#: actions/all.php:63 actions/facebookhome.php:162
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s 及好友"
+
+#: actions/avatarsettings.php:76
+#, fuzzy
+msgid "You can upload your personal avatar."
+msgstr "您可以在这里更新个人信息。"
+
+#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
+#: actions/grouplogo.php:250
+#, fuzzy
+msgid "Avatar settings"
+msgstr "Twitter 设置"
+
+#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
+#: actions/grouplogo.php:198 actions/grouplogo.php:258
+msgid "Original"
+msgstr ""
+
+#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
+#: actions/grouplogo.php:209 actions/grouplogo.php:270
+msgid "Preview"
+msgstr ""
+
+#: actions/avatarsettings.php:225 actions/grouplogo.php:284
+msgid "Crop"
+msgstr ""
+
+#: actions/avatarsettings.php:248 actions/deletenotice.php:133
+#: actions/emailsettings.php:224 actions/grouplogo.php:307
+#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
+#: actions/newnotice.php:96 actions/openidsettings.php:188
+#: actions/othersettings.php:136 actions/passwordsettings.php:131
+#: actions/profilesettings.php:172 actions/register.php:113
+#: actions/remotesubscribe.php:53 actions/smssettings.php:216
+#: actions/subedit.php:38 actions/twittersettings.php:290
+#: actions/userauthorization.php:39
+#, fuzzy
+msgid "There was a problem with your session token. "
+msgstr "会话标识有问题,请重试。"
+
+#: actions/avatarsettings.php:303 actions/grouplogo.php:360
+msgid "Pick a square area of the image to be your avatar"
+msgstr ""
+
+#: actions/avatarsettings.php:327 actions/grouplogo.php:384
+msgid "Lost our file data."
+msgstr ""
+
+#: actions/avatarsettings.php:334 actions/grouplogo.php:391
+#: classes/User_group.php:112
+#, fuzzy
+msgid "Lost our file."
+msgstr "没有这份通告。"
+
+#: actions/avatarsettings.php:349 actions/avatarsettings.php:383
+#: actions/grouplogo.php:406 actions/grouplogo.php:440
+#: classes/User_group.php:129 classes/User_group.php:161
+#, fuzzy
+msgid "Unknown file type"
+msgstr "不支持这种类型的文件"
+
+#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
+
+#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
+#: actions/unblock.php:75
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信息。"
+
+#: actions/block.php:111
+#, fuzzy
+msgid "Block user"
+msgstr "未找到用户"
+
+#: actions/block.php:129
+#, fuzzy
+msgid "Are you sure you want to block this user? "
+msgstr "确定要删除这条通告吗?"
+
+#: actions/block.php:162
+#, fuzzy
+msgid "You have already blocked this user."
+msgstr "您已订阅这些用户:"
+
+#: actions/block.php:167
+msgid "Failed to save block information."
+msgstr ""
+
+#: actions/confirmaddress.php:159
+#, fuzzy, php-format
+msgid "The address \"%s\" has been "
+msgstr "地址被移除。"
+
+#: actions/deletenotice.php:73
+#, fuzzy
+msgid "You are about to permanently delete a notice. "
+msgstr "您选择了永久删除通告。这样做是无法恢复的。"
+
+#: actions/disfavor.php:94
+#, fuzzy
+msgid "Add to favorites"
+msgstr "%s 的收藏的聚合"
+
+#: actions/editgroup.php:54
+#, php-format
+msgid "Edit %s group"
+msgstr ""
+
+#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
+#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+msgid "Inboxes must be enabled for groups to work"
+msgstr ""
+
+#: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#, fuzzy
+msgid "You must be logged in to create a group."
+msgstr "您必须登录才能邀请其他人使用 %s"
+
+#: actions/editgroup.php:87 actions/grouplogo.php:87
+#: actions/groupmembers.php:76 actions/joingroup.php:81
+#: actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "没有昵称。"
+
+#: actions/editgroup.php:99 actions/groupbyid.php:88 actions/grouplogo.php:100
+#: actions/groupmembers.php:83 actions/joingroup.php:88
+#: actions/showgroup.php:128
+#, fuzzy
+msgid "No such group"
+msgstr "未找到用户"
+
+#: actions/editgroup.php:106 actions/editgroup.php:165
+#: actions/grouplogo.php:107
+#, fuzzy
+msgid "You must be an admin to edit the group"
+msgstr "您必须登录才能邀请其他人使用 %s"
+
+#: actions/editgroup.php:157
+msgid "Use this form to edit the group."
+msgstr ""
+
+#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#, fuzzy
+msgid "Nickname must have only lowercase letters "
+msgstr "昵称只能使用小写字母和数字,不包含空格。"
+
+#: actions/editgroup.php:198 actions/newgroup.php:149
+#, fuzzy
+msgid "description is too long (max 140 chars)."
+msgstr "个人小传过长(不能超过140字符)。"
+
+#: actions/editgroup.php:218
+#, fuzzy
+msgid "Could not update group."
+msgstr "无法更新用户。"
+
+#: actions/editgroup.php:226
+#, fuzzy
+msgid "Options saved."
+msgstr "设置已保存。"
+
+#: actions/emailsettings.php:107 actions/imsettings.php:108
+#, fuzzy, php-format
+msgid "Awaiting confirmation on this address. "
+msgstr "等待确认此电话号码。"
+
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#, fuzzy
+msgid "Make a new email address for posting to; "
+msgstr "新的电子邮件地址,用于发布 %s 信息"
+
+#: actions/emailsettings.php:157
+#, fuzzy
+msgid "Send me email when someone "
+msgstr "如果收到私人信息,发邮件通知我。"
+
+#: actions/emailsettings.php:168
+msgid "Allow friends to nudge me and send me an email."
+msgstr ""
+
+#: actions/emailsettings.php:321
+#, fuzzy
+msgid "That email address already belongs "
+msgstr "此电子邮件属于其他用户。"
+
+#: actions/emailsettings.php:343
+#, fuzzy
+msgid "A confirmation code was sent to the email address you added. "
+msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
+
+#: actions/facebookhome.php:110
+msgid "Server error - couldn't get user!"
+msgstr ""
+
+#: actions/facebookhome.php:196
+#, php-format
+msgid "If you would like the %s app to automatically update "
+msgstr ""
+
+#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#, php-format
+msgid "Allow %s to update my Facebook status"
+msgstr ""
+
+#: actions/facebookhome.php:218
+msgid "Skip"
+msgstr ""
+
+#: actions/facebookhome.php:235
+#, fuzzy
+msgid "No notice content!"
+msgstr "没有内容!"
+
+#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+msgid "Pagination"
+msgstr ""
+
+#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#, fuzzy
+msgid "After"
+msgstr "« 之后"
+
+#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#, fuzzy
+msgid "Before"
+msgstr "之前 »"
+
+#: actions/facebookinvite.php:70
+#, php-format
+msgid "Thanks for inviting your friends to use %s"
+msgstr ""
+
+#: actions/facebookinvite.php:72
+#, fuzzy
+msgid "Invitations have been sent to the following users:"
+msgstr "已发送邀请给这些人:"
+
+#: actions/facebookinvite.php:96
+#, fuzzy, php-format
+msgid "You have been invited to %s"
+msgstr "您已得到确认。输入"
+
+#: actions/facebookinvite.php:105
+#, fuzzy, php-format
+msgid "Invite your friends to use %s"
+msgstr "%s 好友的聚合"
+
+#: actions/facebookinvite.php:113
+#, php-format
+msgid "Friends already using %s:"
+msgstr ""
+
+#: actions/facebookinvite.php:130
+#, php-format
+msgid "Send invitations"
+msgstr ""
+
+#: actions/facebookremove.php:56
+#, fuzzy
+msgid "Couldn't remove Facebook user."
+msgstr "无法移除 Twitter 用户。"
+
+#: actions/facebooksettings.php:65
+#, fuzzy
+msgid "There was a problem saving your sync preferences!"
+msgstr "会话标识有问题,请重试。"
+
+#: actions/facebooksettings.php:67
+#, fuzzy
+msgid "Sync preferences saved."
+msgstr "首选项已保存。"
+
+#: actions/facebooksettings.php:90
+#, fuzzy
+msgid "Automatically update my Facebook status with my notices."
+msgstr "自动将我的通告转发到 Twitter。"
+
+#: actions/facebooksettings.php:97
+#, fuzzy
+msgid "Send \"@\" replies to Facebook."
+msgstr "将这里的 \"@\" 回复发送到 Twitter。"
+
+#: actions/facebooksettings.php:106
+#, fuzzy
+msgid "Prefix"
+msgstr "个人信息"
+
+#: actions/facebooksettings.php:108
+msgid "A string to prefix notices with."
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid "If you would like %s to automatically update "
+msgstr ""
+
+#: actions/facebooksettings.php:147
+#, fuzzy
+msgid "Sync preferences"
+msgstr "首选项"
+
+#: actions/favor.php:94 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "取消收藏"
+
+#: actions/favorited.php:65 lib/popularnoticesection.php:76
+#: lib/publicgroupnav.php:91
+#, fuzzy
+msgid "Popular notices"
+msgstr "没有这份通告。"
+
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "没有这份通告。"
+
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "显示上周以来最流行的标签"
+
+#: actions/featured.php:69 lib/featureduserssection.php:82
+#: lib/publicgroupnav.php:87
+msgid "Featured users"
+msgstr ""
+
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr ""
+
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr ""
+
+#: actions/finishremotesubscribe.php:188
+msgid "That user has blocked you from subscribing."
+msgstr ""
+
+#: actions/groupbyid.php:79
+msgid "No ID"
+msgstr ""
+
+#: actions/grouplogo.php:138 actions/grouplogo.php:191
+msgid "Group logo"
+msgstr ""
+
+#: actions/grouplogo.php:149
+msgid "You can upload a logo image for your group."
+msgstr ""
+
+#: actions/grouplogo.php:448
+#, fuzzy
+msgid "Logo updated."
+msgstr "头像已更新。"
+
+#: actions/grouplogo.php:450
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "更新头像失败。"
+
+#: actions/groupmembers.php:93 lib/groupnav.php:91
+#, php-format
+msgid "%s group members"
+msgstr ""
+
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr ""
+
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr ""
+
+#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
+#: lib/subgroupnav.php:96
+msgid "Groups"
+msgstr ""
+
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr ""
+
+#: actions/groups.php:90
+#, php-format
+msgid "%%%%site.name%%%% groups let you find and talk with "
+msgstr ""
+
+#: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#, fuzzy
+msgid "Create a new group"
+msgstr "创建新帐号"
+
+#: actions/groupsearch.php:57
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+msgstr "在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。"
+
+#: actions/groupsearch.php:63
+#, fuzzy
+msgid "Group search"
+msgstr "搜索用户"
+
+#: actions/imsettings.php:70
+#, fuzzy
+msgid "You can send and receive notices through "
+msgstr "无法向此用户发送消息。"
+
+#: actions/imsettings.php:120
+#, php-format
+msgid "Jabber or GTalk address, "
+msgstr ""
+
+#: actions/imsettings.php:147
+#, fuzzy
+msgid "Send me replies through Jabber/GTalk "
+msgstr "通过Jabber/GTalk发送通告。"
+
+#: actions/imsettings.php:321
+#, fuzzy, php-format
+msgid "A confirmation code was sent "
+msgstr "没有验证码"
+
+#: actions/joingroup.php:65
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "您必须登录才能邀请其他人使用 %s"
+
+#: actions/joingroup.php:95
+#, fuzzy
+msgid "You are already a member of that group"
+msgstr "您已订阅这些用户:"
+
+#: actions/joingroup.php:128
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "无法订阅用户:未找到。"
+
+#: actions/joingroup.php:135
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s 的收藏 / %s"
+
+#: actions/leavegroup.php:60
+msgid "Inboxes must be enabled for groups to work."
+msgstr ""
+
+#: actions/leavegroup.php:65
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "您必须登录才能邀请其他人使用 %s"
+
+#: actions/leavegroup.php:88
+#, fuzzy
+msgid "No such group."
+msgstr "未找到此消息。"
+
+#: actions/leavegroup.php:95
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "您未告知此个人信息"
+
+#: actions/leavegroup.php:100
+#, fuzzy
+msgid "You may not leave a group while you are its administrator."
+msgstr "您不能删除其他用户的状态。"
+
+#: actions/leavegroup.php:130
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "无法更新用户记录。"
+
+#: actions/leavegroup.php:138
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "无法订阅用户:未找到。"
+
+#: actions/leavegroup.php:145
+#, php-format
+msgid "%s left group %s"
+msgstr ""
+
+#: actions/login.php:225 lib/facebookaction.php:304
+msgid "Login to site"
+msgstr ""
+
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr ""
+
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr ""
+
+#: actions/newgroup.php:115
+msgid "Use this form to create a new group."
+msgstr ""
+
+#: actions/newgroup.php:177
+#, fuzzy
+msgid "Could not create group."
+msgstr "无法创建收藏。"
+
+#: actions/newgroup.php:191
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "无法删除订阅。"
+
+#: actions/newmessage.php:119 actions/newnotice.php:132
+#, fuzzy
+msgid "That's too long. "
+msgstr "文件超出大小限制。"
+
+#: actions/newmessage.php:134
+#, fuzzy
+msgid "Don't send a message to yourself; "
+msgstr "无法向此用户发送消息。"
+
+#: actions/newnotice.php:166
+#, fuzzy
+msgid "Notice posted"
+msgstr "通告"
+
+#: actions/newnotice.php:200 classes/Channel.php:163
+msgid "Ajax Error"
+msgstr ""
+
+#: actions/nudge.php:85
+msgid ""
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr ""
+
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr ""
+
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr ""
+
+#: actions/openidlogin.php:97
+#, fuzzy
+msgid "OpenID login"
+msgstr "OpenID 登录"
+
+#: actions/openidsettings.php:128
+#, fuzzy
+msgid "Removing your only OpenID "
+msgstr "移除OpenID"
+
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter 设置"
+
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr ""
+
+#: actions/othersettings.php:93
+msgid "URL Auto-shortening"
+msgstr ""
+
+#: actions/othersettings.php:112
+#, fuzzy
+msgid "Service"
+msgstr "搜索"
+
+#: actions/othersettings.php:113
+msgid "Automatic shortening service to use."
+msgstr ""
+
+#: actions/othersettings.php:144
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "语言过长(不能超过50个字符)。"
+
+#: actions/passwordsettings.php:69
+#, fuzzy
+msgid "Change your password."
+msgstr "修改密码"
+
+#: actions/passwordsettings.php:89
+#, fuzzy
+msgid "Password change"
+msgstr "密码已保存。"
+
+#: actions/peopletag.php:35
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "不是有效的电子邮件"
+
+#: actions/peopletag.php:47
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr ""
+
+#: actions/peopletag.php:91
+#, php-format
+msgid "These are users who have tagged themselves \"%s\" "
+msgstr ""
+
+#: actions/profilesettings.php:91
+#, fuzzy
+msgid "Profile information"
+msgstr "未知的帐号"
+
+#: actions/profilesettings.php:124
+msgid ""
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr ""
+
+#: actions/profilesettings.php:144
+#, fuzzy
+msgid "Automatically subscribe to whoever "
+msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
+
+#: actions/profilesettings.php:229 actions/tagother.php:176
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "主页'%s'不正确"
+
+#: actions/profilesettings.php:311
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "无法保存个人信息。"
+
+#: actions/public.php:107
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "公开的时间表"
+
+#: actions/public.php:173
+#, fuzzy
+msgid "Could not retrieve public stream."
+msgstr "无法获取收藏的通告。"
+
+#: actions/public.php:220
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service "
+msgstr ""
+
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "公开的聚合"
+
+#: actions/publictagcloud.php:63
+#, php-format
+msgid "These are most popular recent tags on %s "
+msgstr ""
+
+#: actions/publictagcloud.php:119
+msgid "Tag cloud"
+msgstr ""
+
+#: actions/register.php:139 actions/register.php:349
+msgid "Sorry, only invited people can register."
+msgstr ""
+
+#: actions/register.php:149
+#, fuzzy
+msgid "You can't register if you don't "
+msgstr "您必须同意此授权方可注册。"
+
+#: actions/register.php:286
+msgid "With this form you can create "
+msgstr ""
+
+#: actions/register.php:368
+#, fuzzy
+msgid "1-64 lowercase letters or numbers, "
+msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
+
+#: actions/register.php:382 actions/register.php:386
+#, fuzzy
+msgid "Used only for updates, announcements, "
+msgstr "只用于更新、通告或密码恢复"
+
+#: actions/register.php:398
+#, fuzzy
+msgid "URL of your homepage, blog, "
+msgstr "您的主页、博客或在其他站点的URL"
+
+#: actions/register.php:404
+#, fuzzy
+msgid "Describe yourself and your "
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: actions/register.php:410
+#, fuzzy
+msgid "Where you are, like \"City, "
+msgstr "你的位置,格式类似\"城市,省份,国家\""
+
+#: actions/register.php:432
+#, fuzzy
+msgid " except this private data: password, "
+msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
+
+#: actions/register.php:471
+#, fuzzy, php-format
+msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
+msgstr "祝贺你,%s!欢迎来到 %%%%site.name%%%%。在这里,您可以……"
+
+#: actions/register.php:495
+#, fuzzy
+msgid "(You should receive a message by email "
+msgstr "(您将立即收到一封电子邮件,含有"
+
+#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
+msgid "That's a local profile! Login to subscribe."
+msgstr ""
+
+#: actions/replies.php:118
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s 的回复"
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s favorite notices, page %d"
+msgstr "%s 收藏的通告"
+
+#: actions/showgroup.php:77 lib/groupnav.php:85
+#, php-format
+msgid "%s group"
+msgstr ""
+
+#: actions/showgroup.php:79
+#, php-format
+msgid "%s group, page %d"
+msgstr ""
+
+#: actions/showgroup.php:206
+#, fuzzy
+msgid "Group profile"
+msgstr "没有这份通告。"
+
+#: actions/showgroup.php:251 actions/showstream.php:278
+#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
+msgid "URL"
+msgstr ""
+
+#: actions/showgroup.php:262 actions/showstream.php:289
+#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#, fuzzy
+msgid "Note"
+msgstr "通告"
+
+#: actions/showgroup.php:270
+msgid "Group actions"
+msgstr ""
+
+#: actions/showgroup.php:323
+#, fuzzy, php-format
+msgid "Notice feed for %s group"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:357 lib/groupnav.php:90
+#, fuzzy
+msgid "Members"
+msgstr "注册于"
+
+#: actions/showgroup.php:363 actions/showstream.php:413
+#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr ""
+
+#: actions/showgroup.php:370
+msgid "All members"
+msgstr ""
+
+#: actions/showgroup.php:378
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/showmessage.php:98
+#, fuzzy
+msgid "Only the sender and recipient "
+msgstr "只有发送和接受双方可以阅读此消息。"
+
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "%s 的收件箱 - 第 %d 页"
+
+#: actions/showstream.php:143
+#, fuzzy
+msgid "'s profile"
+msgstr "个人信息"
+
+#: actions/showstream.php:236 actions/tagother.php:77
+#, fuzzy
+msgid "User profile"
+msgstr "用户没有个人信息。"
+
+#: actions/showstream.php:240 actions/tagother.php:81
+msgid "Photo"
+msgstr ""
+
+#: actions/showstream.php:317
+#, fuzzy
+msgid "User actions"
+msgstr "未知动作"
+
+#: actions/showstream.php:342
+#, fuzzy
+msgid "Send a direct message to this user"
+msgstr "无法向此用户发送消息。"
+
+#: actions/showstream.php:343
+#, fuzzy
+msgid "Message"
+msgstr "新消息"
+
+#: actions/showstream.php:451
+#, fuzzy
+msgid "All subscribers"
+msgstr "订阅者"
+
+#: actions/showstream.php:533
+msgid "All groups"
+msgstr ""
+
+#: actions/showstream.php:542
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service "
+msgstr ""
+
+#: actions/smssettings.php:128
+#, fuzzy
+msgid "Phone number, no punctuation or spaces, "
+msgstr "电话号码,不带标点或空格,包含地区代码"
+
+#: actions/smssettings.php:162
+#, fuzzy
+msgid "Send me notices through SMS; "
+msgstr "通过Jabber/GTalk发送通告。"
+
+#: actions/smssettings.php:335
+#, fuzzy
+msgid "A confirmation code was sent to the phone number you added. "
+msgstr "等待确认此电话号码。"
+
+#: actions/smssettings.php:453
+#, fuzzy
+msgid "Mobile carrier"
+msgstr "选择运营商"
+
+#: actions/subedit.php:70
+#, fuzzy
+msgid "You are not subscribed to that profile."
+msgstr "您未告知此个人信息"
+
+#: actions/subedit.php:83
+#, fuzzy
+msgid "Could not save subscription."
+msgstr "无法删除订阅。"
+
+#: actions/subscribe.php:55
+#, fuzzy
+msgid "Not a local user."
+msgstr "没有这个用户。"
+
+#: actions/subscribe.php:69
+#, fuzzy
+msgid "Subscribed"
+msgstr "订阅"
+
+#: actions/subscribers.php:50
+#, fuzzy, php-format
+msgid "%s subscribers"
+msgstr "订阅者"
+
+#: actions/subscribers.php:52
+#, php-format
+msgid "%s subscribers, page %d"
+msgstr ""
+
+#: actions/subscribers.php:63
+#, fuzzy
+msgid "These are the people who listen to "
+msgstr "这些用户订阅了 %s 的通告。"
+
+#: actions/subscribers.php:67
+#, fuzzy, php-format
+msgid "These are the people who "
+msgstr "这些用户订阅了 %s 的通告。"
+
+#: actions/subscriptions.php:52
+#, fuzzy, php-format
+msgid "%s subscriptions"
+msgstr "所有订阅"
+
+#: actions/subscriptions.php:54
+#, fuzzy, php-format
+msgid "%s subscriptions, page %d"
+msgstr "所有订阅"
+
+#: actions/subscriptions.php:65
+#, fuzzy
+msgid "These are the people whose notices "
+msgstr "这是 %s 订阅的用户。"
+
+#: actions/subscriptions.php:69
+#, fuzzy, php-format
+msgid "These are the people whose "
+msgstr "这些用户订阅了 %s 的通告。"
+
+#: actions/subscriptions.php:122
+#, fuzzy
+msgid "Jabber"
+msgstr "没有 Jabber ID。"
+
+#: actions/tag.php:43
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "带 %s 标签的通告"
+
+#: actions/tag.php:66
+#, php-format
+msgid "Messages tagged \"%s\", most recent first"
+msgstr ""
+
+#: actions/tagother.php:33
+#, fuzzy
+msgid "Not logged in"
+msgstr "未登录。"
+
+#: actions/tagother.php:39
+#, fuzzy
+msgid "No id argument."
+msgstr "没有这份文档。"
+
+#: actions/tagother.php:65
+#, fuzzy, php-format
+msgid "Tag %s"
+msgstr "标签"
+
+#: actions/tagother.php:141
+#, fuzzy
+msgid "Tag user"
+msgstr "标签"
+
+#: actions/tagother.php:149
+msgid ""
+"Tags for this user (letters, numbers, -, ., and _), comma- or space- "
+"separated"
+msgstr ""
+
+#: actions/tagother.php:164
+#, fuzzy
+msgid "There was a problem with your session token."
+msgstr "会话标识有问题,请重试。"
+
+#: actions/tagother.php:191
+msgid ""
+"You can only tag people you are subscribed to or who are subscribed to you."
+msgstr ""
+
+#: actions/tagother.php:198
+#, fuzzy
+msgid "Could not save tags."
+msgstr "无法保存头像"
+
+#: actions/tagother.php:233
+msgid "Use this form to add tags to your subscribers or subscriptions."
+msgstr ""
+
+#: actions/tagrss.php:35
+#, fuzzy
+msgid "No such tag."
+msgstr "未找到此消息。"
+
+#: actions/tagrss.php:66
+#, fuzzy, php-format
+msgid "Microblog tagged with %s"
+msgstr "带 %s 标签的通告"
+
+#: actions/twitapiblocks.php:47
+msgid "Block user failed."
+msgstr ""
+
+#: actions/twitapiblocks.php:69
+msgid "Unblock user failed."
+msgstr ""
+
+#: actions/twitapiusers.php:48
+#, fuzzy
+msgid "Not found."
+msgstr "未找到"
+
+#: actions/twittersettings.php:71
+#, fuzzy
+msgid "Add your Twitter account to automatically send "
+msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
+
+#: actions/twittersettings.php:119
+#, fuzzy
+msgid "Twitter user name"
+msgstr "Twitter 用户名"
+
+#: actions/twittersettings.php:126
+#, fuzzy
+msgid "Twitter password"
+msgstr "Twitter 密码"
+
+#: actions/twittersettings.php:228
+#, fuzzy
+msgid "Twitter Friends"
+msgstr "Twitter 设置"
+
+#: actions/twittersettings.php:327
+msgid "Username must have only numbers, "
+msgstr ""
+
+#: actions/twittersettings.php:341
+#, fuzzy, php-format
+msgid "Unable to retrieve account information "
+msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
+
+#: actions/unblock.php:108
+#, fuzzy
+msgid "Error removing the block."
+msgstr "保存用户时出错。"
+
+#: actions/unsubscribe.php:50
+#, fuzzy
+msgid "No profile id in request."
+msgstr "服务器没有返回个人信息URL。"
+
+#: actions/unsubscribe.php:57
+#, fuzzy
+msgid "No profile with that id."
+msgstr "没有找到此ID的信息。"
+
+#: actions/unsubscribe.php:71
+#, fuzzy
+msgid "Unsubscribed"
+msgstr "退订"
+
+#: actions/usergroups.php:63
+#, php-format
+msgid "%s groups"
+msgstr ""
+
+#: actions/usergroups.php:65
+#, php-format
+msgid "%s groups, page %d"
+msgstr ""
+
+#: classes/Notice.php:104
+#, fuzzy
+msgid "Problem saving notice. Unknown user."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:109
+msgid ""
+"Too many notices too fast; take a breather and post again in a few minutes."
+msgstr ""
+
+#: classes/Notice.php:116
+#, fuzzy
+msgid "You are banned from posting notices on this site."
+msgstr ""
+"您的新的发布用的地址是 %1$s。\n"
+"\n"
+
+#: lib/accountsettingsaction.php:108
+#, fuzzy
+msgid "Upload an avatar"
+msgstr "更新头像失败。"
+
+#: lib/accountsettingsaction.php:119
+msgid "Other"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120
+msgid "Other options"
+msgstr ""
+
+#: lib/action.php:130
+#, fuzzy, php-format
+msgid "%s - %s"
+msgstr "%s (%s)"
+
+#: lib/action.php:145
+msgid "Untitled page"
+msgstr ""
+
+#: lib/action.php:316
+msgid "Primary site navigation"
+msgstr ""
+
+#: lib/action.php:322
+msgid "Personal profile and friends timeline"
+msgstr ""
+
+#: lib/action.php:325
+msgid "Search for people or text"
+msgstr ""
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Account"
+msgstr "关于"
+
+#: lib/action.php:328
+#, fuzzy
+msgid "Change your email, avatar, password, profile"
+msgstr "修改密码"
+
+#: lib/action.php:330
+msgid "Connect to IM, SMS, Twitter"
+msgstr ""
+
+#: lib/action.php:332
+msgid "Logout from the site"
+msgstr ""
+
+#: lib/action.php:335
+msgid "Login to the site"
+msgstr ""
+
+#: lib/action.php:338
+#, fuzzy
+msgid "Create an account"
+msgstr "创建新帐号"
+
+#: lib/action.php:341
+#, fuzzy
+msgid "Login with OpenID"
+msgstr "没有这个 OpenID。"
+
+#: lib/action.php:344
+#, fuzzy
+msgid "Help me!"
+msgstr "帮助"
+
+#: lib/action.php:362
+#, fuzzy
+msgid "Site notice"
+msgstr "新通告"
+
+#: lib/action.php:417
+msgid "Local views"
+msgstr ""
+
+#: lib/action.php:472
+#, fuzzy
+msgid "Page notice"
+msgstr "新通告"
+
+#: lib/action.php:562
+#, fuzzy
+msgid "Secondary site navigation"
+msgstr "订阅"
+
+#: lib/action.php:602 lib/action.php:623
+msgid "Laconica software license"
+msgstr ""
+
+#: lib/action.php:630
+msgid "All "
+msgstr ""
+
+#: lib/action.php:635
+msgid "license."
+msgstr ""
+
+#: lib/blockform.php:123 lib/blockform.php:153
+#, fuzzy
+msgid "Block this user"
+msgstr "未找到用户"
+
+#: lib/blockform.php:153
+msgid "Block"
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s 收藏的通告"
+
+#: lib/facebookaction.php:268
+#, php-format
+msgid "To use the %s Facebook Application you need to login "
+msgstr ""
+
+#: lib/facebookaction.php:271
+#, fuzzy
+msgid " a new account."
+msgstr "创建新帐号"
+
+#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+msgid "Published"
+msgstr ""
+
+#: lib/favorform.php:114 lib/favorform.php:140
+#, fuzzy
+msgid "Favor this notice"
+msgstr "%s 收藏的通告"
+
+#: lib/feedlist.php:64
+msgid "Export data"
+msgstr ""
+
+#: lib/galleryaction.php:121
+#, fuzzy
+msgid "Filter tags"
+msgstr "%s 标签的聚合"
+
+#: lib/galleryaction.php:131
+msgid "All"
+msgstr ""
+
+#: lib/galleryaction.php:137
+#, fuzzy
+msgid "Tag"
+msgstr "标签"
+
+#: lib/galleryaction.php:138
+msgid "Choose a tag to narrow list"
+msgstr ""
+
+#: lib/galleryaction.php:139
+msgid "Go"
+msgstr ""
+
+#: lib/groupeditform.php:148
+#, fuzzy
+msgid "URL of the homepage or blog of the group or topic"
+msgstr "您的主页、博客或在其他站点的URL"
+
+#: lib/groupeditform.php:151
+#, fuzzy
+msgid "Description"
+msgstr "订阅"
+
+#: lib/groupeditform.php:153
+#, fuzzy
+msgid "Describe the group or topic in 140 chars"
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: lib/groupeditform.php:158
+#, fuzzy
+msgid ""
+"Location for the group, if any, like \"City, State (or Region), Country\""
+msgstr "你的位置,格式类似\"城市,省份,国家\""
+
+#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+msgid "Group"
+msgstr ""
+
+#: lib/groupnav.php:100
+msgid "Admin"
+msgstr ""
+
+#: lib/groupnav.php:101
+#, php-format
+msgid "Edit %s group properties"
+msgstr ""
+
+#: lib/groupnav.php:106
+#, fuzzy
+msgid "Logo"
+msgstr "登出"
+
+#: lib/groupnav.php:107
+#, php-format
+msgid "Add or edit %s logo"
+msgstr ""
+
+#: lib/groupsbymemberssection.php:71
+msgid "Groups with most members"
+msgstr ""
+
+#: lib/groupsbypostssection.php:71
+msgid "Groups with most posts"
+msgstr ""
+
+#: lib/grouptagcloudsection.php:56
+#, php-format
+msgid "Tags in %s group's notices"
+msgstr ""
+
+#: lib/htmloutputter.php:104
+#, fuzzy
+msgid "This page is not available in a "
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: lib/joinform.php:114
+#, fuzzy
+msgid "Join"
+msgstr "登录"
+
+#: lib/leaveform.php:114
+#, fuzzy
+msgid "Leave"
+msgstr "保存"
+
+#: lib/logingroupnav.php:76
+#, fuzzy
+msgid "Login with a username and password"
+msgstr "输入用户名和密码以登录。"
+
+#: lib/logingroupnav.php:79
+#, fuzzy
+msgid "Sign up for a new account"
+msgstr "创建新帐号"
+
+#: lib/logingroupnav.php:82
+msgid "Login or register with OpenID"
+msgstr ""
+
+#: lib/mail.php:175
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:236
+#, fuzzy, php-format
+msgid "%1$s is now listening to "
+msgstr "%1$s 开始关注您的 %2$s 信息。"
+
+#: lib/mail.php:254
+#, fuzzy, php-format
+msgid "Location: %s\n"
+msgstr "位置:%s"
+
+#: lib/mail.php:256
+#, fuzzy, php-format
+msgid "Homepage: %s\n"
+msgstr "主页:%s"
+
+#: lib/mail.php:258
+#, php-format
+msgid ""
+"Bio: %s\n"
+"\n"
+msgstr ""
+
+#: lib/mail.php:461
+#, fuzzy, php-format
+msgid "You've been nudged by %s"
+msgstr "您已得到确认。输入"
+
+#: lib/mail.php:465
+#, fuzzy, php-format
+msgid "%1$s (%2$s) is wondering what you are up to "
+msgstr ""
+"%1$s (%2$s) 发送了新的私人信息:\n"
+"\n"
+
+#: lib/mail.php:555
+#, fuzzy, php-format
+msgid "%1$s just added your notice from %2$s"
+msgstr ""
+"%1$s 收藏了您的 %2$s 通告。\n"
+"\n"
+
+#: lib/mailbox.php:229 lib/noticelist.php:380
+#, fuzzy
+msgid "From"
+msgstr " 从 "
+
+#: lib/messageform.php:110
+#, fuzzy
+msgid "Send a direct notice"
+msgstr "删除通告"
+
+#: lib/noticeform.php:125
+#, fuzzy
+msgid "Send a notice"
+msgstr "发送消息"
+
+#: lib/noticeform.php:152
+#, fuzzy
+msgid "Available characters"
+msgstr "6 个或更多字符"
+
+#: lib/noticelist.php:426
+#, fuzzy
+msgid "in reply to"
+msgstr "先前……"
+
+#: lib/noticelist.php:447 lib/noticelist.php:450
+#, fuzzy
+msgid "Reply to this notice"
+msgstr "无法删除通告。"
+
+#: lib/noticelist.php:451
+#, fuzzy
+msgid "Reply"
+msgstr "回复"
+
+#: lib/noticelist.php:471 lib/noticelist.php:474
+#, fuzzy
+msgid "Delete this notice"
+msgstr "删除通告"
+
+#: lib/noticelist.php:474
+#, fuzzy
+msgid "Delete"
+msgstr "删除"
+
+#: lib/nudgeform.php:116
+msgid "Nudge this user"
+msgstr ""
+
+#: lib/nudgeform.php:128
+msgid "Nudge"
+msgstr ""
+
+#: lib/nudgeform.php:128
+#, fuzzy
+msgid "Send a nudge to this user"
+msgstr "无法向此用户发送消息。"
+
+#: lib/personaltagcloudsection.php:56
+#, fuzzy, php-format
+msgid "Tags in %s's notices"
+msgstr "用户没有通告。"
+
+#: lib/profilelist.php:182
+msgid "(none)"
+msgstr ""
+
+#: lib/publicgroupnav.php:76
+msgid "Public"
+msgstr ""
+
+#: lib/publicgroupnav.php:80
+msgid "User groups"
+msgstr ""
+
+#: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#, fuzzy
+msgid "Recent tags"
+msgstr "最近的标签"
+
+#: lib/publicgroupnav.php:86
+msgid "Featured"
+msgstr ""
+
+#: lib/publicgroupnav.php:90
+#, fuzzy
+msgid "Popular"
+msgstr "用户"
+
+#: lib/searchgroupnav.php:82
+#, fuzzy
+msgid "Notice"
+msgstr "通告"
+
+#: lib/searchgroupnav.php:85
+#, fuzzy
+msgid "Find groups on this site"
+msgstr "搜索用户信息"
+
+#: lib/section.php:89
+msgid "Untitled section"
+msgstr ""
+
+#: lib/subgroupnav.php:81
+#, fuzzy, php-format
+msgid "People %s subscribes to"
+msgstr "远程订阅"
+
+#: lib/subgroupnav.php:89
+#, fuzzy, php-format
+msgid "People subscribed to %s"
+msgstr "订阅 %s"
+
+#: lib/subgroupnav.php:97
+#, php-format
+msgid "Groups %s is a member of"
+msgstr ""
+
+#: lib/subgroupnav.php:104
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "使用这个表单来邀请好友和同事加入。"
+
+#: lib/subs.php:53
+#, fuzzy
+msgid "User has blocked you."
+msgstr "用户没有个人信息。"
+
+#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#, fuzzy
+msgid "Subscribe to this user"
+msgstr "订阅 %s"
+
+#: lib/tagcloudsection.php:56
+#, fuzzy
+msgid "None"
+msgstr "否"
+
+#: lib/topposterssection.php:74
+msgid "Top posters"
+msgstr ""
+
+#: lib/unblockform.php:120 lib/unblockform.php:150
+#, fuzzy
+msgid "Unblock this user"
+msgstr "未找到用户"
+
+#: lib/unblockform.php:150
+msgid "Unblock"
+msgstr ""
+
+#: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
+#, fuzzy
+msgid "Unsubscribe from this user"
+msgstr "取消订阅 %s"
+
+#, fuzzy
+#~ msgid "Code not yet ready."
+#~ msgstr "命令尚未实现。"
+
+#, fuzzy
+#~ msgid "Delete my account"
+#~ msgstr "创建新帐号"
+
+#, fuzzy
+#~ msgid "Delete my account confirmation"
+#~ msgstr "无法删除电子邮件确认。"
+
+#, fuzzy
+#~ msgid "Check if you are sure you want to delete your account."
+#~ msgstr "确定要删除这条通告吗?"
+
+#, fuzzy
+#~ msgid "Showing recently popular notices"
+#~ msgstr "搜索通告内容"