]> git.mxchange.org Git - quix0rs-gnu-social.git/blobdiff - locale/zh_CN/LC_MESSAGES/statusnet.po
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
[quix0rs-gnu-social.git] / locale / zh_CN / LC_MESSAGES / statusnet.po
index 5c2eced4e36cf0a20c3d039d6a7a507a616af652..05ab5243ff4ff6aef896052508f439100a8d5807 100644 (file)
@@ -1,3 +1,6 @@
+# Translation of StatusNet to Simplified Chinese
+#
+# --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
 # This file is distributed under the same license as the identi.ca package.
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
 # This file is distributed under the same license as the identi.ca package.
@@ -5,26 +8,27 @@
 #
 msgid ""
 msgstr ""
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: identi.ca\n"
+"Project-Id-Version: StatusNet\n"
 "Report-Msgid-Bugs-To: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-25 16:24+0000\n"
-"PO-Revision-Date: 2009-07-28 14:03+0000\n"
-"Last-Translator: offacer <offacer@gmail.com>\n"
-"Language-Team: i18n-zh <i18n-zh@googlegroups.com>\n"
-"MIME-Version: 1.0\n"
+"POT-Creation-Date: 2009-11-06 13:16+0000\n"
+"PO-Revision-Date: 2009-11-06 15:44:51+0000\n"
+"Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
+"X-Language-Code: zh-hans\n"
+"X-Message-Group: out-statusnet\n"
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
 
 #: ../actions/noticesearchrss.php:64 actions/noticesearchrss.php:68
-#: actions/noticesearchrss.php:88
+#: actions/noticesearchrss.php:88 actions/noticesearchrss.php:89
 #, 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
 #, 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
+#: actions/finishopenidlogin.php:110 actions/finishopenidlogin.php:109
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
 msgid ""
 " except this private data: password, email address, IM address, phone number."
 msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
@@ -35,17 +39,19 @@ msgid " from "
 msgstr " 从 "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
 msgstr " 从 "
 
 #: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/twitapistatuses.php:347 actions/twitapistatuses.php:363
 #, 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:211
 #, 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:211
+#: actions/invite.php:218 actions/invite.php:220 actions/invite.php:226
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请您加入 %2$s"
 
 #, php-format
 msgid "%1$s has invited you to join them on %2$s"
 msgstr "%1$s 邀请您加入 %2$s"
 
-#: ../actions/invite.php:170
+#: ../actions/invite.php:170 actions/invite.php:220 actions/invite.php:222
+#: actions/invite.php:228
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
 #, php-format
 msgid ""
 "%1$s has invited you to join them on %2$s (%3$s).\n"
@@ -78,7 +84,8 @@ msgstr ""
 "%1$s 邀请你加入 %2$s (%3$s).\n"
 "\n"
 "%2$s 是一个能让你和你认识的、感兴趣的人保持联系的微博客服务。 \n"
 "%1$s 邀请你加入 %2$s (%3$s).\n"
 "\n"
 "%2$s 是一个能让你和你认识的、感兴趣的人保持联系的微博客服务。 \n"
-"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣的新朋友。\n"
+"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣"
+"的新朋友。\n"
 "\n"
 "%1$s 说:\n"
 "\n"
 "\n"
 "%1$s 说:\n"
 "\n"
@@ -96,6 +103,7 @@ msgstr ""
 "诚挚的感谢, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
 "诚挚的感谢, %2$s\n"
 
 #: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
+#: lib/mail.php:236 lib/mail.php:235
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信息。"
 #, php-format
 msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信息。"
@@ -117,25 +125,28 @@ msgstr ""
 "为您效力的 %4$s\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
 "为您效力的 %4$s\n"
 
 #: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/twitapistatuses.php:350 actions/twitapistatuses.php:367
+#: actions/twitapistatuses.php:328 actions/apitimelinementions.php:126
 #, 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
 #, 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
+#: actions/shownotice.php:161 actions/shownotice.php:174 actions/oembed.php:86
+#: actions/shownotice.php:180
 #, 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:123 actions/invite.php:131
 #, 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:123 actions/invite.php:131
+#: actions/invite.php:125 actions/invite.php:133 actions/invite.php:139
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
 #, php-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
 #: ../actions/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/publicrss.php:90 actions/publicrss.php:89
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s 公开聚合"
 #, php-format
 msgid "%s Public Stream"
 msgstr "%s 公开聚合"
@@ -145,40 +156,55 @@ msgstr "%s 公开聚合"
 #: 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
 #: 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
+#: actions/all.php:68 actions/all.php:114 actions/allrss.php:106
+#: actions/facebookhome.php:163 actions/twitapistatuses.php:130
+#: actions/all.php:50 actions/all.php:127 actions/allrss.php:114
+#: actions/facebookhome.php:158 actions/twitapistatuses.php:89
+#: lib/personalgroupnav.php:100 actions/all.php:86 actions/all.php:167
+#: actions/allrss.php:115 actions/apitimelinefriends.php:114
 #, php-format
 msgid "%s and friends"
 msgstr "%s 及好友"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
 #, php-format
 msgid "%s and friends"
 msgstr "%s 及好友"
 
 #: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
+#: actions/twitapistatuses.php:33 actions/twitapistatuses.php:32
+#: actions/twitapistatuses.php:37 actions/apitimelinepublic.php:106
+#: actions/publicrss.php:103
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
 #, php-format
 msgid "%s public timeline"
 msgstr "%s 公众时间表"
 
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411 lib/mail.php:412
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
 #, php-format
 msgid "%s status"
 msgstr "%s 状态"
 
 #: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
+#: actions/twitapistatuses.php:199 actions/twitapistatuses.php:209
+#: actions/twitapigroups.php:69 actions/twitapistatuses.php:154
+#: actions/apitimelinegroup.php:102 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
 msgid "%s timeline"
 msgstr "%s 时间表"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
 #, php-format
 msgid "%s timeline"
 msgstr "%s 时间表"
 
 #: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
+#: actions/twitapistatuses.php:36 actions/twitapistatuses.php:38
+#: actions/twitapistatuses.php:41 actions/apitimelinepublic.php:110
+#: actions/publicrss.php:105
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "来自所有人的 %s 消息!"
 
 #, php-format
 msgid "%s updates from everyone!"
 msgstr "来自所有人的 %s 消息!"
 
-#: ../actions/register.php:213
+#: ../actions/register.php:213 actions/register.php:497
+#: actions/register.php:545 actions/register.php:555
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr "(您将收到一封邮件,包含了如何确认邮件地址的说明。)"
 
 msgid ""
 "(You should receive a message by email momentarily, with instructions on how "
 "to confirm your email address.)"
 msgstr "(您将收到一封邮件,包含了如何确认邮件地址的说明。)"
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605 lib/action.php:702
+#: lib/action.php:752 lib/action.php:767
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
 #, php-format
 msgid ""
 "**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -187,7 +213,8 @@ msgstr ""
 "**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
 "broughtbyurl%%)。"
 
 "**%%site.name%%** 是一个微博客服务,提供者为 [%%site.broughtby%%](%%site."
 "broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
+#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607 lib/action.php:704
+#: lib/action.php:754 lib/action.php:769
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 是一个微博客服务。"
 #, php-format
 msgid "**%%site.name%%** is a microblogging service. "
 msgstr "**%%site.name%%** 是一个微博客服务。"
@@ -199,30 +226,34 @@ 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
 #: ../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
+#: lib/groupeditform.php:139 actions/finishopenidlogin.php:100
+#: lib/groupeditform.php:154 actions/profilesettings.php:108
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
 
 #: ../actions/register.php:152 actions/register.php:166
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
 msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
 
 #: ../actions/register.php:152 actions/register.php:166
+#: actions/register.php:368 actions/register.php:414 actions/register.php:418
 msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
 msgstr "1 到 64 个小写字母或数字,不包含标点及空白。此项必填。"
 
 #: ../actions/password.php:42 actions/profilesettings.php:181
 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
+#: actions/passwordsettings.php:102 actions/passwordsettings.php:108
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
 msgid "6 or more characters"
 msgstr "6 个或更多字符"
 
 #: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
+#: actions/recoverpassword.php:220 actions/recoverpassword.php:233
+#: actions/recoverpassword.php:236
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 个或更多字符,不能忘记!"
 
 #: ../actions/register.php:154 actions/register.php:168
 msgid "6 or more characters, and don't forget it!"
 msgstr "6 个或更多字符,不能忘记!"
 
 #: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
+#: actions/register.php:373 actions/register.php:419 actions/register.php:423
 msgid "6 or more characters. Required."
 msgstr "6 个或更多字符。此项必填。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
 msgid "6 or more characters. Required."
 msgstr "6 个或更多字符。此项必填。"
 
 #: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/imsettings.php:321 actions/imsettings.php:327
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
 #, php-format
 msgid ""
 "A confirmation code was sent to the IM address you added. You must approve %"
@@ -230,6 +261,7 @@ msgid ""
 msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
 msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
 #: ../actions/emailsettings.php:213 actions/emailsettings.php:231
+#: actions/emailsettings.php:350 actions/emailsettings.php:358
 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."
 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."
@@ -263,7 +295,34 @@ msgstr ""
 #: 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/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
+#: actions/twitapiusers.php:32 actions/twitapidirect_messages.php:120
+#: actions/twitapifavorites.php:91 actions/twitapifavorites.php:108
+#: actions/twitapistatuses.php:82 actions/twitapistatuses.php:159
+#: actions/twitapistatuses.php:246 actions/twitapistatuses.php:257
+#: actions/twitapistatuses.php:416 actions/twitapistatuses.php:426
+#: actions/twitapistatuses.php:453 actions/twitapidirect_messages.php:113
+#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:109
+#: actions/twitapifavorites.php:160 actions/twitapifriendships.php:128
+#: actions/twitapifriendships.php:168 actions/twitapigroups.php:110
+#: actions/twitapistatuses.php:68 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:201 actions/twitapistatuses.php:211
+#: actions/twitapistatuses.php:357 actions/twitapistatuses.php:372
+#: actions/twitapistatuses.php:409 actions/twitapitags.php:110
+#: actions/twitapiusers.php:34 actions/apiaccountratelimitstatus.php:70
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:184 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplist.php:132 actions/apigrouplistall.php:120
+#: actions/apigroupmembership.php:101 actions/apigroupshow.php:105
+#: actions/apihelptest.php:88 actions/apistatusesdestroy.php:102
+#: actions/apistatusesshow.php:108 actions/apistatusnetconfig.php:133
+#: actions/apistatusnetversion.php:93 actions/apisubscriptions.php:111
+#: actions/apitimelinefavorites.php:144 actions/apitimelinefriends.php:154
+#: actions/apitimelinegroup.php:141 actions/apitimelinementions.php:149
+#: actions/apitimelinepublic.php:130 actions/apitimelinetag.php:139
+#: actions/apitimelineuser.php:163 actions/apiusershow.php:101
 msgid "API method not found!"
 msgstr "API 方法未实现!"
 
 msgid "API method not found!"
 msgstr "API 方法未实现!"
 
@@ -286,16 +345,23 @@ msgstr "API 方法未实现!"
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
 #: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
 #: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
 #: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
+#: actions/twitapistatuses.php:562 actions/twitapiaccount.php:46
+#: actions/twitapiaccount.php:98 actions/twitapiaccount.php:104
+#: actions/twitapidirect_messages.php:193 actions/twitapifavorites.php:149
+#: actions/twitapistatuses.php:625 actions/twitapitrends.php:87
+#: actions/twitapiaccount.php:48 actions/twitapidirect_messages.php:189
+#: actions/twitapihelp.php:54 actions/twitapistatuses.php:582
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
 msgid "API method under construction."
 msgstr "API 方法尚未实现。"
 
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
+#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568 lib/action.php:661
+#: lib/action.php:706 lib/action.php:721
 msgid "About"
 msgstr "关于"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
 msgid "About"
 msgstr "关于"
 
 #: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
+#: actions/userauthorization.php:143 actions/userauthorization.php:178
+#: actions/userauthorization.php:209
 msgid "Accept"
 msgstr "接受"
 
 msgid "Accept"
 msgstr "接受"
 
@@ -306,6 +372,9 @@ msgstr "接受"
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
 #: actions/twittersettings.php:85 actions/emailsettings.php:120
 #: actions/imsettings.php:127 actions/openidsettings.php:111
 #: actions/smssettings.php:133 actions/twittersettings.php:163
+#: actions/twittersettings.php:166 actions/twittersettings.php:182
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
 msgid "Add"
 msgstr "添加"
 
 msgid "Add"
 msgstr "添加"
 
@@ -323,27 +392,29 @@ msgstr "添加或移除 OpenID"
 #: ../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: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
+#: actions/smssettings.php:92 actions/emailsettings.php:100
+#: actions/imsettings.php:100 actions/smssettings.php:104
 msgid "Address"
 msgstr "地址"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
 msgid "Address"
 msgstr "地址"
 
 #: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
+#: actions/invite.php:181 actions/invite.php:183 actions/invite.php:189
 msgid "Addresses of friends to invite (one per line)"
 msgstr "要邀请的好友地址(每行一个)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
 msgid "Addresses of friends to invite (one per line)"
 msgstr "要邀请的好友地址(每行一个)"
 
 #: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
+#: actions/showstream.php:422 lib/profileaction.php:126
 msgid "All subscriptions"
 msgstr "所有订阅"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
 msgid "All subscriptions"
 msgstr "所有订阅"
 
 #: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/publicrss.php:92 actions/publicrss.php:91
 #, php-format
 msgid "All updates for %s"
 msgstr "所有 %s 消息"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
 #, php-format
 msgid "All updates for %s"
 msgstr "所有 %s 消息"
 
 #: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
+#: actions/noticesearchrss.php:90 actions/noticesearchrss.php:91
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有匹配搜索条件\"%s\"的消息"
 #, php-format
 msgid "All updates matching search term \"%s\""
 msgstr "所有匹配搜索条件\"%s\"的消息"
@@ -353,30 +424,37 @@ msgstr "所有匹配搜索条件\"%s\"的消息"
 #: 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/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
+#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
+#: actions/login.php:79
 msgid "Already logged in."
 msgstr "已登录。"
 
 msgid "Already logged in."
 msgstr "已登录。"
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
+#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49 lib/subs.php:48
 msgid "Already subscribed!."
 msgstr "已订阅!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
 msgid "Already subscribed!."
 msgstr "已订阅!"
 
 #: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
+#: actions/deletenotice.php:113 actions/deletenotice.php:114
+#: actions/deletenotice.php:144
 msgid "Are you sure you want to delete this notice?"
 msgstr "确定要删除这条消息吗?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
 msgid "Are you sure you want to delete this notice?"
 msgstr "确定要删除这条消息吗?"
 
 #: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
+#: actions/userauthorization.php:81 actions/userauthorization.php:76
+#: actions/userauthorization.php:105
 msgid "Authorize subscription"
 msgstr "确认订阅"
 
 #: ../actions/login.php:104 ../actions/register.php:178
 msgid "Authorize subscription"
 msgstr "确认订阅"
 
 #: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
+#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
+#: actions/register.php:416 actions/register.php:463 actions/login.php:226
+#: actions/register.php:473
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
 msgid "Automatically login in the future; not for shared computers!"
 msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
 
 #: ../actions/profilesettings.php:65 actions/profilesettings.php:98
+#: actions/profilesettings.php:144 actions/profilesettings.php:145
+#: actions/profilesettings.php:160
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 msgid ""
 "Automatically subscribe to whoever subscribes to me (best for non-humans)"
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
@@ -384,22 +462,29 @@ msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
 #: ../actions/avatar.php:32 ../lib/settingsaction.php:90
 #: actions/profilesettings.php:34 actions/avatarsettings.php:65
 #: actions/showgroup.php:209 lib/accountsettingsaction.php:107
+#: actions/avatarsettings.php:67 actions/showgroup.php:211
+#: actions/showgroup.php:216 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:111
 msgid "Avatar"
 msgstr "头像"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
 msgid "Avatar"
 msgstr "头像"
 
 #: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
+#: actions/avatarsettings.php:395 actions/avatarsettings.php:346
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
 msgid "Avatar updated."
 msgstr "头像已更新。"
 
 #: ../actions/imsettings.php:55 actions/imsettings.php:56
+#: actions/imsettings.php:108 actions/imsettings.php:114
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
 #, php-format
 msgid ""
 "Awaiting confirmation on this address. Check your Jabber/GTalk account for a "
 "message with further instructions. (Did you add %s to your buddy list?)"
-msgstr "正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。(你是否已经添加 %s为你的好友?)"
+msgstr ""
+"正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。"
+"(你是否已经添加 %s为你的好友?)"
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
 
 #: ../actions/emailsettings.php:54 actions/emailsettings.php:55
+#: actions/emailsettings.php:107 actions/emailsettings.php:113
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
 msgid ""
 "Awaiting confirmation on this address. Check your inbox (and spam box!) for "
 "a message with further instructions."
@@ -408,7 +493,7 @@ msgstr ""
 "指示。"
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
 "指示。"
 
 #: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
+#: actions/smssettings.php:111 actions/smssettings.php:123
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
 msgid "Awaiting confirmation on this phone number."
 msgstr "等待确认此电话号码。"
 
@@ -420,6 +505,8 @@ 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
 #: ../actions/profilesettings.php:49 ../actions/register.php:170
 #: actions/profilesettings.php:82 actions/register.php:184
 #: actions/profilesettings.php:112 actions/register.php:402
+#: actions/register.php:448 actions/profilesettings.php:127
+#: actions/register.php:459
 msgid "Bio"
 msgstr "自述"
 
 msgid "Bio"
 msgstr "自述"
 
@@ -427,16 +514,18 @@ msgstr "自述"
 #: ../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: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
+#: actions/updateprofile.php:107 actions/updateprofile.php:109
+#: actions/profilesettings.php:206 actions/register.php:211
 msgid "Bio is too long (max 140 chars)."
 msgstr "自述过长(不能超过140字符)。"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
 msgid "Bio is too long (max 140 chars)."
 msgstr "自述过长(不能超过140字符)。"
 
 #: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
+#: actions/deletenotice.php:71
 msgid "Can't delete this notice."
 msgstr "无法删除通告。"
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
 msgid "Can't delete this notice."
 msgstr "无法删除通告。"
 
 #: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
+#: actions/updateprofile.php:123 actions/updateprofile.php:125
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "无法访问头像URL '%s'"
 #, php-format
 msgid "Can't read avatar URL '%s'"
 msgstr "无法访问头像URL '%s'"
@@ -444,6 +533,8 @@ 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
 #: ../actions/password.php:85 ../actions/recoverpassword.php:300
 #: actions/profilesettings.php:404 actions/recoverpassword.php:313
 #: actions/passwordsettings.php:169 actions/recoverpassword.php:347
+#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
+#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
 msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
 msgid "Can't save new password."
 msgstr "无法保存新密码。"
 
@@ -451,31 +542,34 @@ msgstr "无法保存新密码。"
 #: ../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: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
+#: actions/smssettings.php:114 actions/emailsettings.php:117
+#: actions/imsettings.php:120 actions/smssettings.php:126
 msgid "Cancel"
 msgstr "取消"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
 msgid "Cancel"
 msgstr "取消"
 
 #: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
+#: lib/openid.php:133
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "无法创建 OpenID 用户对象。"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
 msgid "Cannot instantiate OpenID consumer object."
 msgstr "无法创建 OpenID 用户对象。"
 
 #: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
+#: actions/imsettings.php:286 actions/imsettings.php:292
 msgid "Cannot normalize that Jabber ID"
 msgstr "无法识别此Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
 msgid "Cannot normalize that Jabber ID"
 msgstr "无法识别此Jabber ID"
 
 #: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
+#: actions/emailsettings.php:311 actions/emailsettings.php:318
+#: actions/emailsettings.php:326
 msgid "Cannot normalize that email address"
 msgstr "无法识别此电子邮件"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
 msgid "Cannot normalize that email address"
 msgstr "无法识别此电子邮件"
 
 #: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
+#: actions/passwordsettings.php:110 actions/passwordsettings.php:116
 msgid "Change"
 msgstr "修改"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
 msgid "Change"
 msgstr "修改"
 
 #: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 lib/accountsettingsaction.php:118
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
 msgid "Change email handling"
 msgstr "修改电子邮件"
 
@@ -485,11 +579,12 @@ msgid "Change password"
 msgstr "修改密码"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
 msgstr "修改密码"
 
 #: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
+#: lib/accountsettingsaction.php:115
 msgid "Change your password"
 msgstr "修改密码"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
 msgid "Change your password"
 msgstr "修改密码"
 
 #: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
+#: lib/accountsettingsaction.php:105 lib/accountsettingsaction.php:109
 msgid "Change your profile settings"
 msgstr "修改您的个人信息"
 
 msgid "Change your profile settings"
 msgstr "修改您的个人信息"
 
@@ -499,6 +594,9 @@ msgstr "修改您的个人信息"
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
 #: actions/register.php:169 actions/smssettings.php:65
 #: actions/passwordsettings.php:105 actions/recoverpassword.php:221
 #: actions/register.php:376 actions/smssettings.php:122
+#: actions/recoverpassword.php:236 actions/register.php:422
+#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
+#: actions/register.php:426 actions/smssettings.php:134
 msgid "Confirm"
 msgstr "确认"
 
 msgid "Confirm"
 msgstr "确认"
 
@@ -511,12 +609,14 @@ msgstr "确认地址"
 #: ../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: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
+#: actions/smssettings.php:374 actions/emailsettings.php:386
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
 msgid "Confirmation cancelled."
 msgstr "已取消确认。"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
 msgid "Confirmation cancelled."
 msgstr "已取消确认。"
 
 #: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
+#: actions/smssettings.php:118 actions/smssettings.php:130
 msgid "Confirmation code"
 msgstr "确认码"
 
 msgid "Confirmation code"
 msgstr "确认码"
 
@@ -525,7 +625,8 @@ msgstr "确认码"
 msgid "Confirmation code not found."
 msgstr "未找到确认码。"
 
 msgid "Confirmation code not found."
 msgstr "未找到确认码。"
 
-#: ../actions/register.php:202
+#: ../actions/register.php:202 actions/register.php:473
+#: actions/register.php:521 actions/register.php:531
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
 #, php-format
 msgid ""
 "Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -546,28 +647,35 @@ msgstr ""
 "恭喜, %s! 欢迎来到 %%%%site.name%%%%. 这里,你需要\n"
 "\n"
 "* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
 "恭喜, %s! 欢迎来到 %%%%site.name%%%%. 这里,你需要\n"
 "\n"
 "* 查看你的资料Go to [your profile](%s) 发布你的第一条消息.\n"
-"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消息平台发布信息。\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的朋友。 \n"
-"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关于你的情况。 \n"
+"* 填加 [Jabber/GTalk address](%%%%action.imsettings%%%%) 然后你可以通过即时消"
+"息平台发布信息。\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) 你认识的或和你有共同兴趣的"
+"朋友。 \n"
+"* 更新你的 [profile settings](%%%%action.profilesettings%%%%) 告诉大家更多关"
+"于你的情况。 \n"
 "* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
 "\n"
 "感谢您的注册,希望您喜欢这个服务。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
 "* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
 "\n"
 "感谢您的注册,希望您喜欢这个服务。"
 
 #: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
+#: actions/finishopenidlogin.php:119 lib/action.php:330 lib/action.php:403
+#: lib/action.php:406 actions/finishopenidlogin.php:118 lib/action.php:422
+#: lib/action.php:425 lib/action.php:435
 msgid "Connect"
 msgstr "连接"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
 msgid "Connect"
 msgstr "连接"
 
 #: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
+#: actions/finishopenidlogin.php:114 actions/finishopenidlogin.php:113
 msgid "Connect existing account"
 msgstr "连接现有帐号"
 
 msgid "Connect existing account"
 msgstr "连接现有帐号"
 
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
+#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576 lib/action.php:669
+#: lib/action.php:719 lib/action.php:734
 msgid "Contact"
 msgstr "联系人"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
 msgid "Contact"
 msgstr "联系人"
 
 #: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: lib/openid.php:190
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "无法创建 OpenID 表单:%s"
 #, php-format
 msgid "Could not create OpenID form: %s"
 msgstr "无法创建 OpenID 表单:%s"
@@ -575,35 +683,39 @@ 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
 #: ../actions/twitapifriendships.php:60 ../actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:60 actions/twitapifriendships.php:76
 #: actions/twitapifriendships.php:48 actions/twitapifriendships.php:64
+#: actions/twitapifriendships.php:51 actions/twitapifriendships.php:68
+#: actions/apifriendshipscreate.php:118
 #, php-format
 msgid "Could not follow user: %s is already on your list."
 msgstr "无法订阅用户:%s 已在订阅列表中。"
 
 #: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
 #, 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
+#: actions/twitapifriendships.php:41 actions/twitapifriendships.php:43
+#: actions/apifriendshipscreate.php:109
 msgid "Could not follow user: User not found."
 msgstr "无法订阅用户:未找到。"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
 msgid "Could not follow user: User not found."
 msgstr "无法订阅用户:未找到。"
 
 #: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: lib/openid.php:172
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "无法重定向到服务器:%s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
 #, php-format
 msgid "Could not redirect to server: %s"
 msgstr "无法重定向到服务器:%s"
 
 #: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
+#: actions/updateprofile.php:166 actions/updateprofile.php:176
 msgid "Could not save avatar info"
 msgstr "无法保存头像"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
 msgid "Could not save avatar info"
 msgstr "无法保存头像"
 
 #: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
+#: actions/updateprofile.php:159 actions/updateprofile.php:163
 msgid "Could not save new profile info"
 msgstr "无法保存个人信息"
 
 msgid "Could not save new profile info"
 msgstr "无法保存个人信息"
 
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
+#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72 lib/subs.php:75
 msgid "Could not subscribe other to you."
 msgstr "无法订阅他人更新。"
 
 msgid "Could not subscribe other to you."
 msgstr "无法订阅他人更新。"
 
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
+#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57 lib/subs.php:56
 msgid "Could not subscribe."
 msgstr "无法订阅。"
 
 msgid "Could not subscribe."
 msgstr "无法订阅。"
 
@@ -623,15 +735,17 @@ msgstr "无法将请求标记转换为访问令牌。"
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
 #: actions/imsettings.php:226 actions/smssettings.php:249
 #: actions/confirmaddress.php:126 actions/emailsettings.php:375
 #: actions/imsettings.php:357 actions/smssettings.php:370
+#: actions/emailsettings.php:382 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
 msgid "Couldn't delete email confirmation."
 msgstr "无法删除电子邮件确认。"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
+#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134 lib/subs.php:136
 msgid "Couldn't delete subscription."
 msgstr "无法删除订阅。"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
 msgid "Couldn't delete subscription."
 msgstr "无法删除订阅。"
 
 #: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
+#: actions/twitapistatuses.php:84 actions/twitapistatuses.php:87
 msgid "Couldn't find any statuses."
 msgstr "找不到任何信息。"
 
 msgid "Couldn't find any statuses."
 msgstr "找不到任何信息。"
 
@@ -644,29 +758,38 @@ msgstr "无法获得一份请求标记。"
 #: ../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: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
+#: actions/smssettings.php:325 actions/emailsettings.php:344
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
 msgid "Couldn't insert confirmation code."
 msgstr "无法插入验证码。"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
 msgid "Couldn't insert confirmation code."
 msgstr "无法插入验证码。"
 
 #: ../actions/finishremotesubscribe.php:180
 #: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
+#: lib/oauthstore.php:487
 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 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
+#: actions/twitapiaccount.php:82 actions/profilesettings.php:328
 msgid "Couldn't save profile."
 msgstr "无法保存个人信息。"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
 msgid "Couldn't save profile."
 msgstr "无法保存个人信息。"
 
 #: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
+#: actions/profilesettings.php:279 actions/profilesettings.php:295
 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 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
+#: actions/emailsettings.php:447 actions/emailsettings.php:469
+#: actions/smssettings.php:515 actions/smssettings.php:539
+#: actions/smssettings.php:516 actions/smssettings.php:540
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
 msgid "Couldn't update user record."
 msgstr "无法更新用户记录。"
 
@@ -682,42 +805,48 @@ msgstr "无法更新用户记录。"
 #: 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/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
+#: actions/smssettings.php:408 actions/emailsettings.php:287
+#: actions/emailsettings.php:418 actions/othersettings.php:167
+#: actions/profilesettings.php:260 actions/emailsettings.php:295
+#: actions/emailsettings.php:426 actions/imsettings.php:258
+#: actions/imsettings.php:401 actions/othersettings.php:174
+#: actions/profilesettings.php:276 actions/smssettings.php:278
+#: actions/smssettings.php:420
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
 msgid "Couldn't update user."
 msgstr "无法更新用户。"
 
 #: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
+#: actions/finishopenidlogin.php:112 actions/finishopenidlogin.php:111
 msgid "Create"
 msgstr "创建"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
 msgid "Create"
 msgstr "创建"
 
 #: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
+#: actions/finishopenidlogin.php:98 actions/finishopenidlogin.php:97
 msgid "Create a new user with this nickname."
 msgstr "创建使用此昵称的新用户。"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
 msgid "Create a new user with this nickname."
 msgstr "创建使用此昵称的新用户。"
 
 #: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
+#: actions/finishopenidlogin.php:96 actions/finishopenidlogin.php:95
 msgid "Create new account"
 msgstr "创建新帐号"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
 msgid "Create new account"
 msgstr "创建新帐号"
 
 #: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
+#: actions/finishopenidlogin.php:231 actions/finishopenidlogin.php:247
 msgid "Creating new account for OpenID that already has a user."
 msgstr "为 OpenID 用户产生新的帐号。"
 
 #: ../actions/imsettings.php:45 actions/imsettings.php:46
 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
+#: actions/imsettings.php:100 actions/imsettings.php:106
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "已确认的Jabber/GTalk帐号。"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
 msgid "Current confirmed Jabber/GTalk address."
 msgstr "已确认的Jabber/GTalk帐号。"
 
 #: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
+#: actions/smssettings.php:100 actions/smssettings.php:112
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的可以发送SMS短消息的电话号码。"
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
 msgid "Current confirmed SMS-enabled phone number."
 msgstr "已确认的可以发送SMS短消息的电话号码。"
 
 #: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
+#: actions/emailsettings.php:99 actions/emailsettings.php:105
 msgid "Current confirmed email address."
 msgstr "已确认的电子邮件。"
 
 msgid "Current confirmed email address."
 msgstr "已确认的电子邮件。"
 
@@ -726,23 +855,27 @@ msgid "Currently"
 msgstr "目前"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
 msgstr "目前"
 
 #: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
+#: classes/Notice.php:114 classes/Notice.php:124 classes/Notice.php:164
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "添加标签时数据库出错:%s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
 #, php-format
 msgid "DB error inserting hashtag: %s"
 msgstr "添加标签时数据库出错:%s"
 
 #: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
+#: classes/Notice.php:757 classes/Notice.php:1042 classes/Notice.php:1117
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回复时数据库出错:%s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
 #, php-format
 msgid "DB error inserting reply: %s"
 msgstr "添加回复时数据库出错:%s"
 
 #: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
+#: actions/deletenotice.php:79 actions/deletenotice.php:111
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
 msgid "Delete notice"
 msgstr "删除通告"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
 msgid "Delete notice"
 msgstr "删除通告"
 
 #: ../actions/profilesettings.php:51 ../actions/register.php:172
 #: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
+#: actions/profilesettings.php:114 actions/register.php:404
+#: actions/register.php:450
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 msgid "Describe yourself and your interests in 140 chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
@@ -750,11 +883,13 @@ msgstr "用不超过140个字符描述您自己和您的爱好"
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
 #: ../lib/settingsaction.php:87 actions/register.php:172
 #: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
 #: actions/register.php:385 lib/accountsettingsaction.php:113
+#: actions/register.php:427 actions/register.php:431 actions/register.php:435
+#: lib/accountsettingsaction.php:117
 msgid "Email"
 msgstr "电子邮件"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
 msgid "Email"
 msgstr "电子邮件"
 
 #: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
+#: actions/emailsettings.php:115 actions/emailsettings.php:121
 msgid "Email Address"
 msgstr "电子邮件地址"
 
 msgid "Email Address"
 msgstr "电子邮件地址"
 
@@ -764,39 +899,43 @@ msgid "Email Settings"
 msgstr "电子邮件设置"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
 msgstr "电子邮件设置"
 
 #: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
+#: actions/register.php:200 actions/register.php:206
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
 msgid "Email address already exists."
 msgstr "电子邮件地址已存在。"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
+#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173 lib/mail.php:172
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
 msgid "Email address confirmation"
 msgstr "电子邮件地址确认"
 
 #: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
+#: actions/emailsettings.php:117 actions/emailsettings.php:123
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件,类似 \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
 msgid "Email address, like \"UserName@example.org\""
 msgstr "电子邮件,类似 \"UserName@example.org\""
 
 #: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
+#: actions/invite.php:179 actions/invite.php:181 actions/invite.php:187
 msgid "Email addresses"
 msgstr "电子邮件地址"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
 msgid "Email addresses"
 msgstr "电子邮件地址"
 
 #: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
+#: actions/recoverpassword.php:231 actions/recoverpassword.php:249
+#: actions/recoverpassword.php:252
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电子邮件。"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
 msgid "Enter a nickname or email address."
 msgstr "输入昵称或电子邮件。"
 
 #: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
+#: actions/smssettings.php:119 actions/smssettings.php:131
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验证码。"
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
 msgid "Enter the code you received on your phone."
 msgstr "输入手机收到的验证码。"
 
 #: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
+#: actions/userauthorization.php:161 actions/userauthorization.php:200
 msgid "Error authorizing token"
 msgstr "无法认证令牌"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
 msgid "Error authorizing token"
 msgstr "无法认证令牌"
 
 #: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
+#: actions/finishopenidlogin.php:297 actions/finishopenidlogin.php:302
+#: actions/finishopenidlogin.php:325
 msgid "Error connecting user to OpenID."
 msgstr "无法将用户与 OpenID 连接。"
 
 msgid "Error connecting user to OpenID."
 msgstr "无法将用户与 OpenID 连接。"
 
@@ -807,39 +946,46 @@ msgstr "无法连接用户。"
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
 
 #: ../actions/finishremotesubscribe.php:151
 #: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
+#: lib/oauthstore.php:291
 msgid "Error inserting avatar"
 msgstr "添加头像出错"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
 msgid "Error inserting avatar"
 msgstr "添加头像出错"
 
 #: ../actions/finishremotesubscribe.php:143
 #: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
+#: lib/oauthstore.php:283
 msgid "Error inserting new profile"
 msgstr "添加个人信息出错"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
 msgid "Error inserting new profile"
 msgstr "添加个人信息出错"
 
 #: ../actions/finishremotesubscribe.php:167
 #: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
+#: lib/oauthstore.php:311
 msgid "Error inserting remote profile"
 msgstr "添加远程的个人信息出错"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
 msgid "Error inserting remote profile"
 msgstr "添加远程的个人信息出错"
 
 #: ../actions/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
+#: actions/recoverpassword.php:280 actions/recoverpassword.php:298
+#: actions/recoverpassword.php:301
 msgid "Error saving address confirmation."
 msgstr "保存地址确认时出错。"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
 msgid "Error saving address confirmation."
 msgstr "保存地址确认时出错。"
 
 #: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
+#: actions/userauthorization.php:164 actions/userauthorization.php:203
 msgid "Error saving remote profile"
 msgstr "保存远程的个人信息时出错"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
 msgid "Error saving remote profile"
 msgstr "保存远程的个人信息时出错"
 
 #: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
+#: lib/openid.php:238
 msgid "Error saving the profile."
 msgstr "保存个人信息时出错。"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
 msgid "Error saving the profile."
 msgstr "保存个人信息时出错。"
 
 #: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
+#: lib/openid.php:249
 msgid "Error saving the user."
 msgstr "保存用户时出错。"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
 msgid "Error saving the user."
 msgstr "保存用户时出错。"
 
 #: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
+#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
+#: actions/passwordsettings.php:175
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错;不正确。"
 
 msgid "Error saving user; invalid."
 msgstr "保存用户时出错;不正确。"
 
@@ -848,6 +994,9 @@ msgstr "保存用户时出错;不正确。"
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
 #: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
 #: actions/register.php:108 actions/login.php:112 actions/login.php:138
 #: actions/recoverpassword.php:354 actions/register.php:198
+#: actions/login.php:120 actions/recoverpassword.php:372
+#: actions/register.php:235 actions/login.php:122
+#: actions/recoverpassword.php:375 actions/register.php:242
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
 msgid "Error setting user."
 msgstr "保存用户设置时出错。"
 
@@ -858,6 +1007,7 @@ msgstr "更新个人信息时出错"
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
 
 #: ../actions/finishremotesubscribe.php:161
 #: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
 msgid "Error updating remote profile"
 msgstr "更新远程的个人信息时出错"
 
 msgid "Error updating remote profile"
 msgstr "更新远程的个人信息时出错"
 
@@ -867,33 +1017,36 @@ msgid "Error with confirmation code."
 msgstr "验证码出错。"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
 msgstr "验证码出错。"
 
 #: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
+#: actions/finishopenidlogin.php:117 actions/finishopenidlogin.php:116
 msgid "Existing nickname"
 msgstr "昵称已被使用"
 
 msgid "Existing nickname"
 msgstr "昵称已被使用"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
+#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570 lib/action.php:663
+#: lib/action.php:708 lib/action.php:723
 msgid "FAQ"
 msgstr "常见问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
 msgid "FAQ"
 msgstr "常见问题FAQ"
 
 #: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
+#: actions/avatarsettings.php:397 actions/avatarsettings.php:349
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
 msgid "Failed updating avatar."
 msgstr "更新头像失败。"
 
 #: ../actions/all.php:61 ../actions/allrss.php:64 actions/all.php:61
 #: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
+#: actions/allrss.php:110 actions/allrss.php:118
 #, 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:134
 #, 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:134
-#: actions/repliesrss.php:71
+#: actions/repliesrss.php:71 actions/replies.php:136 actions/replies.php:135
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s 回复的聚合"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
 #, php-format
 msgid "Feed for replies to %s"
 msgstr "%s 回复的聚合"
 
 #: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/tag.php:68
 #, php-format
 msgid "Feed for tag %s"
 msgstr "%s 标签的聚合"
 #, php-format
 msgid "Feed for tag %s"
 msgstr "%s 标签的聚合"
@@ -908,7 +1061,7 @@ msgstr "搜索通告内容"
 msgid "Find people on this site"
 msgstr "搜索用户信息"
 
 msgid "Find people on this site"
 msgstr "搜索用户信息"
 
-#: ../actions/login.php:122
+#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
 msgid ""
 "For security reasons, please re-enter your user name and password before "
 "changing your settings."
@@ -919,6 +1072,11 @@ msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
 #: actions/profilesettings.php:103 actions/register.php:391
 #: actions/showgroup.php:235 actions/showstream.php:262
 #: actions/tagother.php:105 lib/groupeditform.php:142
+#: actions/showgroup.php:237 actions/showstream.php:255
+#: actions/tagother.php:104 actions/register.php:437 actions/showgroup.php:242
+#: actions/showstream.php:220 lib/groupeditform.php:157
+#: actions/profilesettings.php:111 actions/register.php:441
+#: actions/showgroup.php:247 actions/showstream.php:267
 msgid "Full name"
 msgstr "全名"
 
 msgid "Full name"
 msgstr "全名"
 
@@ -927,23 +1085,33 @@ msgstr "全名"
 #: 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/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
+#: actions/updateprofile.php:97 actions/updateprofile.php:99
+#: actions/editgroup.php:197 actions/newgroup.php:147
+#: actions/profilesettings.php:203 actions/register.php:208
+#: actions/apigroupcreate.php:253 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:214
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
 msgid "Full name is too long (max 255 chars)."
 msgstr "全名过长(不能超过 255 个字符)。"
 
 #: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
+#: lib/action.php:421 lib/action.php:659 lib/action.php:446 lib/action.php:704
+#: lib/action.php:456 lib/action.php:719
 msgid "Help"
 msgstr "帮助"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
 msgid "Help"
 msgstr "帮助"
 
 #: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
+#: lib/facebookaction.php:200 lib/action.php:393 lib/facebookaction.php:213
+#: lib/action.php:417 lib/action.php:430
 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
 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
+#: lib/groupeditform.php:146 actions/register.php:442
+#: lib/groupeditform.php:161 actions/profilesettings.php:115
+#: actions/register.php:446
 msgid "Homepage"
 msgstr "主页"
 
 msgid "Homepage"
 msgstr "主页"
 
@@ -951,21 +1119,27 @@ msgstr "主页"
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
 #: actions/profilesettings.php:210 actions/register.php:83
 #: actions/editgroup.php:192 actions/newgroup.php:143
 #: actions/profilesettings.php:199 actions/register.php:168
+#: actions/editgroup.php:194 actions/newgroup.php:144
+#: actions/profilesettings.php:200 actions/register.php:205
+#: actions/apigroupcreate.php:244 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:211
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
 msgid "Homepage is not a valid URL."
 msgstr "主页的URL不正确。"
 
 #: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
+#: actions/emailsettings.php:173 actions/emailsettings.php:178
+#: actions/emailsettings.php:185
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
 msgid "I want to post notices by email."
 msgstr "我希望通过邮件发布信息。"
 
 #: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
+#: lib/connectsettingsaction.php:104 lib/connectsettingsaction.php:110
 msgid "IM"
 msgstr "即时通讯IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
 msgid "IM"
 msgstr "即时通讯IM"
 
 #: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
+#: actions/imsettings.php:118 actions/imsettings.php:124
 msgid "IM Address"
 msgstr "IM 帐号"
 
 msgid "IM Address"
 msgstr "IM 帐号"
 
@@ -975,19 +1149,19 @@ msgid "IM Settings"
 msgstr "IM 设置"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
 msgstr "IM 设置"
 
 #: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
+#: actions/finishopenidlogin.php:116 actions/finishopenidlogin.php:115
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr "如果您已经拥有帐号,可以将它连接到您的 OpenID。请输入用户名和密码。"
 
 msgid ""
 "If you already have an account, login with your username and password to "
 "connect it to your OpenID."
 msgstr "如果您已经拥有帐号,可以将它连接到您的 OpenID。请输入用户名和密码。"
 
-#: ../actions/openidsettings.php:45
+#: ../actions/openidsettings.php:45 actions/openidsettings.php:96
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr "如果您希望添加新的 OpenID,输入它并点击“添加”。"
 
 msgid ""
 "If you want to add an OpenID to your account, enter it in the box below and "
 "click \"Add\"."
 msgstr "如果您希望添加新的 OpenID,输入它并点击“添加”。"
 
-#: ../actions/recoverpassword.php:137
+#: ../actions/recoverpassword.php:137 actions/recoverpassword.php:152
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
 msgid ""
 "If you've forgotten or lost your password, you can get a new one sent to the "
 "email address you have stored  in your account."
@@ -996,55 +1170,62 @@ 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
 #: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
 #: actions/emailsettings.php:68 actions/smssettings.php:76
 #: actions/emailsettings.php:127 actions/smssettings.php:140
+#: actions/emailsettings.php:133 actions/smssettings.php:152
 msgid "Incoming email"
 msgstr "发布用的电子邮件"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
 msgid "Incoming email"
 msgstr "发布用的电子邮件"
 
 #: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
+#: actions/emailsettings.php:443 actions/emailsettings.php:450
+#: actions/smssettings.php:518 actions/smssettings.php:519
+#: actions/emailsettings.php:458 actions/smssettings.php:531
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被移除。"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
 msgid "Incoming email address removed."
 msgstr "发布用的电子邮件被移除。"
 
 #: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
+#: actions/passwordsettings.php:153 actions/passwordsettings.php:158
+#: actions/passwordsettings.php:164
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
 msgid "Incorrect old password"
 msgstr "旧密码不正确"
 
 #: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
+#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
+#: actions/facebookhome.php:129 actions/login.php:116
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
 msgid "Incorrect username or password."
 msgstr "用户名或密码不正确。"
 
-#: ../actions/recoverpassword.php:265
+#: ../actions/recoverpassword.php:265 actions/recoverpassword.php:304
+#: actions/recoverpassword.php:322 actions/recoverpassword.php:325
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "恢复密码的指示已被发送到您的注册邮箱。"
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
 msgid ""
 "Instructions for recovering your password have been sent to the email "
 "address registered to your account."
 msgstr "恢复密码的指示已被发送到您的注册邮箱。"
 
 #: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
+#: actions/updateprofile.php:118 actions/updateprofile.php:120
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "头像URL '%s'不正确"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
 #, php-format
 msgid "Invalid avatar URL '%s'"
 msgstr "头像URL '%s'不正确"
 
 #: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/invite.php:72
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "电子邮件地址 %s 不正确"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
 #, php-format
 msgid "Invalid email address: %s"
 msgstr "电子邮件地址 %s 不正确"
 
 #: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/updateprofile.php:102 actions/updateprofile.php:104
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "主页'%s'不正确"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
 #, php-format
 msgid "Invalid homepage '%s'"
 msgstr "主页'%s'不正确"
 
 #: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/updateprofile.php:86 actions/updateprofile.php:88
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "授权方式URL '%s'不正确"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
 #, php-format
 msgid "Invalid license URL '%s'"
 msgstr "授权方式URL '%s'不正确"
 
 #: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
+#: actions/postnotice.php:66 actions/postnotice.php:84
 msgid "Invalid notice content"
 msgstr "通告内容不正确"
 
 msgid "Invalid notice content"
 msgstr "通告内容不正确"
 
@@ -1059,13 +1240,13 @@ msgid "Invalid notice url"
 msgstr "通告URL不正确"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
 msgstr "通告URL不正确"
 
 #: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
+#: actions/updateprofile.php:91 actions/updateprofile.php:93
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "个人信息URL '%s'不正确。"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
 #, php-format
 msgid "Invalid profile URL '%s'."
 msgstr "个人信息URL '%s'不正确。"
 
 #: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
+#: actions/remotesubscribe.php:135 actions/remotesubscribe.php:159
 msgid "Invalid profile URL (bad format)"
 msgstr "个人信息URL不正确(格式错误)"
 
 msgid "Invalid profile URL (bad format)"
 msgstr "个人信息URL不正确(格式错误)"
 
@@ -1083,28 +1264,35 @@ msgstr "大小不正确。"
 #: ../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: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
+#: actions/register.php:211 actions/finishopenidlogin.php:284
+#: actions/finishopenidlogin.php:307 actions/register.php:230
+#: actions/register.php:251 actions/register.php:237 actions/register.php:258
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
 msgid "Invalid username or password."
 msgstr "用户名或密码不正确。"
 
 #: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
+#: actions/invite.php:104 actions/invite.php:110
 msgid "Invitation(s) sent"
 msgstr "已发送邀请"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
 msgid "Invitation(s) sent"
 msgstr "已发送邀请"
 
 #: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
+#: actions/invite.php:138 actions/invite.php:144
 msgid "Invitation(s) sent to the following people:"
 msgstr "已发送邀请给这些人:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
 msgid "Invitation(s) sent to the following people:"
 msgstr "已发送邀请给这些人:"
 
 #: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
+#: lib/subgroupnav.php:103 lib/facebookaction.php:220 lib/action.php:429
+#: lib/facebookaction.php:221 lib/subgroupnav.php:105 lib/action.php:439
 msgid "Invite"
 msgstr "邀请"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
 msgid "Invite"
 msgstr "邀请"
 
 #: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
+#: actions/invite.php:106 actions/invite.php:112
 msgid "Invite new users"
 msgstr "邀请新用户"
 
 msgid "Invite new users"
 msgstr "邀请新用户"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
+#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609 lib/action.php:706
+#: lib/action.php:756 lib/action.php:771
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
 #, php-format
 msgid ""
 "It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -1116,11 +1304,12 @@ msgstr ""
 "授权。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
 "授权。"
 
 #: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
+#: actions/imsettings.php:296 actions/imsettings.php:302
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
 msgid "Jabber ID already belongs to another user."
 msgstr "Jabber ID 属于另一用户。"
 
 #: ../actions/imsettings.php:62 actions/imsettings.php:63
+#: actions/imsettings.php:120 actions/imsettings.php:126
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
 #, php-format
 msgid ""
 "Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -1130,12 +1319,14 @@ msgstr ""
 "或GTalk中将 %s 加为好友。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 "或GTalk中将 %s 加为好友。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
+#: actions/profilesettings.php:128 actions/profilesettings.php:129
+#: actions/profilesettings.php:144
 msgid "Language"
 msgstr "语言"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
 msgid "Language"
 msgstr "语言"
 
 #: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
+#: actions/profilesettings.php:217 actions/profilesettings.php:218
+#: actions/profilesettings.php:234
 msgid "Language is too long (max 50 chars)."
 msgstr "语言过长(不能超过50个字符)。"
 
 msgid "Language is too long (max 50 chars)."
 msgstr "语言过长(不能超过50个字符)。"
 
@@ -1144,7 +1335,15 @@ msgstr "语言过长(不能超过50个字符)。"
 #: 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
 #: 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
+#: lib/profilelist.php:125 actions/showgroup.php:246
+#: actions/showstream.php:264 actions/tagother.php:112 lib/profilelist.php:123
+#: actions/register.php:454 actions/showgroup.php:251
+#: actions/showstream.php:229 actions/userauthorization.php:128
+#: lib/groupeditform.php:171 lib/profilelist.php:185
+#: actions/profilesettings.php:132 actions/register.php:464
+#: actions/showgroup.php:256 actions/showstream.php:282
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/profilelist.php:218
 msgid "Location"
 msgstr "位置"
 
 msgid "Location"
 msgstr "位置"
 
@@ -1153,7 +1352,12 @@ msgstr "位置"
 #: 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/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
+#: actions/updateprofile.php:112 actions/updateprofile.php:114
+#: actions/editgroup.php:203 actions/newgroup.php:153
+#: actions/profilesettings.php:209 actions/register.php:214
+#: actions/apigroupcreate.php:272 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:221
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
 msgid "Location is too long (max 255 chars)."
 msgstr "位置过长(不能超过255个字符)。"
 
@@ -1162,43 +1366,51 @@ msgstr "位置过长(不能超过255个字符)。"
 #: 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
 #: 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
+#: lib/facebookaction.php:315 lib/logingroupnav.php:75 actions/login.php:169
+#: actions/login.php:222 actions/openidlogin.php:121 lib/action.php:412
+#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
+#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
+#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
 #, php-format
 msgid "Login"
 msgstr "登录"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
 #, php-format
 msgid "Login"
 msgstr "登录"
 
 #: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
+#: actions/openidlogin.php:62 actions/openidlogin.php:70
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
 
 #, php-format
 msgid "Login with an [OpenID](%%doc.openid%%) account."
 msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
 
-#: ../actions/login.php:126
+#: ../actions/login.php:126 actions/login.php:251
 #, 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 ""
 #, 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%%). "
+"请使用你的帐号和密码登入。没有帐号?[注册](%%action.register%%) 一个新帐号, "
+"或使用 [OpenID](%%action.openidlogin%%). "
 
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
+#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332 lib/action.php:409
+#: lib/action.php:435 lib/action.php:445
 msgid "Logout"
 msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
 msgid "Logout"
 msgstr "登出"
 
 #: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
+#: actions/register.php:393 actions/register.php:439 actions/register.php:443
 msgid "Longer name, preferably your \"real\" name"
 msgstr "长名字,最好是“实名”"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
 msgid "Longer name, preferably your \"real\" name"
 msgstr "长名字,最好是“实名”"
 
 #: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
+#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
+#: lib/facebookaction.php:327 actions/login.php:236
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
 msgid "Lost or forgotten password?"
 msgstr "忘记了密码?"
 
 #: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
 #: actions/emailsettings.php:81 actions/smssettings.php:89
+#: actions/emailsettings.php:139 actions/smssettings.php:150
+#: actions/emailsettings.php:145 actions/smssettings.php:162
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生成新的电子邮件地址用于发布信息;取消旧的。"
 
 msgid "Make a new email address for posting to; cancels the old one."
 msgstr "生成新的电子邮件地址用于发布信息;取消旧的。"
 
@@ -1209,16 +1421,18 @@ msgid "Manage how you get email from %%site.name%%."
 msgstr "设置 %%site.name%% 发送的邮件。"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
 msgstr "设置 %%site.name%% 发送的邮件。"
 
 #: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
+#: actions/showstream.php:480 lib/profileaction.php:182
 msgid "Member since"
 msgstr "用户始于"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
 msgid "Member since"
 msgstr "用户始于"
 
 #: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
+#: actions/userrss.php:93
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s 的微博客服务"
 
 #, php-format
 msgid "Microblog by %s"
 msgstr "%s 的微博客服务"
 
-#: ../actions/smssettings.php:304
+#: ../actions/smssettings.php:304 actions/smssettings.php:464
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
 #, php-format
 msgid ""
 "Mobile carrier for your phone. If you know a carrier that accepts SMS over "
@@ -1230,42 +1444,50 @@ msgstr ""
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
 #: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
 #: actions/finishopenidlogin.php:85 actions/register.php:202
 #: actions/finishopenidlogin.php:107 actions/register.php:429
+#: actions/register.php:430 actions/finishopenidlogin.php:106
+#: actions/register.php:477 actions/register.php:487
 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 "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
+#: actions/emailsettings.php:148 actions/smssettings.php:164
 msgid "New"
 msgstr "新建"
 
 msgid "New"
 msgstr "新建"
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
+#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286 lib/mail.php:285
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址,用于发布 %s 信息"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
 #, php-format
 msgid "New email address for posting to %s"
 msgstr "新的电子邮件地址,用于发布 %s 信息"
 
 #: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
+#: actions/emailsettings.php:465 actions/emailsettings.php:472
+#: actions/smssettings.php:542 actions/smssettings.php:543
+#: actions/emailsettings.php:480 actions/smssettings.php:555
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
 msgid "New incoming email address added."
 msgstr "已添加新的发布用的电子邮件地址。"
 
 #: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
+#: actions/finishopenidlogin.php:99 actions/finishopenidlogin.php:98
 msgid "New nickname"
 msgstr "新昵称"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
 msgid "New nickname"
 msgstr "新昵称"
 
 #: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
+#: actions/newnotice.php:68 actions/newnotice.php:69
 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 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
+#: actions/recoverpassword.php:232 actions/passwordsettings.php:107
+#: actions/recoverpassword.php:235
 msgid "New password"
 msgstr "新密码"
 
 msgid "New password"
 msgstr "新密码"
 
-#: ../actions/recoverpassword.php:314
+#: ../actions/recoverpassword.php:314 actions/recoverpassword.php:361
+#: actions/recoverpassword.php:379 actions/recoverpassword.php:382
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存,您现在已登录。"
 
 msgid "New password successfully saved. You are now logged in."
 msgstr "新密码已保存,您现在已登录。"
 
@@ -1275,7 +1497,13 @@ msgstr "新密码已保存,您现在已登录。"
 #: actions/login.php:228 actions/profilesettings.php:98
 #: actions/register.php:367 actions/showgroup.php:224
 #: actions/showstream.php:251 actions/tagother.php:95
 #: 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
+#: lib/facebookaction.php:308 lib/groupeditform.php:137 actions/login.php:211
+#: actions/showgroup.php:226 actions/showstream.php:244
+#: actions/tagother.php:94 lib/facebookaction.php:312 actions/register.php:413
+#: actions/showgroup.php:231 actions/showstream.php:209
+#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
+#: actions/profilesettings.php:106 actions/register.php:417
+#: actions/showgroup.php:236 actions/showstream.php:249
 msgid "Nickname"
 msgstr "昵称"
 
 msgid "Nickname"
 msgstr "昵称"
 
@@ -1284,7 +1512,12 @@ msgstr "昵称"
 #: 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/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
+#: actions/register.php:159 actions/editgroup.php:185
+#: actions/finishopenidlogin.php:231 actions/newgroup.php:135
+#: actions/profilesettings.php:215 actions/register.php:196
+#: actions/apigroupcreate.php:221 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:202
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用,换一个吧。"
 
 msgid "Nickname already in use. Try another one."
 msgstr "昵称已被使用,换一个吧。"
 
@@ -1293,47 +1526,58 @@ msgstr "昵称已被使用,换一个吧。"
 #: 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/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
+#: actions/updateprofile.php:81 actions/editgroup.php:179
+#: actions/newgroup.php:130 actions/register.php:156
+#: actions/updateprofile.php:83 actions/editgroup.php:181
+#: actions/finishopenidlogin.php:221 actions/newgroup.php:131
+#: actions/profilesettings.php:193 actions/register.php:193
+#: actions/apigroupcreate.php:212 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:199
 msgid "Nickname must have only lowercase letters and numbers and no spaces."
 msgstr "昵称只能使用小写字母和数字,不包含空格。"
 
 #: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
 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
+#: actions/finishopenidlogin.php:210 actions/finishopenidlogin.php:226
 msgid "Nickname not allowed."
 msgstr "不允许的昵称。"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
 msgid "Nickname not allowed."
 msgstr "不允许的昵称。"
 
 #: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
+#: actions/remotesubscribe.php:106 actions/remotesubscribe.php:130
 msgid "Nickname of the user you want to follow"
 msgstr "希望订阅的用户的昵称"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
 msgid "Nickname of the user you want to follow"
 msgstr "希望订阅的用户的昵称"
 
 #: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
+#: actions/recoverpassword.php:186 actions/recoverpassword.php:191
 msgid "Nickname or email"
 msgstr "昵称或电子邮件"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
 msgid "Nickname or email"
 msgstr "昵称或电子邮件"
 
 #: ../actions/deletenotice.php:59 actions/deletenotice.php:60
 #: actions/block.php:147 actions/deletenotice.php:118
+#: actions/deletenotice.php:116 actions/block.php:149
+#: actions/deletenotice.php:115 actions/groupblock.php:176
+#: actions/deletenotice.php:145
 msgid "No"
 msgstr "否"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
 msgid "No"
 msgstr "否"
 
 #: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
+#: actions/imsettings.php:279 actions/imsettings.php:285
 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
 msgid "No Jabber ID."
 msgstr "没有 Jabber ID。"
 
 #: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
+#: actions/userauthorization.php:153 actions/userauthorization.php:192
+#: actions/userauthorization.php:225
 msgid "No authorization request!"
 msgstr "未收到认证请求!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
 msgid "No authorization request!"
 msgstr "未收到认证请求!"
 
 #: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
+#: actions/smssettings.php:299 actions/smssettings.php:311
 msgid "No carrier selected."
 msgstr "未选择运营商。"
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
 msgid "No carrier selected."
 msgstr "未选择运营商。"
 
 #: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
+#: actions/smssettings.php:486 actions/smssettings.php:498
 msgid "No code entered"
 msgstr "没有输入验证码"
 
 msgid "No code entered"
 msgstr "没有输入验证码"
 
@@ -1345,11 +1589,15 @@ msgstr "没有验证码"
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
 #: ../actions/newnotice.php:44 actions/newmessage.php:53
 #: actions/newnotice.php:44 classes/Command.php:197 actions/newmessage.php:109
 #: actions/newnotice.php:126 classes/Command.php:223
+#: actions/newmessage.php:142 actions/newnotice.php:131 lib/command.php:223
+#: actions/newnotice.php:162 lib/command.php:216 actions/newmessage.php:144
+#: actions/newnotice.php:136 lib/command.php:351 lib/command.php:424
 msgid "No content!"
 msgstr "没有内容!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
 msgid "No content!"
 msgstr "没有内容!"
 
 #: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
+#: actions/emailsettings.php:304 actions/emailsettings.php:311
+#: actions/emailsettings.php:319
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
 msgid "No email address."
 msgstr "没有电子邮件地址。"
 
@@ -1358,7 +1606,9 @@ msgid "No id."
 msgstr "没有 id。"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
 msgstr "没有 id。"
 
 #: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
+#: actions/emailsettings.php:430 actions/emailsettings.php:437
+#: actions/smssettings.php:505 actions/smssettings.php:506
+#: actions/emailsettings.php:445 actions/smssettings.php:518
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
 msgid "No incoming email address."
 msgstr "没有发布用的电子邮件地址。"
 
@@ -1369,6 +1619,7 @@ msgstr "远程服务器没有昵称。"
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
 
 #: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
 #: actions/avatarbynickname.php:59 actions/leavegroup.php:81
+#: actions/leavegroup.php:76
 msgid "No nickname."
 msgstr "没有昵称。"
 
 msgid "No nickname."
 msgstr "没有昵称。"
 
@@ -1376,12 +1627,14 @@ msgstr "没有昵称。"
 #: ../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: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
+#: actions/smssettings.php:358 actions/emailsettings.php:370
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
 msgid "No pending confirmation to cancel."
 msgstr "没有可以取消的确认。"
 
 #: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
+#: actions/smssettings.php:294 actions/smssettings.php:306
 msgid "No phone number."
 msgstr "没有电话号码。"
 
 msgid "No phone number."
 msgstr "没有电话号码。"
 
@@ -1391,7 +1644,8 @@ msgid "No profile URL returned by server."
 msgstr "服务器没有返回个人信息URL。"
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
 msgstr "服务器没有返回个人信息URL。"
 
 #: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
+#: actions/recoverpassword.php:266 actions/recoverpassword.php:284
+#: actions/recoverpassword.php:287
 msgid "No registered email address for that user."
 msgstr "用户没有注册电子邮件。"
 
 msgid "No registered email address for that user."
 msgstr "用户没有注册电子邮件。"
 
@@ -1403,7 +1657,7 @@ 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/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
+#: actions/peoplesearch.php:85 actions/noticesearch.php:117
 msgid "No results"
 msgstr "没有结果"
 
 msgid "No results"
 msgstr "没有结果"
 
@@ -1414,12 +1668,16 @@ msgstr "没有大小。"
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
 
 #: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
 #: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
+#: actions/twitapistatuses.php:446 actions/twitapifavorites.php:118
+#: actions/twitapistatuses.php:470 actions/twitapifavorites.php:169
+#: actions/twitapistatuses.php:426 actions/apifavoritecreate.php:108
+#: actions/apifavoritedestroy.php:109 actions/apistatusesdestroy.php:113
 msgid "No status found with that ID."
 msgstr "没有找到此ID的信息。"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
 msgid "No status found with that ID."
 msgstr "没有找到此ID的信息。"
 
 #: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
+#: actions/twitapistatuses.php:418 actions/twitapistatuses.php:442
+#: actions/twitapistatuses.php:399 actions/apistatusesshow.php:144
 msgid "No status with that ID found."
 msgstr "没有找到此ID的信息。"
 
 msgid "No status with that ID found."
 msgstr "没有找到此ID的信息。"
 
@@ -1429,13 +1687,15 @@ msgid "No such OpenID."
 msgstr "没有这个 OpenID。"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
 msgstr "没有这个 OpenID。"
 
 #: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
+#: actions/doc.php:69
 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:87
 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:87
-#: lib/deleteaction.php:51
+#: lib/deleteaction.php:51 actions/deletenotice.php:52
+#: actions/shownotice.php:92
 msgid "No such notice."
 msgstr "没有这份通告。"
 
 msgid "No such notice."
 msgstr "没有这份通告。"
 
@@ -1473,12 +1733,22 @@ msgstr "没有这个订阅"
 #: 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
 #: 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
+#: lib/subs.php:34 lib/subs.php:109 actions/all.php:56 actions/allrss.php:68
+#: actions/favoritesrss.php:74 lib/command.php:140 lib/command.php:185
+#: lib/command.php:234 lib/command.php:271 lib/mailbox.php:84
+#: actions/all.php:38 actions/foaf.php:58 actions/replies.php:72
+#: actions/usergroups.php:91 actions/userrss.php:39 lib/command.php:133
+#: lib/command.php:178 lib/command.php:227 lib/command.php:264
+#: lib/galleryaction.php:59 lib/profileaction.php:77 lib/subs.php:112
+#: actions/all.php:74 actions/remotesubscribe.php:145 actions/xrds.php:71
+#: lib/command.php:163 lib/command.php:311 lib/command.php:364
+#: lib/command.php:411 lib/command.php:466
 msgid "No such user."
 msgstr "没有这个用户。"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
 msgid "No such user."
 msgstr "没有这个用户。"
 
 #: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
+#: actions/recoverpassword.php:251 actions/recoverpassword.php:269
+#: actions/recoverpassword.php:272
 msgid "No user with that email address or username."
 msgstr "没有拥有这个用户名或电子邮件的用户。"
 
 msgid "No user with that email address or username."
 msgstr "没有拥有这个用户名或电子邮件的用户。"
 
@@ -1492,32 +1762,38 @@ msgid "Not a recovery code."
 msgstr "不是恢复码。"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
 msgstr "不是恢复码。"
 
 #: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
+#: scripts/maildaemon.php:53 scripts/maildaemon.php:52
 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:448 lib/twitterapi.php:476
 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:448 lib/twitterapi.php:476
-#: lib/twitterapi.php:566
+#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
+#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
+#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
 msgid "Not a supported data format."
 msgstr "不支持的数据格式。"
 
 #: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
+#: actions/imsettings.php:290 actions/imsettings.php:296
 msgid "Not a valid Jabber ID"
 msgstr "不是有效的 Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
 msgid "Not a valid Jabber ID"
 msgstr "不是有效的 Jabber ID"
 
 #: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
+#: lib/openid.php:143
 msgid "Not a valid OpenID."
 msgstr "不是有效的 OpenID。"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
 msgid "Not a valid OpenID."
 msgstr "不是有效的 OpenID。"
 
 #: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
+#: actions/emailsettings.php:315 actions/emailsettings.php:322
+#: actions/emailsettings.php:330
 msgid "Not a valid email address"
 msgstr "不是有效的电子邮件"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
 msgid "Not a valid email address"
 msgstr "不是有效的电子邮件"
 
 #: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
+#: actions/register.php:189 actions/register.php:195
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
 msgid "Not a valid email address."
 msgstr "不是有效的电子邮件。"
 
@@ -1525,6 +1801,11 @@ msgstr "不是有效的电子邮件。"
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
 #: actions/profilesettings.php:206 actions/register.php:78
 #: actions/editgroup.php:186 actions/newgroup.php:137
 #: actions/profilesettings.php:195 actions/register.php:161
+#: actions/editgroup.php:188 actions/newgroup.php:138
+#: actions/profilesettings.php:196 actions/register.php:198
+#: actions/apigroupcreate.php:228 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:204
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
 msgid "Not a valid nickname."
 msgstr "不是有效的昵称。"
 
@@ -1544,7 +1825,8 @@ msgid "Not a valid profile URL (no YADIS document)."
 msgstr "不是有效的个人信息URL(没有YADIS数据)。"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
 msgstr "不是有效的个人信息URL(没有YADIS数据)。"
 
 #: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
+#: lib/imagefile.php:87 lib/imagefile.php:90 lib/imagefile.php:91
+#: lib/imagefile.php:96
 msgid "Not an image or corrupt file."
 msgstr "不是图片文件或文件已损坏。"
 
 msgid "Not an image or corrupt file."
 msgstr "不是图片文件或文件已损坏。"
 
@@ -1555,11 +1837,13 @@ msgstr "未认证。"
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
 
 #: ../actions/finishremotesubscribe.php:38
 #: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
+#: actions/finishremotesubscribe.php:69
 msgid "Not expecting this response!"
 msgstr "未预料的响应!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
 msgid "Not expecting this response!"
 msgstr "未预料的响应!"
 
 #: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
+#: actions/twitapistatuses.php:309 actions/twitapistatuses.php:327
+#: actions/twitapistatuses.php:284 actions/apistatusesupdate.php:186
 msgid "Not found"
 msgstr "未找到"
 
 msgid "Not found"
 msgstr "未找到"
 
@@ -1575,11 +1859,15 @@ msgstr "未找到"
 #: 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
 #: 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
+#: lib/settingsaction.php:72 actions/newmessage.php:87 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61
+#: actions/makeadmin.php:61 actions/newnotice.php:88
+#: actions/deletenotice.php:67 actions/logout.php:69 actions/newnotice.php:89
+#: actions/unsubscribe.php:52
 msgid "Not logged in."
 msgstr "未登录。"
 
 msgid "Not logged in."
 msgstr "未登录。"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
+#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122 lib/subs.php:124
 msgid "Not subscribed!."
 msgstr "未订阅!"
 
 msgid "Not subscribed!."
 msgstr "未订阅!"
 
@@ -1596,39 +1884,44 @@ msgid "Notice feed for %s"
 msgstr "%s 的通告聚合"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
 msgstr "%s 的通告聚合"
 
 #: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
+#: actions/shownotice.php:94 actions/oembed.php:79 actions/shownotice.php:100
 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
 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
+#: lib/noticelist.php:87 lib/facebookaction.php:581 lib/mailbox.php:118
+#: actions/conversation.php:149 lib/facebookaction.php:572
+#: lib/profileaction.php:206 actions/conversation.php:154
 msgid "Notices"
 msgstr "通告"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
 msgid "Notices"
 msgstr "通告"
 
 #: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/tag.php:81 actions/tag.php:41 actions/tag.php:49 actions/tag.php:57
+#: actions/twitapitags.php:69 actions/apitimelinetag.php:101
+#: actions/tag.php:66
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的通告"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
 #, php-format
 msgid "Notices tagged with %s"
 msgstr "带 %s 标签的通告"
 
 #: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
+#: actions/passwordsettings.php:97 actions/passwordsettings.php:103
 msgid "Old password"
 msgstr "旧密码"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
 msgid "Old password"
 msgstr "旧密码"
 
 #: ../lib/settingsaction.php:96 ../lib/util.php:314 lib/settingsaction.php:90
 #: lib/util.php:330 lib/accountsettingsaction.php:116 lib/action.php:341
-#: lib/logingroupnav.php:81
+#: lib/logingroupnav.php:81 lib/action.php:418
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
 msgid "OpenID"
 msgstr "OpenID"
 
 #: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
+#: actions/finishopenidlogin.php:73 actions/finishopenidlogin.php:72
 msgid "OpenID Account Setup"
 msgstr "OpenID 帐号设置"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
 msgid "OpenID Account Setup"
 msgstr "OpenID 帐号设置"
 
 #: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
+#: lib/openid.php:269
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自动提交"
 
 msgid "OpenID Auto-Submit"
 msgstr "OpenID 自动提交"
 
@@ -1636,29 +1929,34 @@ msgstr "OpenID 自动提交"
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
 #: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
 #: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
 #: actions/finishaddopenid.php:170 actions/openidlogin.php:80
+#: actions/openidlogin.php:89
 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 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
+#: actions/openidlogin.php:111
 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 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
+#: actions/finishopenidlogin.php:129
 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
 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
+#: actions/finishopenidlogin.php:133
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID 认证失败:%s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
 #, php-format
 msgid "OpenID authentication failed: %s"
 msgstr "OpenID 认证失败:%s"
 
 #: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
+#: lib/openid.php:145
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 失败:%s"
 #, php-format
 msgid "OpenID failure: %s"
 msgstr "OpenID 失败:%s"
@@ -1674,11 +1972,12 @@ msgid "OpenID settings"
 msgstr "OpenID 设置"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
 msgstr "OpenID 设置"
 
 #: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
+#: actions/invite.php:186 actions/invite.php:188 actions/invite.php:194
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
 msgid "Optionally add a personal message to the invitation."
 msgstr "在邀请中加几句话(可选)。"
 
 #: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
+#: lib/imagefile.php:75 lib/imagefile.php:79 lib/imagefile.php:80
 msgid "Partial upload."
 msgstr "部分上传。"
 
 msgid "Partial upload."
 msgstr "部分上传。"
 
@@ -1688,34 +1987,46 @@ msgstr "部分上传。"
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
 #: actions/register.php:167 actions/finishopenidlogin.php:118
 #: actions/login.php:231 actions/register.php:372
 #: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
+#: actions/login.php:214 lib/facebookaction.php:315
+#: actions/finishopenidlogin.php:117 actions/register.php:418
+#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
+#: lib/accountsettingsaction.php:114
 msgid "Password"
 msgstr "密码"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
 msgid "Password"
 msgstr "密码"
 
 #: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
+#: actions/recoverpassword.php:335 actions/recoverpassword.php:353
+#: actions/recoverpassword.php:356
 msgid "Password and confirmation do not match."
 msgstr "密码和确认不匹配。"
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
 msgid "Password and confirmation do not match."
 msgstr "密码和确认不匹配。"
 
 #: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
+#: actions/recoverpassword.php:331 actions/recoverpassword.php:349
+#: actions/recoverpassword.php:352
 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 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
+#: actions/recoverpassword.php:207 actions/recoverpassword.php:319
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
 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 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
+#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
+#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
 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 "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
+#: actions/passwordsettings.php:150 actions/register.php:220
+#: actions/passwordsettings.php:156 actions/register.php:227
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
 msgid "Passwords don't match."
 msgstr "密码不匹配。"
 
@@ -1735,14 +2046,17 @@ msgid "People search"
 msgstr "搜索用户"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
 msgstr "搜索用户"
 
 #: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
+#: lib/personalgroupnav.php:99
 msgid "Personal"
 msgstr "个人"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
 msgid "Personal"
 msgstr "个人"
 
 #: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
+#: actions/invite.php:184 actions/invite.php:186 actions/invite.php:192
 msgid "Personal message"
 msgstr "个人消息"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
 msgid "Personal message"
 msgstr "个人消息"
 
 #: ../actions/smssettings.php:69 actions/smssettings.php:69
+#: actions/smssettings.php:128 actions/smssettings.php:140
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电话号码,不带标点或空格,包含地区代码"
 
 msgid "Phone number, no punctuation or spaces, with area code"
 msgstr "电话号码,不带标点或空格,包含地区代码"
 
@@ -1756,7 +2070,7 @@ msgstr ""
 "告,请点击\"取消\"。"
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
 "告,请点击\"取消\"。"
 
 #: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
+#: actions/imsettings.php:142 actions/imsettings.php:148
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
 
 msgid "Post a notice when my Jabber/GTalk status changes."
 msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
 
@@ -1765,7 +2079,9 @@ msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
 #: actions/imsettings.php:68 actions/smssettings.php:94
 #: actions/twittersettings.php:70 actions/emailsettings.php:147
 #: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
+#: actions/twittersettings.php:134 actions/twittersettings.php:137
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
 msgid "Preferences"
 msgstr "首选项"
 
 msgid "Preferences"
 msgstr "首选项"
 
@@ -1774,42 +2090,52 @@ msgstr "首选项"
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
 #: actions/imsettings.php:152 actions/smssettings.php:171
 #: actions/emailsettings.php:286 actions/imsettings.php:258
 #: actions/othersettings.php:168 actions/smssettings.php:272
+#: actions/emailsettings.php:293 actions/othersettings.php:173
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
 msgid "Preferences saved."
 msgstr "首选项已保存。"
 
 #: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
+#: actions/profilesettings.php:129 actions/profilesettings.php:130
+#: actions/profilesettings.php:145
 msgid "Preferred language"
 msgstr "首选语言"
 
 msgid "Preferred language"
 msgstr "首选语言"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
+#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572 lib/action.php:665
+#: lib/action.php:715 lib/action.php:730
 msgid "Privacy"
 msgstr "隐私"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
 msgid "Privacy"
 msgstr "隐私"
 
 #: ../classes/Notice.php:95 ../classes/Notice.php:106 classes/Notice.php:109
 #: classes/Notice.php:119 classes/Notice.php:145 classes/Notice.php:155
+#: classes/Notice.php:178 classes/Notice.php:188 classes/Notice.php:206
+#: classes/Notice.php:216 classes/Notice.php:232 classes/Notice.php:268
+#: classes/Notice.php:293
 msgid "Problem saving notice."
 msgstr "保存通告时出错。"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
 msgid "Problem saving notice."
 msgstr "保存通告时出错。"
 
 #: ../lib/settingsaction.php:84 ../lib/stream.php:60 lib/personal.php:60
 #: lib/settingsaction.php:84 lib/accountsettingsaction.php:104
-#: lib/personalgroupnav.php:108
+#: lib/personalgroupnav.php:108 lib/personalgroupnav.php:109
+#: lib/accountsettingsaction.php:108
 msgid "Profile"
 msgstr "个人信息"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
 msgid "Profile"
 msgstr "个人信息"
 
 #: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
+#: actions/remotesubscribe.php:109 actions/remotesubscribe.php:133
 msgid "Profile URL"
 msgstr "个人信息URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
 msgid "Profile URL"
 msgstr "个人信息URL"
 
 #: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
+#: actions/profilesettings.php:58 actions/profilesettings.php:60
 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 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
+#: actions/updateprofile.php:58
 msgid "Profile unknown"
 msgstr "未知的帐号"
 
 msgid "Profile unknown"
 msgstr "未知的帐号"
 
@@ -1818,17 +2144,19 @@ msgid "Public Stream Feed"
 msgstr "公开的聚合"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
 msgstr "公开的聚合"
 
 #: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
+#: lib/publicgroupnav.php:77 actions/public.php:112 lib/publicgroupnav.php:79
+#: actions/public.php:120 actions/public.php:131
 msgid "Public timeline"
 msgstr "公开的时间表"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
 msgid "Public timeline"
 msgstr "公开的时间表"
 
 #: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
+#: actions/imsettings.php:153 actions/imsettings.php:159
 msgid "Publish a MicroID for my Jabber/GTalk address."
 msgstr "公开Jabber/GTalk帐号的 MicroID。"
 
 #: ../actions/emailsettings.php:94 actions/emailsettings.php:101
 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
+#: actions/emailsettings.php:178 actions/emailsettings.php:183
+#: actions/emailsettings.php:191
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
 msgid "Publish a MicroID for my email address."
 msgstr "公开电子邮件的 MicroID。"
 
@@ -1838,12 +2166,14 @@ msgid "Recent Tags"
 msgstr "最近的标签"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
 msgstr "最近的标签"
 
 #: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
+#: actions/recoverpassword.php:190 actions/recoverpassword.php:197
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
 msgid "Recover"
 msgstr "恢复"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
 msgid "Recover"
 msgstr "恢复"
 
 #: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
+#: actions/recoverpassword.php:198 actions/recoverpassword.php:206
+#: actions/recoverpassword.php:209
 msgid "Recover password"
 msgstr "恢复密码"
 
 msgid "Recover password"
 msgstr "恢复密码"
 
@@ -1856,37 +2186,45 @@ msgstr "恢复码未知"
 #: 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
 #: 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
+#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
+#: actions/register.php:108 actions/register.php:486 lib/action.php:440
+#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
+#: lib/logingroupnav.php:85
 msgid "Register"
 msgstr "注册"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
 msgid "Register"
 msgstr "注册"
 
 #: ../actions/register.php:28 actions/register.php:28
 #: actions/finishopenidlogin.php:196 actions/register.php:90
+#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
+#: actions/register.php:129
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #: ../actions/register.php:200 actions/register.php:214
 msgid "Registration not allowed."
 msgstr "不允许注册。"
 
 #: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
+#: actions/register.php:67 actions/register.php:106
 msgid "Registration successful"
 msgstr "注册成功。"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
 msgid "Registration successful"
 msgstr "注册成功。"
 
 #: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
+#: actions/userauthorization.php:144 actions/userauthorization.php:179
+#: actions/userauthorization.php:211
 msgid "Reject"
 msgstr "拒绝"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
 msgid "Reject"
 msgstr "拒绝"
 
 #: ../actions/login.php:103 ../actions/register.php:176 actions/login.php:103
 #: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
-#: actions/register.php:414
+#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
+#: actions/register.php:461 actions/login.php:225 actions/register.php:471
 msgid "Remember me"
 msgstr "记住登录状态"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
 msgid "Remember me"
 msgstr "记住登录状态"
 
 #: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
+#: actions/updateprofile.php:74 actions/updateprofile.php:76
 msgid "Remote profile with no matching profile"
 msgstr "没有匹配的远程个人信息"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
 msgid "Remote profile with no matching profile"
 msgstr "没有匹配的远程个人信息"
 
 #: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
+#: actions/remotesubscribe.php:88 actions/remotesubscribe.php:112
 msgid "Remote subscribe"
 msgstr "远程订阅"
 
 msgid "Remote subscribe"
 msgstr "远程订阅"
 
@@ -1900,6 +2238,9 @@ msgstr "远程订阅"
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
 #: actions/emailsettings.php:134 actions/imsettings.php:102
 #: actions/openidsettings.php:166 actions/smssettings.php:103
 #: actions/smssettings.php:146 actions/twittersettings.php:115
+#: actions/twittersettings.php:118 actions/emailsettings.php:107
+#: actions/emailsettings.php:140 actions/imsettings.php:108
+#: actions/smssettings.php:115 actions/smssettings.php:158
 msgid "Remove"
 msgstr "移除"
 
 msgid "Remove"
 msgstr "移除"
 
@@ -1908,41 +2249,48 @@ msgstr "移除"
 msgid "Remove OpenID"
 msgstr "移除OpenID"
 
 msgid "Remove OpenID"
 msgstr "移除OpenID"
 
-#: ../actions/openidsettings.php:73
+#: ../actions/openidsettings.php:73 actions/openidsettings.php:128
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr "移除唯一的OpenID可能使您无法登陆!如果需要移除它,请先添加一个新的。"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
 msgid ""
 "Removing your only OpenID would make it impossible to log in! If you need to "
 "remove it, add another OpenID first."
 msgstr "移除唯一的OpenID可能使您无法登陆!如果需要移除它,请先添加一个新的。"
 
 #: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
+#: lib/personalgroupnav.php:104
 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
 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
+#: lib/personalgroupnav.php:104 actions/replies.php:118
+#: actions/replies.php:117 lib/personalgroupnav.php:105
+#: actions/replies.php:125 actions/repliesrss.php:68
 #, php-format
 msgid "Replies to %s"
 msgstr "%s 的回复"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
 #, php-format
 msgid "Replies to %s"
 msgstr "%s 的回复"
 
 #: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
+#: actions/recoverpassword.php:223 actions/recoverpassword.php:240
+#: actions/recoverpassword.php:243
 msgid "Reset"
 msgstr "重置"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
 msgid "Reset"
 msgstr "重置"
 
 #: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
+#: actions/recoverpassword.php:197 actions/recoverpassword.php:205
+#: actions/recoverpassword.php:208
 msgid "Reset password"
 msgstr "重置密码"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
 msgid "Reset password"
 msgstr "重置密码"
 
 #: ../lib/settingsaction.php:99 lib/settingsaction.php:93
 #: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
+#: actions/subscriptions.php:125 actions/subscriptions.php:184
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
 msgid "SMS"
 msgstr "SMS短信"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
 msgid "SMS"
 msgstr "SMS短信"
 
 #: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
+#: actions/smssettings.php:126 actions/smssettings.php:138
 msgid "SMS Phone number"
 msgstr "SMS短信电话号码"
 
 msgid "SMS Phone number"
 msgstr "SMS短信电话号码"
 
@@ -1951,17 +2299,18 @@ msgstr "SMS短信电话号码"
 msgid "SMS Settings"
 msgstr "SMS短信设置"
 
 msgid "SMS Settings"
 msgstr "SMS短信设置"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
+#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437 lib/mail.php:438
 msgid "SMS confirmation"
 msgstr "SMS短信确认"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
 msgid "SMS confirmation"
 msgstr "SMS短信确认"
 
 #: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
+#: actions/recoverpassword.php:222 actions/recoverpassword.php:237
+#: actions/recoverpassword.php:240
 msgid "Same as password above"
 msgstr "相同的密码"
 
 #: ../actions/register.php:156 actions/register.php:170
 msgid "Same as password above"
 msgstr "相同的密码"
 
 #: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
+#: actions/register.php:377 actions/register.php:423 actions/register.php:427
 msgid "Same as password above. Required."
 msgstr "相同的密码。此项必填。"
 
 msgid "Same as password above. Required."
 msgstr "相同的密码。此项必填。"
 
@@ -1974,12 +2323,21 @@ msgstr "相同的密码。此项必填。"
 #: actions/othersettings.php:117 actions/profilesettings.php:150
 #: actions/smssettings.php:169 actions/subscriptions.php:124
 #: actions/tagother.php:152 actions/twittersettings.php:161
 #: 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
+#: lib/groupeditform.php:171 actions/emailsettings.php:187
+#: actions/subscriptions.php:126 actions/tagother.php:154
+#: actions/twittersettings.php:164 actions/othersettings.php:119
+#: actions/profilesettings.php:152 actions/subscriptions.php:185
+#: actions/twittersettings.php:180 lib/designsettings.php:256
+#: lib/groupeditform.php:196 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/smssettings.php:181
+#: actions/subscriptions.php:203 lib/groupeditform.php:202
 msgid "Save"
 msgstr "保存"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
 msgid "Save"
 msgstr "保存"
 
 #: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
+#: lib/util.php:316 lib/action.php:325 lib/action.php:396 lib/action.php:448
+#: lib/action.php:459
 msgid "Search"
 msgstr "搜索"
 
 msgid "Search"
 msgstr "搜索"
 
@@ -1989,7 +2347,7 @@ msgid "Search Stream Feed"
 msgstr "搜索聚合"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
 msgstr "搜索聚合"
 
 #: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/noticesearch.php:57 actions/noticesearch.php:68
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
 #, php-format
 msgid ""
 "Search for notices on %%site.name%% by their contents. Separate search terms "
@@ -1998,7 +2356,7 @@ msgstr ""
 "在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符,多个搜索条件用"
 "空格分隔。"
 
 "在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符,多个搜索条件用"
 "空格分隔。"
 
-#: ../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. "
 #, php-format
 msgid ""
 "Search for people on %%site.name%% by their name, location, or interests. "
@@ -2008,48 +2366,56 @@ msgstr ""
 "含 3 个字符,多个搜索条件用空格分隔。"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
 "含 3 个字符,多个搜索条件用空格分隔。"
 
 #: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
+#: actions/smssettings.php:457 actions/smssettings.php:469
 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 actions/invite.php:182
 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 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
+#: lib/messageform.php:167 lib/noticeform.php:177 actions/invite.php:189
+#: lib/messageform.php:165 actions/invite.php:191 lib/messageform.php:157
+#: lib/noticeform.php:179 actions/invite.php:197 lib/messageform.php:181
+#: lib/noticeform.php:208
 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"
 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
+#: actions/emailsettings.php:138 actions/smssettings.php:157
 msgid "Send email to this address to post new notices."
 msgstr "向这个电子邮件发信以发布新的通告。"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
 msgid "Send email to this address to post new notices."
 msgstr "向这个电子邮件发信以发布新的通告。"
 
 #: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
+#: actions/emailsettings.php:152 actions/emailsettings.php:158
 msgid "Send me notices of new subscriptions through email."
 msgstr "如果有新订阅,通过电子邮件告诉我。"
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
 msgid "Send me notices of new subscriptions through email."
 msgstr "如果有新订阅,通过电子邮件告诉我。"
 
 #: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
+#: actions/imsettings.php:137 actions/imsettings.php:143
 msgid "Send me notices through Jabber/GTalk."
 msgstr "通过Jabber/GTalk发送通告。"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
 msgid "Send me notices through Jabber/GTalk."
 msgstr "通过Jabber/GTalk发送通告。"
 
 #: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/smssettings.php:162 actions/smssettings.php:174
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "通过SMS短信将通告发给我;我了解这样也许会给我带来不菲的开支。"
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
 msgid ""
 "Send me notices through SMS; I understand I may incur exorbitant charges "
 "from my carrier."
 msgstr "通过SMS短信将通告发给我;我了解这样也许会给我带来不菲的开支。"
 
 #: ../actions/imsettings.php:76 actions/imsettings.php:77
+#: actions/imsettings.php:147 actions/imsettings.php:153
 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/facebookaction.php:215
 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/facebookaction.php:215
+#: lib/facebookaction.php:228 lib/facebookaction.php:230
 msgid "Settings"
 msgstr "设置"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
 msgid "Settings"
 msgstr "设置"
 
 #: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
+#: actions/profilesettings.php:319 actions/profilesettings.php:318
+#: actions/profilesettings.php:344
 msgid "Settings saved."
 msgstr "设置已保存。"
 
 msgid "Settings saved."
 msgstr "设置已保存。"
 
@@ -2069,27 +2435,32 @@ msgid "Something weird happened."
 msgstr "发生了奇怪的错误……"
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
 msgstr "发生了奇怪的错误……"
 
 #: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
+#: scripts/maildaemon.php:61 scripts/maildaemon.php:60
 msgid "Sorry, no incoming email allowed."
 msgstr "对不起,发布用的电子邮件无法使用。"
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
 msgid "Sorry, no incoming email allowed."
 msgstr "对不起,发布用的电子邮件无法使用。"
 
 #: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
+#: scripts/maildaemon.php:57 scripts/maildaemon.php:56
 msgid "Sorry, that is not your incoming email address."
 msgstr "对不起,这个发布用的电子邮件属于其他用户。"
 
 msgid "Sorry, that is not your incoming email address."
 msgstr "对不起,这个发布用的电子邮件属于其他用户。"
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
+#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574 lib/action.php:667
+#: lib/action.php:717 lib/action.php:732
 msgid "Source"
 msgstr "来源"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
 msgid "Source"
 msgstr "来源"
 
 #: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
+#: actions/showstream.php:476 actions/showgroup.php:375
+#: actions/showgroup.php:421 lib/profileaction.php:173
+#: actions/showgroup.php:429
 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 "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
+#: actions/finishopenidlogin.php:295 actions/finishopenidlogin.php:238
+#: actions/finishopenidlogin.php:318
 msgid "Stored OpenID not found."
 msgstr "未找到已有的OpenID。"
 
 msgid "Stored OpenID not found."
 msgstr "未找到已有的OpenID。"
 
@@ -2097,24 +2468,28 @@ msgstr "未找到已有的OpenID。"
 #: ../actions/showstream.php:197 actions/remotesubscribe.php:84
 #: actions/showstream.php:197 actions/showstream.php:206
 #: actions/remotesubscribe.php:113 actions/showstream.php:376
 #: ../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
+#: lib/subscribeform.php:139 actions/showstream.php:345
+#: actions/remotesubscribe.php:137 actions/showstream.php:439
 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
 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
+#: lib/subgroupnav.php:88 lib/profileaction.php:140 lib/profileaction.php:200
+#: lib/subgroupnav.php:90
 msgid "Subscribers"
 msgstr "订阅者"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
 msgid "Subscribers"
 msgstr "订阅者"
 
 #: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
+#: actions/userauthorization.php:338 actions/userauthorization.php:344
+#: actions/userauthorization.php:378 actions/userauthorization.php:247
 msgid "Subscription authorized"
 msgstr "订阅已确认"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
 msgid "Subscription authorized"
 msgstr "订阅已确认"
 
 #: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
+#: actions/userauthorization.php:349 actions/userauthorization.php:355
+#: actions/userauthorization.php:389 actions/userauthorization.php:259
 msgid "Subscription rejected"
 msgstr "订阅被拒绝"
 
 msgid "Subscription rejected"
 msgstr "订阅被拒绝"
 
@@ -2122,28 +2497,35 @@ msgstr "订阅被拒绝"
 #: ../actions/subscriptions.php:27 actions/showstream.php:240
 #: actions/showstream.php:322 actions/subscriptions.php:27
 #: actions/showstream.php:407 actions/showstream.php:489
 #: ../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
+#: lib/subgroupnav.php:80 lib/profileaction.php:109 lib/profileaction.php:191
+#: lib/subgroupnav.php:82
 msgid "Subscriptions"
 msgstr "订阅"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
 msgid "Subscriptions"
 msgstr "订阅"
 
 #: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
+#: lib/imagefile.php:78 lib/imagefile.php:82 lib/imagefile.php:83
+#: lib/imagefile.php:88 lib/mediafile.php:170
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: lib/util.php:317 actions/profilesettings.php:122 actions/showstream.php:297
 #: actions/tagother.php:147 actions/tagother.php:207 lib/profilelist.php:162
 msgid "System error uploading file."
 msgstr "上传文件时出错。"
 
 #: ../actions/tag.php:41 ../lib/util.php:301 actions/tag.php:41
 #: 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
+#: lib/profilelist.php:164 actions/showstream.php:290 actions/tagother.php:149
+#: actions/tagother.php:209 lib/profilelist.php:160
+#: actions/profilesettings.php:123 actions/showstream.php:255
+#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
+#: actions/profilesettings.php:138 actions/showstream.php:327
 msgid "Tags"
 msgstr "标签"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
 msgid "Tags"
 msgstr "标签"
 
 #: ../lib/searchaction.php:104 lib/searchaction.php:104
+#: lib/designsettings.php:217
 msgid "Text"
 msgstr "文本"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
 msgid "Text"
 msgstr "文本"
 
 #: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
+#: actions/noticesearch.php:67 actions/noticesearch.php:78
 msgid "Text search"
 msgstr "搜索文本"
 
 msgid "Text search"
 msgstr "搜索文本"
 
@@ -2163,6 +2545,7 @@ msgid "That confirmation code is not for you!"
 msgstr "此确认码不适用!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
 msgstr "此确认码不适用!"
 
 #: ../actions/emailsettings.php:191 actions/emailsettings.php:209
+#: actions/emailsettings.php:328 actions/emailsettings.php:336
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
 msgid "That email address already belongs to another user."
 msgstr "此电子邮件属于其他用户。"
 
@@ -2172,63 +2555,73 @@ msgid "That file is too big."
 msgstr "文件超出大小限制。"
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
 msgstr "文件超出大小限制。"
 
 #: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: actions/imsettings.php:293
+#: actions/imsettings.php:293 actions/imsettings.php:299
 msgid "That is already your Jabber ID."
 msgstr "您已登记此Jabber帐号。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
 msgid "That is already your Jabber ID."
 msgstr "您已登记此Jabber帐号。"
 
 #: ../actions/emailsettings.php:188 actions/emailsettings.php:206
-#: actions/emailsettings.php:318
+#: actions/emailsettings.php:318 actions/emailsettings.php:325
+#: actions/emailsettings.php:333
 msgid "That is already your email address."
 msgstr "您已登记此电子邮件。"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
 msgid "That is already your email address."
 msgstr "您已登记此电子邮件。"
 
 #: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
+#: actions/smssettings.php:306 actions/smssettings.php:318
 msgid "That is already your phone number."
 msgstr "您已登记此电话号码。"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
 msgid "That is already your phone number."
 msgstr "您已登记此电话号码。"
 
 #: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: actions/imsettings.php:381
+#: actions/imsettings.php:381 actions/imsettings.php:387
 msgid "That is not your Jabber ID."
 msgstr "这不是您的Jabber帐号。"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
 msgid "That is not your Jabber ID."
 msgstr "这不是您的Jabber帐号。"
 
 #: ../actions/emailsettings.php:249 actions/emailsettings.php:267
-#: actions/emailsettings.php:397
+#: actions/emailsettings.php:397 actions/emailsettings.php:404
+#: actions/emailsettings.php:412
 msgid "That is not your email address."
 msgstr "这是他人的电子邮件。"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
 msgid "That is not your email address."
 msgstr "这是他人的电子邮件。"
 
 #: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
+#: actions/smssettings.php:393 actions/smssettings.php:405
 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 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
+#: actions/emailsettings.php:374 actions/emailsettings.php:382
+#: actions/imsettings.php:355
 msgid "That is the wrong IM address."
 msgstr "即时通讯帐号错误。"
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
 msgid "That is the wrong IM address."
 msgstr "即时通讯帐号错误。"
 
 #: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
+#: actions/smssettings.php:362 actions/smssettings.php:374
 msgid "That is the wrong confirmation number."
 msgstr "确认码错误。"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
 msgid "That is the wrong confirmation number."
 msgstr "确认码错误。"
 
 #: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
+#: actions/smssettings.php:309 actions/smssettings.php:321
 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 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
+#: actions/newnotice.php:136 actions/twitapistatuses.php:294
+#: lib/facebookaction.php:485 actions/newnotice.php:166
+#: actions/twitapistatuses.php:251 lib/facebookaction.php:477
+#: scripts/maildaemon.php:70
 msgid "That's too long. Max notice size is 140 chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
 #: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
 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
+#: actions/twitapiaccount.php:62 actions/twitapiaccount.php:63
+#: actions/twitapiaccount.php:66
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "超出长度限制。不能超过 255 个字符。"
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
 msgid "That's too long. Max notice size is 255 chars."
 msgstr "超出长度限制。不能超过 255 个字符。"
 
 #: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/confirmaddress.php:159
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "地址 \"%s\" 已确认。"
 #, php-format
 msgid "The address \"%s\" has been confirmed for your account."
 msgstr "地址 \"%s\" 已确认。"
@@ -2237,11 +2630,14 @@ msgstr "地址 \"%s\" 已确认。"
 #: ../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: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
+#: actions/smssettings.php:413 actions/emailsettings.php:423
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
 msgid "The address was removed."
 msgstr "地址被移除。"
 
 msgid "The address was removed."
 msgstr "地址被移除。"
 
-#: ../actions/userauthorization.php:312
+#: ../actions/userauthorization.php:312 actions/userauthorization.php:346
+#: actions/userauthorization.php:380
 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 "
 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 "
@@ -2249,7 +2645,8 @@ msgid ""
 msgstr ""
 "订阅已确认,但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是:"
 
 msgstr ""
 "订阅已确认,但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是:"
 
-#: ../actions/userauthorization.php:322
+#: ../actions/userauthorization.php:322 actions/userauthorization.php:357
+#: actions/userauthorization.php:391
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
 msgid ""
 "The subscription has been rejected, but no callback URL was passed. Check "
 "with the site's instructions for details on how to fully reject the "
@@ -2257,40 +2654,45 @@ msgid ""
 msgstr "订阅已被拒绝,但是没有回传URL。请到此网站查看如何拒绝订阅。"
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
 msgstr "订阅已被拒绝,但是没有回传URL。请到此网站查看如何拒绝订阅。"
 
 #: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/subscribers.php:67
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户订阅了 %s 的通告。"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
 #, php-format
 msgid "These are the people who listen to %s's notices."
 msgstr "这些用户订阅了 %s 的通告。"
 
 #: ../actions/subscribers.php:33 actions/subscribers.php:33
+#: actions/subscribers.php:63
 msgid "These are the people who listen to your notices."
 msgstr "这些用户订阅了您的通告。"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
 msgid "These are the people who listen to your notices."
 msgstr "这些用户订阅了您的通告。"
 
 #: ../actions/subscriptions.php:35 actions/subscriptions.php:35
+#: actions/subscriptions.php:69
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是 %s 订阅的用户。"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
 #, php-format
 msgid "These are the people whose notices %s listens to."
 msgstr "这是 %s 订阅的用户。"
 
 #: ../actions/subscriptions.php:33 actions/subscriptions.php:33
+#: actions/subscriptions.php:65
 msgid "These are the people whose notices you listen to."
 msgstr "这是您订阅的用户。"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
 msgid "These are the people whose notices you listen to."
 msgstr "这是您订阅的用户。"
 
 #: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:130 actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "这些好友已注册,您已自动订阅这些用户。"
 
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "这些好友已注册,您已自动订阅这些用户。"
 
-#: ../actions/recoverpassword.php:88
+#: ../actions/recoverpassword.php:88 actions/recoverpassword.php:97
 msgid "This confirmation code is too old. Please start again."
 msgstr "验证码超时,请重来。"
 
 msgid "This confirmation code is too old. Please start again."
 msgstr "验证码超时,请重来。"
 
-#: ../lib/openid.php:195
+#: ../lib/openid.php:195 lib/openid.php:206
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr "此表单会自动提交。如果没有,点击“提交”以转向 OpenID 提供者。"
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
 msgid ""
 "This form should automatically submit itself. If not, click the submit "
 "button to go to your OpenID provider."
 msgstr "此表单会自动提交。如果没有,点击“提交”以转向 OpenID 提供者。"
 
 #: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
+#: actions/finishopenidlogin.php:67 actions/finishopenidlogin.php:66
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
 #, php-format
 msgid ""
 "This is the first time you've logged into %s so we must connect your OpenID "
@@ -2304,6 +2706,9 @@ msgstr ""
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
 #: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
 #: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
 #: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
+#: actions/twitapifavorites.php:103 actions/twitapistatuses.php:460
+#: actions/twitapifavorites.php:154 actions/twitapifriendships.php:90
+#: actions/twitapistatuses.php:416 actions/apistatusesdestroy.php:107
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"
 
 msgid "This method requires a POST or DELETE."
 msgstr "此方法接受POST或DELETE请求。"
 
@@ -2312,47 +2717,63 @@ msgstr "此方法接受POST或DELETE请求。"
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
 #: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
 #: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
 #: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
+#: actions/twitapistatuses.php:244 actions/twitapiaccount.php:54
+#: actions/twitapidirect_messages.php:131 actions/twitapistatuses.php:262
+#: actions/twitapiaccount.php:56 actions/twitapidirect_messages.php:124
+#: actions/twitapifriendships.php:34 actions/twitapistatuses.php:216
+#: actions/apiblockcreate.php:89 actions/apiblockdestroy.php:88
+#: actions/apidirectmessagenew.php:117 actions/apifavoritecreate.php:90
+#: actions/apifavoritedestroy.php:91 actions/apifriendshipscreate.php:91
+#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
+#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
+#: actions/apistatusesupdate.php:109
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
 msgid "This method requires a POST."
 msgstr "此方法接受POST请求。"
 
-#: ../lib/util.php:164 lib/util.php:246
+#: ../lib/util.php:164 lib/util.php:246 lib/htmloutputter.php:104
 msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供您想要的媒体类型"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 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
+#: actions/profilesettings.php:138 actions/profilesettings.php:139
+#: actions/profilesettings.php:154
 msgid "Timezone"
 msgstr "时区"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
 msgid "Timezone"
 msgstr "时区"
 
 #: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
+#: actions/profilesettings.php:211 actions/profilesettings.php:212
+#: actions/profilesettings.php:228
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
 msgid "Timezone not selected."
 msgstr "未选择时区。"
 
-#: ../actions/remotesubscribe.php:43
+#: ../actions/remotesubscribe.php:43 actions/remotesubscribe.php:74
+#: actions/remotesubscribe.php:98
 #, 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 ""
 #, 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 ""
-"要订阅,你可以登录 (%%action.login%%), 或注册(%%action.register%%) "
-"一个新帐号。如果你已经有在另一个兼容的微博客的帐号(%%doc.openmublog%%),  请填入你资料的互联网地址URL."
+"要订阅,你可以登录 (%%action.login%%), 或注册(%%action.register%%) 一个新帐"
+"号。如果你已经有在另一个兼容的微博客的帐号(%%doc.openmublog%%),  请填入你资料"
+"的互联网地址URL."
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
 
 #: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
+#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
+#: actions/apifriendshipsexists.php:103
 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
 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
+#: actions/profilesettings.php:109 actions/register.php:398
+#: actions/register.php:444 actions/profilesettings.php:117
+#: actions/register.php:448
 msgid "URL of your homepage, blog, or profile on another site"
 msgstr "您的主页、博客或在其他站点的URL"
 
 #: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
 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
+#: actions/remotesubscribe.php:110 actions/remotesubscribe.php:134
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "您在其他兼容的微博客服务的个人信息URL"
 
 msgid "URL of your profile on another compatible microblogging service"
 msgstr "您在其他兼容的微博客服务的个人信息URL"
 
@@ -2364,15 +2785,22 @@ msgstr "您在其他兼容的微博客服务的个人信息URL"
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
 #: actions/emailsettings.php:242 actions/grouplogo.php:317
 #: actions/imsettings.php:214 actions/recoverpassword.php:44
 #: actions/smssettings.php:236 actions/twittersettings.php:302
+#: actions/avatarsettings.php:263 actions/emailsettings.php:247
+#: actions/grouplogo.php:324 actions/twittersettings.php:306
+#: actions/twittersettings.php:322 lib/designsettings.php:301
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/smssettings.php:248
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
 msgid "Unexpected form submission."
 msgstr "未预料的表单提交。"
 
 #: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
+#: actions/recoverpassword.php:323 actions/recoverpassword.php:341
+#: actions/recoverpassword.php:344
 msgid "Unexpected password reset."
 msgstr "未预料的密码重置。"
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
 msgid "Unexpected password reset."
 msgstr "未预料的密码重置。"
 
 #: ../index.php:57 index.php:57 actions/recoverpassword.php:202
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:213
 msgid "Unknown action"
 msgstr "未知动作"
 
 msgid "Unknown action"
 msgstr "未知动作"
 
@@ -2401,38 +2829,47 @@ 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
 #: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
 #: actions/postnotice.php:45 actions/updateprofile.php:46
 #: actions/postnotice.php:48 actions/updateprofile.php:49
+#: actions/updateprofile.php:51
 msgid "Unsupported OMB version"
 msgstr "不支持此OMB版本"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
 msgid "Unsupported OMB version"
 msgstr "不支持此OMB版本"
 
 #: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
+#: lib/imagefile.php:102 lib/imagefile.php:99 lib/imagefile.php:100
+#: lib/imagefile.php:105
 msgid "Unsupported image file format."
 msgstr "不支持这种图像格式。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
 msgid "Unsupported image file format."
 msgstr "不支持这种图像格式。"
 
 #: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
+#: lib/connectsettingsaction.php:108 lib/connectsettingsaction.php:116
 msgid "Updates by SMS"
 msgstr "使用SMS短信更新"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
 msgid "Updates by SMS"
 msgstr "使用SMS短信更新"
 
 #: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
+#: lib/connectsettingsaction.php:105 lib/connectsettingsaction.php:111
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
 msgid "Updates by instant messenger (IM)"
 msgstr "使用即时通讯工具(IM)更新"
 
 #: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
+#: actions/twitapistatuses.php:129 actions/twitapistatuses.php:134
+#: actions/twitapistatuses.php:94 actions/allrss.php:119
+#: actions/apitimelinefriends.php:121
 #, 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
 #, 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
+#: actions/twitapistatuses.php:202 actions/twitapistatuses.php:213
+#: actions/twitapigroups.php:74 actions/twitapistatuses.php:159
+#: actions/apitimelinegroup.php:110 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
 #, 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
 #, 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
+#: actions/avatarsettings.php:165 actions/grouplogo.php:238
+#: actions/grouplogo.php:233
 msgid "Upload"
 msgstr "上传"
 
 msgid "Upload"
 msgstr "上传"
 
@@ -2451,12 +2888,15 @@ msgid "Upload a new profile image"
 msgstr "上传个人信息头像"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
 msgstr "上传个人信息头像"
 
 #: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
+#: actions/invite.php:156 actions/invite.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 #: ../actions/register.php:159 ../actions/register.php:162
 msgid ""
 "Use this form to invite your friends and colleagues to use this service."
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 #: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
+#: actions/register.php:173 actions/register.php:176 actions/register.php:382
+#: actions/register.php:386 actions/register.php:428 actions/register.php:432
+#: actions/register.php:436
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "只用于更新、通告或密码恢复"
 
 msgid "Used only for updates, announcements, and password recovery"
 msgstr "只用于更新、通告或密码恢复"
 
@@ -2480,11 +2920,16 @@ msgstr "要查看的用户不存在。"
 #: 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
 #: 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
+#: actions/twitapiaccount.php:71 actions/twitapistatuses.php:179
+#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
+#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+#: actions/apiusershow.php:108
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
 msgid "User has no profile."
 msgstr "用户没有个人信息。"
 
 #: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
+#: actions/remotesubscribe.php:105 actions/remotesubscribe.php:129
 msgid "User nickname"
 msgstr "昵称"
 
 msgid "User nickname"
 msgstr "昵称"
 
@@ -2493,29 +2938,33 @@ msgid "User not found."
 msgstr "未找到用户。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
 msgstr "未找到用户。"
 
 #: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
+#: actions/profilesettings.php:139 actions/profilesettings.php:140
+#: actions/profilesettings.php:155
 msgid "What timezone are you normally in?"
 msgstr "您一般处于哪个时区?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
 msgid "What timezone are you normally in?"
 msgstr "您一般处于哪个时区?"
 
 #: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: lib/noticeform.php:158
 #, 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
 #, 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
+#: actions/profilesettings.php:119 actions/register.php:410
+#: actions/register.php:456 actions/profilesettings.php:134
+#: actions/register.php:466
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的位置,格式类似\"城市,省份,国家\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
 msgid "Where you are, like \"City, State (or Region), Country\""
 msgstr "你的位置,格式类似\"城市,省份,国家\""
 
 #: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/updateprofile.php:132 actions/updateprofile.php:134
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' 图像格式错误"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
 #, php-format
 msgid "Wrong image type for '%s'"
 msgstr "'%s' 图像格式错误"
 
 #: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/updateprofile.php:127 actions/updateprofile.php:129
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "图像大小 '%s' 错误"
 #, php-format
 msgid "Wrong size image at '%s'"
 msgstr "图像大小 '%s' 错误"
@@ -2523,7 +2972,9 @@ 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: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
+#: actions/deletenotice.php:141 actions/deletenotice.php:115
+#: actions/block.php:150 actions/deletenotice.php:116
+#: actions/groupblock.php:177 actions/deletenotice.php:146
 msgid "Yes"
 msgstr "是"
 
 msgid "Yes"
 msgstr "是"
 
@@ -2544,11 +2995,12 @@ msgid "You are already logged in!"
 msgstr "已登录!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
 msgstr "已登录!"
 
 #: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
+#: actions/invite.php:122 actions/invite.php:128
 msgid "You are already subscribed to these users:"
 msgstr "您已订阅这些用户:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
 msgid "You are already subscribed to these users:"
 msgstr "您已订阅这些用户:"
 
 #: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
+#: actions/twitapifriendships.php:105 actions/twitapifriendships.php:111
 msgid "You are not friends with the specified user."
 msgstr "您与此用户并非好友。"
 
 msgid "You are not friends with the specified user."
 msgstr "您与此用户并非好友。"
 
@@ -2566,13 +3018,14 @@ msgstr "请创建新帐号,开始发布通告。"
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
 msgid "You can receive SMS messages through email from %%site.name%%."
 msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
-#: ../actions/openidsettings.php:86
+#: ../actions/openidsettings.php:86 actions/openidsettings.php:143
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "您可以点击\"移除\"按钮,移除帐号的 OpenID。"
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
 msgid ""
 "You can remove an OpenID from your account by clicking the button marked "
 "\"Remove\"."
 msgstr "您可以点击\"移除\"按钮,移除帐号的 OpenID。"
 
 #: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/imsettings.php:70
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
 #, php-format
 msgid ""
 "You can send and receive notices through Jabber/GTalk [instant messages](%%"
@@ -2581,7 +3034,8 @@ msgstr ""
 "您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
 "们。"
 
 "您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
 "们。"
 
-#: ../actions/profilesettings.php:27
+#: ../actions/profilesettings.php:27 actions/profilesettings.php:69
+#: actions/profilesettings.php:71
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息,让大家对您了解得更多。"
 msgid ""
 "You can update your personal profile info here so people know more about you."
 msgstr "在这里更新个人信息,让大家对您了解得更多。"
@@ -2590,21 +3044,23 @@ msgstr "在这里更新个人信息,让大家对您了解得更多。"
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
 #: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
 #: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
 #: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
 msgid "You can use the local subscription!"
 msgstr "您可以在这里订阅!"
 
 #: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
 #: actions/finishopenidlogin.php:38 actions/register.php:68
 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
+#: actions/finishopenidlogin.php:43 actions/register.php:149
+#: actions/register.php:186 actions/register.php:192
 msgid "You can't register if you don't agree to the license."
 msgstr "您必须同意此授权方可注册。"
 
 #: ../actions/updateprofile.php:63 actions/updateprofile.php:64
 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
+#: actions/updateprofile.php:67 actions/updateprofile.php:69
 msgid "You did not send us that profile"
 msgstr "您未告知此个人信息"
 
 msgid "You did not send us that profile"
 msgstr "您未告知此个人信息"
 
-#: ../lib/mail.php:147
+#: ../lib/mail.php:147 lib/mail.php:289 lib/mail.php:288
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
 #, php-format
 msgid ""
 "You have a new posting address on %1$s.\n"
@@ -2625,35 +3081,39 @@ msgstr ""
 "为您效力的 %4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
 "为您效力的 %4$s"
 
 #: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
+#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:486
+#: actions/twitapistatuses.php:443 actions/apistatusesdestroy.php:130
 msgid "You may not delete another user's status."
 msgstr "您不能删除其他用户的状态。"
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
 msgid "You may not delete another user's status."
 msgstr "您不能删除其他用户的状态。"
 
 #: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
+#: actions/invite.php:41
 #, 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:142
 #, 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:142
+#: actions/invite.php:144 actions/invite.php:150
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr "如果其他人接受邀请并注册,您将得到通知。谢谢您推动了社区发展壮大!"
 
 msgid ""
 "You will be notified when your invitees accept the invitation and register "
 "on the site. Thanks for growing the community!"
 msgstr "如果其他人接受邀请并注册,您将得到通知。谢谢您推动了社区发展壮大!"
 
-#: ../actions/recoverpassword.php:149
+#: ../actions/recoverpassword.php:149 actions/recoverpassword.php:158
 msgid "You've been identified. Enter a  new password below. "
 msgstr "您已得到确认。请输入新密码。"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
 msgid "You've been identified. Enter a  new password below. "
 msgstr "您已得到确认。请输入新密码。"
 
 #: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
+#: actions/openidlogin.php:104 actions/openidlogin.php:113
 msgid "Your OpenID URL"
 msgstr "您的OpenID URL"
 
 msgid "Your OpenID URL"
 msgstr "您的OpenID URL"
 
-#: ../actions/recoverpassword.php:164
+#: ../actions/recoverpassword.php:164 actions/recoverpassword.php:188
+#: actions/recoverpassword.php:193
 msgid "Your nickname on this server, or your registered email address."
 msgstr "您在此服务器的昵称,或注册邮箱。"
 
 msgid "Your nickname on this server, or your registered email address."
 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  with the same user "
 #, php-format
 msgid ""
 "[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
@@ -2662,47 +3122,57 @@ msgstr ""
 "[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
 "关联的 OpenID。"
 
 "[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
 "关联的 OpenID。"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
+#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
+#: lib/util.php:770 lib/util.php:816
 msgid "a few seconds ago"
 msgstr "几秒前"
 
 msgid "a few seconds ago"
 msgstr "几秒前"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
+#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
+#: lib/util.php:782 lib/util.php:828
 #, php-format
 msgid "about %d days ago"
 msgstr "%d 天前"
 
 #, php-format
 msgid "about %d days ago"
 msgstr "%d 天前"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
+#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
+#: lib/util.php:778 lib/util.php:824
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d 小时前"
 
 #, php-format
 msgid "about %d hours ago"
 msgstr "%d 小时前"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
+#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
+#: lib/util.php:774 lib/util.php:820
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d 分钟前"
 
 #, php-format
 msgid "about %d minutes ago"
 msgstr "%d 分钟前"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
+#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
+#: lib/util.php:786 lib/util.php:832
 #, php-format
 msgid "about %d months ago"
 msgstr "%d 个月前"
 
 #, php-format
 msgid "about %d months ago"
 msgstr "%d 个月前"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
+#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
+#: lib/util.php:780 lib/util.php:826
 msgid "about a day ago"
 msgstr "一天前"
 
 msgid "about a day ago"
 msgstr "一天前"
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
+#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
+#: lib/util.php:772 lib/util.php:818
 msgid "about a minute ago"
 msgstr "一分钟前"
 
 msgid "about a minute ago"
 msgstr "一分钟前"
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
+#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
+#: lib/util.php:784 lib/util.php:830
 msgid "about a month ago"
 msgstr "一个月前"
 
 msgid "about a month ago"
 msgstr "一个月前"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
+#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
+#: lib/util.php:788 lib/util.php:834
 msgid "about a year ago"
 msgstr "一年前"
 
 msgid "about a year ago"
 msgstr "一年前"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
+#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
+#: lib/util.php:776 lib/util.php:822
 msgid "about an hour ago"
 msgstr "一小时前"
 
 msgid "about an hour ago"
 msgstr "一小时前"
 
@@ -2724,12 +3194,14 @@ msgid "reply"
 msgstr "回复"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
 msgstr "回复"
 
 #: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
+#: actions/passwordsettings.php:106 actions/passwordsettings.php:112
 msgid "same as password above"
 msgstr "相同的密码"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
 msgid "same as password above"
 msgstr "相同的密码"
 
 #: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
+#: actions/twitapistatuses.php:555 actions/twitapistatuses.php:596
+#: actions/twitapistatuses.php:618 actions/twitapistatuses.php:553
+#: actions/twitapistatuses.php:575
 msgid "unsupported file type"
 msgstr "不支持这种类型的文件"
 
 msgid "unsupported file type"
 msgstr "不支持这种类型的文件"
 
@@ -2751,6 +3223,26 @@ msgstr "« 之后"
 #: 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
 #: 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
+#: actions/avatarsettings.php:251 actions/emailsettings.php:229
+#: actions/grouplogo.php:314 actions/imsettings.php:200 actions/login.php:103
+#: actions/newmessage.php:133 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/tagother.php:166
+#: actions/twittersettings.php:294 actions/userauthorization.php:39
+#: actions/favor.php:75 actions/groupblock.php:66 actions/groupunblock.php:66
+#: actions/invite.php:56 actions/makeadmin.php:66 actions/newnotice.php:102
+#: actions/othersettings.php:138 actions/recoverpassword.php:334
+#: actions/register.php:153 actions/twittersettings.php:310
+#: lib/designsettings.php:291 actions/emailsettings.php:237
+#: actions/grouplogo.php:309 actions/imsettings.php:206 actions/login.php:105
+#: actions/newmessage.php:135 actions/newnotice.php:103
+#: actions/othersettings.php:145 actions/passwordsettings.php:137
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:159 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会话标识有问题,请重试。"
 
 msgid "There was a problem with your session token. Try again, please."
 msgstr "会话标识有问题,请重试。"
 
@@ -2759,6 +3251,7 @@ msgid "This notice is not a favorite!"
 msgstr "此通告未被收藏!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
 msgstr "此通告未被收藏!"
 
 #: actions/disfavor.php:63 actions/disfavor.php:87
+#: actions/twitapifavorites.php:188 actions/apifavoritedestroy.php:134
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
 msgid "Could not delete favorite."
 msgstr "无法删除收藏。"
 
@@ -2766,22 +3259,28 @@ msgstr "无法删除收藏。"
 msgid "Favor"
 msgstr "收藏"
 
 msgid "Favor"
 msgstr "收藏"
 
-#: actions/emailsettings.php:92
+#: actions/emailsettings.php:92 actions/emailsettings.php:157
+#: actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "如果有人收藏我的通告,发邮件通知我。"
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
 msgid "Send me email when someone adds my notice as a favorite."
 msgstr "如果有人收藏我的通告,发邮件通知我。"
 
 #: actions/emailsettings.php:95 actions/emailsettings.php:163
+#: actions/emailsettings.php:169
 msgid "Send me email when someone sends me a private message."
 msgstr "如果收到私人信息,发邮件通知我。"
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
 msgid "Send me email when someone sends me a private message."
 msgstr "如果收到私人信息,发邮件通知我。"
 
 #: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
+#: actions/twitapifavorites.php:118 actions/twitapifavorites.php:124
+#: actions/favor.php:79
 msgid "This notice is already a favorite!"
 msgstr "已收藏此通告!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
 msgid "This notice is already a favorite!"
 msgstr "已收藏此通告!"
 
 #: actions/favor.php:60 actions/twitapifavorites.php:151
 #: classes/Command.php:132 actions/favor.php:86
 #: actions/twitapifavorites.php:125 classes/Command.php:152
+#: actions/twitapifavorites.php:131 lib/command.php:152 actions/favor.php:84
+#: actions/twitapifavorites.php:133 lib/command.php:145
+#: actions/apifavoritecreate.php:130 lib/command.php:176
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
 msgid "Could not create favorite."
 msgstr "无法创建收藏。"
 
@@ -2791,11 +3290,13 @@ msgstr "取消收藏"
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
 
 #: actions/favoritesrss.php:60 actions/showfavorites.php:47
 #: actions/favoritesrss.php:100 actions/showfavorites.php:77
+#: actions/favoritesrss.php:110
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s 收藏的通告"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
 #, php-format
 msgid "%s favorite notices"
 msgstr "%s 收藏的通告"
 
 #: actions/favoritesrss.php:64 actions/favoritesrss.php:104
+#: actions/favoritesrss.php:114
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s 的收藏的聚合"
 #, php-format
 msgid "Feed of favorite notices of %s"
 msgstr "%s 的收藏的聚合"
@@ -2837,33 +3338,44 @@ msgid "Login with your username and password. "
 msgstr "输入用户名和密码以登录。"
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
 msgstr "输入用户名和密码以登录。"
 
 #: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
+#: actions/twitapidirect_messages.php:141 actions/newmessage.php:148
+#: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:145
 msgid "That's too long. Max message size is 140 chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
 msgid "That's too long. Max message size is 140 chars."
 msgstr "超出长度限制。不能超过 140 个字符。"
 
 #: actions/newmessage.php:65 actions/newmessage.php:128
+#: actions/newmessage.php:155 actions/newmessage.php:158
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
 msgid "No recipient specified."
 msgstr "没有收件人。"
 
 #: actions/newmessage.php:68 actions/newmessage.php:113
 #: classes/Command.php:206 actions/newmessage.php:131
 #: actions/newmessage.php:168 classes/Command.php:237
+#: actions/newmessage.php:119 actions/newmessage.php:158 lib/command.php:237
+#: lib/command.php:230 actions/newmessage.php:121 actions/newmessage.php:161
+#: lib/command.php:367
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
 msgid "You can't send a message to this user."
 msgstr "无法向此用户发送消息。"
 
 #: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
 #: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: classes/Command.php:240 actions/newmessage.php:161
+#: actions/twitapidirect_messages.php:167 lib/command.php:240
+#: actions/twitapidirect_messages.php:163 lib/command.php:233
+#: actions/newmessage.php:164 lib/command.php:370
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
 msgid ""
 "Don't send a message to yourself; just say it to yourself quietly instead."
 msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
 
 #: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
+#: actions/newmessage.php:163 actions/newmessage.php:114
+#: actions/newmessage.php:116 actions/remotesubscribe.php:154
 msgid "No such user"
 msgstr "未找到用户"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
 msgid "No such user"
 msgstr "未找到用户"
 
 #: actions/newmessage.php:117 actions/newmessage.php:67
+#: actions/newmessage.php:71 actions/newmessage.php:231
 msgid "New message"
 msgstr "新消息"
 
 msgid "New message"
 msgstr "新消息"
 
@@ -2917,6 +3429,11 @@ msgstr "您可以在这里更新个人信息。"
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
 #: actions/avatarsettings.php:104 actions/avatarsettings.php:179
 #: actions/grouplogo.php:177 actions/remotesubscribe.php:367
 #: actions/userauthorization.php:176 actions/userrss.php:82
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:183 actions/remotesubscribe.php:366
+#: actions/remotesubscribe.php:364 actions/userauthorization.php:215
+#: actions/userrss.php:103 actions/grouplogo.php:178
+#: actions/remotesubscribe.php:191 actions/userauthorization.php:72
 msgid "User without matching profile"
 msgstr "找不到匹配的用户。"
 
 msgid "User without matching profile"
 msgstr "找不到匹配的用户。"
 
@@ -2945,6 +3462,8 @@ msgid "New password successfully saved. "
 msgstr "新密码已保存。"
 
 #: actions/register.php:95 actions/register.php:180
 msgstr "新密码已保存。"
 
 #: actions/register.php:95 actions/register.php:180
+#: actions/passwordsettings.php:147 actions/register.php:217
+#: actions/passwordsettings.php:153 actions/register.php:224
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
 msgid "Password must be 6 or more characters."
 msgstr "密码必须包含 6 个或更多字符。"
 
@@ -2965,12 +3484,15 @@ msgid "To subscribe, you can [login](%%action.login%%),"
 msgstr "要订阅,请先[登录](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
 msgstr "要订阅,请先[登录](%%action.login%%),"
 
 #: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/showfavorites.php:147
 #, 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
 #, 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
+#: actions/showfavorites.php:179 actions/showfavorites.php:209
+#: actions/showfavorites.php:132
 msgid "Could not retrieve favorite notices."
 msgstr "无法获取收藏的通告。"
 
 msgid "Could not retrieve favorite notices."
 msgstr "无法获取收藏的通告。"
 
@@ -2978,7 +3500,7 @@ msgstr "无法获取收藏的通告。"
 msgid "No such message."
 msgstr "未找到此消息。"
 
 msgid "No such message."
 msgstr "未找到此消息。"
 
-#: actions/showmessage.php:42
+#: actions/showmessage.php:42 actions/showmessage.php:98
 msgid "Only the sender and recipient may read this message."
 msgstr "只有发送和接受双方可以阅读此消息。"
 
 msgid "Only the sender and recipient may read this message."
 msgstr "只有发送和接受双方可以阅读此消息。"
 
@@ -3002,51 +3524,70 @@ msgid "Mobile carrier for your phone. "
 msgstr "手机的运营商。"
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
 msgstr "手机的运营商。"
 
 #: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
+#: actions/twitapidirect_messages.php:67 actions/twitapidirect_messages.php:53
+#: actions/apidirectmessage.php:101
 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给 %s 的直接消息"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
 #, php-format
 msgid "Direct messages to %s"
 msgstr "发给 %s 的直接消息"
 
 #: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/twitapidirect_messages.php:68 actions/twitapidirect_messages.php:54
+#: actions/apidirectmessage.php:105
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "发给 %s 的直接消息"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
 #, php-format
 msgid "All the direct messages sent to %s"
 msgstr "发给 %s 的直接消息"
 
 #: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
+#: actions/twitapidirect_messages.php:72 actions/twitapidirect_messages.php:59
 msgid "Direct Messages You've Sent"
 msgstr "您已发送的直接消息"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
 msgid "Direct Messages You've Sent"
 msgstr "您已发送的直接消息"
 
 #: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/twitapidirect_messages.php:73 actions/twitapidirect_messages.php:60
+#: actions/apidirectmessage.php:93
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s 发送的直接消息"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
 #, php-format
 msgid "All the direct messages sent from %s"
 msgstr "%s 发送的直接消息"
 
 #: actions/twitapidirect_messages.php:128
 #: actions/twitapidirect_messages.php:137
+#: actions/twitapidirect_messages.php:146
+#: actions/twitapidirect_messages.php:140 actions/apidirectmessagenew.php:126
 msgid "No message text!"
 msgstr "消息没有正文!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
 msgid "No message text!"
 msgstr "消息没有正文!"
 
 #: actions/twitapidirect_messages.php:138
 #: actions/twitapidirect_messages.php:150
+#: actions/twitapidirect_messages.php:159
+#: actions/twitapidirect_messages.php:154 actions/apidirectmessagenew.php:146
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
 msgid "Recipient user not found."
 msgstr "未找到收件人。"
 
 #: actions/twitapidirect_messages.php:141
 #: actions/twitapidirect_messages.php:153
+#: actions/twitapidirect_messages.php:162
+#: actions/twitapidirect_messages.php:158 actions/apidirectmessagenew.php:150
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "无法向并非好友的用户发送直接消息。"
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
 msgid "Can't send direct messages to users who aren't your friend."
 msgstr "无法向并非好友的用户发送直接消息。"
 
 #: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/twitapifavorites.php:64 actions/twitapifavorites.php:49
+#: actions/apitimelinefavorites.php:107
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s 的收藏 / %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
 #, php-format
 msgid "%s / Favorites from %s"
 msgstr "%s 的收藏 / %s"
 
 #: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/twitapifavorites.php:68 actions/twitapifavorites.php:55
+#: actions/apitimelinefavorites.php:119
 #, 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 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
+#: actions/twitapifavorites.php:170 lib/mail.php:554
+#: actions/twitapifavorites.php:221
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s 收藏了您的通告"
 #, php-format
 msgid "%s added your notice as a favorite"
 msgstr "%s 收藏了您的通告"
@@ -3067,14 +3608,17 @@ msgid ""
 msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
 msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
 
 #: actions/twittersettings.php:41 actions/twittersettings.php:60
+#: actions/twittersettings.php:61
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
 msgid "Twitter settings"
 msgstr "Twitter 设置"
 
 #: actions/twittersettings.php:48 actions/twittersettings.php:105
+#: actions/twittersettings.php:106
 msgid "Twitter Account"
 msgstr "Twitter 帐号"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
 msgid "Twitter Account"
 msgstr "Twitter 帐号"
 
 #: actions/twittersettings.php:56 actions/twittersettings.php:113
+#: actions/twittersettings.php:114
 msgid "Current verified Twitter account."
 msgstr "已验证的 Twitter 帐号。"
 
 msgid "Current verified Twitter account."
 msgstr "已验证的 Twitter 帐号。"
 
@@ -3083,6 +3627,7 @@ msgid "Twitter Username"
 msgstr "Twitter 用户名"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
 msgstr "Twitter 用户名"
 
 #: actions/twittersettings.php:65 actions/twittersettings.php:123
+#: actions/twittersettings.php:126
 msgid "No spaces, please."
 msgstr "请不要包含空格。"
 
 msgid "No spaces, please."
 msgstr "请不要包含空格。"
 
@@ -3091,24 +3636,29 @@ msgid "Twitter Password"
 msgstr "Twitter 密码"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
 msgstr "Twitter 密码"
 
 #: actions/twittersettings.php:72 actions/twittersettings.php:139
+#: actions/twittersettings.php:142
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的通告转发到 Twitter。"
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
 msgid "Automatically send my notices to Twitter."
 msgstr "自动将我的通告转发到 Twitter。"
 
 #: actions/twittersettings.php:75 actions/twittersettings.php:146
+#: actions/twittersettings.php:149
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将这里的 \"@\" 回复发送到 Twitter。"
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
 msgid "Send local \"@\" replies to Twitter."
 msgstr "将这里的 \"@\" 回复发送到 Twitter。"
 
 #: actions/twittersettings.php:78 actions/twittersettings.php:153
+#: actions/twittersettings.php:156
 msgid "Subscribe to my Twitter friends here."
 msgstr "在这里订阅 Twitter 好友。"
 
 msgid "Subscribe to my Twitter friends here."
 msgstr "在这里订阅 Twitter 好友。"
 
-#: actions/twittersettings.php:122
+#: actions/twittersettings.php:122 actions/twittersettings.php:331
+#: actions/twittersettings.php:348
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr "用户名只能包含数字,大写和小写字母和下划线。不能超过 15 个字符。"
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
 msgid ""
 "Username must have only numbers, upper- and lowercase letters, and "
 "underscore (_). 15 chars max."
 msgstr "用户名只能包含数字,大写和小写字母和下划线。不能超过 15 个字符。"
 
 #: actions/twittersettings.php:128 actions/twittersettings.php:334
+#: actions/twittersettings.php:338 actions/twittersettings.php:355
 msgid "Could not verify your Twitter credentials!"
 msgstr "不能验证 Twitter 帐号!"
 
 msgid "Could not verify your Twitter credentials!"
 msgstr "不能验证 Twitter 帐号!"
 
@@ -3119,33 +3669,43 @@ msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
 
 #: actions/twittersettings.php:151 actions/twittersettings.php:170
 #: actions/twittersettings.php:348 actions/twittersettings.php:368
+#: actions/twittersettings.php:352 actions/twittersettings.php:372
+#: actions/twittersettings.php:369 actions/twittersettings.php:389
 msgid "Unable to save your Twitter settings!"
 msgstr "无法保存 Twitter 设置!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
 msgid "Unable to save your Twitter settings!"
 msgstr "无法保存 Twitter 设置!"
 
 #: actions/twittersettings.php:174 actions/twittersettings.php:376
+#: actions/twittersettings.php:380 actions/twittersettings.php:399
 msgid "Twitter settings saved."
 msgstr "Twitter 设置已保存。"
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
 msgid "Twitter settings saved."
 msgstr "Twitter 设置已保存。"
 
 #: actions/twittersettings.php:192 actions/twittersettings.php:395
+#: actions/twittersettings.php:399 actions/twittersettings.php:418
 msgid "That is not your Twitter account."
 msgstr "此 Twitter 帐号属于他人。"
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
 msgid "That is not your Twitter account."
 msgstr "此 Twitter 帐号属于他人。"
 
 #: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
+#: actions/twittersettings.php:403 actions/twittersettings.php:407
+#: actions/twittersettings.php:426
 msgid "Couldn't remove Twitter user."
 msgstr "无法移除 Twitter 用户。"
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
 msgid "Couldn't remove Twitter user."
 msgstr "无法移除 Twitter 用户。"
 
 #: actions/twittersettings.php:212 actions/twittersettings.php:407
+#: actions/twittersettings.php:411 actions/twittersettings.php:430
 msgid "Twitter account removed."
 msgstr "Twitter 帐号已移除。"
 
 #: actions/twittersettings.php:225 actions/twittersettings.php:239
 #: actions/twittersettings.php:428 actions/twittersettings.php:439
 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
+#: actions/twittersettings.php:453 actions/twittersettings.php:432
+#: actions/twittersettings.php:443 actions/twittersettings.php:457
+#: actions/twittersettings.php:452 actions/twittersettings.php:463
+#: actions/twittersettings.php:477
 msgid "Couldn't save Twitter preferences."
 msgstr "无法保存 Twitter 首选项。"
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
 msgid "Couldn't save Twitter preferences."
 msgstr "无法保存 Twitter 首选项。"
 
 #: actions/twittersettings.php:245 actions/twittersettings.php:461
+#: actions/twittersettings.php:465 actions/twittersettings.php:485
 msgid "Twitter preferences saved."
 msgstr "Twitter 首选项已保存。"
 
 msgid "Twitter preferences saved."
 msgstr "Twitter 首选项已保存。"
 
@@ -3162,18 +3722,19 @@ msgid "The subscription has been rejected, but no "
 msgstr "订阅已拒绝,但是"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
 msgstr "订阅已拒绝,但是"
 
 #: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
+#: lib/channel.php:138 lib/channel.php:158
 msgid "Command results"
 msgstr "执行结果"
 
 msgid "Command results"
 msgstr "执行结果"
 
-#: classes/Channel.php:148 classes/Channel.php:204
+#: classes/Channel.php:148 classes/Channel.php:204 lib/channel.php:210
 msgid "Command complete"
 msgstr "执行完毕"
 
 msgid "Command complete"
 msgstr "执行完毕"
 
-#: classes/Channel.php:158 classes/Channel.php:215
+#: classes/Channel.php:158 classes/Channel.php:215 lib/channel.php:221
 msgid "Command failed"
 msgstr "执行失败"
 
 msgid "Command failed"
 msgstr "执行失败"
 
-#: classes/Command.php:39 classes/Command.php:44
+#: classes/Command.php:39 classes/Command.php:44 lib/command.php:44
 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起,这个命令还没有实现。"
 
 msgid "Sorry, this command is not yet implemented."
 msgstr "对不起,这个命令还没有实现。"
 
@@ -3183,89 +3744,111 @@ msgid "Subscriptions: %1$s\n"
 msgstr "订阅:%1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
 msgstr "订阅:%1$s\n"
 
 #: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
+#: classes/Command.php:276 lib/command.php:145 lib/command.php:276
+#: lib/command.php:138 lib/command.php:269 lib/command.php:168
+#: lib/command.php:416 lib/command.php:471
 msgid "User has no last notice"
 msgstr "用户没有通告。"
 
 msgid "User has no last notice"
 msgstr "用户没有通告。"
 
-#: classes/Command.php:146 classes/Command.php:166
+#: classes/Command.php:146 classes/Command.php:166 lib/command.php:166
+#: lib/command.php:159 lib/command.php:190
 msgid "Notice marked as fave."
 msgstr "通告被标记为收藏。"
 
 msgid "Notice marked as fave."
 msgstr "通告被标记为收藏。"
 
-#: classes/Command.php:166 classes/Command.php:189
+#: classes/Command.php:166 classes/Command.php:189 lib/command.php:189
+#: lib/command.php:182 lib/command.php:315
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
 #, php-format
 msgid "%1$s (%2$s)"
 msgstr "%1$s (%2$s)"
 
-#: classes/Command.php:169 classes/Command.php:192
+#: classes/Command.php:169 classes/Command.php:192 lib/command.php:192
+#: lib/command.php:185 lib/command.php:318
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名:%s"
 
 #, php-format
 msgid "Fullname: %s"
 msgstr "全名:%s"
 
-#: classes/Command.php:172 classes/Command.php:195
+#: classes/Command.php:172 classes/Command.php:195 lib/command.php:195
+#: lib/command.php:188 lib/command.php:321
 #, php-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
 #, php-format
 msgid "Location: %s"
 msgstr "位置:%s"
 
-#: classes/Command.php:175 classes/Command.php:198
+#: classes/Command.php:175 classes/Command.php:198 lib/command.php:198
+#: lib/command.php:191 lib/command.php:324
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页:%s"
 
 #, php-format
 msgid "Homepage: %s"
 msgstr "主页:%s"
 
-#: classes/Command.php:178 classes/Command.php:201
+#: classes/Command.php:178 classes/Command.php:201 lib/command.php:201
+#: lib/command.php:194 lib/command.php:327
 #, php-format
 msgid "About: %s"
 msgstr "关于:%s"
 
 #, php-format
 msgid "About: %s"
 msgstr "关于:%s"
 
-#: classes/Command.php:200 classes/Command.php:228
+#: classes/Command.php:200 classes/Command.php:228 lib/command.php:228
+#: lib/command.php:221
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
 
 #, php-format
 msgid "Message too long - maximum is 140 characters, you sent %d"
 msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
 
-#: classes/Command.php:214 classes/Command.php:245
+#: classes/Command.php:214 classes/Command.php:245 lib/command.php:245
+#: actions/newmessage.php:182 lib/command.php:238 actions/newmessage.php:185
+#: lib/command.php:375
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "已向 %s 发送消息"
 
 #, php-format
 msgid "Direct message to %s sent"
 msgstr "已向 %s 发送消息"
 
-#: classes/Command.php:216 classes/Command.php:247
+#: classes/Command.php:216 classes/Command.php:247 lib/command.php:247
+#: lib/command.php:240 lib/command.php:377
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
 msgid "Error sending direct message."
 msgstr "发送消息出错。"
 
-#: classes/Command.php:263 classes/Command.php:300
+#: classes/Command.php:263 classes/Command.php:300 lib/command.php:300
+#: lib/command.php:293 lib/command.php:495
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定要订阅的用户名"
 
 msgid "Specify the name of the user to subscribe to"
 msgstr "指定要订阅的用户名"
 
-#: classes/Command.php:270 classes/Command.php:307
+#: classes/Command.php:270 classes/Command.php:307 lib/command.php:307
+#: lib/command.php:300 lib/command.php:502
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
 #, php-format
 msgid "Subscribed to %s"
 msgstr "订阅 %s"
 
-#: classes/Command.php:288 classes/Command.php:328
+#: classes/Command.php:288 classes/Command.php:328 lib/command.php:328
+#: lib/command.php:321 lib/command.php:523
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "指定要取消订阅的用户名"
 
 msgid "Specify the name of the user to unsubscribe from"
 msgstr "指定要取消订阅的用户名"
 
-#: classes/Command.php:295 classes/Command.php:335
+#: classes/Command.php:295 classes/Command.php:335 lib/command.php:335
+#: lib/command.php:328 lib/command.php:530
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "取消订阅 %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
 #, php-format
 msgid "Unsubscribed from %s"
 msgstr "取消订阅 %s"
 
 #: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
+#: classes/Command.php:376 lib/command.php:353 lib/command.php:376
+#: lib/command.php:346 lib/command.php:369 lib/command.php:548
+#: lib/command.php:571
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
 msgid "Command not yet implemented."
 msgstr "命令尚未实现。"
 
-#: classes/Command.php:313 classes/Command.php:356
+#: classes/Command.php:313 classes/Command.php:356 lib/command.php:356
+#: lib/command.php:349 lib/command.php:551
 msgid "Notification off."
 msgstr "通告关闭。"
 
 msgid "Notification off."
 msgstr "通告关闭。"
 
-#: classes/Command.php:315 classes/Command.php:358
+#: classes/Command.php:315 classes/Command.php:358 lib/command.php:358
+#: lib/command.php:351 lib/command.php:553
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
 msgid "Can't turn off notification."
 msgstr "无法关闭通告。"
 
-#: classes/Command.php:333 classes/Command.php:379
+#: classes/Command.php:333 classes/Command.php:379 lib/command.php:379
+#: lib/command.php:372 lib/command.php:574
 msgid "Notification on."
 msgstr "通告开启。"
 
 msgid "Notification on."
 msgstr "通告开启。"
 
-#: classes/Command.php:335 classes/Command.php:381
+#: classes/Command.php:335 classes/Command.php:381 lib/command.php:381
+#: lib/command.php:374 lib/command.php:576
 msgid "Can't turn on notification."
 msgstr "无法开启通告。"
 
 msgid "Can't turn on notification."
 msgstr "无法开启通告。"
 
@@ -3273,11 +3856,11 @@ msgstr "无法开启通告。"
 msgid "Commands:\n"
 msgstr "命令:\n"
 
 msgid "Commands:\n"
 msgstr "命令:\n"
 
-#: classes/Message.php:53 classes/Message.php:56
+#: classes/Message.php:53 classes/Message.php:56 classes/Message.php:55
 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
 msgid "Could not insert message."
 msgstr "无法添加信息。"
 
-#: classes/Message.php:63 classes/Message.php:66
+#: classes/Message.php:63 classes/Message.php:66 classes/Message.php:65
 msgid "Could not update message with new URI."
 msgstr "无法添加新URI的信息。"
 
 msgid "Could not update message with new URI."
 msgstr "无法添加新URI的信息。"
 
@@ -3294,7 +3877,7 @@ msgstr ""
 "您的新的发布用的地址是 %1$s。\n"
 "\n"
 
 "您的新的发布用的地址是 %1$s。\n"
 "\n"
 
-#: lib/mail.php:249 lib/mail.php:508
+#: lib/mail.php:249 lib/mail.php:508 lib/mail.php:509
 #, php-format
 msgid "New private message from %s"
 msgstr "%s 发送了新的私人信息"
 #, php-format
 msgid "New private message from %s"
 msgstr "%s 发送了新的私人信息"
@@ -3308,7 +3891,7 @@ msgstr ""
 "%1$s (%2$s) 发送了新的私人信息:\n"
 "\n"
 
 "%1$s (%2$s) 发送了新的私人信息:\n"
 "\n"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
+#: lib/mailbox.php:43 lib/mailbox.php:89 lib/mailbox.php:91
 msgid "Only the user can read their own mailboxes."
 msgstr "只有用户自己可以访问邮箱。"
 
 msgid "Only the user can read their own mailboxes."
 msgstr "只有用户自己可以访问邮箱。"
 
@@ -3317,31 +3900,39 @@ msgid "This form should automatically submit itself. "
 msgstr "此表单会自动提交。"
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
 msgstr "此表单会自动提交。"
 
 #: lib/personal.php:65 lib/personalgroupnav.php:113
+#: lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "收藏夹"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 msgid "Favorites"
 msgstr "收藏夹"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/favoritesrss.php:110 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115 actions/favoritesrss.php:111
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 收藏的通告"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
 #, php-format
 msgid "%s's favorite notices"
 msgstr "%s 收藏的通告"
 
 #: lib/personal.php:66 lib/personalgroupnav.php:114
+#: lib/personalgroupnav.php:115
 msgid "User"
 msgstr "用户"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
 msgid "User"
 msgstr "用户"
 
 #: lib/personal.php:75 lib/personalgroupnav.php:123
+#: lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "收件箱"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
 msgid "Inbox"
 msgstr "收件箱"
 
 #: lib/personal.php:76 lib/personalgroupnav.php:124
+#: lib/personalgroupnav.php:125
 msgid "Your incoming messages"
 msgstr "您接收的消息"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
 msgid "Your incoming messages"
 msgstr "您接收的消息"
 
 #: lib/personal.php:80 lib/personalgroupnav.php:128
+#: lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "发件箱"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
 msgid "Outbox"
 msgstr "发件箱"
 
 #: lib/personal.php:81 lib/personalgroupnav.php:129
+#: lib/personalgroupnav.php:130
 msgid "Your sent messages"
 msgstr "您发送的消息"
 
 msgid "Your sent messages"
 msgstr "您发送的消息"
 
@@ -3354,14 +3945,19 @@ msgid "Twitter integration options"
 msgstr "Twitter 整合选项"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
 msgstr "Twitter 整合选项"
 
 #: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
+#: lib/messageform.php:137 lib/noticelist.php:425 lib/messageform.php:135
+#: lib/noticelist.php:433 lib/messageform.php:146
 msgid "To"
 msgstr "到"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
 msgid "To"
 msgstr "到"
 
 #: scripts/maildaemon.php:45 scripts/maildaemon.php:48
+#: scripts/maildaemon.php:47
 msgid "Could not parse message."
 msgstr "无法解析消息。"
 
 msgid "Could not parse message."
 msgstr "无法解析消息。"
 
-#: actions/all.php:63 actions/facebookhome.php:162
+#: actions/all.php:63 actions/facebookhome.php:162 actions/all.php:66
+#: actions/facebookhome.php:161 actions/all.php:48
+#: actions/facebookhome.php:156 actions/all.php:84
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s 及好友"
 #, fuzzy, php-format
 msgid "%s and friends, page %d"
 msgstr "%s 及好友"
@@ -3371,21 +3967,31 @@ msgid "You can upload your personal avatar."
 msgstr "您可以在这里上传个人头像。"
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
 msgstr "您可以在这里上传个人头像。"
 
 #: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
+#: actions/grouplogo.php:250 actions/avatarsettings.php:119
+#: actions/avatarsettings.php:194 actions/grouplogo.php:256
+#: actions/grouplogo.php:251
 msgid "Avatar settings"
 msgstr "头像设置"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
 msgid "Avatar settings"
 msgstr "头像设置"
 
 #: actions/avatarsettings.php:124 actions/avatarsettings.php:199
 #: actions/grouplogo.php:198 actions/grouplogo.php:258
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:204 actions/grouplogo.php:264
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
 msgid "Original"
 msgstr "原来的"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
 msgid "Original"
 msgstr "原来的"
 
 #: actions/avatarsettings.php:139 actions/avatarsettings.php:211
 #: actions/grouplogo.php:209 actions/grouplogo.php:270
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:215 actions/grouplogo.php:276
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
 msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
 msgid "Preview"
 msgstr "预览"
 
 #: actions/avatarsettings.php:225 actions/grouplogo.php:284
+#: actions/avatarsettings.php:228 actions/grouplogo.php:291
+#: actions/grouplogo.php:286
 msgid "Crop"
 msgstr "剪裁"
 
 msgid "Crop"
 msgstr "剪裁"
 
@@ -3403,37 +4009,46 @@ msgid "There was a problem with your session token. "
 msgstr "会话标识有问题,请重试。"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
 msgstr "会话标识有问题,请重试。"
 
 #: actions/avatarsettings.php:303 actions/grouplogo.php:360
+#: actions/avatarsettings.php:308
 msgid "Pick a square area of the image to be your avatar"
 msgstr "请选择一块方形区域作为你的头像"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
 msgid "Pick a square area of the image to be your avatar"
 msgstr "请选择一块方形区域作为你的头像"
 
 #: actions/avatarsettings.php:327 actions/grouplogo.php:384
+#: actions/avatarsettings.php:323 actions/grouplogo.php:382
+#: actions/grouplogo.php:377
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
 msgid "Lost our file data."
 msgstr "文件数据丢失"
 
 #: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
+#: classes/User_group.php:112 lib/imagefile.php:112 lib/imagefile.php:113
+#: lib/imagefile.php:118
 #, fuzzy
 msgid "Lost our file."
 msgstr "没有这份通告。"
 
 #: actions/avatarsettings.php:349 actions/avatarsettings.php:383
 #: actions/grouplogo.php:406 actions/grouplogo.php:440
 #, 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
+#: classes/User_group.php:129 classes/User_group.php:161 lib/imagefile.php:144
+#: lib/imagefile.php:191 lib/imagefile.php:145 lib/imagefile.php:192
+#: lib/imagefile.php:150 lib/imagefile.php:197
 msgid "Unknown file type"
 msgstr "未知文件类型"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
 msgid "Unknown file type"
 msgstr "未知文件类型"
 
 #: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71
 #, fuzzy
 msgid "No profile specified."
 msgstr "没有收件人。"
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
 #, fuzzy
 msgid "No profile specified."
 msgstr "没有收件人。"
 
 #: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/unblock.php:75 actions/groupblock.php:76
+#: actions/groupunblock.php:76 actions/makeadmin.php:76
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "没有找到此ID的信息。"
 
 #, fuzzy
 msgid "No profile with that ID."
 msgstr "没有找到此ID的信息。"
 
-#: actions/block.php:111
+#: actions/block.php:111 actions/block.php:134
 #, fuzzy
 msgid "Block user"
 msgstr "阻止用户"
 #, fuzzy
 msgid "Block user"
 msgstr "阻止用户"
@@ -3443,11 +4058,11 @@ msgstr "阻止用户"
 msgid "Are you sure you want to block this user? "
 msgstr "确定要阻止该用户吗?"
 
 msgid "Are you sure you want to block this user? "
 msgstr "确定要阻止该用户吗?"
 
-#: actions/block.php:162
+#: actions/block.php:162 actions/block.php:165
 msgid "You have already blocked this user."
 msgstr "您已成功阻止该用户:"
 
 msgid "You have already blocked this user."
 msgstr "您已成功阻止该用户:"
 
-#: actions/block.php:167
+#: actions/block.php:167 actions/block.php:170
 msgid "Failed to save block information."
 msgstr "保存阻止信息失败。"
 
 msgid "Failed to save block information."
 msgstr "保存阻止信息失败。"
 
@@ -3465,41 +4080,58 @@ msgstr "您将要永久删除这条通告。"
 msgid "Add to favorites"
 msgstr "加入收藏"
 
 msgid "Add to favorites"
 msgstr "加入收藏"
 
-#: actions/editgroup.php:54
+#: actions/editgroup.php:54 actions/editgroup.php:56
 #, php-format
 msgid "Edit %s group"
 msgstr "编辑 %s 组"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
 #, php-format
 msgid "Edit %s group"
 msgstr "编辑 %s 组"
 
 #: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
 #: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
+#: actions/grouplogo.php:70 actions/grouprss.php:80 actions/editgroup.php:68
+#: actions/groupdesignsettings.php:68 actions/showgroup.php:105
 #, fuzzy
 msgid "Inboxes must be enabled for groups to work"
 msgstr "使用组功能前必须使能邮箱"
 
 #, fuzzy
 msgid "Inboxes must be enabled for groups to work"
 msgstr "使用组功能前必须使能邮箱"
 
-# before login, the user don't even see any Chinese translation. Anyway. This may be good for the future.
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
 #: actions/editgroup.php:71 actions/grouplogo.php:71 actions/newgroup.php:70
+#: actions/grouplogo.php:75 actions/editgroup.php:73 actions/editgroup.php:68
+#: actions/grouplogo.php:70 actions/newgroup.php:65
 msgid "You must be logged in to create a group."
 msgstr "您必须登录才能创建小组。"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
 msgid "You must be logged in to create a group."
 msgstr "您必须登录才能创建小组。"
 
 #: actions/editgroup.php:87 actions/grouplogo.php:87
 #: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/showgroup.php:121 actions/grouplogo.php:91 actions/grouprss.php:96
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:89
+#: actions/groupdesignsettings.php:89 actions/showgroup.php:126
+#: actions/editgroup.php:84 actions/groupdesignsettings.php:84
+#: actions/grouplogo.php:86 actions/grouprss.php:91 actions/joingroup.php:76
 #, 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
 #, 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
+#: actions/showgroup.php:128 actions/grouplogo.php:104
+#: actions/grouprss.php:103 actions/blockedfromgroup.php:80
+#: actions/editgroup.php:101 actions/groupdesignsettings.php:102
+#: actions/showgroup.php:133 actions/editgroup.php:96 actions/groupbyid.php:83
+#: actions/groupdesignsettings.php:97 actions/grouplogo.php:99
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
 msgid "No such group"
 msgstr "没有这个组"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
 msgid "No such group"
 msgstr "没有这个组"
 
 #: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
+#: actions/grouplogo.php:107 actions/grouplogo.php:111
+#: actions/editgroup.php:108 actions/editgroup.php:167
+#: actions/groupdesignsettings.php:109 actions/editgroup.php:103
+#: actions/editgroup.php:168 actions/groupdesignsettings.php:104
+#: actions/grouplogo.php:106
 msgid "You must be an admin to edit the group"
 msgstr "只有admin才能编辑这个组"
 
 msgid "You must be an admin to edit the group"
 msgstr "只有admin才能编辑这个组"
 
-#: actions/editgroup.php:157
+#: actions/editgroup.php:157 actions/editgroup.php:159
+#: actions/editgroup.php:154
 msgid "Use this form to edit the group."
 msgstr "使用这个表单来编辑组"
 
 msgid "Use this form to edit the group."
 msgstr "使用这个表单来编辑组"
 
@@ -3509,14 +4141,15 @@ msgid "Nickname must have only lowercase letters "
 msgstr "昵称只能使用小写字母"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
 msgstr "昵称只能使用小写字母"
 
 #: actions/editgroup.php:198 actions/newgroup.php:149
+#: actions/editgroup.php:200 actions/newgroup.php:150
 msgid "description is too long (max 140 chars)."
 msgstr "描述过长(不能超过140字符)。"
 
 msgid "description is too long (max 140 chars)."
 msgstr "描述过长(不能超过140字符)。"
 
-#: actions/editgroup.php:218
+#: actions/editgroup.php:218 actions/editgroup.php:253
 msgid "Could not update group."
 msgstr "无法更新组"
 
 msgid "Could not update group."
 msgstr "无法更新组"
 
-#: actions/editgroup.php:226
+#: actions/editgroup.php:226 actions/editgroup.php:269
 msgid "Options saved."
 msgstr "选项已保存。"
 
 msgid "Options saved."
 msgstr "选项已保存。"
 
@@ -3535,7 +4168,8 @@ msgstr "新的电子邮件地址,用于发布 %s 信息"
 msgid "Send me email when someone "
 msgstr "如果收到私人信息,发邮件通知我。"
 
 msgid "Send me email when someone "
 msgstr "如果收到私人信息,发邮件通知我。"
 
-#: actions/emailsettings.php:168
+#: actions/emailsettings.php:168 actions/emailsettings.php:173
+#: actions/emailsettings.php:179
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫并给我发送邮件。"
 
 msgid "Allow friends to nudge me and send me an email."
 msgstr "允许朋友们呼叫并给我发送邮件。"
 
@@ -3549,7 +4183,7 @@ msgstr "此电子邮件属于其他用户。"
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
 msgid "A confirmation code was sent to the email address you added. "
 msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
-#: actions/facebookhome.php:110
+#: actions/facebookhome.php:110 actions/facebookhome.php:109
 msgid "Server error - couldn't get user!"
 msgstr "服务器报错 -- 无法找到该用户。"
 
 msgid "Server error - couldn't get user!"
 msgstr "服务器报错 -- 无法找到该用户。"
 
@@ -3563,55 +4197,70 @@ msgstr "如果你想使用 %s 程序自动更新"
 msgid "Allow %s to update my Facebook status"
 msgstr "允许 %s 更新我Facebook 的状态"
 
 msgid "Allow %s to update my Facebook status"
 msgstr "允许 %s 更新我Facebook 的状态"
 
-#: actions/facebookhome.php:218
+#: actions/facebookhome.php:218 actions/facebookhome.php:223
+#: actions/facebookhome.php:217
 msgid "Skip"
 msgstr "跳过"
 
 msgid "Skip"
 msgstr "跳过"
 
-#: actions/facebookhome.php:235
+#: actions/facebookhome.php:235 lib/facebookaction.php:479
+#: lib/facebookaction.php:471
 #, fuzzy
 msgid "No notice content!"
 msgstr "没有内容!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
 #, fuzzy
 msgid "No notice content!"
 msgstr "没有内容!"
 
 #: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
+#: actions/facebookhome.php:253 lib/action.php:973 lib/facebookaction.php:433
+#: actions/facebookhome.php:247 lib/action.php:1037 lib/facebookaction.php:435
+#: lib/action.php:1053
 msgid "Pagination"
 msgstr "分页"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
 msgid "Pagination"
 msgstr "分页"
 
 #: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
+#: actions/facebookhome.php:262 lib/action.php:982 lib/facebookaction.php:442
+#: actions/facebookhome.php:256 lib/action.php:1046 lib/facebookaction.php:444
+#: lib/action.php:1062
 #, fuzzy
 msgid "After"
 msgstr "« 之后"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
 #, fuzzy
 msgid "After"
 msgstr "« 之后"
 
 #: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/facebookhome.php:270 lib/action.php:990 lib/facebookaction.php:450
+#: actions/facebookhome.php:264 lib/action.php:1054 lib/facebookaction.php:452
+#: lib/action.php:1070
 #, fuzzy
 msgid "Before"
 msgstr "之前 »"
 
 #, fuzzy
 msgid "Before"
 msgstr "之前 »"
 
-#: actions/facebookinvite.php:70
+#: actions/facebookinvite.php:70 actions/facebookinvite.php:72
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "感谢您邀请朋友使用 %s"
 
 #, php-format
 msgid "Thanks for inviting your friends to use %s"
 msgstr "感谢您邀请朋友使用 %s"
 
-#: actions/facebookinvite.php:72
+#: actions/facebookinvite.php:72 actions/facebookinvite.php:74
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "已发送邀请给这些人:"
 
 #, fuzzy
 msgid "Invitations have been sent to the following users:"
 msgstr "已发送邀请给这些人:"
 
-#: actions/facebookinvite.php:96
+#: actions/facebookinvite.php:96 actions/facebookinvite.php:102
+#: actions/facebookinvite.php:94
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "您已被邀请到 %s"
 
 #, fuzzy, php-format
 msgid "You have been invited to %s"
 msgstr "您已被邀请到 %s"
 
-#: actions/facebookinvite.php:105
+#: actions/facebookinvite.php:105 actions/facebookinvite.php:111
+#: actions/facebookinvite.php:103
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s 好友的聚合"
 
 #, fuzzy, php-format
 msgid "Invite your friends to use %s"
 msgstr "%s 好友的聚合"
 
-#: actions/facebookinvite.php:113
+#: actions/facebookinvite.php:113 actions/facebookinvite.php:126
+#: actions/facebookinvite.php:124
 #, php-format
 msgid "Friends already using %s:"
 msgstr "已经正在使用 %s 的朋友:"
 
 #, php-format
 msgid "Friends already using %s:"
 msgstr "已经正在使用 %s 的朋友:"
 
-#: actions/facebookinvite.php:130
+#: actions/facebookinvite.php:130 actions/facebookinvite.php:143
+#: actions/facebookinvite.php:142
 #, php-format
 msgid "Send invitations"
 msgstr "发出邀请"
 #, php-format
 msgid "Send invitations"
 msgstr "发出邀请"
@@ -3658,13 +4307,15 @@ msgstr "如果你希望 %s 自动更新。"
 msgid "Sync preferences"
 msgstr "同步设置"
 
 msgid "Sync preferences"
 msgstr "同步设置"
 
-#: actions/favor.php:94 lib/disfavorform.php:140
+#: actions/favor.php:94 lib/disfavorform.php:140 actions/favor.php:92
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "取消收藏"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
 #, fuzzy
 msgid "Disfavor favorite"
 msgstr "取消收藏"
 
 #: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
+#: lib/publicgroupnav.php:91 lib/popularnoticesection.php:82
+#: lib/publicgroupnav.php:93 lib/popularnoticesection.php:91
+#: lib/popularnoticesection.php:87
 #, fuzzy
 msgid "Popular notices"
 msgstr "没有这份通告。"
 #, fuzzy
 msgid "Popular notices"
 msgstr "没有这份通告。"
@@ -3680,7 +4331,8 @@ msgid "The most popular notices on the site right now."
 msgstr "显示上周以来最流行的标签"
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
 msgstr "显示上周以来最流行的标签"
 
 #: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
+#: lib/publicgroupnav.php:87 lib/publicgroupnav.php:89
+#: lib/featureduserssection.php:87
 msgid "Featured users"
 msgstr "推荐用户"
 
 msgid "Featured users"
 msgstr "推荐用户"
 
@@ -3694,15 +4346,17 @@ msgstr "推荐用户,第 %d 页"
 msgid "A selection of some of the great users on %s"
 msgstr "%s 优秀用户摘选"
 
 msgid "A selection of some of the great users on %s"
 msgstr "%s 优秀用户摘选"
 
-#: actions/finishremotesubscribe.php:188
+#: actions/finishremotesubscribe.php:188 actions/finishremotesubscribe.php:96
 msgid "That user has blocked you from subscribing."
 msgstr "那个用户阻止了你的订阅。"
 
 msgid "That user has blocked you from subscribing."
 msgstr "那个用户阻止了你的订阅。"
 
-#: actions/groupbyid.php:79
+#: actions/groupbyid.php:79 actions/groupbyid.php:74
 msgid "No ID"
 msgstr "没有ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
 msgid "No ID"
 msgstr "没有ID"
 
 #: actions/grouplogo.php:138 actions/grouplogo.php:191
+#: actions/grouplogo.php:144 actions/grouplogo.php:197
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
 msgid "Group logo"
 msgstr "组logo"
 
 msgid "Group logo"
 msgstr "组logo"
 
@@ -3710,11 +4364,13 @@ msgstr "组logo"
 msgid "You can upload a logo image for your group."
 msgstr "你可以给你的组上载一个logo图。"
 
 msgid "You can upload a logo image for your group."
 msgstr "你可以给你的组上载一个logo图。"
 
-#: actions/grouplogo.php:448
+#: actions/grouplogo.php:448 actions/grouplogo.php:401
+#: actions/grouplogo.php:396
 msgid "Logo updated."
 msgstr "logo已更新。"
 
 msgid "Logo updated."
 msgstr "logo已更新。"
 
-#: actions/grouplogo.php:450
+#: actions/grouplogo.php:450 actions/grouplogo.php:403
+#: actions/grouplogo.php:398
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "更新logo失败。"
 #, fuzzy
 msgid "Failed updating logo."
 msgstr "更新logo失败。"
@@ -3734,7 +4390,8 @@ msgid "A list of the users in this group."
 msgstr "该组成员列表。"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
 msgstr "该组成员列表。"
 
 #: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
+#: lib/subgroupnav.php:96 lib/publicgroupnav.php:81 lib/profileaction.php:220
+#: lib/subgroupnav.php:98
 msgid "Groups"
 msgstr "组"
 
 msgid "Groups"
 msgstr "组"
 
@@ -3744,12 +4401,12 @@ msgid "Groups, page %d"
 msgstr "组,第 %d 页"
 
 #: actions/groups.php:90
 msgstr "组,第 %d 页"
 
 #: actions/groups.php:90
-#, php-format
-#, fuzzy
+#, fuzzy, php-format
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% 组你可以查找并联络"
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
 msgid "%%%%site.name%%%% groups let you find and talk with "
 msgstr "%%%%site.name%%%% 组你可以查找并联络"
 
 #: actions/groups.php:106 actions/usergroups.php:124 lib/groupeditform.php:123
+#: actions/usergroups.php:125 actions/groups.php:107 lib/groupeditform.php:122
 #, fuzzy
 msgid "Create a new group"
 msgstr "创建新组"
 #, fuzzy
 msgid "Create a new group"
 msgstr "创建新组"
@@ -3760,7 +4417,7 @@ msgid ""
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。"
 
 "Search for groups on %%site.name%% by their name, location, or description. "
 msgstr "在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。"
 
-#: actions/groupsearch.php:63
+#: actions/groupsearch.php:63 actions/groupsearch.php:58
 msgid "Group search"
 msgstr "组检索"
 
 msgid "Group search"
 msgstr "组检索"
 
@@ -3784,21 +4441,21 @@ msgstr "通过Jabber/GTalk发送通告。"
 msgid "A confirmation code was sent "
 msgstr "确认消息已经发送"
 
 msgid "A confirmation code was sent "
 msgstr "确认消息已经发送"
 
-#: actions/joingroup.php:65
+#: actions/joingroup.php:65 actions/joingroup.php:60
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "您必须登录才能加入组。"
 
 #, fuzzy
 msgid "You must be logged in to join a group."
 msgstr "您必须登录才能加入组。"
 
-#: actions/joingroup.php:95
+#: actions/joingroup.php:95 actions/joingroup.php:90 lib/command.php:217
 msgid "You are already a member of that group"
 msgstr "您已经是该组成员"
 
 msgid "You are already a member of that group"
 msgstr "您已经是该组成员"
 
-#: actions/joingroup.php:128
+#: actions/joingroup.php:128 actions/joingroup.php:133 lib/command.php:234
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "无法把 %s 用户添加到 %s 组"
 
 #, fuzzy, php-format
 msgid "Could not join user %s to group %s"
 msgstr "无法把 %s 用户添加到 %s 组"
 
-#: actions/joingroup.php:135
+#: actions/joingroup.php:135 actions/joingroup.php:140 lib/command.php:239
 #, fuzzy, php-format
 msgid "%s joined group %s"
 msgstr "%s 加入 %s 组"
 #, fuzzy, php-format
 msgid "%s joined group %s"
 msgstr "%s 加入 %s 组"
@@ -3807,16 +4464,19 @@ msgstr "%s 加入 %s 组"
 msgid "Inboxes must be enabled for groups to work."
 msgstr "邮箱必须使能组才能工作。"
 
 msgid "Inboxes must be enabled for groups to work."
 msgstr "邮箱必须使能组才能工作。"
 
-#: actions/leavegroup.php:65
+#: actions/leavegroup.php:65 actions/leavegroup.php:60
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "您必须登录才能邀请其他人使用 %s"
 
 #, fuzzy
 msgid "You must be logged in to leave a group."
 msgstr "您必须登录才能邀请其他人使用 %s"
 
-#: actions/leavegroup.php:88
+#: actions/leavegroup.php:88 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/makeadmin.php:86
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/leavegroup.php:83
+#: lib/command.php:212 lib/command.php:263
 msgid "No such group."
 msgstr "没有这个组。"
 
 msgid "No such group."
 msgstr "没有这个组。"
 
-#: actions/leavegroup.php:95
+#: actions/leavegroup.php:95 actions/leavegroup.php:90 lib/command.php:268
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "您未告知此个人信息"
 #, fuzzy
 msgid "You are not a member of that group."
 msgstr "您未告知此个人信息"
@@ -3826,22 +4486,26 @@ msgstr "您未告知此个人信息"
 msgid "You may not leave a group while you are its administrator."
 msgstr "您不能删除其他用户的状态。"
 
 msgid "You may not leave a group while you are its administrator."
 msgstr "您不能删除其他用户的状态。"
 
-#: actions/leavegroup.php:130
+#: actions/leavegroup.php:130 actions/leavegroup.php:124
+#: actions/leavegroup.php:119 lib/command.php:278
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "无法更新用户记录。"
 
 #, fuzzy
 msgid "Could not find membership record."
 msgstr "无法更新用户记录。"
 
-#: actions/leavegroup.php:138
+#: actions/leavegroup.php:138 actions/leavegroup.php:132
+#: actions/leavegroup.php:127 lib/command.php:284
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "无法订阅用户:未找到。"
 
 #, fuzzy, php-format
 msgid "Could not remove user %s to group %s"
 msgstr "无法订阅用户:未找到。"
 
-#: actions/leavegroup.php:145
+#: actions/leavegroup.php:145 actions/leavegroup.php:139
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
 msgid "%s left group %s"
 msgstr "%s 离开群 %s"
 
 #, php-format
 msgid "%s left group %s"
 msgstr "%s 离开群 %s"
 
-#: actions/login.php:225 lib/facebookaction.php:304
+#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
+#: actions/login.php:216
 msgid "Login to site"
 msgstr "登录"
 
 msgid "Login to site"
 msgstr "登录"
 
@@ -3853,15 +4517,17 @@ msgstr "没有当前状态"
 msgid "New group"
 msgstr "新组"
 
 msgid "New group"
 msgstr "新组"
 
-#: actions/newgroup.php:115
+#: actions/newgroup.php:115 actions/newgroup.php:110
 msgid "Use this form to create a new group."
 msgstr "使用此表格创建组。"
 
 msgid "Use this form to create a new group."
 msgstr "使用此表格创建组。"
 
-#: actions/newgroup.php:177
+#: actions/newgroup.php:177 actions/newgroup.php:209
+#: actions/apigroupcreate.php:136 actions/newgroup.php:204
 msgid "Could not create group."
 msgstr "无法创建组。"
 
 msgid "Could not create group."
 msgstr "无法创建组。"
 
-#: actions/newgroup.php:191
+#: actions/newgroup.php:191 actions/newgroup.php:229
+#: actions/apigroupcreate.php:166 actions/newgroup.php:224
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "无法删除订阅。"
 #, fuzzy
 msgid "Could not set group membership."
 msgstr "无法删除订阅。"
@@ -3876,11 +4542,14 @@ msgstr "文件超出大小限制。"
 msgid "Don't send a message to yourself; "
 msgstr "无法向此用户发送消息。"
 
 msgid "Don't send a message to yourself; "
 msgstr "无法向此用户发送消息。"
 
-#: actions/newnotice.php:166
+#: actions/newnotice.php:166 actions/newnotice.php:174
+#: actions/newnotice.php:272 actions/newnotice.php:199
 msgid "Notice posted"
 msgstr "消息已发布。"
 
 msgid "Notice posted"
 msgstr "消息已发布。"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
+#: actions/newnotice.php:200 classes/Channel.php:163 actions/newnotice.php:208
+#: lib/channel.php:170 actions/newmessage.php:207 actions/newnotice.php:387
+#: actions/newmessage.php:210 actions/newnotice.php:233
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
 msgid "Ajax Error"
 msgstr "Ajax错误"
 
@@ -3897,7 +4566,7 @@ msgstr "振铃呼叫发出。"
 msgid "Nudge sent!"
 msgstr "振铃呼叫已经发出!"
 
 msgid "Nudge sent!"
 msgstr "振铃呼叫已经发出!"
 
-#: actions/openidlogin.php:97
+#: actions/openidlogin.php:97 actions/openidlogin.php:106
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID 登录"
 #, fuzzy
 msgid "OpenID login"
 msgstr "OpenID 登录"
@@ -3924,11 +4593,13 @@ msgstr "URL自动缩短"
 msgid "Service"
 msgstr "服务"
 
 msgid "Service"
 msgstr "服务"
 
-#: actions/othersettings.php:113
+#: actions/othersettings.php:113 actions/othersettings.php:111
+#: actions/othersettings.php:118
 msgid "Automatic shortening service to use."
 msgstr "要使用的自动缩短服务。"
 
 msgid "Automatic shortening service to use."
 msgstr "要使用的自动缩短服务。"
 
-#: actions/othersettings.php:144
+#: actions/othersettings.php:144 actions/othersettings.php:146
+#: actions/othersettings.php:153
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL缩短服务超长(最多50个字符)。"
 #, fuzzy
 msgid "URL shortening service is too long (max 50 chars)."
 msgstr "URL缩短服务超长(最多50个字符)。"
@@ -3938,17 +4609,18 @@ msgstr "URL缩短服务超长(最多50个字符)。"
 msgid "Change your password."
 msgstr "修改密码"
 
 msgid "Change your password."
 msgstr "修改密码"
 
-#: actions/passwordsettings.php:89
+#: actions/passwordsettings.php:89 actions/recoverpassword.php:228
+#: actions/passwordsettings.php:95 actions/recoverpassword.php:231
 #, fuzzy
 msgid "Password change"
 msgstr "密码已保存。"
 
 #, fuzzy
 msgid "Password change"
 msgstr "密码已保存。"
 
-#: actions/peopletag.php:35
+#: actions/peopletag.php:35 actions/peopletag.php:70
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "不是有效的电子邮件"
 
 #, fuzzy, php-format
 msgid "Not a valid people tag: %s"
 msgstr "不是有效的电子邮件"
 
-#: actions/peopletag.php:47
+#: actions/peopletag.php:47 actions/peopletag.php:144
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "用户自加标签 %s - 第 %d 页"
 #, php-format
 msgid "Users self-tagged with %s - page %d"
 msgstr "用户自加标签 %s - 第 %d 页"
@@ -3958,12 +4630,13 @@ msgstr "用户自加标签 %s - 第 %d 页"
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "这些是自我标识为 \"%s\"  的用户"
 
 msgid "These are users who have tagged themselves \"%s\" "
 msgstr "这些是自我标识为 \"%s\"  的用户"
 
-#: actions/profilesettings.php:91
+#: actions/profilesettings.php:91 actions/profilesettings.php:99
 #, fuzzy
 msgid "Profile information"
 msgstr "未知的帐号"
 
 #, fuzzy
 msgid "Profile information"
 msgstr "未知的帐号"
 
-#: actions/profilesettings.php:124
+#: actions/profilesettings.php:124 actions/profilesettings.php:125
+#: actions/profilesettings.php:140
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
 msgid ""
 "Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
 msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
@@ -3974,21 +4647,26 @@ msgid "Automatically subscribe to whoever "
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
 msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 
 #: actions/profilesettings.php:229 actions/tagother.php:176
+#: actions/tagother.php:178 actions/profilesettings.php:230
+#: actions/profilesettings.php:246
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "主页'%s'不正确"
 
 #, fuzzy, php-format
 msgid "Invalid tag: \"%s\""
 msgstr "主页'%s'不正确"
 
-#: actions/profilesettings.php:311
+#: actions/profilesettings.php:311 actions/profilesettings.php:310
+#: actions/profilesettings.php:336
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "无法保存个人信息。"
 
 #, fuzzy
 msgid "Couldn't save tags."
 msgstr "无法保存个人信息。"
 
-#: actions/public.php:107
+#: actions/public.php:107 actions/public.php:110 actions/public.php:118
+#: actions/public.php:129
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "公开的时间表"
 
 #, fuzzy, php-format
 msgid "Public timeline, page %d"
 msgstr "公开的时间表"
 
-#: actions/public.php:173
+#: actions/public.php:173 actions/public.php:184 actions/public.php:210
+#: actions/public.php:92
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "无法获取收藏的通告。"
 #, fuzzy
 msgid "Could not retrieve public stream."
 msgstr "无法获取收藏的通告。"
@@ -3999,8 +4677,8 @@ msgid ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
 "This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
 "blogging) service "
 msgstr ""
-"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) 服务"
+"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) 服务"
 
 #: actions/publictagcloud.php:57
 #, fuzzy
 
 #: actions/publictagcloud.php:57
 #, fuzzy
@@ -4012,11 +4690,13 @@ msgstr "公开的聚合"
 msgid "These are most popular recent tags on %s "
 msgstr "这些是最近的 %s 流行标签 "
 
 msgid "These are most popular recent tags on %s "
 msgstr "这些是最近的 %s 流行标签 "
 
-#: actions/publictagcloud.php:119
+#: actions/publictagcloud.php:119 actions/publictagcloud.php:135
 msgid "Tag cloud"
 msgstr "标签云聚集"
 
 msgid "Tag cloud"
 msgstr "标签云聚集"
 
-#: actions/register.php:139 actions/register.php:349
+#: actions/register.php:139 actions/register.php:349 actions/register.php:79
+#: actions/register.php:177 actions/register.php:394 actions/register.php:183
+#: actions/register.php:398
 msgid "Sorry, only invited people can register."
 msgstr "对不起,请邀请那些能注册的人。"
 
 msgid "Sorry, only invited people can register."
 msgstr "对不起,请邀请那些能注册的人。"
 
@@ -4073,7 +4753,8 @@ msgstr "(您将立即收到一封电子邮件,含有"
 msgid "That's a local profile! Login to subscribe."
 msgstr "那是一个本地资料!需要登录才能订阅。"
 
 msgid "That's a local profile! Login to subscribe."
 msgstr "那是一个本地资料!需要登录才能订阅。"
 
-#: actions/replies.php:118
+#: actions/replies.php:118 actions/replies.php:120 actions/replies.php:119
+#: actions/replies.php:127
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s 的回复,第 % 页"
 #, fuzzy, php-format
 msgid "Replies to %s, page %d"
 msgstr "%s 的回复,第 % 页"
@@ -4083,53 +4764,74 @@ msgstr "%s 的回复,第 % 页"
 msgid "%s favorite notices, page %d"
 msgstr "%s 收藏的通告"
 
 msgid "%s favorite notices, page %d"
 msgstr "%s 收藏的通告"
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
+#: actions/showgroup.php:77 lib/groupnav.php:85 actions/showgroup.php:82
 #, php-format
 msgid "%s group"
 msgstr "%s 组"
 
 #, php-format
 msgid "%s group"
 msgstr "%s 组"
 
-#: actions/showgroup.php:79
+#: actions/showgroup.php:79 actions/showgroup.php:84
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 组, 第 %d 页"
 
 #, php-format
 msgid "%s group, page %d"
 msgstr "%s 组, 第 %d 页"
 
-#: actions/showgroup.php:206
+#: actions/showgroup.php:206 actions/showgroup.php:208
+#: actions/showgroup.php:213 actions/showgroup.php:218
 #, 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
 #, 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
+#: actions/showgroup.php:253 actions/showstream.php:271
+#: actions/tagother.php:118 lib/profilelist.php:131 actions/showgroup.php:258
+#: actions/showstream.php:236 actions/userauthorization.php:137
+#: lib/profilelist.php:197 actions/showgroup.php:263
+#: actions/showstream.php:295 actions/userauthorization.php:167
+#: lib/profilelist.php:230
 msgid "URL"
 msgstr "URL 互联网地址"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
 msgid "URL"
 msgstr "URL 互联网地址"
 
 #: actions/showgroup.php:262 actions/showstream.php:289
 #: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
+#: actions/showgroup.php:264 actions/showstream.php:282
+#: actions/tagother.php:128 lib/profilelist.php:142 actions/showgroup.php:269
+#: actions/showstream.php:247 actions/userauthorization.php:149
+#: lib/profilelist.php:212 actions/showgroup.php:274
+#: actions/showstream.php:312 actions/userauthorization.php:179
+#: lib/profilelist.php:245
 #, fuzzy
 msgid "Note"
 msgstr "通告"
 
 #, fuzzy
 msgid "Note"
 msgstr "通告"
 
-#: actions/showgroup.php:270
+#: actions/showgroup.php:270 actions/showgroup.php:272
+#: actions/showgroup.php:288 actions/showgroup.php:293
 msgid "Group actions"
 msgstr "组动作"
 
 msgid "Group actions"
 msgstr "组动作"
 
-#: actions/showgroup.php:323
+#: actions/showgroup.php:323 actions/showgroup.php:304
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s 的通告聚合"
 
 #, fuzzy, php-format
 msgid "Notice feed for %s group"
 msgstr "%s 的通告聚合"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
+#: actions/showgroup.php:357 lib/groupnav.php:90 actions/showgroup.php:339
+#: actions/showgroup.php:384 actions/showgroup.php:373
+#: actions/showgroup.php:430 actions/showgroup.php:381
+#: actions/showgroup.php:438
 #, fuzzy
 msgid "Members"
 msgstr "注册于"
 
 #: actions/showgroup.php:363 actions/showstream.php:413
 #: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
 #, 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
+#: lib/tagcloudsection.php:71 actions/showgroup.php:344
+#: actions/showgroup.php:378 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226
+#: actions/showgroup.php:386
 msgid "(None)"
 msgstr "(没有)"
 
 msgid "(None)"
 msgstr "(没有)"
 
-#: actions/showgroup.php:370
+#: actions/showgroup.php:370 actions/showgroup.php:350
+#: actions/showgroup.php:384 actions/showgroup.php:392
 msgid "All members"
 msgstr "所有成员"
 
 msgid "All members"
 msgstr "所有成员"
 
@@ -4139,15 +4841,15 @@ msgid ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 "**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient "
 msgstr "只有发送和接受双方可以阅读此消息。"
 
 
 #: actions/showmessage.php:98
 #, fuzzy
 msgid "Only the sender and recipient "
 msgstr "只有发送和接受双方可以阅读此消息。"
 
-#: actions/showstream.php:73
+#: actions/showstream.php:73 actions/showstream.php:78
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
 #, fuzzy, php-format
 msgid "%s, page %d"
 msgstr "%s 的收件箱 - 第 %d 页"
@@ -4158,35 +4860,42 @@ msgid "'s profile"
 msgstr "个人信息"
 
 #: actions/showstream.php:236 actions/tagother.php:77
 msgstr "个人信息"
 
 #: actions/showstream.php:236 actions/tagother.php:77
+#: actions/showstream.php:220 actions/showstream.php:185
+#: actions/showstream.php:193
 #, fuzzy
 msgid "User profile"
 msgstr "用户没有个人信息。"
 
 #: actions/showstream.php:240 actions/tagother.php:81
 #, fuzzy
 msgid "User profile"
 msgstr "用户没有个人信息。"
 
 #: actions/showstream.php:240 actions/tagother.php:81
+#: actions/showstream.php:224 actions/showstream.php:189
+#: actions/showstream.php:220
 msgid "Photo"
 msgstr "相片"
 
 msgid "Photo"
 msgstr "相片"
 
-#: actions/showstream.php:317
+#: actions/showstream.php:317 actions/showstream.php:309
+#: actions/showstream.php:274 actions/showstream.php:354
 #, fuzzy
 msgid "User actions"
 msgstr "未知动作"
 
 #, fuzzy
 msgid "User actions"
 msgstr "未知动作"
 
-#: actions/showstream.php:342
+#: actions/showstream.php:342 actions/showstream.php:307
+#: actions/showstream.php:390
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "无法向此用户发送消息。"
 
 #, fuzzy
 msgid "Send a direct message to this user"
 msgstr "无法向此用户发送消息。"
 
-#: actions/showstream.php:343
+#: actions/showstream.php:343 actions/showstream.php:308
+#: actions/showstream.php:391
 #, fuzzy
 msgid "Message"
 msgstr "新消息"
 
 #, fuzzy
 msgid "Message"
 msgstr "新消息"
 
-#: actions/showstream.php:451
+#: actions/showstream.php:451 lib/profileaction.php:157
 #, fuzzy
 msgid "All subscribers"
 msgstr "订阅者"
 
 #, fuzzy
 msgid "All subscribers"
 msgstr "订阅者"
 
-#: actions/showstream.php:533
+#: actions/showstream.php:533 lib/profileaction.php:235
 msgid "All groups"
 msgstr "所有组"
 
 msgid "All groups"
 msgstr "所有组"
 
@@ -4196,8 +4905,8 @@ msgid ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
 "**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
 "wikipedia.org/wiki/Micro-blogging) service "
 msgstr ""
-"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
+"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
 
 #: actions/smssettings.php:128
 #, fuzzy
 
 #: actions/smssettings.php:128
 #, fuzzy
@@ -4214,7 +4923,7 @@ msgstr "通过Jabber/GTalk发送通告。"
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "等待确认此电话号码。"
 
 msgid "A confirmation code was sent to the phone number you added. "
 msgstr "等待确认此电话号码。"
 
-#: actions/smssettings.php:453
+#: actions/smssettings.php:453 actions/smssettings.php:465
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "选择运营商"
 #, fuzzy
 msgid "Mobile carrier"
 msgstr "选择运营商"
@@ -4279,17 +4988,18 @@ msgstr "这是 %s 订阅的用户。"
 msgid "These are the people whose "
 msgstr "这些用户订阅了 %s 的通告。"
 
 msgid "These are the people whose "
 msgstr "这些用户订阅了 %s 的通告。"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:122 actions/subscriptions.php:124
+#: actions/subscriptions.php:183 actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "没有 Jabber ID。"
 
 #, fuzzy
 msgid "Jabber"
 msgstr "没有 Jabber ID。"
 
-#: actions/tag.php:43
+#: actions/tag.php:43 actions/tag.php:51 actions/tag.php:59 actions/tag.php:68
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "带 %s 标签的通告"
 
 #, fuzzy, php-format
 msgid "Notices tagged with %s, page %d"
 msgstr "带 %s 标签的通告"
 
-#: actions/tag.php:66
+#: actions/tag.php:66 actions/tag.php:73
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "有 \"%s\" 标签的消息,最近的排序在前"
 #, php-format
 msgid "Messages tagged \"%s\", most recent first"
 msgstr "有 \"%s\" 标签的消息,最近的排序在前"
@@ -4314,28 +5024,29 @@ msgstr "标签"
 msgid "Tag user"
 msgstr "标签"
 
 msgid "Tag user"
 msgstr "标签"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:149 actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
+msgstr ""
+"给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
 #: actions/tagother.php:164
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "会话标识有问题,请重试。"
 
 
 #: actions/tagother.php:164
 #, fuzzy
 msgid "There was a problem with your session token."
 msgstr "会话标识有问题,请重试。"
 
-#: actions/tagother.php:191
+#: actions/tagother.php:191 actions/tagother.php:193
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你订阅的人或订阅你的人加标签。"
 
 msgid ""
 "You can only tag people you are subscribed to or who are subscribed to you."
 msgstr "你只能给你订阅的人或订阅你的人加标签。"
 
-#: actions/tagother.php:198
+#: actions/tagother.php:198 actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "无法保存头像"
 
 #, fuzzy
 msgid "Could not save tags."
 msgstr "无法保存头像"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:233 actions/tagother.php:235 actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
@@ -4344,20 +5055,23 @@ msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 msgid "No such tag."
 msgstr "未找到此消息。"
 
 msgid "No such tag."
 msgstr "未找到此消息。"
 
-#: actions/tagrss.php:66
+#: actions/tagrss.php:66 actions/tagrss.php:64
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "带 %s 标签的通告"
 
 #, fuzzy, php-format
 msgid "Microblog tagged with %s"
 msgstr "带 %s 标签的通告"
 
-#: actions/twitapiblocks.php:47
+#: actions/twitapiblocks.php:47 actions/twitapiblocks.php:49
+#: actions/apiblockcreate.php:108
 msgid "Block user failed."
 msgstr "阻止用户失败。"
 
 msgid "Block user failed."
 msgstr "阻止用户失败。"
 
-#: actions/twitapiblocks.php:69
+#: actions/twitapiblocks.php:69 actions/twitapiblocks.php:71
+#: actions/apiblockdestroy.php:107
 msgid "Unblock user failed."
 msgstr "取消阻止用户失败。"
 
 msgid "Unblock user failed."
 msgstr "取消阻止用户失败。"
 
-#: actions/twitapiusers.php:48
+#: actions/twitapiusers.php:48 actions/twitapiusers.php:52
+#: actions/twitapiusers.php:50 actions/apiusershow.php:96
 #, fuzzy
 msgid "Not found."
 msgstr "未找到"
 #, fuzzy
 msgid "Not found."
 msgstr "未找到"
@@ -4367,17 +5081,18 @@ msgstr "未找到"
 msgid "Add your Twitter account to automatically send "
 msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
 
 msgid "Add your Twitter account to automatically send "
 msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
 
-#: actions/twittersettings.php:119
+#: actions/twittersettings.php:119 actions/twittersettings.php:122
 #, fuzzy
 msgid "Twitter user name"
 msgstr "Twitter 用户名"
 
 #, fuzzy
 msgid "Twitter user name"
 msgstr "Twitter 用户名"
 
-#: actions/twittersettings.php:126
+#: actions/twittersettings.php:126 actions/twittersettings.php:129
 #, fuzzy
 msgid "Twitter password"
 msgstr "Twitter 密码"
 
 #, fuzzy
 msgid "Twitter password"
 msgstr "Twitter 密码"
 
-#: actions/twittersettings.php:228
+#: actions/twittersettings.php:228 actions/twittersettings.php:232
+#: actions/twittersettings.php:248
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "Twitter 设置"
 #, fuzzy
 msgid "Twitter Friends"
 msgstr "Twitter 设置"
@@ -4391,156 +5106,165 @@ msgstr "用户名只能有数字,"
 msgid "Unable to retrieve account information "
 msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
 
 msgid "Unable to retrieve account information "
 msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
 
-#: actions/unblock.php:108
+#: actions/unblock.php:108 actions/groupunblock.php:128
 #, fuzzy
 msgid "Error removing the block."
 msgstr "保存用户时出错。"
 
 #, fuzzy
 msgid "Error removing the block."
 msgstr "保存用户时出错。"
 
-#: actions/unsubscribe.php:50
+#: actions/unsubscribe.php:50 actions/unsubscribe.php:77
 #, fuzzy
 msgid "No profile id in request."
 msgstr "服务器没有返回个人信息URL。"
 
 #, fuzzy
 msgid "No profile id in request."
 msgstr "服务器没有返回个人信息URL。"
 
-#: actions/unsubscribe.php:57
+#: actions/unsubscribe.php:57 actions/unsubscribe.php:84
 #, fuzzy
 msgid "No profile with that id."
 msgstr "没有找到此ID的信息。"
 
 #, fuzzy
 msgid "No profile with that id."
 msgstr "没有找到此ID的信息。"
 
-#: actions/unsubscribe.php:71
+#: actions/unsubscribe.php:71 actions/unsubscribe.php:98
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订"
 
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "退订"
 
-#: actions/usergroups.php:63
+#: actions/usergroups.php:63 actions/usergroups.php:62
+#: actions/apigrouplistall.php:90
 #, php-format
 msgid "%s groups"
 msgstr "%s 群组"
 
 #, php-format
 msgid "%s groups"
 msgstr "%s 群组"
 
-#: actions/usergroups.php:65
+#: actions/usergroups.php:65 actions/usergroups.php:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 群组, 第 %d 页"
 
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 群组, 第 %d 页"
 
-#: classes/Notice.php:104
+#: classes/Notice.php:104 classes/Notice.php:128 classes/Notice.php:144
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "保存通告时出错。"
 
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:109 classes/Notice.php:133 classes/Notice.php:149
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
 
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
 
-#: classes/Notice.php:116
+#: classes/Notice.php:116 classes/Notice.php:145 classes/Notice.php:161
+#: classes/Notice.php:202
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
-#: lib/accountsettingsaction.php:108
+#: lib/accountsettingsaction.php:108 lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "上载一个头像。"
 
 msgid "Upload an avatar"
 msgstr "上载一个头像。"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:119 lib/accountsettingsaction.php:122
+#: lib/accountsettingsaction.php:123
 msgid "Other"
 msgstr "其他"
 
 msgid "Other"
 msgstr "其他"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:124
 msgid "Other options"
 msgstr "其他选项"
 
 msgid "Other options"
 msgstr "其他选项"
 
-#: lib/action.php:130
+#: lib/action.php:130 lib/action.php:132 lib/action.php:142 lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:145 lib/action.php:147 lib/action.php:157 lib/action.php:159
 msgid "Untitled page"
 msgstr "无标题页"
 
 msgid "Untitled page"
 msgstr "无标题页"
 
-#: lib/action.php:316
+#: lib/action.php:316 lib/action.php:387 lib/action.php:411 lib/action.php:424
 msgid "Primary site navigation"
 msgstr "主站导航"
 
 msgid "Primary site navigation"
 msgstr "主站导航"
 
-#: lib/action.php:322
+#: lib/action.php:322 lib/action.php:393 lib/action.php:417 lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友年表"
 
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友年表"
 
-#: lib/action.php:325
+#: lib/action.php:325 lib/action.php:396 lib/action.php:448 lib/action.php:459
 msgid "Search for people or text"
 msgstr "检索人或文字"
 
 msgid "Search for people or text"
 msgstr "检索人或文字"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 msgid "Account"
 msgstr "帐号"
 
 msgid "Account"
 msgstr "帐号"
 
-#: lib/action.php:328
+#: lib/action.php:328 lib/action.php:399 lib/action.php:419 lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "修改资料"
 
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "修改资料"
 
-#: lib/action.php:330
+#: lib/action.php:330 lib/action.php:403 lib/action.php:422
 msgid "Connect to IM, SMS, Twitter"
 msgstr "与IM,手机短信,Twitter的连接"
 
 msgid "Connect to IM, SMS, Twitter"
 msgstr "与IM,手机短信,Twitter的连接"
 
-#: lib/action.php:332
+#: lib/action.php:332 lib/action.php:409 lib/action.php:435 lib/action.php:445
 msgid "Logout from the site"
 msgstr "登出本站"
 
 msgid "Logout from the site"
 msgstr "登出本站"
 
-#: lib/action.php:335
+#: lib/action.php:335 lib/action.php:412 lib/action.php:443 lib/action.php:453
 msgid "Login to the site"
 msgstr "登入本站"
 
 msgid "Login to the site"
 msgstr "登入本站"
 
-#: lib/action.php:338
+#: lib/action.php:338 lib/action.php:415 lib/action.php:440 lib/action.php:450
 #, fuzzy
 msgid "Create an account"
 msgstr "创建新帐号"
 
 #, fuzzy
 msgid "Create an account"
 msgstr "创建新帐号"
 
-#: lib/action.php:341
+#: lib/action.php:341 lib/action.php:418
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "没有这个 OpenID。"
 
 #, fuzzy
 msgid "Login with OpenID"
 msgstr "没有这个 OpenID。"
 
-#: lib/action.php:344
+#: lib/action.php:344 lib/action.php:421 lib/action.php:446 lib/action.php:456
 #, fuzzy
 msgid "Help me!"
 msgstr "帮助"
 
 #, fuzzy
 msgid "Help me!"
 msgstr "帮助"
 
-#: lib/action.php:362
+#: lib/action.php:362 lib/action.php:441 lib/action.php:468 lib/action.php:480
 #, fuzzy
 msgid "Site notice"
 msgstr "新通告"
 
 #, fuzzy
 msgid "Site notice"
 msgstr "新通告"
 
-#: lib/action.php:417
+#: lib/action.php:417 lib/action.php:504 lib/action.php:531 lib/action.php:546
 msgid "Local views"
 msgstr "本地显示"
 
 msgid "Local views"
 msgstr "本地显示"
 
-#: lib/action.php:472
+#: lib/action.php:472 lib/action.php:559 lib/action.php:597 lib/action.php:612
 #, fuzzy
 msgid "Page notice"
 msgstr "新通告"
 
 #, fuzzy
 msgid "Page notice"
 msgstr "新通告"
 
-#: lib/action.php:562
+#: lib/action.php:562 lib/action.php:654 lib/action.php:699 lib/action.php:714
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "次项站导航"
 
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "次项站导航"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:602 lib/action.php:623 lib/action.php:699 lib/action.php:720
+#: lib/action.php:749 lib/action.php:770 lib/action.php:764
 msgid "StatusNet software license"
 msgstr "StatusNet软件注册证"
 
 msgid "StatusNet software license"
 msgstr "StatusNet软件注册证"
 
-#: lib/action.php:630
+#: lib/action.php:630 lib/action.php:727 lib/action.php:779 lib/action.php:794
 msgid "All "
 msgstr "全部"
 
 msgid "All "
 msgstr "全部"
 
-#: lib/action.php:635
+#: lib/action.php:635 lib/action.php:732 lib/action.php:784 lib/action.php:799
 msgid "license."
 msgstr "注册证"
 
 msgid "license."
 msgstr "注册证"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/blockform.php:123 lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 #, fuzzy
 msgid "Block this user"
 msgstr "阻止该用户"
 
 #, fuzzy
 msgid "Block this user"
 msgstr "阻止该用户"
 
-#: lib/blockform.php:153
+#: lib/blockform.php:153 actions/groupmembers.php:343
+#: actions/groupmembers.php:346
 msgid "Block"
 msgstr "阻止"
 
 msgid "Block"
 msgstr "阻止"
 
@@ -4554,12 +5278,15 @@ msgstr "%s 收藏的通告"
 msgid "To use the %s Facebook Application you need to login "
 msgstr "你需要登录方能使用%sFacebook程序"
 
 msgid "To use the %s Facebook Application you need to login "
 msgstr "你需要登录方能使用%sFacebook程序"
 
-#: lib/facebookaction.php:271
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#: lib/facebookaction.php:275
 #, fuzzy
 msgid " a new account."
 msgstr "一个新帐号"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
 #, fuzzy
 msgid " a new account."
 msgstr "一个新帐号"
 
 #: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
+#: lib/facebookaction.php:675 lib/mailbox.php:216 lib/noticelist.php:357
+#: lib/mailbox.php:217 lib/noticelist.php:361
 msgid "Published"
 msgstr "已发布"
 
 msgid "Published"
 msgstr "已发布"
 
@@ -4581,35 +5308,40 @@ msgstr "%s 标签的聚合"
 msgid "All"
 msgstr "全部"
 
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:137 lib/galleryaction.php:138
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "标签"
 
 #, fuzzy
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:138 lib/galleryaction.php:139
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:139 lib/galleryaction.php:141
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "执行"
 
 msgid "Go"
 msgstr "执行"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:148 lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页、博客或在其他站点的URL"
 
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页、博客或在其他站点的URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:151 lib/groupeditform.php:166
+#: lib/groupeditform.php:172
 #, fuzzy
 msgid "Description"
 msgstr "描述"
 
 #, fuzzy
 msgid "Description"
 msgstr "描述"
 
-#: lib/groupeditform.php:153
+#: lib/groupeditform.php:153 lib/groupeditform.php:168
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
 #, fuzzy
 msgid "Describe the group or topic in 140 chars"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:158 lib/groupeditform.php:173
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
@@ -4619,21 +5351,21 @@ msgstr "你的位置,格式类似\"城市,省份,国家\""
 msgid "Group"
 msgstr "组"
 
 msgid "Group"
 msgstr "组"
 
-#: lib/groupnav.php:100
+#: lib/groupnav.php:100 actions/groupmembers.php:175 lib/groupnav.php:106
 msgid "Admin"
 msgstr "admin管理员"
 
 msgid "Admin"
 msgstr "admin管理员"
 
-#: lib/groupnav.php:101
+#: lib/groupnav.php:101 lib/groupnav.php:107
 #, php-format
 msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
 #, php-format
 msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:106 lib/groupnav.php:112
 #, fuzzy
 msgid "Logo"
 msgstr "Logo图标"
 
 #, fuzzy
 msgid "Logo"
 msgstr "Logo图标"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:107 lib/groupnav.php:113
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
@@ -4666,12 +5398,12 @@ msgstr "加入"
 msgid "Leave"
 msgstr "保存"
 
 msgid "Leave"
 msgstr "保存"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:76 lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "输入用户名和密码以登录。"
 
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "输入用户名和密码以登录。"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:79 lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "创建新帐号"
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "创建新帐号"
@@ -4694,17 +5426,17 @@ msgstr ""
 msgid "%1$s is now listening to "
 msgstr "%1$s 开始关注您的 %2$s 信息。"
 
 msgid "%1$s is now listening to "
 msgstr "%1$s 开始关注您的 %2$s 信息。"
 
-#: lib/mail.php:254
+#: lib/mail.php:254 lib/mail.php:253
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "位置:%s\n"
 
 #, fuzzy, php-format
 msgid "Location: %s\n"
 msgstr "位置:%s\n"
 
-#: lib/mail.php:256
+#: lib/mail.php:256 lib/mail.php:255
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "主页:%s\n"
 
 #, fuzzy, php-format
 msgid "Homepage: %s\n"
 msgstr "主页:%s\n"
 
-#: lib/mail.php:258
+#: lib/mail.php:258 lib/mail.php:257
 #, php-format
 msgid ""
 "Bio: %s\n"
 #, php-format
 msgid ""
 "Bio: %s\n"
@@ -4713,7 +5445,7 @@ msgstr ""
 "自传Bio: %s\n"
 "\n"
 
 "自传Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:461 lib/mail.php:462
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 振铃呼叫你"
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 振铃呼叫你"
@@ -4728,47 +5460,55 @@ msgstr "%1$s (%2$s) 发送了新的私人信息:"
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s 收藏了您的 %2$s 通告"
 
 msgid "%1$s just added your notice from %2$s"
 msgstr "%1$s 收藏了您的 %2$s 通告"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
+#: lib/mailbox.php:229 lib/noticelist.php:380 lib/mailbox.php:231
+#: lib/noticelist.php:383 lib/mailbox.php:232 lib/noticelist.php:388
 #, fuzzy
 msgid "From"
 msgstr "从 "
 
 #, fuzzy
 msgid "From"
 msgstr "从 "
 
-#: lib/messageform.php:110
+#: lib/messageform.php:110 lib/messageform.php:109 lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "删除通告"
 
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "删除通告"
 
-#: lib/noticeform.php:125
+#: lib/noticeform.php:125 lib/noticeform.php:128 lib/noticeform.php:145
 #, fuzzy
 msgid "Send a notice"
 msgstr "发送消息"
 
 #, fuzzy
 msgid "Send a notice"
 msgstr "发送消息"
 
-#: lib/noticeform.php:152
+#: lib/noticeform.php:152 lib/noticeform.php:149 lib/messageform.php:162
+#: lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
 
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
 
-#: lib/noticelist.php:426
+#: lib/noticelist.php:426 lib/noticelist.php:429
 #, fuzzy
 msgid "in reply to"
 msgstr "先前……"
 
 #, fuzzy
 msgid "in reply to"
 msgstr "先前……"
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticelist.php:447 lib/noticelist.php:450 lib/noticelist.php:451
+#: lib/noticelist.php:454 lib/noticelist.php:458 lib/noticelist.php:461
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:451 lib/noticelist.php:455 lib/noticelist.php:462
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
 
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
+#: lib/noticelist.php:471 lib/noticelist.php:474 lib/noticelist.php:476
+#: lib/noticelist.php:479 actions/deletenotice.php:116 lib/noticelist.php:483
+#: lib/noticelist.php:486 actions/deletenotice.php:146 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete this notice"
 msgstr "删除通告"
 
 #, fuzzy
 msgid "Delete this notice"
 msgstr "删除通告"
 
-#: lib/noticelist.php:474
+#: lib/noticelist.php:474 actions/avatarsettings.php:148
+#: lib/noticelist.php:479 lib/noticelist.php:486 lib/noticelist.php:522
 #, fuzzy
 msgid "Delete"
 msgstr "删除"
 #, fuzzy
 msgid "Delete"
 msgstr "删除"
@@ -4791,28 +5531,30 @@ msgstr "呼叫这个用户"
 msgid "Tags in %s's notices"
 msgstr "%s's 的消息的标签"
 
 msgid "Tags in %s's notices"
 msgstr "%s's 的消息的标签"
 
-#: lib/profilelist.php:182
+#: lib/profilelist.php:182 lib/profilelist.php:180
+#: lib/subscriptionlist.php:126
 msgid "(none)"
 msgstr "(none 没有)"
 
 msgid "(none)"
 msgstr "(none 没有)"
 
-#: lib/publicgroupnav.php:76
+#: lib/publicgroupnav.php:76 lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "公告"
 
 msgid "Public"
 msgstr "公告"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:80 lib/publicgroupnav.php:82
 msgid "User groups"
 msgstr "用户组"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
 msgid "User groups"
 msgstr "用户组"
 
 #: lib/publicgroupnav.php:82 lib/publicgroupnav.php:83
+#: lib/publicgroupnav.php:84 lib/publicgroupnav.php:85
 #, fuzzy
 msgid "Recent tags"
 msgstr "最近的标签"
 
 #, fuzzy
 msgid "Recent tags"
 msgstr "最近的标签"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:86 lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "特征"
 
 msgid "Featured"
 msgstr "特征"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:90 lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "用户"
 #, fuzzy
 msgid "Popular"
 msgstr "用户"
@@ -4831,32 +5573,34 @@ msgstr "搜索用户信息"
 msgid "Untitled section"
 msgstr "无标题章节"
 
 msgid "Untitled section"
 msgstr "无标题章节"
 
-#: lib/subgroupnav.php:81
+#: lib/subgroupnav.php:81 lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "%s 订阅的人"
 
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "%s 订阅的人"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:89 lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "订阅 %s"
 
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "订阅 %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:97 lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subgroupnav.php:104
+#: lib/subgroupnav.php:104 lib/action.php:430 lib/subgroupnav.php:106
+#: lib/action.php:440
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "使用这个表单来邀请好友和同事加入。"
 
 #, fuzzy, php-format
 msgid "Invite friends and colleagues to join you on %s"
 msgstr "使用这个表单来邀请好友和同事加入。"
 
-#: lib/subs.php:53
+#: lib/subs.php:53 lib/subs.php:52
 #, fuzzy
 msgid "User has blocked you."
 msgstr "用户没有个人信息。"
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
 #, fuzzy
 msgid "User has blocked you."
 msgstr "用户没有个人信息。"
 
 #: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: actions/userauthorization.php:178 actions/userauthorization.php:210
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "订阅 %s"
 #, fuzzy
 msgid "Subscribe to this user"
 msgstr "订阅 %s"
@@ -4872,11 +5616,12 @@ msgid "Top posters"
 msgstr "灌水精英"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
 msgstr "灌水精英"
 
 #: lib/unblockform.php:120 lib/unblockform.php:150
+#: actions/blockedfromgroup.php:313
 #, fuzzy
 msgid "Unblock this user"
 msgstr "取消阻止次用户"
 
 #, fuzzy
 msgid "Unblock this user"
 msgstr "取消阻止次用户"
 
-#: lib/unblockform.php:150
+#: lib/unblockform.php:150 actions/blockedfromgroup.php:313
 msgid "Unblock"
 msgstr "取消阻止"
 
 msgid "Unblock"
 msgstr "取消阻止"
 
@@ -4885,22 +5630,2041 @@ msgstr "取消阻止"
 msgid "Unsubscribe from this user"
 msgstr "取消订阅 %s"
 
 msgid "Unsubscribe from this user"
 msgstr "取消订阅 %s"
 
+#: actions/all.php:77 actions/all.php:59 actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
+
+#: actions/all.php:82 actions/all.php:64 actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
+
+#: actions/all.php:87 actions/all.php:69 actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s 好友的聚合"
+
+#: actions/all.php:112 actions/all.php:125 actions/all.php:165
+#, fuzzy
+msgid "You and friends"
+msgstr "%s 及好友"
+
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "您可以在这里上传个人头像。"
+
+#: actions/avatarsettings.php:373
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "头像已更新。"
+
+#: actions/block.php:129 actions/block.php:136
+msgid ""
+"Are you sure you want to block this user? Afterwards, they will be "
+"unsubscribed from you, unable to subscribe to you in the future, and you "
+"will not be notified of any @-replies from them."
+msgstr ""
+
+#: actions/deletenotice.php:73 actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "您选择了永久删除通告。这样做是无法恢复的。"
+
+#: actions/deletenotice.php:127 actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "会话标识有问题,请重试。"
+
+#: actions/emailsettings.php:168 actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "如果收到私人信息,发邮件通知我。"
+
+#: actions/facebookhome.php:193 actions/facebookhome.php:187
+#, php-format
+msgid ""
+"If you would like the %s app to automatically update your Facebook status "
+"with your latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/facebookhome.php:217 actions/facebookhome.php:211
+#, php-format
+msgid "Okay, do it!"
+msgstr ""
+
+#: actions/facebooksettings.php:124
+#, php-format
+msgid ""
+"If you would like %s to automatically update your Facebook status with your "
+"latest notice, you need to give it permission."
+msgstr ""
+
+#: actions/grouplogo.php:155 actions/grouplogo.php:150
+#, fuzzy, php-format
+msgid ""
+"You can upload a logo image for your group. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"
+
+#: actions/grouplogo.php:367 actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "请选择一块方形区域作为你的头像"
+
+#: actions/grouprss.php:136 actions/grouprss.php:137
+#, fuzzy, php-format
+msgid "Microblog by %s group"
+msgstr "%s 的微博客服务"
+
+#: actions/groupsearch.php:57 actions/groupsearch.php:52
+#, fuzzy, php-format
+msgid ""
+"Search for groups on %%site.name%% by their name, location, or description. "
+"Separate the terms by spaces; they must be 3 characters or more."
+msgstr ""
+"在 %%site.name%% 的用户信息中搜索,可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符,多个搜索条件用空格分隔。"
+
+#: actions/groups.php:90
+#, php-format
+msgid ""
+"%%%%site.name%%%% groups let you find and talk with people of similar "
+"interests. After you join a group you can send messages to all other members "
+"using the syntax \"!groupname\". Don't see a group you like? Try [searching "
+"for one](%%%%action.groupsearch%%%%) or [start your own!](%%%%action.newgroup"
+"%%%%)"
+msgstr ""
+
+#: actions/newmessage.php:102
+#, fuzzy
+msgid "Only logged-in users can send direct messages."
+msgstr "发送消息出错。"
+
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "搜索有关\"%s\"的消息"
+
+#: actions/openidlogin.php:66
+#, fuzzy, php-format
+msgid ""
+"For security reasons, please re-login with your [OpenID](%%doc.openid%%) "
+"before changing your settings."
+msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
+
+#: actions/public.php:125 actions/public.php:133 actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "公开的聚合"
+
+#: actions/public.php:130 actions/public.php:138 actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "公开的聚合"
+
+#: actions/public.php:135 actions/public.php:143 actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "公开的聚合"
+
+#: actions/public.php:210 actions/public.php:241 actions/public.php:233
+#, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool. [Join now](%%action.register%%) to share notices about yourself with "
+"friends, family, and colleagues! ([Read more](%%doc.help%%))"
+msgstr ""
+
+#: actions/register.php:286 actions/register.php:329
+#, php-format
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. (Have an [OpenID](http://openid.net/)? "
+"Try our [OpenID registration](%%action.openidlogin%%)!)"
+msgstr ""
+
+#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+msgid "Creative Commons Attribution 3.0"
+msgstr ""
+
+#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "除了隐私内容:密码,电子邮件,即时通讯帐号,电话号码。"
+
+#: actions/showgroup.php:378 actions/showgroup.php:424
+#: actions/showgroup.php:432
+#, fuzzy
+msgid "Created"
+msgstr "创建"
+
+#: actions/showgroup.php:393 actions/showgroup.php:440
+#: actions/showgroup.php:448
+#, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. [Join now](%%%%action.register%%%%) to become part "
+"of this group and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/showstream.php:147
+#, fuzzy
+msgid "Your profile"
+msgstr "组资料"
+
+#: actions/showstream.php:149
+#, fuzzy, php-format
+msgid "%s's profile"
+msgstr "个人信息"
+
+#: actions/showstream.php:163 actions/showstream.php:128
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showstream.php:170 actions/showstream.php:135
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showstream.php:177 actions/showstream.php:142
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s 的通告聚合"
+
+#: actions/showstream.php:182 actions/showstream.php:147
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s 的发件箱"
+
+#: actions/showstream.php:237 actions/showstream.php:202
+#: actions/showstream.php:234
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "头像"
+
+#: actions/showstream.php:316 actions/showstream.php:281
+#: actions/showstream.php:366
+#, fuzzy
+msgid "Edit profile settings"
+msgstr "个人设置"
+
+#: actions/showstream.php:317 actions/showstream.php:282
+#: actions/showstream.php:367
+msgid "Edit"
+msgstr ""
+
+#: actions/showstream.php:542 actions/showstream.php:388
+#: actions/showstream.php:487
+#, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. [Join now](%%%%action.register%%%%) to "
+"follow **%s**'s notices and many more! ([Read more](%%%%doc.help%%%%))"
+msgstr ""
+
+#: actions/smssettings.php:335 actions/smssettings.php:347
+#, fuzzy
+msgid ""
+"A confirmation code was sent to the phone number you added. Check your phone "
+"for the code and instructions on how to use it."
+msgstr ""
+"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱),找到验证码并按要求"
+"使用它。"
+
+#: actions/twitapifavorites.php:171 lib/mail.php:556
+#: actions/twitapifavorites.php:222
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"In case you forgot, you can see the text of your notice here:\n"
+"\n"
+"%3$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Faithfully yours,\n"
+"%5$s\n"
+msgstr ""
+
+#: actions/twitapistatuses.php:124 actions/twitapistatuses.php:82
+#: actions/twitapistatuses.php:314 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:75 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#, fuzzy
+msgid "No such user!"
+msgstr "未找到用户"
+
+#: actions/twittersettings.php:72
+#, fuzzy
+msgid ""
+"Add your Twitter account to automatically send  your notices to Twitter, and "
+"subscribe to Twitter friends already here."
+msgstr "添加 Twitter 帐号,自动向 Twitter 发送更新。"
+
+#: actions/twittersettings.php:345 actions/twittersettings.php:362
+#, fuzzy, php-format
+msgid "Unable to retrieve account information For \"%s\" from Twitter."
+msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
+
+#: actions/userauthorization.php:86 actions/userauthorization.php:81
 #, fuzzy
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "命令尚未实现。"
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user's notices. If you didn't just ask to subscribe to someone's notices, "
+"click \"Reject\"."
+msgstr ""
+"请检查详细信息,确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
+"告,请点击\"取消\"。"
 
 
+#: actions/usergroups.php:131 actions/usergroups.php:130
 #, fuzzy
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "创建新帐号"
+msgid "Search for more groups"
+msgstr "检索人或文字"
 
 
+#: classes/Notice.php:138 classes/Notice.php:154 classes/Notice.php:194
 #, fuzzy
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "无法删除电子邮件确认。"
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr "你在短时间里发布了过多的消息,请深呼吸,过几分钟再发消息。"
 
 
+#: lib/action.php:406 lib/action.php:425
 #, fuzzy
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "确定要删除这条通告吗?"
+msgid "Connect to SMS, Twitter"
+msgstr "与IM,手机短信,Twitter的连接"
 
 
+#: lib/action.php:671 lib/action.php:721 lib/action.php:736
 #, fuzzy
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "搜索通告内容"
+msgid "Badge"
+msgstr "呼叫"
+
+#: lib/command.php:113 lib/command.php:106 lib/command.php:126
+#, php-format
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:392 lib/command.php:385
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - not yet implemented.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+msgstr ""
+
+#: lib/facebookaction.php:271 lib/facebookaction.php:273
+#, fuzzy, php-format
+msgid ""
+"To use the %s Facebook Application you need to login with your username and "
+"password. Don't have a username yet? "
+msgstr "你需要登录方能使用%sFacebook程序"
+
+#: lib/feed.php:85
+msgid "RSS 1.0"
+msgstr ""
+
+#: lib/feed.php:87
+msgid "RSS 2.0"
+msgstr ""
+
+#: lib/feed.php:89
+msgid "Atom"
+msgstr ""
+
+#: lib/feed.php:91
+msgid "FOAF"
+msgstr ""
+
+#: lib/imagefile.php:75
+#, php-format
+msgid "That file is too big. The maximum file size is %d."
+msgstr ""
+
+#: lib/mail.php:175 lib/mail.php:174
+#, php-format
+msgid ""
+"Hey, %s.\n"
+"\n"
+"Someone just entered this email address on %s.\n"
+"\n"
+"If it was you, and you want to confirm your entry, use the URL below:\n"
+"\n"
+"\t%s\n"
+"\n"
+"If not, just ignore this message.\n"
+"\n"
+"Thanks for your time, \n"
+"%s\n"
+msgstr ""
+
+#: lib/mail.php:241 lib/mail.php:240
+#, fuzzy, php-format
+msgid ""
+"%1$s is now listening to your notices on %2$s.\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"%4$s%5$s%6$s\n"
+"Faithfully yours,\n"
+"%7$s.\n"
+"\n"
+"----\n"
+"Change your email address or notification options at %8$s\n"
+msgstr ""
+"%1$s 开始关注您的 %2$s 信息。\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"为您效力的 %4$s\n"
+
+#: lib/mail.php:466
+#, php-format
+msgid ""
+"%1$s (%2$s) is wondering what you are up to these days and is inviting you "
+"to post some news.\n"
+"\n"
+"So let's hear from you :)\n"
+"\n"
+"%3$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%4$s\n"
+msgstr ""
+
+#: lib/mail.php:513
+#, php-format
+msgid ""
+"%1$s (%2$s) sent you a private message:\n"
+"\n"
+"------------------------------------------------------\n"
+"%3$s\n"
+"------------------------------------------------------\n"
+"\n"
+"You can reply to their message here:\n"
+"\n"
+"%4$s\n"
+"\n"
+"Don't reply to this email; it won't get to them.\n"
+"\n"
+"With kind regards,\n"
+"%5$s\n"
+msgstr ""
+
+#: lib/mail.php:598 lib/mail.php:600
+#, php-format
+msgid "%s sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:600 lib/mail.php:602
+#, php-format
+msgid ""
+"%1$s just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+"You can reply back here:\n"
+"\n"
+"\t%5$s\n"
+"\n"
+"The list of all @-replies for you here:\n"
+"\n"
+"%6$s\n"
+"\n"
+"Faithfully yours,\n"
+"%2$s\n"
+"\n"
+"P.S. You can turn off these email notifications here: %7$s\n"
+msgstr ""
+
+#: lib/searchaction.php:122 lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "搜索"
+
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: actions/all.php:80 actions/all.php:127
+#, php-format
+msgid ""
+"This is the timeline for %s and friends but no one has posted anything yet."
+msgstr ""
+
+#: actions/all.php:85 actions/all.php:132
+#, php-format
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
+
+#: actions/all.php:87 actions/all.php:134
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) from his profile or [post something to his "
+"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
+
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "没有这份文档。"
+
+#: actions/block.php:149
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "该组成员列表。"
+
+#: actions/block.php:150
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "该组成员列表。"
+
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "用户没有个人信息。"
+
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s 及好友"
+
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "该组成员列表。"
+
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "取消阻止用户失败。"
+
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "确认码"
+
+#: actions/deletenotice.php:115 actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "无法删除通告。"
+
+#: actions/editgroup.php:214 actions/newgroup.php:164
+#: actions/apigroupcreate.php:291 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
+
+#: actions/editgroup.php:223 actions/newgroup.php:173
+#: actions/apigroupcreate.php:312 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "主页'%s'不正确"
+
+#: actions/editgroup.php:227 actions/newgroup.php:177
+#: actions/apigroupcreate.php:321 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "昵称已被使用,换一个吧。"
+
+#: actions/editgroup.php:233 actions/newgroup.php:183
+#: actions/apigroupcreate.php:334 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
+
+#: actions/editgroup.php:259 actions/newgroup.php:215
+#: actions/apigroupcreate.php:147 actions/newgroup.php:210
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "无法创建收藏。"
+
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
+
+#: actions/favorited.php:153
+msgid ""
+"Be the first to add a notice to your favorites by clicking the fave button "
+"next to any notice you like."
+msgstr ""
+
+#: actions/favorited.php:156
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
+
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新通告"
+
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新通告"
+
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
+
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
+
+#: actions/finishopenidlogin.php:211
+#, fuzzy
+msgid "Not a valid invitation code."
+msgstr "不是有效的昵称。"
+
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "没有收件人。"
+
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
+
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "用户没有个人信息。"
+
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "您未告知此个人信息"
+
+#: actions/groupblock.php:136 actions/groupmembers.php:311
+#: actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "阻止用户"
+
+#: actions/groupblock.php:155
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
+
+#: actions/groupblock.php:193
+msgid "Database error blocking user from group."
+msgstr ""
+
+#: actions/groupdesignsettings.php:73 actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "您必须登录才能创建小组。"
+
+#: actions/groupdesignsettings.php:146 actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "组"
+
+#: actions/groupdesignsettings.php:157 actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/groupdesignsettings.php:267 actions/userdesignsettings.php:186
+#: lib/designsettings.php:440 lib/designsettings.php:470
+#: actions/groupdesignsettings.php:262 lib/designsettings.php:431
+#: lib/designsettings.php:461
+#, fuzzy
+msgid "Couldn't update your design."
+msgstr "无法更新用户。"
+
+#: actions/groupdesignsettings.php:291 actions/groupdesignsettings.php:301
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "无法保存 Twitter 设置!"
+
+#: actions/groupdesignsettings.php:312 actions/userdesignsettings.php:231
+#: actions/groupdesignsettings.php:307
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "同步选项已保存。"
+
+#: actions/groupmembers.php:438 actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "只有admin才能编辑这个组"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "admin管理员"
+
+#: actions/groupmembers.php:470 actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
+
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "没有结果"
+
+#: actions/groupsearch.php:82
+#, php-format
+msgid ""
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
+msgstr ""
+
+#: actions/groupsearch.php:85
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
+msgstr ""
+
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
+
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "用户没有个人信息。"
+
+#: actions/invite.php:39
+msgid "Invites have been disabled."
+msgstr ""
+
+#: actions/joingroup.php:100 actions/apigroupjoin.php:119
+#: actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
+
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
+
+#: actions/makeadmin.php:95
+#, php-format
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
+
+#: actions/makeadmin.php:132
+#, php-format
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
+
+#: actions/makeadmin.php:145
+#, php-format
+msgid "Can't make %s an admin for group %s"
+msgstr ""
+
+#: actions/newmessage.php:178 actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "新消息"
+
+#: actions/newnotice.php:93 lib/designsettings.php:281
+#: actions/newnotice.php:94
+#, php-format
+msgid ""
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
+msgstr ""
+
+#: actions/newnotice.php:128 scripts/maildaemon.php:185 lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: actions/newnotice.php:133 scripts/maildaemon.php:190 lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: actions/newnotice.php:205 lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: actions/newnotice.php:208 lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: actions/newnotice.php:211 lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
+
+#: actions/newnotice.php:214 lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: actions/newnotice.php:217 lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: actions/newnotice.php:220 lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: actions/newnotice.php:230 scripts/maildaemon.php:85
+#, fuzzy
+msgid "Couldn't save file."
+msgstr "无法保存个人信息。"
+
+#: actions/newnotice.php:246 scripts/maildaemon.php:101
+msgid "Max notice size is 140 chars, including attachment URL."
+msgstr ""
+
+#: actions/newnotice.php:297
+msgid "Somehow lost the login in saveFile"
+msgstr ""
+
+#: actions/newnotice.php:309 scripts/maildaemon.php:127 lib/mediafile.php:196
+#: lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: actions/newnotice.php:336 actions/newnotice.php:360
+#: scripts/maildaemon.php:148 scripts/maildaemon.php:167 lib/mediafile.php:98
+#: lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
+
+#: actions/noticesearch.php:124
+#, php-format
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and be the first to  "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
+msgstr ""
+
+#: actions/openidsettings.php:70
+#, fuzzy, php-format
+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。"
+
+#: actions/othersettings.php:110 actions/othersettings.php:117
+msgid "Shorten URLs with"
+msgstr ""
+
+#: actions/othersettings.php:115 actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "个人设置"
+
+#: actions/othersettings.php:116 actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
+
+#: actions/public.php:82 actions/public.php:83
+#, php-format
+msgid "Beyond the page limit (%s)"
+msgstr ""
+
+#: actions/public.php:179
+#, php-format
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
+
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
+
+#: actions/public.php:186
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
+
+#: actions/public.php:245 actions/public.php:238
+#, fuzzy, php-format
+msgid ""
+"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
+"blogging) service based on the Free Software [StatusNet](http://status.net/) "
+"tool."
+msgstr ""
+"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/"
+"wiki/Micro-blogging) 服务"
+
+#: actions/publictagcloud.php:69
+#, php-format
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
+
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
+
+#: actions/publictagcloud.php:75
+#, php-format
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
+msgstr ""
+
+#: actions/recoverpassword.php:152
+#, fuzzy
+msgid ""
+"If you've forgotten or lost your password, you can get a new one sent to the "
+"email address you have stored in your account."
+msgstr "如果您忘记了密码,可以使用此邮箱收到新的密码。"
+
+#: actions/recoverpassword.php:158
+#, fuzzy
+msgid "You've been identified. Enter a new password below. "
+msgstr "您已得到确认。请输入新密码。"
+
+#: actions/recoverpassword.php:188
+#, fuzzy
+msgid "Password recover"
+msgstr "请求恢复密码"
+
+#: actions/register.php:86
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "验证码出错。"
+
+#: actions/remotesubscribe.php:100 actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "订阅 %s"
+
+#: actions/replies.php:179 actions/replies.php:198
+#, php-format
+msgid ""
+"This is the timeline showing replies to %s but %s hasn't received a notice "
+"to his attention yet."
+msgstr ""
+
+#: actions/replies.php:184 actions/replies.php:203
+#, php-format
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
+
+#: actions/replies.php:186 actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 收藏的通告"
+
+#: actions/showfavorites.php:170 actions/showfavorites.php:205
+msgid ""
+"You haven't chosen any favorite notices yet. Click the fave button on "
+"notices you like to bookmark them for later or shed a spotlight on them."
+msgstr ""
+
+#: actions/showfavorites.php:172 actions/showfavorites.php:207
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Post something interesting "
+"they would add to their favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:176
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to thier favorites :)"
+msgstr ""
+
+#: actions/showfavorites.php:226 actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
+
+#: actions/showgroup.php:279 lib/groupeditform.php:178
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
+
+#: actions/showgroup.php:323 actions/showgroup.php:328
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:330 actions/tag.php:84 actions/showgroup.php:334
+#, fuzzy, php-format
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:337 actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s 的通告聚合"
+
+#: actions/showgroup.php:446 actions/showgroup.php:454
+#, fuzzy, php-format
+msgid ""
+"**%s** is a user group on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. Its members share short messages about "
+"their life and interests. "
+msgstr ""
+"**%s** 是一个 %%%%site.name%%%% 的用户组,一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/showgroup.php:474 actions/showgroup.php:482
+#, fuzzy
+msgid "Admins"
+msgstr "admin管理员"
+
+#: actions/shownotice.php:101
+#, fuzzy
+msgid "Not a local notice"
+msgstr "没有这个用户。"
+
+#: actions/showstream.php:72
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "带 %s 标签的通告"
+
+#: actions/showstream.php:121
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/showstream.php:350 actions/showstream.php:444
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
+
+#: actions/showstream.php:355 actions/showstream.php:449
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
+
+#: actions/showstream.php:357 actions/showstream.php:451
+#, php-format
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
+
+#: actions/showstream.php:393 actions/showstream.php:492
+#, fuzzy, php-format
+msgid ""
+"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
+"wikipedia.org/wiki/Micro-blogging) service based on the Free Software "
+"[StatusNet](http://status.net/) tool. "
+msgstr ""
+"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-blogging]"
+"(http://en.wikipedia.org/wiki/Micro-blogging)"
+
+#: actions/subscribers.php:108
+msgid ""
+"You have no subscribers. Try subscribing to people you know and they might "
+"return the favor"
+msgstr ""
+
+#: actions/subscribers.php:110
+#, php-format
+msgid "%s has no subscribers. Want to be the first?"
+msgstr ""
+
+#: actions/subscribers.php:114
+#, php-format
+msgid ""
+"%s has no subscribers. Why not [register an account](%%%%action.register%%%"
+"%) and be the first?"
+msgstr ""
+
+#: actions/subscriptions.php:115 actions/subscriptions.php:121
+#, php-format
+msgid ""
+"You're not listening to anyone's notices right now, try subscribing to "
+"people you know. Try [people search](%%action.peoplesearch%%), look for "
+"members in groups you're interested in and in our [featured users](%%action."
+"featured%%). If you're a [Twitter user](%%action.twittersettings%%), you can "
+"automatically subscribe to people you already follow there."
+msgstr ""
+
+#: actions/subscriptions.php:117 actions/subscriptions.php:121
+#: actions/subscriptions.php:123 actions/subscriptions.php:127
+#, fuzzy, php-format
+msgid "%s is not listening to anyone."
+msgstr "%1$s 开始关注您的 %2$s 信息。"
+
+#: actions/tag.php:77 actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:91 actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s 的通告聚合"
+
+#: actions/twitapifavorites.php:125 actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "已收藏此通告!"
+
+#: actions/twitapifavorites.php:179 actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "此通告未被收藏!"
+
+#: actions/twitapifriendships.php:180 actions/twitapifriendships.php:200
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "无法获取收藏的通告。"
+
+#: actions/twitapifriendships.php:215
+#, fuzzy
+msgid "Target user not specified."
+msgstr "没有收件人。"
+
+#: actions/twitapifriendships.php:221 actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "找不到任何信息。"
+
+#: actions/twitapistatuses.php:322 actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / 回复 %2$s 的消息"
+
+#: actions/twitapitags.php:74 actions/apitimelinetag.php:107
+#: actions/tagrss.php:64
+#, fuzzy, php-format
+msgid "Updates tagged with %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新!"
+
+#: actions/twittersettings.php:165
+msgid "Import my Friends Timeline."
+msgstr ""
+
+#: actions/userauthorization.php:158 actions/userauthorization.php:188
+#, fuzzy
+msgid "License"
+msgstr "注册证"
+
+#: actions/userauthorization.php:179 actions/userauthorization.php:212
+#, fuzzy
+msgid "Reject this subscription"
+msgstr "所有订阅"
+
+#: actions/userdesignsettings.php:76 lib/designsettings.php:65
+#, fuzzy
+msgid "Profile design"
+msgstr "个人设置"
+
+#: actions/userdesignsettings.php:87 lib/designsettings.php:76
+msgid ""
+"Customize the way your profile looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
+
+#: actions/userdesignsettings.php:282
+msgid "Enjoy your hotdog!"
+msgstr ""
+
+#: actions/usergroups.php:153
+#, fuzzy, php-format
+msgid "%s is not a member of any group."
+msgstr "您未告知此个人信息"
+
+#: actions/usergroups.php:158
+#, php-format
+msgid "Try [searching for groups](%%action.groupsearch%%) and joining them."
+msgstr ""
+
+#: classes/File.php:127 classes/File.php:137
+#, php-format
+msgid ""
+"No file may be larger than %d bytes and the file you sent was %d bytes. Try "
+"to upload a smaller version."
+msgstr ""
+
+#: classes/File.php:137 classes/File.php:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:145 classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Notice.php:139 classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "保存通告时出错。"
+
+#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
+#: lib/accountsettingsaction.php:119 lib/groupnav.php:118
+#: lib/accountsettingsaction.php:120
+msgid "Design"
+msgstr ""
+
+#: lib/accountsettingsaction.php:120 lib/accountsettingsaction.php:121
+#, fuzzy
+msgid "Design your profile"
+msgstr "用户没有个人信息。"
+
+#: lib/action.php:712 lib/action.php:727
+msgid "TOS"
+msgstr ""
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "个人信息"
+
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/designsettings.php:101
+msgid "Change background image"
+msgstr ""
+
+#: lib/designsettings.php:105
+#, fuzzy
+msgid "Upload file"
+msgstr "上传"
+
+#: lib/designsettings.php:109
+msgid ""
+"You can upload your personal background image. The maximum file size is 2Mb."
+msgstr ""
+
+#: lib/designsettings.php:139
+msgid "On"
+msgstr ""
+
+#: lib/designsettings.php:155
+msgid "Off"
+msgstr ""
+
+#: lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
+
+#: lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
+
+#: lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "修改密码"
+
+#: lib/designsettings.php:178
+msgid "Background"
+msgstr ""
+
+#: lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "连接"
+
+#: lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "搜索"
+
+#: lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登录"
+
+#: lib/designsettings.php:247
+msgid "Use defaults"
+msgstr ""
+
+#: lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
+
+#: lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
+
+#: lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
+
+#: lib/designsettings.php:378 lib/designsettings.php:369
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:474 lib/designsettings.php:465
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/groupeditform.php:181 lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:100
+#, fuzzy
+msgid "Blocked"
+msgstr "阻止"
+
+#: lib/groupnav.php:101
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "阻止用户"
+
+#: lib/groupnav.php:119
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "添加或编辑 %s 图标"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:646
+#, php-format
+msgid "Your Twitter bridge has been disabled."
+msgstr ""
+
+#: lib/mail.php:648
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that your link to Twitter has been "
+"disabled. Your Twitter credentials have either changed (did you recently "
+"change your Twitter password?) or you have otherwise revoked our access to "
+"your Twitter account.\n"
+"\n"
+"You can re-enable your Twitter bridge by visiting your Twitter settings "
+"page:\n"
+"\n"
+"\t%2$s\n"
+"\n"
+"Regards,\n"
+"%3$s\n"
+msgstr ""
+
+#: lib/mail.php:682
+#, php-format
+msgid "Your %s Facebook application access has been disabled."
+msgstr ""
+
+#: lib/mail.php:685
+#, php-format
+msgid ""
+"Hi, %1$s. We're sorry to inform you that we are unable to update your "
+"Facebook status from %s, and have disabled the Facebook application for your "
+"account. This may be because you have removed the Facebook application's "
+"authorization, or have deleted your Facebook account.  You can re-enable the "
+"Facebook application and automatic status updating by re-installing the %1$s "
+"Facebook application.\n"
+"\n"
+"Regards,\n"
+"\n"
+"%1$s"
+msgstr ""
+
+#: lib/mailbox.php:139
+msgid ""
+"You have no private messages. You can send private message to engage other "
+"users in conversation. People can send you messages for your eyes only."
+msgstr ""
+
+#: lib/noticeform.php:154 lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
+
+#: lib/noticeform.php:158 lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:436 lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "没有内容!"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "用户"
+
+#: lib/searchaction.php:156 lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "搜索"
+
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
+
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/webcolor.php:82
+#, fuzzy, php-format
+msgid "%s is not a valid color!"
+msgstr "主页的URL不正确。"
+
+#: lib/webcolor.php:123
+#, php-format
+msgid "%s is not a valid color! Use 3 or 6 hex chars."
+msgstr ""
+
+#: actions/all.php:63 actions/public.php:97 actions/replies.php:92
+#: actions/showfavorites.php:137 actions/tag.php:51
+#, fuzzy
+msgid "No such page"
+msgstr "未找到此消息。"
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "发给 %s 的直接消息"
+
+#: actions/apidirectmessagenew.php:135 actions/newmessage.php:150
+#, fuzzy, php-format
+msgid "That's too long. Max message size is %d chars."
+msgstr "超出长度限制。不能超过 140 个字符。"
+
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "无法订阅用户:未找到。"
+
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
+
+#: actions/apigroupcreate.php:261
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
+
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "您已经是该组成员"
+
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "无法把 %s 用户添加到 %s 组"
+
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "您未告知此个人信息"
+
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "无法订阅用户:未找到。"
+
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 群组"
+
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 组是成员组成了"
+
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "组动作"
+
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "头像已更新。"
+
+#: actions/apistatusesupdate.php:132
+msgid "Unable to handle that much POST data!"
+msgstr ""
+
+#: actions/apistatusesupdate.php:145 actions/newnotice.php:155
+#: scripts/maildaemon.php:71
+#, fuzzy, php-format
+msgid "That's too long. Max notice size is %d chars."
+msgstr "超出长度限制。不能超过 140 个字符。"
+
+#: actions/apistatusesupdate.php:209 actions/newnotice.php:178
+#, php-format
+msgid "Max notice size is %d chars, including attachment URL."
+msgstr ""
+
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "不支持这种图像格式。"
+
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "相片"
+
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
+
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新!"
+
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "要查看的用户不存在。"
+
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "未认证。"
+
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "无法将请求标记转换为访问令牌。"
+
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "此OMB协议版本无效。"
+
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+msgstr "没有这份通告。"
+
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+msgstr "没有这份通告。"
+
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新!"
+
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/login.php:259
+#, fuzzy, php-format
+msgid ""
+"Login with your username and password. Don't have a username yet? [Register]"
+"(%%action.register%%) a new account."
+msgstr ""
+"请使用你的帐号和密码登入。没有帐号?[注册](%%action.register%%) 一个新帐号, "
+"或使用 [OpenID](%%action.openidlogin%%). "
+
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s 上 %1$s 的更新!"
+
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有匹配搜索条件\"%s\"的消息"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "连接"
+
+#: actions/oembed.php:160
+msgid "Only "
+msgstr ""
+
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/profilesettings.php:122 actions/register.php:454
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: actions/profilesettings.php:125 actions/register.php:457
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: actions/profilesettings.php:221 actions/register.php:217
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自述过长(不能超过140字符)。"
+
+#: actions/register.php:336
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
+
+#: actions/remotesubscribe.php:168
+#, fuzzy
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "不是有效的个人信息URL(没有YADIS数据)。"
+
+#: actions/remotesubscribe.php:176
+#, fuzzy
+msgid "That’s a local profile! Login to subscribe."
+msgstr "那是一个本地资料!需要登录才能订阅。"
+
+#: actions/remotesubscribe.php:183
+#, fuzzy
+msgid "Couldn’t get a request token."
+msgstr "无法获得一份请求标记。"
+
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s 的通告聚合"
+
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
+#: actions/showfavorites.php:170
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
+
+#: actions/showfavorites.php:177
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
+
+#: actions/showfavorites.php:184
+#, fuzzy, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s 好友的聚合"
+
+#: actions/showfavorites.php:211
+#, php-format
+msgid ""
+"%s hasn't added any notices to his favorites yet. Why not [register an "
+"account](%%%%action.register%%%%) and then post something interesting they "
+"would add to their favorites :)"
+msgstr ""
+
+#: actions/showgroup.php:345
+#, fuzzy, php-format
+msgid "FOAF for %s group"
+msgstr "%s 的发件箱"
+
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "消息已发布。"
+
+#: actions/smssettings.php:91
+#, fuzzy
+msgid "SMS is not available."
+msgstr "这个页面不提供您想要的媒体类型"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
+
+#: actions/userauthorization.php:110
+#, fuzzy
+msgid ""
+"Please check these details to make sure that you want to subscribe to this "
+"user’s notices. If you didn’t just ask to subscribe to someone’s notices, "
+"click “Reject”."
+msgstr ""
+"请检查详细信息,确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
+"告,请点击\"取消\"。"
+
+#: actions/userauthorization.php:249
+#, fuzzy
+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。请到此网站查看如何确认订阅。您的订阅标识是:"
+
+#: actions/userauthorization.php:261
+#, fuzzy
+msgid ""
+"The subscription has been rejected, but no callback URL was passed. Check "
+"with the site’s instructions for details on how to fully reject the "
+"subscription."
+msgstr "订阅已被拒绝,但是没有回传URL。请到此网站查看如何拒绝订阅。"
+
+#: actions/userauthorization.php:296
+#, php-format
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
+
+#: actions/userauthorization.php:307
+#, php-format
+msgid "Listenee URI ‘%s’ is a local user."
+msgstr ""
+
+#: actions/userauthorization.php:322
+#, php-format
+msgid "Profile URL ‘%s’ is for a local user."
+msgstr ""
+
+#: actions/userauthorization.php:338
+#, php-format
+msgid "Avatar URL ‘%s’ is not valid."
+msgstr ""
+
+#: actions/userauthorization.php:343
+#, fuzzy, php-format
+msgid "Can’t read avatar URL ‘%s’."
+msgstr "无法访问头像URL '%s'"
+
+#: actions/userauthorization.php:348
+#, fuzzy, php-format
+msgid "Wrong image type for avatar URL ‘%s’."
+msgstr "'%s' 图像格式错误"
+
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "无法重定向到服务器:%s"
+
+#: lib/action.php:785
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet软件注册证"
+
+#: lib/command.php:88
+#, fuzzy, php-format
+msgid "Could not find a user with nickname %s"
+msgstr "无法更新已确认的电子邮件。"
+
+#: lib/command.php:92
+msgid "It does not make a lot of sense to nudge yourself!"
+msgstr ""
+
+#: lib/command.php:99
+#, fuzzy, php-format
+msgid "Nudge sent to %s"
+msgstr "振铃呼叫发出。"
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
+
+#: lib/command.php:358 scripts/xmppdaemon.php:321
+#, fuzzy, php-format
+msgid "Message too long - maximum is %d characters, you sent %d"
+msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
+
+#: lib/command.php:431
+#, fuzzy, php-format
+msgid "Notice too long - maximum is %d characters, you sent %d"
+msgstr "您的消息包含 %d 个字符,超出长度限制 - 不能超过 140 个字符。"
+
+#: lib/command.php:439
+#, fuzzy, php-format
+msgid "Reply to %s sent"
+msgstr "无法删除通告。"
+
+#: lib/command.php:441
+#, fuzzy
+msgid "Error saving notice."
+msgstr "保存通告时出错。"
+
+#: lib/command.php:587
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"drop <group> - leave group\n"
+"stats - get your stats\n"
+"stop - same as 'off'\n"
+"quit - same as 'off'\n"
+"sub <nickname> - same as 'follow'\n"
+"unsub <nickname> - same as 'leave'\n"
+"last <nickname> - same as 'get'\n"
+"on <nickname> - not yet implemented.\n"
+"off <nickname> - not yet implemented.\n"
+"nudge <nickname> - remind a user to update.\n"
+"invite <phone number> - not yet implemented.\n"
+"track <word> - not yet implemented.\n"
+"untrack <word> - not yet implemented.\n"
+"track off - not yet implemented.\n"
+"untrack all - not yet implemented.\n"
+"tracks - not yet implemented.\n"
+"tracking - not yet implemented.\n"
+msgstr ""
+
+#: lib/common.php:191
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "没有验证码"
+
+#: lib/common.php:192
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:193
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:194
+#, fuzzy
+msgid "Go to the installer."
+msgstr "登入本站"
+
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "选择运营商"
+
+#: lib/groupeditform.php:168
+#, fuzzy
+msgid "Describe the group or topic"
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
+msgstr "用不超过140个字符描述您自己和您的爱好"
+
+#: lib/jabber.php:192
+#, fuzzy, php-format
+msgid "notice id: %s"
+msgstr "新通告"
+
+#: lib/mail.php:554
+#, fuzzy, php-format
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s 收藏了您的通告"
+
+#: lib/mail.php:556
+#, php-format
+msgid ""
+"%1$s (@%7$s) just added your notice from %2$s as one of their favorites.\n"
+"\n"
+"The URL of your notice is:\n"
+"\n"
+"%3$s\n"
+"\n"
+"The text of your notice is:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see the list of %1$s's favorites here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"Faithfully yours,\n"
+"%6$s\n"
+msgstr ""
+
+#: lib/mail.php:611
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:613
+#, php-format
+msgid ""
+"%1$s (@%9$s) just sent a notice to your attention (an '@-reply') on %2$s.\n"
+"\n"
+"The notice is here:\n"
+"\n"
+"\t%3$s\n"
+"\n"
+"It reads:\n"
+"\n"
+"\t%4$s\n"
+"\n"
+msgstr ""
+
+#: lib/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " 从 "
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+#, fuzzy
+msgid "Could not determine file's mime-type!"
+msgstr "无法获取收藏的通告。"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "删除通告"