Merge branch '0.9-release'

* 0.9-release: (874 commits) Removed call to NewDirectMessage() until IE return is fixed i.e., Don't show flag user button your own profile Fixed HXR response for flag user Using the right form class name Using common_redirect Left a form_data class of a <ul> in the user admin panel Added validation to fields in user admin panel Added a user admin panel Added mobile logos for default and identica themes Changed gif to png Changed this to action. THANKS zach! Doing content negotiation only once Add execute bit to pingqueuehandler Localisation updates for !StatusNet from !translatewiki.net Use the browser's geolocation API to set the location on the notice form Add geometa library, and include it. Add location form elements to the noticeform, and save their values on submission Use the $user object nickname, as login name doesnt have to == nickname anymore with plugins such as ldap/etc Revert "Re added NICKNAME_FMT constant to router.php." Moved most path and server settings to a new paths admin panel ... Conflicts: js/util.js locale/it_IT/LC_MESSAGES/statusnet.mo locale/mk_MK/LC_MESSAGES/statusnet.mo locale/mk_MK/LC_MESSAGES/statusnet.po locale/pt_BR/LC_MESSAGES/statusnet.mo locale/vi_VN/LC_MESSAGES/statusnet.mo plugins/InfiniteScroll/infinitescroll.js plugins/Realtime/realtimeupdate.js
author: Zach Copley <zach@status.net> 2009-11-19 20:12:46 -0800
committer: Zach Copley <zach@status.net> 2009-11-19 20:12:46 -0800
commit: 4b98edf75f4e255f8c61087bd1525d89653a521f (patch)
tree: b2a7eb6d77429eadb1beabe2d5e6ae1c1a2831d6 /locale/zh_CN/LC_MESSAGES
parent: f92574dbcb1f2d7cd0aaf3c9362db46fa066e888 (diff)
parent: c213477081afefb1720c8ae729d1965e7a1dac63 (diff)
2 files changed, 4103 insertions, 3637 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index 7984ab714..6f41c554e 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 5c2eced4e..f32b9e629 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,4223 +1,3467 @@
+# Translation of StatusNet to Simplified Chinese
+#
+# Author@translatewiki.net: Translationista
+# Author: Gouki <gouki@goukihq.org>, 2008
+# --
 # Messages of identi.ca
 # Copyright (C) 2008 Gouki <gouki@goukihq.org>
-# This file is distributed under the same license as the identi.ca package.
-# Gouki <gouki@goukihq.org>, 2008
+# This file is distributed under the same license as the StatusNet package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: identi.ca\n"
+"Project-Id-Version: StatusNet\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-19 10:43+0000\n"
+"PO-Revision-Date: 2009-11-18 19:32:53+0000\n"
+"Language-Team: Simplified Chinese\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Pootle 1.1.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: MediaWiki 1.16alpha(r59207); Translate extension (2009-11-16)\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:88
-#, php-format
-msgid " Search Stream for \"%s\""
-msgstr "搜索有关\"%s\"的消息"
+#: 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/finishopenidlogin.php:82 ../actions/register.php:191
-#: actions/finishopenidlogin.php:88 actions/register.php:205
-#: actions/finishopenidlogin.php:110
-msgid ""
-" except this private data: password, email address, IM address, phone number."
-msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
+#: actions/all.php:74 actions/allrss.php:68
+#: actions/apiaccountupdatedeliverydevice.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:116
+#: actions/apiaccountupdateprofileimage.php:105
+#: actions/apiaccountupdateprofile.php:105 actions/apiblockcreate.php:97
+#: actions/apiblockdestroy.php:96 actions/apidirectmessagenew.php:75
+#: actions/apidirectmessage.php:77 actions/apigroupcreate.php:112
+#: actions/apigroupismember.php:90 actions/apigroupjoin.php:99
+#: actions/apigroupleave.php:99 actions/apigrouplist.php:90
+#: actions/apistatusesupdate.php:144 actions/apisubscriptions.php:87
+#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
+#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/avatarbynickname.php:75 actions/favoritesrss.php:74
+#: actions/foaf.php:40 actions/foaf.php:58 actions/microsummary.php:62
+#: actions/newmessage.php:116 actions/remotesubscribe.php:145
+#: actions/remotesubscribe.php:154 actions/replies.php:73
+#: actions/repliesrss.php:38 actions/showfavorites.php:105
+#: actions/userbyid.php:74 actions/usergroups.php:91 actions/userrss.php:38
+#: actions/xrds.php:71 lib/command.php:163 lib/command.php:311
+#: lib/command.php:364 lib/command.php:411 lib/command.php:466
+#: lib/galleryaction.php:59 lib/mailbox.php:82 lib/profileaction.php:77
+#: lib/subs.php:34 lib/subs.php:116
+msgid "No such user."
+msgstr "没有这个用户。"
 
-#: ../actions/showstream.php:400 ../lib/stream.php:109
-#: actions/showstream.php:418 lib/mailbox.php:164 lib/stream.php:76
-msgid " from "
-msgstr " 从 "
+#: actions/all.php:84
+#, fuzzy, php-format
+msgid "%s and friends, page %d"
+msgstr "%s 及好友"
 
-#: ../actions/twitapistatuses.php:478 actions/twitapistatuses.php:412
-#: actions/twitapistatuses.php:347
+#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
+#: actions/apitimelinefriends.php:114 lib/personalgroupnav.php:100
 #, php-format
-msgid "%1$s / Updates replying to %2$s"
-msgstr "%1$s / 回复 %2$s 的消息"
+msgid "%s and friends"
+msgstr "%s 及好友"
 
-#: ../actions/invite.php:168 actions/invite.php:176 actions/invite.php:211
-#, php-format
-msgid "%1$s has invited you to join them on %2$s"
-msgstr "%1$s 邀请您加入 %2$s"
+#: actions/all.php:99
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
 
-#: ../actions/invite.php:170
-#, php-format
-msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
-"%2$s is a micro-blogging service that lets you keep up-to-date with people "
-"you know and people who interest you.\n"
-"\n"
-"You can also share news about yourself, your thoughts, or your life online "
-"with people who know about you. It's also great for meeting new people who "
-"share your interests.\n"
-"\n"
-"%1$s said:\n"
-"\n"
-"%4$s\n"
-"\n"
-"You can see %1$s's profile page on %2$s here:\n"
-"\n"
-"%5$s\n"
-"\n"
-"If you'd like to try the service, click on the link below to accept the "
-"invitation.\n"
-"\n"
-"%6$s\n"
-"\n"
-"If not, you can ignore this message. Thanks for your patience and your "
-"time.\n"
-"\n"
-"Sincerely, %2$s\n"
-msgstr ""
-"%1$s 邀请你加入 %2$s (%3$s).\n"
-"\n"
-"%2$s 是一个能让你和你认识的、感兴趣的人保持联系的微博客服务。 \n"
-"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣的新朋友。\n"
-"\n"
-"%1$s 说:\n"
-"\n"
-"%4$s\n"
-"\n"
-"你可以在这里查阅 %1$s's 的资料 %2$s :\n"
-"\n"
-"%5$s\n"
-"\n"
-"如果你想使用这个服务，请点击一下链接接受邀请。\n"
-"%6$s\n"
-"\n"
-"如果你不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
-"\n"
-"诚挚的感谢, %2$s\n"
+#: actions/all.php:107
+#, fuzzy, php-format
+msgid "Feed for friends of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
 
-#: ../lib/mail.php:124 lib/mail.php:124 lib/mail.php:126 lib/mail.php:241
-#, php-format
-msgid "%1$s is now listening to your notices on %2$s."
-msgstr "%1$s 开始关注您的 %2$s 信息。"
+#: actions/all.php:115
+#, fuzzy, php-format
+msgid "Feed for friends of %s (Atom)"
+msgstr "%s 好友的聚合"
 
-#: ../lib/mail.php:126
+#: actions/all.php:127
 #, php-format
 msgid ""
-"%1$s is now listening to your notices on %2$s.\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s.\n"
+"This is the timeline for %s and friends but no one has posted anything yet."
 msgstr ""
-"%1$s 开始关注您的 %2$s 信息。\n"
-"\n"
-"\t%3$s\n"
-"\n"
-"为您效力的 %4$s\n"
 
-#: ../actions/twitapistatuses.php:482 actions/twitapistatuses.php:415
-#: actions/twitapistatuses.php:350
+#: actions/all.php:132
 #, php-format
-msgid "%1$s updates that reply to updates from %2$s / %3$s."
-msgstr "回复 %2$s / %3$s 的 %1$s 更新。"
-
-#: ../actions/shownotice.php:45 actions/shownotice.php:45
-#: actions/shownotice.php:161
-#, php-format
-msgid "%1$s's status on %2$s"
-msgstr "%1$s 的 %2$s 状态"
+msgid ""
+"Try subscribing to more people, [join a group](%%action.groups%%) or post "
+"something yourself."
+msgstr ""
 
-#: ../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/all.php:134
 #, php-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
+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/publicrss.php:62 actions/publicrss.php:48
-#: actions/publicrss.php:90
+#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
 #, php-format
-msgid "%s Public Stream"
-msgstr "%s 公开聚合"
+msgid ""
+"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
+"post a notice to his or her attention."
+msgstr ""
 
-#: ../actions/all.php:47 ../actions/allrss.php:60
-#: ../actions/twitapistatuses.php:238 ../lib/stream.php:51 actions/all.php:47
-#: actions/allrss.php:60 actions/twitapistatuses.php:155 lib/personal.php:51
-#: actions/all.php:65 actions/allrss.php:103 actions/facebookhome.php:164
-#: actions/twitapistatuses.php:126 lib/personalgroupnav.php:99
-#, php-format
-msgid "%s and friends"
+#: actions/all.php:165
+#, fuzzy
+msgid "You and friends"
 msgstr "%s 及好友"
 
-#: ../actions/twitapistatuses.php:49 actions/twitapistatuses.php:49
-#: actions/twitapistatuses.php:33
-#, php-format
-msgid "%s public timeline"
-msgstr "%s 公众时间表"
-
-#: ../lib/mail.php:206 lib/mail.php:212 lib/mail.php:411
+#: actions/allrss.php:119 actions/apitimelinefriends.php:121
 #, php-format
-msgid "%s status"
-msgstr "%s 状态"
+msgid "Updates from %1$s and friends on %2$s!"
+msgstr "%2$s 上 %1$s 和好友的更新！"
 
-#: ../actions/twitapistatuses.php:338 actions/twitapistatuses.php:265
-#: actions/twitapistatuses.php:199
-#, php-format
-msgid "%s timeline"
-msgstr "%s 时间表"
+#: actions/apiaccountratelimitstatus.php:70
+#: actions/apiaccountupdatedeliverydevice.php:93
+#: actions/apiaccountupdateprofilebackgroundimage.php:94
+#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdateprofile.php:97
+#, fuzzy
+msgid "API method not found."
+msgstr "API 方法未实现！"
 
-#: ../actions/twitapistatuses.php:52 actions/twitapistatuses.php:52
-#: actions/twitapistatuses.php:36
-#, php-format
-msgid "%s updates from everyone!"
-msgstr "来自所有人的 %s 消息！"
+#: actions/apiaccountupdatedeliverydevice.php:85
+#: actions/apiaccountupdateprofilebackgroundimage.php:86
+#: actions/apiaccountupdateprofilecolors.php:110
+#: actions/apiaccountupdateprofileimage.php:84
+#: actions/apiaccountupdateprofile.php:89 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:114
+msgid "This method requires a POST."
+msgstr "此方法接受POST请求。"
 
-#: ../actions/register.php:213
+#: actions/apiaccountupdatedeliverydevice.php:105
 msgid ""
-"(You should receive a message by email momentarily, with instructions on how "
-"to confirm your email address.)"
-msgstr "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
+"You must specify a parameter named 'device' with a value of one of: sms, im, "
+"none"
+msgstr ""
 
-#: ../lib/util.php:257 lib/util.php:273 lib/action.php:605
+#: actions/apiaccountupdatedeliverydevice.php:132
+#, fuzzy
+msgid "Could not update user."
+msgstr "无法更新用户。"
+
+#: actions/apiaccountupdateprofilebackgroundimage.php:108
+#: actions/apiaccountupdateprofileimage.php:97
+#: actions/apistatusesupdate.php:127 actions/avatarsettings.php:254
+#: actions/designadminpanel.php:122 actions/newnotice.php:94
+#: lib/designsettings.php:283
 #, php-format
 msgid ""
-"**%%site.name%%** is a microblogging service brought to you by [%%site."
-"broughtby%%](%%site.broughtbyurl%%). "
+"The server was unable to handle that much POST data (%s bytes) due to its "
+"current configuration."
 msgstr ""
-"**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site."
-"broughtbyurl%%)。"
 
-#: ../lib/util.php:259 lib/util.php:275 lib/action.php:607
-#, php-format
-msgid "**%%site.name%%** is a microblogging service. "
-msgstr "**%%site.name%%** 是一个微博客服务。"
+#: actions/apiaccountupdateprofilebackgroundimage.php:136
+#: actions/apiaccountupdateprofilebackgroundimage.php:146
+#: actions/apiaccountupdateprofilecolors.php:164
+#: actions/apiaccountupdateprofilecolors.php:174
+#, fuzzy
+msgid "Unable to save your design settings."
+msgstr "无法保存 Twitter 设置！"
 
-#: ../lib/util.php:274 lib/util.php:290
-msgid ". Contributors should be attributed by full name or nickname."
-msgstr "。贡献者应当有全名或昵称。"
+#: actions/apiaccountupdateprofilebackgroundimage.php:187
+#: actions/apiaccountupdateprofilecolors.php:142
+#, fuzzy
+msgid "Could not update your design."
+msgstr "无法更新用户。"
 
-#: ../actions/finishopenidlogin.php:73 ../actions/profilesettings.php:43
-#: actions/finishopenidlogin.php:79 actions/profilesettings.php:76
-#: actions/finishopenidlogin.php:101 actions/profilesettings.php:100
-#: lib/groupeditform.php:139
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
+#: actions/apiaccountupdateprofilebackgroundimage.php:194
+#: actions/apiaccountupdateprofilecolors.php:185
+#: actions/apiaccountupdateprofileimage.php:130
+#: actions/apiaccountupdateprofile.php:112 actions/apiusershow.php:108
+#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/replies.php:80
+#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
+msgid "User has no profile."
+msgstr "用户没有个人信息。"
 
-#: ../actions/register.php:152 actions/register.php:166
-msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。"
+#: actions/apiaccountupdateprofile.php:147
+#, fuzzy
+msgid "Could not save profile."
+msgstr "无法保存个人信息。"
 
-#: ../actions/password.php:42 actions/profilesettings.php:181
-#: actions/passwordsettings.php:102
-msgid "6 or more characters"
-msgstr "6 个或更多字符"
+#: actions/apiblockcreate.php:108
+msgid "Block user failed."
+msgstr "阻止用户失败。"
 
-#: ../actions/recoverpassword.php:180 actions/recoverpassword.php:186
-#: actions/recoverpassword.php:220
-msgid "6 or more characters, and don't forget it!"
-msgstr "6 个或更多字符，不能忘记！"
+#: actions/apiblockdestroy.php:107
+msgid "Unblock user failed."
+msgstr "取消阻止用户失败。"
 
-#: ../actions/register.php:154 actions/register.php:168
-#: actions/register.php:373
-msgid "6 or more characters. Required."
-msgstr "6 个或更多字符。此项必填。"
+#: actions/apidirectmessagenew.php:126
+msgid "No message text!"
+msgstr "消息没有正文！"
+
+#: 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/apidirectmessagenew.php:146
+msgid "Recipient user not found."
+msgstr "未找到收件人。"
 
-#: ../actions/imsettings.php:197 actions/imsettings.php:205
+#: actions/apidirectmessagenew.php:150
+msgid "Can't send direct messages to users who aren't your friend."
+msgstr "无法向并非好友的用户发送直接消息。"
+
+#: actions/apidirectmessage.php:89
+#, fuzzy, php-format
+msgid "Direct messages from %s"
+msgstr "发给 %s 的直接消息"
+
+#: actions/apidirectmessage.php:93
 #, php-format
-msgid ""
-"A confirmation code was sent to the IM address you added. You must approve %"
-"s for sending messages to you."
-msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
+msgid "All the direct messages sent from %s"
+msgstr "%s 发送的直接消息"
 
-#: ../actions/emailsettings.php:213 actions/emailsettings.php:231
-msgid ""
-"A confirmation code was sent to the email address you added. Check your "
-"inbox (and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
-"使用它。"
+#: actions/apidirectmessage.php:101
+#, php-format
+msgid "Direct messages to %s"
+msgstr "发给 %s 的直接消息"
 
-#: ../actions/smssettings.php:216 actions/smssettings.php:224
-msgid ""
-"A confirmation code was sent to the phone number you added. Check your inbox "
-"(and spam box!) for the code and instructions on how to use it."
-msgstr ""
-"验证码已被发送到您新增的电话号码。请检查收件箱(和垃圾箱)，找到验证码并按要求"
-"使用它。"
+#: actions/apidirectmessage.php:105
+#, php-format
+msgid "All the direct messages sent to %s"
+msgstr "发给 %s 的直接消息"
 
-#: ../actions/twitapiaccount.php:49 ../actions/twitapihelp.php:45
-#: ../actions/twitapistatuses.php:88 ../actions/twitapistatuses.php:259
-#: ../actions/twitapistatuses.php:370 ../actions/twitapistatuses.php:532
-#: ../actions/twitapiusers.php:122 actions/twitapiaccount.php:49
-#: actions/twitapidirect_messages.php:104 actions/twitapifavorites.php:111
-#: actions/twitapifavorites.php:120 actions/twitapifriendships.php:156
-#: actions/twitapihelp.php:46 actions/twitapistatuses.php:93
-#: actions/twitapistatuses.php:176 actions/twitapistatuses.php:288
-#: actions/twitapistatuses.php:298 actions/twitapistatuses.php:454
-#: actions/twitapistatuses.php:463 actions/twitapistatuses.php:504
-#: actions/twitapiusers.php:55 actions/twitapiaccount.php:37
-#: actions/twitapidirect_messages.php:111 actions/twitapifavorites.php:85
-#: actions/twitapifavorites.php:102 actions/twitapifriendships.php:121
-#: actions/twitapihelp.php:44 actions/twitapistatusnet.php:82
-#: actions/twitapistatusnet.php:151 actions/twitapistatuses.php:79
-#: actions/twitapistatuses.php:147 actions/twitapistatuses.php:228
-#: actions/twitapistatuses.php:239 actions/twitapistatuses.php:392
-#: actions/twitapistatuses.php:402 actions/twitapistatuses.php:429
-#: actions/twitapiusers.php:32
+#: actions/apidirectmessage.php:156 actions/apifavoritecreate.php:99
+#: actions/apifavoritedestroy.php:100 actions/apifriendshipscreate.php:100
+#: actions/apifriendshipsdestroy.php:100 actions/apifriendshipsshow.php:129
+#: actions/apigroupcreate.php:136 actions/apigroupismember.php:114
+#: actions/apigroupjoin.php:155 actions/apigroupleave.php:141
+#: actions/apigrouplistall.php:120 actions/apigrouplist.php:132
+#: actions/apigroupmembership.php:106 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:147 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 方法未实现！"
 
-#: ../actions/twitapiaccount.php:57 ../actions/twitapiaccount.php:113
-#: ../actions/twitapiaccount.php:119 ../actions/twitapiblocks.php:28
-#: ../actions/twitapiblocks.php:34 ../actions/twitapidirect_messages.php:43
-#: ../actions/twitapidirect_messages.php:49
-#: ../actions/twitapidirect_messages.php:56
-#: ../actions/twitapidirect_messages.php:62 ../actions/twitapifavorites.php:41
-#: ../actions/twitapifavorites.php:47 ../actions/twitapifavorites.php:53
-#: ../actions/twitapihelp.php:52 ../actions/twitapinotifications.php:29
-#: ../actions/twitapinotifications.php:35 ../actions/twitapistatuses.php:768
-#: actions/twitapiaccount.php:56 actions/twitapiaccount.php:109
-#: actions/twitapiaccount.php:114 actions/twitapiblocks.php:28
-#: actions/twitapiblocks.php:33 actions/twitapidirect_messages.php:170
-#: actions/twitapifavorites.php:168 actions/twitapihelp.php:53
-#: actions/twitapinotifications.php:29 actions/twitapinotifications.php:34
-#: actions/twitapistatuses.php:690 actions/twitapiaccount.php:45
-#: actions/twitapiaccount.php:97 actions/twitapiaccount.php:103
-#: actions/twitapidirect_messages.php:184 actions/twitapifavorites.php:143
-#: actions/twitapihelp.php:52 actions/twitapistatusnet.php:172
-#: actions/twitapinotifications.php:31 actions/twitapinotifications.php:37
-#: actions/twitapistatuses.php:562
-msgid "API method under construction."
-msgstr "API 方法尚未实现。"
-
-#: ../lib/util.php:324 lib/util.php:340 lib/action.php:568
-msgid "About"
-msgstr "关于"
+#: actions/apifavoritecreate.php:108 actions/apifavoritedestroy.php:109
+#: actions/apistatusesdestroy.php:113
+msgid "No status found with that ID."
+msgstr "没有找到此ID的信息。"
 
-#: ../actions/userauthorization.php:119 actions/userauthorization.php:126
-#: actions/userauthorization.php:143
-msgid "Accept"
-msgstr "接受"
+#: actions/apifavoritecreate.php:119
+#, fuzzy
+msgid "This status is already a favorite!"
+msgstr "已收藏此通告！"
 
-#: ../actions/emailsettings.php:62 ../actions/imsettings.php:63
-#: ../actions/openidsettings.php:57 ../actions/smssettings.php:71
-#: actions/emailsettings.php:63 actions/imsettings.php:64
-#: actions/openidsettings.php:58 actions/smssettings.php:71
-#: actions/twittersettings.php:85 actions/emailsettings.php:120
-#: actions/imsettings.php:127 actions/openidsettings.php:111
-#: actions/smssettings.php:133 actions/twittersettings.php:163
-msgid "Add"
-msgstr "添加"
+#: actions/apifavoritecreate.php:130 actions/favor.php:84 lib/command.php:176
+msgid "Could not create favorite."
+msgstr "无法创建收藏。"
 
-#: ../actions/openidsettings.php:43 actions/openidsettings.php:44
-#: actions/openidsettings.php:93
-msgid "Add OpenID"
-msgstr "添加 OpenID"
-
-#: ../lib/settingsaction.php:97 lib/settingsaction.php:91
-#: lib/accountsettingsaction.php:117
-msgid "Add or remove OpenIDs"
-msgstr "添加或移除 OpenID"
-
-#: ../actions/emailsettings.php:38 ../actions/imsettings.php:39
-#: ../actions/smssettings.php:39 actions/emailsettings.php:39
-#: actions/imsettings.php:40 actions/smssettings.php:39
-#: actions/emailsettings.php:94 actions/imsettings.php:94
-#: actions/smssettings.php:92
-msgid "Address"
-msgstr "地址"
+#: actions/apifavoritedestroy.php:122
+#, fuzzy
+msgid "That status is not a favorite!"
+msgstr "此通告未被收藏！"
 
-#: ../actions/invite.php:131 actions/invite.php:139 actions/invite.php:176
-msgid "Addresses of friends to invite (one per line)"
-msgstr "要邀请的好友地址(每行一个)"
+#: actions/apifavoritedestroy.php:134 actions/disfavor.php:87
+msgid "Could not delete favorite."
+msgstr "无法删除收藏。"
 
-#: ../actions/showstream.php:273 actions/showstream.php:288
-#: actions/showstream.php:422
-msgid "All subscriptions"
-msgstr "所有订阅"
+#: actions/apifriendshipscreate.php:109
+msgid "Could not follow user: User not found."
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/publicrss.php:64 actions/publicrss.php:50
-#: actions/publicrss.php:92
+#: actions/apifriendshipscreate.php:118
 #, php-format
-msgid "All updates for %s"
-msgstr "所有 %s 消息"
+msgid "Could not follow user: %s is already on your list."
+msgstr "无法订阅用户：%s 已在订阅列表中。"
 
-#: ../actions/noticesearchrss.php:66 actions/noticesearchrss.php:70
-#: actions/noticesearchrss.php:90
-#, php-format
-msgid "All updates matching search term \"%s\""
-msgstr "所有匹配搜索条件\"%s\"的消息"
+#: actions/apifriendshipsdestroy.php:109
+#, fuzzy
+msgid "Could not unfollow user: User not found."
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/finishopenidlogin.php:29 ../actions/login.php:31
-#: ../actions/openidlogin.php:29 ../actions/register.php:30
-#: actions/finishopenidlogin.php:29 actions/login.php:31
-#: actions/openidlogin.php:29 actions/register.php:30
-#: actions/finishopenidlogin.php:34 actions/login.php:77
-#: actions/openidlogin.php:30 actions/register.php:92
-msgid "Already logged in."
-msgstr "已登录。"
+#: actions/apifriendshipsdestroy.php:120
+msgid "You cannot unfollow yourself!"
+msgstr ""
 
-#: ../lib/subs.php:42 lib/subs.php:42 lib/subs.php:49
-msgid "Already subscribed!."
-msgstr "已订阅！"
+#: actions/apifriendshipsexists.php:94
+msgid "Two user ids or screen_names must be supplied."
+msgstr "必须提供两个用户帐号或昵称。"
 
-#: ../actions/deletenotice.php:54 actions/deletenotice.php:55
-#: actions/deletenotice.php:113
-msgid "Are you sure you want to delete this notice?"
-msgstr "确定要删除这条消息吗？"
+#: actions/apifriendshipsshow.php:135
+#, fuzzy
+msgid "Could not determine source user."
+msgstr "无法获取收藏的通告。"
 
-#: ../actions/userauthorization.php:77 actions/userauthorization.php:83
-#: actions/userauthorization.php:81
-msgid "Authorize subscription"
-msgstr "确认订阅"
+#: actions/apifriendshipsshow.php:143
+#, fuzzy
+msgid "Could not find target user."
+msgstr "找不到任何信息。"
 
-#: ../actions/login.php:104 ../actions/register.php:178
-#: actions/register.php:192
-msgid "Automatically login in the future; not for shared computers!"
-msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
+#: actions/apigroupcreate.php:164 actions/editgroup.php:182
+#: actions/newgroup.php:126 actions/profilesettings.php:208
+#: actions/register.php:205
+msgid "Nickname must have only lowercase letters and numbers and no spaces."
+msgstr "昵称只能使用小写字母和数字，不包含空格。"
 
-#: ../actions/profilesettings.php:65 actions/profilesettings.php:98
-msgid ""
-"Automatically subscribe to whoever subscribes to me (best for non-humans)"
-msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
+#: actions/apigroupcreate.php:173 actions/editgroup.php:186
+#: actions/newgroup.php:130 actions/profilesettings.php:231
+#: actions/register.php:208
+msgid "Nickname already in use. Try another one."
+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
-msgid "Avatar"
-msgstr "头像"
+#: actions/apigroupcreate.php:180 actions/editgroup.php:189
+#: actions/newgroup.php:133 actions/profilesettings.php:211
+#: actions/register.php:210
+msgid "Not a valid nickname."
+msgstr "不是有效的昵称。"
 
-#: ../actions/avatar.php:113 actions/profilesettings.php:350
-#: actions/avatarsettings.php:395
-msgid "Avatar updated."
-msgstr "头像已更新。"
+#: actions/apigroupcreate.php:196 actions/editgroup.php:195
+#: actions/newgroup.php:139 actions/profilesettings.php:215
+#: actions/register.php:217
+msgid "Homepage is not a valid URL."
+msgstr "主页的URL不正确。"
 
-#: ../actions/imsettings.php:55 actions/imsettings.php:56
-#, 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为你的好友？）"
+#: actions/apigroupcreate.php:205 actions/editgroup.php:198
+#: actions/newgroup.php:142 actions/profilesettings.php:218
+#: actions/register.php:220
+msgid "Full name is too long (max 255 chars)."
+msgstr "全名过长(不能超过 255 个字符)。"
 
-#: ../actions/emailsettings.php:54 actions/emailsettings.php:55
-msgid ""
-"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
-"a message with further instructions."
-msgstr ""
-"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
-"指示。"
+#: actions/apigroupcreate.php:213
+#, fuzzy, php-format
+msgid "Description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
 
-#: ../actions/smssettings.php:58 actions/smssettings.php:58
-#: actions/smssettings.php:111
-msgid "Awaiting confirmation on this phone number."
-msgstr "等待确认此电话号码。"
+#: actions/apigroupcreate.php:224 actions/editgroup.php:204
+#: actions/newgroup.php:148 actions/profilesettings.php:225
+#: actions/register.php:227
+msgid "Location is too long (max 255 chars)."
+msgstr "位置过长(不能超过255个字符)。"
 
-#: ../lib/util.php:1318 lib/util.php:1452
-#, fuzzy
-msgid "Before »"
-msgstr "下一页 »"
+#: actions/apigroupcreate.php:243 actions/editgroup.php:215
+#: actions/newgroup.php:159
+#, php-format
+msgid "Too many aliases! Maximum %d."
+msgstr ""
 
-#: ../actions/profilesettings.php:49 ../actions/register.php:170
-#: actions/profilesettings.php:82 actions/register.php:184
-#: actions/profilesettings.php:112 actions/register.php:402
-msgid "Bio"
-msgstr "自述"
+#: actions/apigroupcreate.php:264 actions/editgroup.php:224
+#: actions/newgroup.php:168
+#, fuzzy, php-format
+msgid "Invalid alias: \"%s\""
+msgstr "主页'%s'不正确"
 
-#: ../actions/profilesettings.php:101 ../actions/register.php:82
-#: ../actions/updateprofile.php:103 actions/profilesettings.php:216
-#: actions/register.php:89 actions/updateprofile.php:104
-#: actions/profilesettings.php:205 actions/register.php:174
-#: actions/updateprofile.php:107
-msgid "Bio is too long (max 140 chars)."
-msgstr "自述过长(不能超过140字符)。"
+#: actions/apigroupcreate.php:273 actions/editgroup.php:228
+#: actions/newgroup.php:172
+#, fuzzy, php-format
+msgid "Alias \"%s\" already in use. Try another one."
+msgstr "昵称已被使用，换一个吧。"
 
-#: ../lib/deleteaction.php:41 lib/deleteaction.php:41 lib/deleteaction.php:69
-msgid "Can't delete this notice."
-msgstr "无法删除通告。"
+#: actions/apigroupcreate.php:286 actions/editgroup.php:234
+#: actions/newgroup.php:178
+msgid "Alias can't be the same as nickname."
+msgstr ""
 
-#: ../actions/updateprofile.php:119 actions/updateprofile.php:120
-#: actions/updateprofile.php:123
-#, php-format
-msgid "Can't read avatar URL '%s'"
-msgstr "无法访问头像URL '%s'"
+#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
+#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
+#: actions/apigroupshow.php:90 actions/apitimelinegroup.php:91
+#, fuzzy
+msgid "Group not found!"
+msgstr "API 方法未实现！"
 
-#: ../actions/password.php:85 ../actions/recoverpassword.php:300
-#: actions/profilesettings.php:404 actions/recoverpassword.php:313
-#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
-msgid "Can't save new password."
-msgstr "无法保存新密码。"
+#: actions/apigroupjoin.php:110
+#, fuzzy
+msgid "You are already a member of that group."
+msgstr "您已经是该组成员"
 
-#: ../actions/emailsettings.php:57 ../actions/imsettings.php:58
-#: ../actions/smssettings.php:62 actions/emailsettings.php:58
-#: actions/imsettings.php:59 actions/smssettings.php:62
-#: actions/emailsettings.php:111 actions/imsettings.php:114
-#: actions/smssettings.php:114
-msgid "Cancel"
-msgstr "取消"
+#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
+msgid "You have been blocked from that group by the admin."
+msgstr ""
 
-#: ../lib/openid.php:121 lib/openid.php:121 lib/openid.php:130
-msgid "Cannot instantiate OpenID consumer object."
-msgstr "无法创建 OpenID 用户对象。"
+#: actions/apigroupjoin.php:138
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s."
+msgstr "无法把 %s 用户添加到 %s 组"
 
-#: ../actions/imsettings.php:163 actions/imsettings.php:171
-#: actions/imsettings.php:286
-msgid "Cannot normalize that Jabber ID"
-msgstr "无法识别此Jabber ID"
+#: actions/apigroupleave.php:114
+#, fuzzy
+msgid "You are not a member of this group."
+msgstr "您未告知此个人信息"
 
-#: ../actions/emailsettings.php:181 actions/emailsettings.php:199
-#: actions/emailsettings.php:311
-msgid "Cannot normalize that email address"
-msgstr "无法识别此电子邮件"
+#: actions/apigroupleave.php:124
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s."
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/password.php:45 actions/profilesettings.php:184
-#: actions/passwordsettings.php:110
-msgid "Change"
-msgstr "修改"
+#: actions/apigrouplistall.php:90 actions/usergroups.php:62
+#, php-format
+msgid "%s groups"
+msgstr "%s 群组"
 
-#: ../lib/settingsaction.php:88 lib/settingsaction.php:88
-#: lib/accountsettingsaction.php:114
-msgid "Change email handling"
-msgstr "修改电子邮件"
+#: actions/apigrouplistall.php:94
+#, fuzzy, php-format
+msgid "groups on %s"
+msgstr "组动作"
 
-#: ../actions/password.php:32 actions/profilesettings.php:36
-#: actions/passwordsettings.php:58
-msgid "Change password"
-msgstr "修改密码"
+#: actions/apigrouplist.php:95
+#, fuzzy, php-format
+msgid "%s's groups"
+msgstr "%s 群组"
 
-#: ../lib/settingsaction.php:94 lib/accountsettingsaction.php:111
-msgid "Change your password"
-msgstr "修改密码"
+#: actions/apigrouplist.php:103
+#, fuzzy, php-format
+msgid "Groups %s is a member of on %s."
+msgstr "%s 组是成员组成了"
 
-#: ../lib/settingsaction.php:85 lib/settingsaction.php:85
-#: lib/accountsettingsaction.php:105
-msgid "Change your profile settings"
-msgstr "修改您的个人信息"
+#: actions/apistatusesdestroy.php:107
+msgid "This method requires a POST or DELETE."
+msgstr "此方法接受POST或DELETE请求。"
 
-#: ../actions/password.php:43 ../actions/recoverpassword.php:181
-#: ../actions/register.php:155 ../actions/smssettings.php:65
-#: actions/profilesettings.php:182 actions/recoverpassword.php:187
-#: actions/register.php:169 actions/smssettings.php:65
-#: actions/passwordsettings.php:105 actions/recoverpassword.php:221
-#: actions/register.php:376 actions/smssettings.php:122
-msgid "Confirm"
-msgstr "确认"
+#: actions/apistatusesdestroy.php:130
+msgid "You may not delete another user's status."
+msgstr "您不能删除其他用户的状态。"
 
-#: ../actions/confirmaddress.php:90 actions/confirmaddress.php:90
-#: actions/confirmaddress.php:144
-msgid "Confirm Address"
-msgstr "确认地址"
+#: actions/apistatusesshow.php:138
+#, fuzzy
+msgid "Status deleted."
+msgstr "头像已更新。"
 
-#: ../actions/emailsettings.php:238 ../actions/imsettings.php:222
-#: ../actions/smssettings.php:245 actions/emailsettings.php:256
-#: actions/imsettings.php:230 actions/smssettings.php:253
-#: actions/emailsettings.php:379 actions/imsettings.php:361
-#: actions/smssettings.php:374
-msgid "Confirmation cancelled."
-msgstr "已取消确认。"
+#: actions/apistatusesshow.php:144
+msgid "No status with that ID found."
+msgstr "没有找到此ID的信息。"
 
-#: ../actions/smssettings.php:63 actions/smssettings.php:63
-#: actions/smssettings.php:118
-msgid "Confirmation code"
-msgstr "确认码"
+#: actions/apistatusesupdate.php:157 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/confirmaddress.php:38 actions/confirmaddress.php:38
-#: actions/confirmaddress.php:80
-msgid "Confirmation code not found."
-msgstr "未找到确认码。"
+#: actions/apistatusesupdate.php:198
+msgid "Not found"
+msgstr "未找到"
 
-#: ../actions/register.php:202
+#: actions/apistatusesupdate.php:227 actions/newnotice.php:178
 #, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to...\n"
-"\n"
-"* Go to [your profile](%s) and post your first message.\n"
-"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
-"notices through instant messages.\n"
-"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
-"share your interests. \n"
-"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
-"others more about you. \n"
-"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
-"missed. \n"
-"\n"
-"Thanks for signing up and we hope you enjoy using this service."
+msgid "Max notice size is %d chars, including attachment URL."
 msgstr ""
-"恭喜， %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"
-"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
-"\n"
-"感谢您的注册，希望您喜欢这个服务。"
 
-#: ../actions/finishopenidlogin.php:91 actions/finishopenidlogin.php:97
-#: actions/finishopenidlogin.php:119 lib/action.php:330
-msgid "Connect"
-msgstr "连接"
-
-#: ../actions/finishopenidlogin.php:86 actions/finishopenidlogin.php:92
-#: actions/finishopenidlogin.php:114
-msgid "Connect existing account"
-msgstr "连接现有帐号"
-
-#: ../lib/util.php:332 lib/util.php:348 lib/action.php:576
-msgid "Contact"
-msgstr "联系人"
+#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
+#, fuzzy
+msgid "Unsupported format."
+msgstr "不支持这种图像格式。"
 
-#: ../lib/openid.php:178 lib/openid.php:178 lib/openid.php:187
+#: actions/apitimelinefavorites.php:107
 #, php-format
-msgid "Could not create OpenID form: %s"
-msgstr "无法创建 OpenID 表单：%s"
+msgid "%s / Favorites from %s"
+msgstr "%s 的收藏 / %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/apitimelinefavorites.php:119
 #, php-format
-msgid "Could not follow user: %s is already on your list."
-msgstr "无法订阅用户：%s 已在订阅列表中。"
-
-#: ../actions/twitapifriendships.php:53 actions/twitapifriendships.php:53
-#: actions/twitapifriendships.php:41
-msgid "Could not follow user: User not found."
-msgstr "无法订阅用户：未找到。"
+msgid "%s updates favorited by %s / %s."
+msgstr "%s 收藏了 %s 的 %s 通告。"
 
-#: ../lib/openid.php:160 lib/openid.php:160 lib/openid.php:169
+#: actions/apitimelinegroup.php:108 actions/apitimelineuser.php:117
+#: actions/grouprss.php:131 actions/userrss.php:90
 #, php-format
-msgid "Could not redirect to server: %s"
-msgstr "无法重定向到服务器：%s"
-
-#: ../actions/updateprofile.php:162 actions/updateprofile.php:163
-#: actions/updateprofile.php:166
-msgid "Could not save avatar info"
-msgstr "无法保存头像"
-
-#: ../actions/updateprofile.php:155 actions/updateprofile.php:156
-#: actions/updateprofile.php:159
-msgid "Could not save new profile info"
-msgstr "无法保存个人信息"
-
-#: ../lib/subs.php:54 lib/subs.php:61 lib/subs.php:72
-msgid "Could not subscribe other to you."
-msgstr "无法订阅他人更新。"
-
-#: ../lib/subs.php:46 lib/subs.php:46 lib/subs.php:57
-msgid "Could not subscribe."
-msgstr "无法订阅。"
+msgid "%s timeline"
+msgstr "%s 时间表"
 
-#: ../actions/recoverpassword.php:102 actions/recoverpassword.php:105
-#: actions/recoverpassword.php:111
-msgid "Could not update user with confirmed email address."
-msgstr "无法更新已确认的电子邮件。"
+#: actions/apitimelinegroup.php:116 actions/apitimelineuser.php:125
+#: actions/userrss.php:92
+#, php-format
+msgid "Updates from %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/finishremotesubscribe.php:99
-#: actions/finishremotesubscribe.php:101 actions/finishremotesubscribe.php:114
-msgid "Couldn't convert request tokens to access tokens."
-msgstr "无法将请求标记转换为访问令牌。"
+#: actions/apitimelinementions.php:116
+#, fuzzy, php-format
+msgid "%1$s / Updates mentioning %2$s"
+msgstr "%1$s / 回复 %2$s 的消息"
 
-#: ../actions/confirmaddress.php:84 ../actions/emailsettings.php:234
-#: ../actions/imsettings.php:218 ../actions/smssettings.php:241
-#: actions/confirmaddress.php:84 actions/emailsettings.php:252
-#: actions/imsettings.php:226 actions/smssettings.php:249
-#: actions/confirmaddress.php:126 actions/emailsettings.php:375
-#: actions/imsettings.php:357 actions/smssettings.php:370
-msgid "Couldn't delete email confirmation."
-msgstr "无法删除电子邮件确认。"
+#: 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 更新。"
 
-#: ../lib/subs.php:103 lib/subs.php:116 lib/subs.php:134
-msgid "Couldn't delete subscription."
-msgstr "无法删除订阅。"
+#: actions/apitimelinepublic.php:106 actions/publicrss.php:103
+#, php-format
+msgid "%s public timeline"
+msgstr "%s 公众时间表"
 
-#: ../actions/twitapistatuses.php:93 actions/twitapistatuses.php:98
-#: actions/twitapistatuses.php:84
-msgid "Couldn't find any statuses."
-msgstr "找不到任何信息。"
+#: actions/apitimelinepublic.php:110 actions/publicrss.php:105
+#, php-format
+msgid "%s updates from everyone!"
+msgstr "来自所有人的 %s 消息！"
 
-#: ../actions/remotesubscribe.php:127 actions/remotesubscribe.php:136
-#: actions/remotesubscribe.php:178
-msgid "Couldn't get a request token."
-msgstr "无法获得一份请求标记。"
+#: actions/apitimelinetag.php:101 actions/tag.php:66
+#, php-format
+msgid "Notices tagged with %s"
+msgstr "带 %s 标签的通告"
 
-#: ../actions/emailsettings.php:205 ../actions/imsettings.php:187
-#: ../actions/smssettings.php:206 actions/emailsettings.php:223
-#: actions/imsettings.php:195 actions/smssettings.php:214
-#: actions/emailsettings.php:337 actions/imsettings.php:311
-#: actions/smssettings.php:325
-msgid "Couldn't insert confirmation code."
-msgstr "无法插入验证码。"
+#: actions/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/finishremotesubscribe.php:180
-#: actions/finishremotesubscribe.php:182 actions/finishremotesubscribe.php:218
-msgid "Couldn't insert new subscription."
-msgstr "无法添加新的订阅。"
+#: actions/apiusershow.php:96
+#, fuzzy
+msgid "Not found."
+msgstr "未找到"
 
-#: ../actions/profilesettings.php:184 ../actions/twitapiaccount.php:96
-#: actions/profilesettings.php:299 actions/twitapiaccount.php:94
-#: actions/profilesettings.php:302 actions/twitapiaccount.php:81
-msgid "Couldn't save profile."
-msgstr "无法保存个人信息。"
+#: actions/attachment.php:73
+#, fuzzy
+msgid "No such attachment."
+msgstr "没有这份文档。"
 
-#: ../actions/profilesettings.php:161 actions/profilesettings.php:276
-#: actions/profilesettings.php:279
-msgid "Couldn't update user for autosubscribe."
-msgstr "无法更新用户的自动订阅选项。"
+#: actions/avatarbynickname.php:59 actions/leavegroup.php:76
+msgid "No nickname."
+msgstr "没有昵称。"
 
-#: ../actions/emailsettings.php:280 ../actions/emailsettings.php:294
-#: actions/emailsettings.php:298 actions/emailsettings.php:312
-#: actions/emailsettings.php:440 actions/emailsettings.php:462
-msgid "Couldn't update user record."
-msgstr "无法更新用户记录。"
+#: actions/avatarbynickname.php:64
+msgid "No size."
+msgstr "没有大小。"
 
-#: ../actions/confirmaddress.php:72 ../actions/emailsettings.php:156
-#: ../actions/emailsettings.php:259 ../actions/imsettings.php:138
-#: ../actions/imsettings.php:243 ../actions/profilesettings.php:141
-#: ../actions/smssettings.php:157 ../actions/smssettings.php:269
-#: actions/confirmaddress.php:72 actions/emailsettings.php:174
-#: actions/emailsettings.php:277 actions/imsettings.php:146
-#: actions/imsettings.php:251 actions/profilesettings.php:256
-#: actions/smssettings.php:165 actions/smssettings.php:277
-#: actions/confirmaddress.php:114 actions/emailsettings.php:280
-#: actions/emailsettings.php:411 actions/imsettings.php:252
-#: actions/imsettings.php:395 actions/othersettings.php:162
-#: actions/profilesettings.php:259 actions/smssettings.php:266
-#: actions/smssettings.php:408
-msgid "Couldn't update user."
-msgstr "无法更新用户。"
+#: actions/avatarbynickname.php:69
+msgid "Invalid size."
+msgstr "大小不正确。"
 
-#: ../actions/finishopenidlogin.php:84 actions/finishopenidlogin.php:90
-#: actions/finishopenidlogin.php:112
-msgid "Create"
-msgstr "创建"
+#: actions/avatarsettings.php:67 actions/showgroup.php:221
+#: lib/accountsettingsaction.php:112
+msgid "Avatar"
+msgstr "头像"
 
-#: ../actions/finishopenidlogin.php:70 actions/finishopenidlogin.php:76
-#: actions/finishopenidlogin.php:98
-msgid "Create a new user with this nickname."
-msgstr "创建使用此昵称的新用户。"
+#: actions/avatarsettings.php:78
+#, fuzzy, php-format
+msgid "You can upload your personal avatar. The maximum file size is %s."
+msgstr "您可以在这里上传个人头像。"
 
-#: ../actions/finishopenidlogin.php:68 actions/finishopenidlogin.php:74
-#: actions/finishopenidlogin.php:96
-msgid "Create new account"
-msgstr "创建新帐号"
+#: actions/avatarsettings.php:106 actions/avatarsettings.php:182
+#: actions/grouplogo.php:178 actions/remotesubscribe.php:191
+#: actions/userauthorization.php:72 actions/userrss.php:103
+msgid "User without matching profile"
+msgstr "找不到匹配的用户。"
 
-#: ../actions/finishopenidlogin.php:191 actions/finishopenidlogin.php:197
-#: actions/finishopenidlogin.php:231
-msgid "Creating new account for OpenID that already has a user."
-msgstr "为 OpenID 用户产生新的帐号。"
+#: actions/avatarsettings.php:119 actions/avatarsettings.php:194
+#: actions/grouplogo.php:251
+msgid "Avatar settings"
+msgstr "头像设置"
 
-#: ../actions/imsettings.php:45 actions/imsettings.php:46
-#: actions/imsettings.php:100
-msgid "Current confirmed Jabber/GTalk address."
-msgstr "已确认的Jabber/GTalk帐号。"
+#: actions/avatarsettings.php:126 actions/avatarsettings.php:202
+#: actions/grouplogo.php:199 actions/grouplogo.php:259
+msgid "Original"
+msgstr "原来的"
 
-#: ../actions/smssettings.php:46 actions/smssettings.php:46
-#: actions/smssettings.php:100
-msgid "Current confirmed SMS-enabled phone number."
-msgstr "已确认的可以发送SMS短消息的电话号码。"
+#: actions/avatarsettings.php:141 actions/avatarsettings.php:214
+#: actions/grouplogo.php:210 actions/grouplogo.php:271
+msgid "Preview"
+msgstr "预览"
 
-#: ../actions/emailsettings.php:44 actions/emailsettings.php:45
-#: actions/emailsettings.php:99
-msgid "Current confirmed email address."
-msgstr "已确认的电子邮件。"
+#: actions/avatarsettings.php:148 lib/deleteuserform.php:66
+#: lib/noticelist.php:522
+#, fuzzy
+msgid "Delete"
+msgstr "删除"
 
-#: ../actions/showstream.php:356 actions/showstream.php:367
-msgid "Currently"
-msgstr "目前"
+#: actions/avatarsettings.php:165 actions/grouplogo.php:233
+msgid "Upload"
+msgstr "上传"
 
-#: ../classes/Notice.php:72 classes/Notice.php:86 classes/Notice.php:91
-#, php-format
-msgid "DB error inserting hashtag: %s"
-msgstr "添加标签时数据库出错：%s"
+#: actions/avatarsettings.php:228 actions/grouplogo.php:286
+msgid "Crop"
+msgstr "剪裁"
 
-#: ../lib/util.php:1061 lib/util.php:1110 classes/Notice.php:698
-#, php-format
-msgid "DB error inserting reply: %s"
-msgstr "添加回复时数据库出错：%s"
+#: actions/avatarsettings.php:265 actions/disfavor.php:74
+#: actions/emailsettings.php:237 actions/favor.php:75
+#: actions/groupblock.php:66 actions/grouplogo.php:309
+#: actions/groupunblock.php:66 actions/imsettings.php:206
+#: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66
+#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
+#: actions/othersettings.php:145 actions/passwordsettings.php:138
+#: actions/profilesettings.php:187 actions/recoverpassword.php:337
+#: actions/register.php:165 actions/remotesubscribe.php:77
+#: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46
+#: actions/tagother.php:166 actions/unsubscribe.php:69
+#: actions/userauthorization.php:52 lib/designsettings.php:294
+msgid "There was a problem with your session token. Try again, please."
+msgstr "会话标识有问题，请重试。"
 
-#: ../actions/deletenotice.php:41 actions/deletenotice.php:41
-#: actions/deletenotice.php:79
-msgid "Delete notice"
-msgstr "删除通告"
+#: actions/avatarsettings.php:277 actions/designadminpanel.php:103
+#: actions/emailsettings.php:255 actions/grouplogo.php:319
+#: actions/imsettings.php:220 actions/recoverpassword.php:44
+#: actions/smssettings.php:248 lib/designsettings.php:304
+msgid "Unexpected form submission."
+msgstr "未预料的表单提交。"
 
-#: ../actions/profilesettings.php:51 ../actions/register.php:172
-#: actions/profilesettings.php:84 actions/register.php:186
-#: actions/profilesettings.php:114
-msgid "Describe yourself and your interests in 140 chars"
-msgstr "用不超过140个字符描述您自己和您的爱好"
+#: actions/avatarsettings.php:322
+msgid "Pick a square area of the image to be your avatar"
+msgstr "请选择一块方形区域作为你的头像"
 
-#: ../actions/register.php:158 ../actions/register.php:161
-#: ../lib/settingsaction.php:87 actions/register.php:172
-#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
-#: actions/register.php:385 lib/accountsettingsaction.php:113
-msgid "Email"
-msgstr "电子邮件"
+#: actions/avatarsettings.php:337 actions/grouplogo.php:377
+msgid "Lost our file data."
+msgstr "文件数据丢失"
 
-#: ../actions/emailsettings.php:59 actions/emailsettings.php:60
-#: actions/emailsettings.php:115
-msgid "Email Address"
-msgstr "电子邮件地址"
+#: actions/avatarsettings.php:360
+msgid "Avatar updated."
+msgstr "头像已更新。"
 
-#: ../actions/emailsettings.php:32 actions/emailsettings.php:32
-#: actions/emailsettings.php:60
-msgid "Email Settings"
-msgstr "电子邮件设置"
+#: actions/avatarsettings.php:363
+msgid "Failed updating avatar."
+msgstr "更新头像失败。"
 
-#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-msgid "Email address already exists."
-msgstr "电子邮件地址已存在。"
+#: actions/avatarsettings.php:387
+#, fuzzy
+msgid "Avatar deleted."
+msgstr "头像已更新。"
 
-#: ../lib/mail.php:90 lib/mail.php:90 lib/mail.php:173
-msgid "Email address confirmation"
-msgstr "电子邮件地址确认"
+#: actions/blockedfromgroup.php:73 actions/editgroup.php:84
+#: actions/groupdesignsettings.php:84 actions/grouplogo.php:86
+#: actions/groupmembers.php:76 actions/grouprss.php:91
+#: actions/joingroup.php:76 actions/showgroup.php:121
+#, fuzzy
+msgid "No nickname"
+msgstr "没有昵称。"
 
-#: ../actions/emailsettings.php:61 actions/emailsettings.php:62
-#: actions/emailsettings.php:117
-msgid "Email address, like \"UserName@example.org\""
-msgstr "电子邮件，类似 \"UserName@example.org\""
+#: actions/blockedfromgroup.php:80 actions/editgroup.php:96
+#: actions/groupbyid.php:83 actions/groupdesignsettings.php:97
+#: actions/grouplogo.php:99 actions/groupmembers.php:83
+#: actions/grouprss.php:98 actions/joingroup.php:83 actions/showgroup.php:137
+msgid "No such group"
+msgstr "没有这个组"
 
-#: ../actions/invite.php:129 actions/invite.php:137 actions/invite.php:174
-msgid "Email addresses"
-msgstr "电子邮件地址"
+#: actions/blockedfromgroup.php:90
+#, fuzzy, php-format
+msgid "%s blocked profiles"
+msgstr "用户没有个人信息。"
 
-#: ../actions/recoverpassword.php:191 actions/recoverpassword.php:197
-#: actions/recoverpassword.php:231
-msgid "Enter a nickname or email address."
-msgstr "输入昵称或电子邮件。"
+#: actions/blockedfromgroup.php:93
+#, fuzzy, php-format
+msgid "%s blocked profiles, page %d"
+msgstr "%s 及好友"
 
-#: ../actions/smssettings.php:64 actions/smssettings.php:64
-#: actions/smssettings.php:119
-msgid "Enter the code you received on your phone."
-msgstr "输入手机收到的验证码。"
+#: actions/blockedfromgroup.php:108
+#, fuzzy
+msgid "A list of the users blocked from joining this group."
+msgstr "该组成员列表。"
 
-#: ../actions/userauthorization.php:137 actions/userauthorization.php:144
-#: actions/userauthorization.php:161
-msgid "Error authorizing token"
-msgstr "无法认证令牌"
+#: actions/blockedfromgroup.php:281
+#, fuzzy
+msgid "Unblock user from group"
+msgstr "取消阻止用户失败。"
 
-#: ../actions/finishopenidlogin.php:253 actions/finishopenidlogin.php:259
-#: actions/finishopenidlogin.php:297
-msgid "Error connecting user to OpenID."
-msgstr "无法将用户与 OpenID 连接。"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:69
+msgid "Unblock"
+msgstr "取消阻止"
 
-#: ../actions/finishaddopenid.php:78 actions/finishaddopenid.php:78
-#: actions/finishaddopenid.php:126
-msgid "Error connecting user."
-msgstr "无法连接用户。"
+#: actions/blockedfromgroup.php:313 lib/unblockform.php:80
+#, fuzzy
+msgid "Unblock this user"
+msgstr "取消阻止次用户"
 
-#: ../actions/finishremotesubscribe.php:151
-#: actions/finishremotesubscribe.php:153 actions/finishremotesubscribe.php:166
-msgid "Error inserting avatar"
-msgstr "添加头像出错"
+#: actions/block.php:69
+#, fuzzy
+msgid "You already blocked that user."
+msgstr "您已成功阻止该用户："
 
-#: ../actions/finishremotesubscribe.php:143
-#: actions/finishremotesubscribe.php:145 actions/finishremotesubscribe.php:158
-msgid "Error inserting new profile"
-msgstr "添加个人信息出错"
+#: actions/block.php:105 actions/block.php:128 actions/groupblock.php:160
+#, fuzzy
+msgid "Block user"
+msgstr "阻止用户"
 
-#: ../actions/finishremotesubscribe.php:167
-#: actions/finishremotesubscribe.php:169 actions/finishremotesubscribe.php:182
-msgid "Error inserting remote profile"
-msgstr "添加远程的个人信息出错"
+#: actions/block.php:130
+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/recoverpassword.php:240 actions/recoverpassword.php:246
-#: actions/recoverpassword.php:280
-msgid "Error saving address confirmation."
-msgstr "保存地址确认时出错。"
+#: actions/block.php:143 actions/deletenotice.php:145
+#: actions/deleteuser.php:147 actions/groupblock.php:178
+msgid "No"
+msgstr "否"
 
-#: ../actions/userauthorization.php:140 actions/userauthorization.php:147
-#: actions/userauthorization.php:164
-msgid "Error saving remote profile"
-msgstr "保存远程的个人信息时出错"
+#: actions/block.php:143 actions/deleteuser.php:147
+#, fuzzy
+msgid "Do not block this user"
+msgstr "取消阻止次用户"
 
-#: ../lib/openid.php:226 lib/openid.php:226 lib/openid.php:235
-msgid "Error saving the profile."
-msgstr "保存个人信息时出错。"
+#: actions/block.php:144 actions/deletenotice.php:146
+#: actions/deleteuser.php:148 actions/groupblock.php:179
+msgid "Yes"
+msgstr "是"
 
-#: ../lib/openid.php:237 lib/openid.php:237 lib/openid.php:246
-msgid "Error saving the user."
-msgstr "保存用户时出错。"
+#: actions/block.php:144 actions/groupmembers.php:346 lib/blockform.php:80
+#, fuzzy
+msgid "Block this user"
+msgstr "阻止该用户"
 
-#: ../actions/password.php:80 actions/profilesettings.php:399
-#: actions/passwordsettings.php:164
-msgid "Error saving user; invalid."
-msgstr "保存用户时出错；不正确。"
+#: actions/block.php:162
+msgid "Failed to save block information."
+msgstr "保存阻止信息失败。"
 
-#: ../actions/login.php:47 ../actions/login.php:73
-#: ../actions/recoverpassword.php:307 ../actions/register.php:98
-#: actions/login.php:47 actions/login.php:73 actions/recoverpassword.php:320
-#: actions/register.php:108 actions/login.php:112 actions/login.php:138
-#: actions/recoverpassword.php:354 actions/register.php:198
-msgid "Error setting user."
-msgstr "保存用户设置时出错。"
+#: actions/bookmarklet.php:50
+#, fuzzy
+msgid "Post to "
+msgstr "相片"
 
-#: ../actions/finishaddopenid.php:83 actions/finishaddopenid.php:83
-#: actions/finishaddopenid.php:131
-msgid "Error updating profile"
-msgstr "更新个人信息时出错"
+#: actions/confirmaddress.php:75
+msgid "No confirmation code."
+msgstr "没有验证码"
 
-#: ../actions/finishremotesubscribe.php:161
-#: actions/finishremotesubscribe.php:163 actions/finishremotesubscribe.php:176
-msgid "Error updating remote profile"
-msgstr "更新远程的个人信息时出错"
+#: actions/confirmaddress.php:80
+msgid "Confirmation code not found."
+msgstr "未找到确认码。"
 
-#: ../actions/recoverpassword.php:80 actions/recoverpassword.php:80
-#: actions/recoverpassword.php:86
-msgid "Error with confirmation code."
-msgstr "验证码出错。"
+#: actions/confirmaddress.php:85
+msgid "That confirmation code is not for you!"
+msgstr "此确认码不适用！"
 
-#: ../actions/finishopenidlogin.php:89 actions/finishopenidlogin.php:95
-#: actions/finishopenidlogin.php:117
-msgid "Existing nickname"
-msgstr "昵称已被使用"
+#: actions/confirmaddress.php:90
+#, php-format
+msgid "Unrecognized address type %s"
+msgstr "不可识别的地址类型 %s"
 
-#: ../lib/util.php:326 lib/util.php:342 lib/action.php:570
-msgid "FAQ"
-msgstr "常见问题FAQ"
+#: actions/confirmaddress.php:94
+msgid "That address has already been confirmed."
+msgstr "此地址已被确认。"
 
-#: ../actions/avatar.php:115 actions/profilesettings.php:352
-#: actions/avatarsettings.php:397
-msgid "Failed updating avatar."
-msgstr "更新头像失败。"
+#: actions/confirmaddress.php:114 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/all.php:61 ../actions/allrss.php:64 actions/all.php:61
-#: actions/allrss.php:64 actions/all.php:75 actions/allrss.php:107
-#, php-format
-msgid "Feed for friends of %s"
-msgstr "%s 好友的聚合"
+#: actions/confirmaddress.php:126 actions/emailsettings.php:390
+#: actions/imsettings.php:363 actions/smssettings.php:382
+msgid "Couldn't delete email confirmation."
+msgstr "无法删除电子邮件确认。"
 
-#: ../actions/replies.php:65 ../actions/repliesrss.php:80
-#: actions/replies.php:65 actions/repliesrss.php:66 actions/replies.php:134
-#: actions/repliesrss.php:71
-#, php-format
-msgid "Feed for replies to %s"
-msgstr "%s 回复的聚合"
+#: actions/confirmaddress.php:144
+msgid "Confirm Address"
+msgstr "确认地址"
 
-#: ../actions/tag.php:55 actions/tag.php:55 actions/tag.php:61
+#: actions/confirmaddress.php:159
 #, php-format
-msgid "Feed for tag %s"
-msgstr "%s 标签的聚合"
-
-#: ../lib/searchaction.php:105 lib/searchaction.php:105
-#: lib/searchgroupnav.php:83
-msgid "Find content of notices"
-msgstr "搜索通告内容"
+msgid "The address \"%s\" has been confirmed for your account."
+msgstr "地址 \"%s\" 已确认。"
 
-#: ../lib/searchaction.php:101 lib/searchaction.php:101
-#: lib/searchgroupnav.php:81
-msgid "Find people on this site"
-msgstr "搜索用户信息"
+#: actions/conversation.php:99
+#, fuzzy
+msgid "Conversation"
+msgstr "确认码"
 
-#: ../actions/login.php:122
-msgid ""
-"For security reasons, please re-enter your user name and password before "
-"changing your settings."
-msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
+#: actions/conversation.php:154 lib/mailbox.php:116 lib/noticelist.php:87
+#: lib/profileaction.php:206
+msgid "Notices"
+msgstr "通告"
 
-#: ../actions/profilesettings.php:44 ../actions/register.php:164
-#: actions/profilesettings.php:77 actions/register.php:178
-#: actions/profilesettings.php:103 actions/register.php:391
-#: actions/showgroup.php:235 actions/showstream.php:262
-#: actions/tagother.php:105 lib/groupeditform.php:142
-msgid "Full name"
-msgstr "全名"
+#: actions/deletenotice.php:52 actions/shownotice.php:92
+msgid "No such notice."
+msgstr "没有这份通告。"
 
-#: ../actions/profilesettings.php:98 ../actions/register.php:79
-#: ../actions/updateprofile.php:93 actions/profilesettings.php:213
-#: actions/register.php:86 actions/updateprofile.php:94
-#: actions/editgroup.php:195 actions/newgroup.php:146
-#: actions/profilesettings.php:202 actions/register.php:171
-#: actions/updateprofile.php:97
-msgid "Full name is too long (max 255 chars)."
-msgstr "全名过长(不能超过 255 个字符)。"
+#: actions/deletenotice.php:67 actions/disfavor.php:61 actions/favor.php:62
+#: actions/groupblock.php:61 actions/groupunblock.php:61 actions/logout.php:69
+#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
+#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:30
+#: actions/unsubscribe.php:52 lib/adminpanelaction.php:72
+#: lib/profileformaction.php:63 lib/settingsaction.php:72
+msgid "Not logged in."
+msgstr "未登录。"
 
-#: ../lib/util.php:322 lib/util.php:338 lib/action.php:344 lib/action.php:566
-msgid "Help"
-msgstr "帮助"
+#: actions/deletenotice.php:71
+msgid "Can't delete this notice."
+msgstr "无法删除通告。"
 
-#: ../lib/util.php:298 lib/util.php:314 lib/action.php:322
-#: lib/facebookaction.php:200
-msgid "Home"
-msgstr "主页"
+#: actions/deletenotice.php:103
+#, fuzzy
+msgid ""
+"You are about to permanently delete a notice. Once this is done, it cannot "
+"be undone."
+msgstr "您选择了永久删除通告。这样做是无法恢复的。"
 
-#: ../actions/profilesettings.php:46 ../actions/register.php:167
-#: actions/profilesettings.php:79 actions/register.php:181
-#: actions/profilesettings.php:107 actions/register.php:396
-#: lib/groupeditform.php:146
-msgid "Homepage"
-msgstr "主页"
+#: actions/deletenotice.php:109 actions/deletenotice.php:141
+msgid "Delete notice"
+msgstr "删除通告"
 
-#: ../actions/profilesettings.php:95 ../actions/register.php:76
-#: actions/profilesettings.php:210 actions/register.php:83
-#: actions/editgroup.php:192 actions/newgroup.php:143
-#: actions/profilesettings.php:199 actions/register.php:168
-msgid "Homepage is not a valid URL."
-msgstr "主页的URL不正确。"
+#: actions/deletenotice.php:144
+msgid "Are you sure you want to delete this notice?"
+msgstr "确定要删除这条消息吗？"
 
-#: ../actions/emailsettings.php:91 actions/emailsettings.php:98
-#: actions/emailsettings.php:173
-msgid "I want to post notices by email."
-msgstr "我希望通过邮件发布信息。"
+#: actions/deletenotice.php:145
+#, fuzzy
+msgid "Do not delete this notice"
+msgstr "无法删除通告。"
 
-#: ../lib/settingsaction.php:102 lib/settingsaction.php:96
-#: lib/connectsettingsaction.php:104
-msgid "IM"
-msgstr "即时通讯IM"
+#: actions/deletenotice.php:146 lib/noticelist.php:522
+#, fuzzy
+msgid "Delete this notice"
+msgstr "删除通告"
 
-#: ../actions/imsettings.php:60 actions/imsettings.php:61
-#: actions/imsettings.php:118
-msgid "IM Address"
-msgstr "IM 帐号"
+#: actions/deletenotice.php:157
+#, fuzzy
+msgid "There was a problem with your session token.  Try again, please."
+msgstr "会话标识有问题，请重试。"
 
-#: ../actions/imsettings.php:33 actions/imsettings.php:33
-#: actions/imsettings.php:59
-msgid "IM Settings"
-msgstr "IM 设置"
+#: actions/deleteuser.php:67
+#, fuzzy
+msgid "You cannot delete users."
+msgstr "无法更新用户。"
 
-#: ../actions/finishopenidlogin.php:88 actions/finishopenidlogin.php:94
-#: actions/finishopenidlogin.php:116
-msgid ""
-"If you already have an account, login with your username and password to "
-"connect it to your OpenID."
-msgstr "如果您已经拥有帐号，可以将它连接到您的 OpenID。请输入用户名和密码。"
+#: actions/deleteuser.php:74
+#, fuzzy
+msgid "You can only delete local users."
+msgstr "您不能删除其他用户的状态。"
 
-#: ../actions/openidsettings.php:45
-msgid ""
-"If you want to add an OpenID to your account, enter it in the box below and "
-"click \"Add\"."
-msgstr "如果您希望添加新的 OpenID，输入它并点击“添加”。"
+#: actions/deleteuser.php:110 actions/deleteuser.php:133
+#, fuzzy
+msgid "Delete user"
+msgstr "删除"
 
-#: ../actions/recoverpassword.php:137
+#: actions/deleteuser.php:135
 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 "如果您忘记了密码，可以使用此邮箱收到新的密码。"
+"Are you sure you want to delete this user? This will clear all data about "
+"the user from the database, without a backup."
+msgstr ""
 
-#: ../actions/emailsettings.php:67 ../actions/smssettings.php:76
-#: actions/emailsettings.php:68 actions/smssettings.php:76
-#: actions/emailsettings.php:127 actions/smssettings.php:140
-msgid "Incoming email"
-msgstr "发布用的电子邮件"
+#: actions/deleteuser.php:148 lib/deleteuserform.php:77
+#, fuzzy
+msgid "Delete this user"
+msgstr "删除通告"
 
-#: ../actions/emailsettings.php:283 actions/emailsettings.php:301
-#: actions/emailsettings.php:443
-msgid "Incoming email address removed."
-msgstr "发布用的电子邮件被移除。"
+#: actions/designadminpanel.php:62 lib/accountsettingsaction.php:124
+#: lib/adminpanelaction.php:302 lib/groupnav.php:119
+msgid "Design"
+msgstr ""
 
-#: ../actions/password.php:69 actions/profilesettings.php:388
-#: actions/passwordsettings.php:153
-msgid "Incorrect old password"
-msgstr "旧密码不正确"
+#: actions/designadminpanel.php:73
+msgid "Design settings for this StatusNet site."
+msgstr ""
 
-#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
-#: actions/login.php:132
-msgid "Incorrect username or password."
-msgstr "用户名或密码不正确。"
+#: actions/designadminpanel.php:278
+#, fuzzy
+msgid "Invalid logo URL."
+msgstr "大小不正确。"
 
-#: ../actions/recoverpassword.php:265
-msgid ""
-"Instructions for recovering your password have been sent to the email "
-"address registered to your account."
-msgstr "恢复密码的指示已被发送到您的注册邮箱。"
+#: actions/designadminpanel.php:282
+#, fuzzy, php-format
+msgid "Theme not available: %s"
+msgstr "这个页面不提供您想要的媒体类型"
 
-#: ../actions/updateprofile.php:114 actions/updateprofile.php:115
-#: actions/updateprofile.php:118
-#, php-format
-msgid "Invalid avatar URL '%s'"
-msgstr "头像URL '%s'不正确"
+#: actions/designadminpanel.php:288
+#, fuzzy, php-format
+msgid "Theme directory not readable: %s"
+msgstr "这个页面不提供您想要的媒体类型"
 
-#: ../actions/invite.php:55 actions/invite.php:62 actions/invite.php:70
+#: actions/designadminpanel.php:292
 #, php-format
-msgid "Invalid email address: %s"
-msgstr "电子邮件地址 %s 不正确"
+msgid "Avatar directory not writable: %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:98 actions/updateprofile.php:99
-#: actions/updateprofile.php:102
+#: actions/designadminpanel.php:296
 #, php-format
-msgid "Invalid homepage '%s'"
-msgstr "主页'%s'不正确"
+msgid "Background directory not writable: %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:82 actions/updateprofile.php:83
-#: actions/updateprofile.php:86
+#: actions/designadminpanel.php:312
 #, php-format
-msgid "Invalid license URL '%s'"
-msgstr "授权方式URL '%s'不正确"
+msgid "Max length for %s %s is 255 characters."
+msgstr ""
 
-#: ../actions/postnotice.php:61 actions/postnotice.php:62
-#: actions/postnotice.php:66
-msgid "Invalid notice content"
-msgstr "通告内容不正确"
+#: actions/designadminpanel.php:412
+#, fuzzy
+msgid "Change logo"
+msgstr "修改密码"
 
-#: ../actions/postnotice.php:67 actions/postnotice.php:68
-#: actions/postnotice.php:72
-msgid "Invalid notice uri"
-msgstr "通告URI不正确"
+#: actions/designadminpanel.php:417
+#, fuzzy
+msgid "Site logo"
+msgstr "邀请"
 
-#: ../actions/postnotice.php:72 actions/postnotice.php:73
-#: actions/postnotice.php:77
-msgid "Invalid notice url"
-msgstr "通告URL不正确"
+#: actions/designadminpanel.php:424
+#, fuzzy
+msgid "Change theme"
+msgstr "修改"
 
-#: ../actions/updateprofile.php:87 actions/updateprofile.php:88
-#: actions/updateprofile.php:91
-#, php-format
-msgid "Invalid profile URL '%s'."
-msgstr "个人信息URL '%s'不正确。"
+#: actions/designadminpanel.php:441
+#, fuzzy
+msgid "Site theme"
+msgstr "新通告"
 
-#: ../actions/remotesubscribe.php:96 actions/remotesubscribe.php:105
-#: actions/remotesubscribe.php:135
-msgid "Invalid profile URL (bad format)"
-msgstr "个人信息URL不正确(格式错误)"
+#: actions/designadminpanel.php:442
+#, fuzzy
+msgid "Theme for the site."
+msgstr "登出本站"
 
-#: ../actions/finishremotesubscribe.php:77
-#: actions/finishremotesubscribe.php:79 actions/finishremotesubscribe.php:80
-msgid "Invalid profile URL returned by server."
-msgstr "服务器返回的个人信息URL不正确。"
+#: actions/designadminpanel.php:447
+msgid "Theme server"
+msgstr ""
 
-#: ../actions/avatarbynickname.php:37 actions/avatarbynickname.php:37
-#: actions/avatarbynickname.php:69
-msgid "Invalid size."
-msgstr "大小不正确。"
+#: actions/designadminpanel.php:451
+msgid "Theme path"
+msgstr ""
 
-#: ../actions/finishopenidlogin.php:235 ../actions/register.php:93
-#: ../actions/register.php:111 actions/finishopenidlogin.php:241
-#: actions/register.php:103 actions/register.php:121
-#: actions/finishopenidlogin.php:279 actions/register.php:193
-#: actions/register.php:211
-msgid "Invalid username or password."
-msgstr "用户名或密码不正确。"
+#: actions/designadminpanel.php:455
+msgid "Theme directory"
+msgstr ""
 
-#: ../actions/invite.php:79 actions/invite.php:86 actions/invite.php:102
-msgid "Invitation(s) sent"
-msgstr "已发送邀请"
+#: actions/designadminpanel.php:462
+#, fuzzy
+msgid "Avatar Settings"
+msgstr "头像设置"
 
-#: ../actions/invite.php:97 actions/invite.php:104 actions/invite.php:136
-msgid "Invitation(s) sent to the following people:"
-msgstr "已发送邀请给这些人："
+#: actions/designadminpanel.php:467
+#, fuzzy
+msgid "Avatar server"
+msgstr "头像设置"
 
-#: ../lib/util.php:306 lib/util.php:322 lib/facebookaction.php:207
-#: lib/subgroupnav.php:103
-msgid "Invite"
-msgstr "邀请"
+#: actions/designadminpanel.php:471
+#, fuzzy
+msgid "Avatar path"
+msgstr "头像已更新。"
 
-#: ../actions/invite.php:123 actions/invite.php:130 actions/invite.php:104
-msgid "Invite new users"
-msgstr "邀请新用户"
+#: actions/designadminpanel.php:475
+#, fuzzy
+msgid "Avatar directory"
+msgstr "头像已更新。"
 
-#: ../lib/util.php:261 lib/util.php:277 lib/action.php:609
-#, php-format
-msgid ""
-"It runs the [StatusNet](http://status.net/) microblogging software, version %"
-"s, available under the [GNU Affero General Public License](http://www.fsf."
-"org/licensing/licenses/agpl-3.0.html)."
+#: actions/designadminpanel.php:486 lib/designsettings.php:101
+msgid "Change background image"
 msgstr ""
-"它运行[StatusNet](http://status.net/)微博客服务，版本 %s，采用[GNU Affero "
-"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
-"授权。"
-
-#: ../actions/imsettings.php:173 actions/imsettings.php:181
-#: actions/imsettings.php:296
-msgid "Jabber ID already belongs to another user."
-msgstr "Jabber ID 属于另一用户。"
 
-#: ../actions/imsettings.php:62 actions/imsettings.php:63
-#, php-format
-msgid ""
-"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
-"add %s to your buddy list in your IM client or on GTalk."
+#: actions/designadminpanel.php:491 actions/designadminpanel.php:578
+#: lib/designsettings.php:178
+msgid "Background"
 msgstr ""
-"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
-"或GTalk中将 %s 加为好友。"
-
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:128
-msgid "Language"
-msgstr "语言"
 
-#: ../actions/profilesettings.php:113 actions/profilesettings.php:228
-#: actions/profilesettings.php:217
-msgid "Language is too long (max 50 chars)."
-msgstr "语言过长(不能超过50个字符)。"
+#: actions/designadminpanel.php:496
+#, fuzzy, php-format
+msgid ""
+"You can upload a background image for the site. The maximum file size is %1"
+"$s."
+msgstr "你可以给你的组上载一个logo图。"
 
-#: ../actions/profilesettings.php:52 ../actions/register.php:173
-#: actions/profilesettings.php:85 actions/register.php:187
-#: actions/profilesettings.php:117 actions/register.php:408
-#: actions/showgroup.php:244 actions/showstream.php:271
-#: actions/tagother.php:113 lib/groupeditform.php:156 lib/grouplist.php:126
-#: lib/profilelist.php:125
-msgid "Location"
-msgstr "位置"
+#: actions/designadminpanel.php:526 lib/designsettings.php:139
+msgid "On"
+msgstr ""
 
-#: ../actions/profilesettings.php:104 ../actions/register.php:85
-#: ../actions/updateprofile.php:108 actions/profilesettings.php:219
-#: actions/register.php:92 actions/updateprofile.php:109
-#: actions/editgroup.php:201 actions/newgroup.php:152
-#: actions/profilesettings.php:208 actions/register.php:177
-#: actions/updateprofile.php:112
-msgid "Location is too long (max 255 chars)."
-msgstr "位置过长(不能超过255个字符)。"
+#: actions/designadminpanel.php:542 lib/designsettings.php:155
+msgid "Off"
+msgstr ""
 
-#: ../actions/login.php:97 ../actions/login.php:106
-#: ../actions/openidlogin.php:68 ../lib/util.php:310 actions/login.php:97
-#: actions/login.php:106 actions/openidlogin.php:77 lib/util.php:326
-#: actions/facebooklogin.php:93 actions/login.php:186 actions/login.php:239
-#: actions/openidlogin.php:112 lib/action.php:335 lib/facebookaction.php:288
-#: lib/facebookaction.php:315 lib/logingroupnav.php:75
-#, php-format
-msgid "Login"
-msgstr "登录"
+#: actions/designadminpanel.php:543 lib/designsettings.php:156
+msgid "Turn background image on or off."
+msgstr ""
 
-#: ../actions/openidlogin.php:44 actions/openidlogin.php:52
-#: actions/openidlogin.php:62
-#, php-format
-msgid "Login with an [OpenID](%%doc.openid%%) account."
-msgstr "使用[OpenID](%%doc.openid%%)帐号登录。"
+#: actions/designadminpanel.php:548 lib/designsettings.php:161
+msgid "Tile background image"
+msgstr ""
 
-#: ../actions/login.php:126
-#, php-format
-msgid ""
-"Login with your username and password. Don't have a username yet? [Register]"
-"(%%action.register%%) a new account, or try [OpenID](%%action.openidlogin%"
-"%). "
+#: actions/designadminpanel.php:554
+msgid "Background server"
 msgstr ""
-"请使用你的帐号和密码登入。没有帐号？[注册](%%action.register%%) 一个新帐号, 或使用 "
-"[OpenID](%%action.openidlogin%%). "
 
-#: ../lib/util.php:308 lib/util.php:324 lib/action.php:332
-msgid "Logout"
-msgstr "登出"
+#: actions/designadminpanel.php:558
+msgid "Background path"
+msgstr ""
 
-#: ../actions/register.php:166 actions/register.php:180
-#: actions/register.php:393
-msgid "Longer name, preferably your \"real\" name"
-msgstr "长名字，最好是“实名”"
+#: actions/designadminpanel.php:562
+msgid "Background directory"
+msgstr ""
 
-#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
-#: lib/facebookaction.php:320
-msgid "Lost or forgotten password?"
-msgstr "忘记了密码？"
+#: actions/designadminpanel.php:569 lib/designsettings.php:170
+#, fuzzy
+msgid "Change colours"
+msgstr "修改密码"
 
-#: ../actions/emailsettings.php:80 ../actions/smssettings.php:89
-#: actions/emailsettings.php:81 actions/smssettings.php:89
-msgid "Make a new email address for posting to; cancels the old one."
-msgstr "生成新的电子邮件地址用于发布信息；取消旧的。"
+#: actions/designadminpanel.php:591 lib/designsettings.php:191
+#, fuzzy
+msgid "Content"
+msgstr "连接"
 
-#: ../actions/emailsettings.php:27 actions/emailsettings.php:27
-#: actions/emailsettings.php:71
-#, php-format
-msgid "Manage how you get email from %%site.name%%."
-msgstr "设置 %%site.name%% 发送的邮件。"
+#: actions/designadminpanel.php:604 lib/designsettings.php:204
+#, fuzzy
+msgid "Sidebar"
+msgstr "搜索"
 
-#: ../actions/showstream.php:300 actions/showstream.php:315
-#: actions/showstream.php:480
-msgid "Member since"
-msgstr "用户始于"
+#: actions/designadminpanel.php:617 lib/designsettings.php:217
+msgid "Text"
+msgstr "文本"
 
-#: ../actions/userrss.php:70 actions/userrss.php:67 actions/userrss.php:72
-#, php-format
-msgid "Microblog by %s"
-msgstr "%s 的微博客服务"
+#: actions/designadminpanel.php:630 lib/designsettings.php:230
+#, fuzzy
+msgid "Links"
+msgstr "登录"
 
-#: ../actions/smssettings.php:304
-#, php-format
-msgid ""
-"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
-"email but isn't listed here, send email to let us know at %s."
+#: actions/designadminpanel.php:658 lib/designsettings.php:247
+msgid "Use defaults"
 msgstr ""
-"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"
-"系 %s 以告知。"
 
-#: ../actions/finishopenidlogin.php:79 ../actions/register.php:188
-#: actions/finishopenidlogin.php:85 actions/register.php:202
-#: actions/finishopenidlogin.php:107 actions/register.php:429
-msgid "My text and files are available under "
-msgstr "我的文字和文件采用的授权方式为"
-
-#: ../actions/emailsettings.php:82 ../actions/smssettings.php:91
-#: actions/emailsettings.php:83 actions/smssettings.php:91
-#: actions/emailsettings.php:142 actions/smssettings.php:152
-msgid "New"
-msgstr "新建"
+#: actions/designadminpanel.php:659 lib/designsettings.php:248
+msgid "Restore default designs"
+msgstr ""
 
-#: ../lib/mail.php:144 lib/mail.php:144 lib/mail.php:286
-#, php-format
-msgid "New email address for posting to %s"
-msgstr "新的电子邮件地址，用于发布 %s 信息"
+#: actions/designadminpanel.php:665 lib/designsettings.php:254
+msgid "Reset back to default"
+msgstr ""
 
-#: ../actions/emailsettings.php:297 actions/emailsettings.php:315
-#: actions/emailsettings.php:465
-msgid "New incoming email address added."
-msgstr "已添加新的发布用的电子邮件地址。"
+#: actions/designadminpanel.php:667 actions/emailsettings.php:195
+#: actions/imsettings.php:163 actions/othersettings.php:126
+#: actions/profilesettings.php:167 actions/siteadminpanel.php:414
+#: actions/smssettings.php:181 actions/subscriptions.php:203
+#: actions/tagother.php:154 actions/useradminpanel.php:226
+#: lib/designsettings.php:256 lib/groupeditform.php:202
+msgid "Save"
+msgstr "保存"
 
-#: ../actions/finishopenidlogin.php:71 actions/finishopenidlogin.php:77
-#: actions/finishopenidlogin.php:99
-msgid "New nickname"
-msgstr "新昵称"
+#: actions/designadminpanel.php:668 lib/designsettings.php:257
+msgid "Save design"
+msgstr ""
 
-#: ../actions/newnotice.php:87 actions/newnotice.php:96
-#: actions/newnotice.php:68
-msgid "New notice"
-msgstr "新通告"
+#: actions/disfavor.php:81
+msgid "This notice is not a favorite!"
+msgstr "此通告未被收藏！"
 
-#: ../actions/password.php:41 ../actions/recoverpassword.php:179
-#: actions/profilesettings.php:180 actions/recoverpassword.php:185
-#: actions/passwordsettings.php:101 actions/recoverpassword.php:219
-msgid "New password"
-msgstr "新密码"
+#: actions/disfavor.php:94
+msgid "Add to favorites"
+msgstr "加入收藏"
 
-#: ../actions/recoverpassword.php:314
-msgid "New password successfully saved. You are now logged in."
-msgstr "新密码已保存，您现在已登录。"
+#: actions/doc.php:69
+msgid "No such document."
+msgstr "没有这份文档。"
 
-#: ../actions/login.php:101 ../actions/profilesettings.php:41
-#: ../actions/register.php:151 actions/login.php:101
-#: actions/profilesettings.php:74 actions/register.php:165
-#: actions/login.php:228 actions/profilesettings.php:98
-#: actions/register.php:367 actions/showgroup.php:224
-#: actions/showstream.php:251 actions/tagother.php:95
-#: lib/facebookaction.php:308 lib/groupeditform.php:137
-msgid "Nickname"
-msgstr "昵称"
+#: actions/editgroup.php:56
+#, php-format
+msgid "Edit %s group"
+msgstr "编辑 %s 组"
 
-#: ../actions/finishopenidlogin.php:175 ../actions/profilesettings.php:110
-#: ../actions/register.php:69 actions/finishopenidlogin.php:181
-#: actions/profilesettings.php:225 actions/register.php:76
-#: actions/editgroup.php:183 actions/finishopenidlogin.php:215
-#: actions/newgroup.php:134 actions/profilesettings.php:214
-#: actions/register.php:159
-msgid "Nickname already in use. Try another one."
-msgstr "昵称已被使用，换一个吧。"
+#: actions/editgroup.php:68 actions/grouplogo.php:70 actions/newgroup.php:65
+msgid "You must be logged in to create a group."
+msgstr "您必须登录才能创建小组。"
 
-#: ../actions/finishopenidlogin.php:165 ../actions/profilesettings.php:88
-#: ../actions/register.php:67 ../actions/updateprofile.php:77
-#: actions/finishopenidlogin.php:171 actions/profilesettings.php:203
-#: actions/register.php:74 actions/updateprofile.php:78
-#: actions/finishopenidlogin.php:205 actions/profilesettings.php:192
-#: actions/updateprofile.php:81
-msgid "Nickname must have only lowercase letters and numbers and no spaces."
-msgstr "昵称只能使用小写字母和数字，不包含空格。"
+#: actions/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才能编辑这个组"
 
-#: ../actions/finishopenidlogin.php:170 actions/finishopenidlogin.php:176
-#: actions/finishopenidlogin.php:210
-msgid "Nickname not allowed."
-msgstr "不允许的昵称。"
+#: actions/editgroup.php:154
+msgid "Use this form to edit the group."
+msgstr "使用这个表单来编辑组"
 
-#: ../actions/remotesubscribe.php:72 actions/remotesubscribe.php:81
-#: actions/remotesubscribe.php:106
-msgid "Nickname of the user you want to follow"
-msgstr "希望订阅的用户的昵称"
+#: actions/editgroup.php:201 actions/newgroup.php:145
+#, fuzzy, php-format
+msgid "description is too long (max %d chars)."
+msgstr "描述过长(不能超过140字符)。"
 
-#: ../actions/recoverpassword.php:162 actions/recoverpassword.php:167
-#: actions/recoverpassword.php:186
-msgid "Nickname or email"
-msgstr "昵称或电子邮件"
+#: actions/editgroup.php:253
+msgid "Could not update group."
+msgstr "无法更新组"
 
-#: ../actions/deletenotice.php:59 actions/deletenotice.php:60
-#: actions/block.php:147 actions/deletenotice.php:118
-msgid "No"
-msgstr "否"
+#: actions/editgroup.php:259 classes/User_group.php:390
+#, fuzzy
+msgid "Could not create aliases."
+msgstr "无法创建收藏。"
 
-#: ../actions/imsettings.php:156 actions/imsettings.php:164
-#: actions/imsettings.php:279
-msgid "No Jabber ID."
-msgstr "没有 Jabber ID。"
+#: actions/editgroup.php:269
+msgid "Options saved."
+msgstr "选项已保存。"
 
-#: ../actions/userauthorization.php:129 actions/userauthorization.php:136
-#: actions/userauthorization.php:153
-msgid "No authorization request!"
-msgstr "未收到认证请求！"
+#: actions/emailsettings.php:60
+msgid "Email Settings"
+msgstr "电子邮件设置"
 
-#: ../actions/smssettings.php:181 actions/smssettings.php:189
-#: actions/smssettings.php:299
-msgid "No carrier selected."
-msgstr "未选择运营商。"
+#: actions/emailsettings.php:71
+#, php-format
+msgid "Manage how you get email from %%site.name%%."
+msgstr "设置 %%site.name%% 发送的邮件。"
 
-#: ../actions/smssettings.php:316 actions/smssettings.php:324
-#: actions/smssettings.php:486
-msgid "No code entered"
-msgstr "没有输入验证码"
+#: actions/emailsettings.php:100 actions/imsettings.php:100
+#: actions/smssettings.php:104
+msgid "Address"
+msgstr "地址"
 
-#: ../actions/confirmaddress.php:33 actions/confirmaddress.php:33
-#: actions/confirmaddress.php:75
-msgid "No confirmation code."
-msgstr "没有验证码"
+#: actions/emailsettings.php:105
+msgid "Current confirmed email address."
+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
-msgid "No content!"
-msgstr "没有内容！"
+#: actions/emailsettings.php:107 actions/emailsettings.php:140
+#: actions/imsettings.php:108 actions/smssettings.php:115
+#: actions/smssettings.php:158
+msgid "Remove"
+msgstr "移除"
 
-#: ../actions/emailsettings.php:174 actions/emailsettings.php:192
-#: actions/emailsettings.php:304
-msgid "No email address."
-msgstr "没有电子邮件地址。"
+#: actions/emailsettings.php:113
+msgid ""
+"Awaiting confirmation on this address. Check your inbox (and spam box!) for "
+"a message with further instructions."
+msgstr ""
+"等待确认此地址。请查看您的收件箱(和垃圾箱)是否收到了邮件，其中包含了进一步的"
+"指示。"
 
-#: ../actions/userbyid.php:32 actions/userbyid.php:32 actions/userbyid.php:70
-msgid "No id."
-msgstr "没有 id。"
+#: actions/emailsettings.php:117 actions/imsettings.php:120
+#: actions/smssettings.php:126
+msgid "Cancel"
+msgstr "取消"
 
-#: ../actions/emailsettings.php:271 actions/emailsettings.php:289
-#: actions/emailsettings.php:430
-msgid "No incoming email address."
-msgstr "没有发布用的电子邮件地址。"
+#: actions/emailsettings.php:121
+msgid "Email Address"
+msgstr "电子邮件地址"
 
-#: ../actions/finishremotesubscribe.php:65
-#: actions/finishremotesubscribe.php:67 actions/finishremotesubscribe.php:68
-msgid "No nickname provided by remote server."
-msgstr "远程服务器没有昵称。"
+#: actions/emailsettings.php:123
+msgid "Email address, like \"UserName@example.org\""
+msgstr "电子邮件，类似 \"UserName@example.org\""
 
-#: ../actions/avatarbynickname.php:27 actions/avatarbynickname.php:27
-#: actions/avatarbynickname.php:59 actions/leavegroup.php:81
-msgid "No nickname."
-msgstr "没有昵称。"
+#: actions/emailsettings.php:126 actions/imsettings.php:133
+#: actions/smssettings.php:145
+msgid "Add"
+msgstr "添加"
 
-#: ../actions/emailsettings.php:222 ../actions/imsettings.php:206
-#: ../actions/smssettings.php:229 actions/emailsettings.php:240
-#: actions/imsettings.php:214 actions/smssettings.php:237
-#: actions/emailsettings.php:363 actions/imsettings.php:345
-#: actions/smssettings.php:358
-msgid "No pending confirmation to cancel."
-msgstr "没有可以取消的确认。"
+#: actions/emailsettings.php:133 actions/smssettings.php:152
+msgid "Incoming email"
+msgstr "发布用的电子邮件"
 
-#: ../actions/smssettings.php:176 actions/smssettings.php:184
-#: actions/smssettings.php:294
-msgid "No phone number."
-msgstr "没有电话号码。"
+#: actions/emailsettings.php:138 actions/smssettings.php:157
+msgid "Send email to this address to post new notices."
+msgstr "向这个电子邮件发信以发布新的通告。"
 
-#: ../actions/finishremotesubscribe.php:72
-#: actions/finishremotesubscribe.php:74 actions/finishremotesubscribe.php:75
-msgid "No profile URL returned by server."
-msgstr "服务器没有返回个人信息URL。"
+#: actions/emailsettings.php:145 actions/smssettings.php:162
+msgid "Make a new email address for posting to; cancels the old one."
+msgstr "生成新的电子邮件地址用于发布信息；取消旧的。"
 
-#: ../actions/recoverpassword.php:226 actions/recoverpassword.php:232
-#: actions/recoverpassword.php:266
-msgid "No registered email address for that user."
-msgstr "用户没有注册电子邮件。"
+#: actions/emailsettings.php:148 actions/smssettings.php:164
+msgid "New"
+msgstr "新建"
 
-#: ../actions/userauthorization.php:49 actions/userauthorization.php:55
-#: actions/userauthorization.php:57
-msgid "No request found!"
-msgstr "没有找到请求！"
+#: actions/emailsettings.php:153 actions/imsettings.php:139
+#: actions/smssettings.php:169
+msgid "Preferences"
+msgstr "首选项"
 
-#: ../actions/noticesearch.php:64 ../actions/peoplesearch.php:64
-#: actions/noticesearch.php:69 actions/peoplesearch.php:69
-#: actions/groupsearch.php:81 actions/noticesearch.php:104
-#: actions/peoplesearch.php:85
-msgid "No results"
-msgstr "没有结果"
+#: actions/emailsettings.php:158
+msgid "Send me notices of new subscriptions through email."
+msgstr "如果有新订阅，通过电子邮件告诉我。"
 
-#: ../actions/avatarbynickname.php:32 actions/avatarbynickname.php:32
-#: actions/avatarbynickname.php:64
-msgid "No size."
-msgstr "没有大小。"
+#: actions/emailsettings.php:163
+msgid "Send me email when someone adds my notice as a favorite."
+msgstr "如果有人收藏我的通告，发邮件通知我。"
 
-#: ../actions/twitapistatuses.php:595 actions/twitapifavorites.php:136
-#: actions/twitapistatuses.php:520 actions/twitapifavorites.php:112
-#: actions/twitapistatuses.php:446
-msgid "No status found with that ID."
-msgstr "没有找到此ID的信息。"
+#: actions/emailsettings.php:169
+msgid "Send me email when someone sends me a private message."
+msgstr "如果收到私人信息，发邮件通知我。"
 
-#: ../actions/twitapistatuses.php:555 actions/twitapistatuses.php:478
-#: actions/twitapistatuses.php:418
-msgid "No status with that ID found."
-msgstr "没有找到此ID的信息。"
+#: actions/emailsettings.php:174
+#, fuzzy
+msgid "Send me email when someone sends me an \"@-reply\"."
+msgstr "如果收到私人信息，发邮件通知我。"
 
-#: ../actions/openidsettings.php:135 actions/openidsettings.php:144
-#: actions/openidsettings.php:222
-msgid "No such OpenID."
-msgstr "没有这个 OpenID。"
+#: actions/emailsettings.php:179
+msgid "Allow friends to nudge me and send me an email."
+msgstr "允许朋友们呼叫并给我发送邮件。"
 
-#: ../actions/doc.php:29 actions/doc.php:29 actions/doc.php:64
-msgid "No such document."
-msgstr "没有这份文档。"
+#: actions/emailsettings.php:185
+msgid "I want to post notices by email."
+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
-msgid "No such notice."
-msgstr "没有这份通告。"
+#: actions/emailsettings.php:191
+msgid "Publish a MicroID for my email address."
+msgstr "公开电子邮件的 MicroID。"
 
-#: ../actions/recoverpassword.php:56 actions/recoverpassword.php:56
-#: actions/recoverpassword.php:62
-msgid "No such recovery code."
-msgstr "没有这个恢复码。"
+#: actions/emailsettings.php:301 actions/imsettings.php:264
+#: actions/othersettings.php:180 actions/smssettings.php:284
+msgid "Preferences saved."
+msgstr "首选项已保存。"
 
-#: ../actions/postnotice.php:56 actions/postnotice.php:57
-#: actions/postnotice.php:60
-msgid "No such subscription"
-msgstr "没有这个订阅"
-
-#: ../actions/all.php:34 ../actions/allrss.php:35
-#: ../actions/avatarbynickname.php:43 ../actions/foaf.php:40
-#: ../actions/remotesubscribe.php:84 ../actions/remotesubscribe.php:91
-#: ../actions/replies.php:57 ../actions/repliesrss.php:35
-#: ../actions/showstream.php:110 ../actions/userbyid.php:36
-#: ../actions/userrss.php:35 ../actions/xrds.php:35 ../lib/gallery.php:57
-#: ../lib/subs.php:33 ../lib/subs.php:82 actions/all.php:34
-#: actions/allrss.php:35 actions/avatarbynickname.php:43
-#: actions/favoritesrss.php:35 actions/foaf.php:40 actions/ical.php:31
-#: actions/remotesubscribe.php:93 actions/remotesubscribe.php:100
-#: actions/replies.php:57 actions/repliesrss.php:35
-#: actions/showfavorites.php:34 actions/showstream.php:110
-#: actions/userbyid.php:36 actions/userrss.php:35 actions/xrds.php:35
-#: classes/Command.php:120 classes/Command.php:162 classes/Command.php:203
-#: classes/Command.php:237 lib/gallery.php:62 lib/mailbox.php:36
-#: lib/subs.php:33 lib/subs.php:95 actions/all.php:53 actions/allrss.php:66
-#: actions/avatarbynickname.php:75 actions/favoritesrss.php:64
-#: actions/foaf.php:41 actions/remotesubscribe.php:123
-#: actions/remotesubscribe.php:130 actions/replies.php:73
-#: actions/repliesrss.php:38 actions/showfavorites.php:105
-#: actions/showstream.php:100 actions/userbyid.php:74
-#: actions/usergroups.php:92 actions/userrss.php:38 actions/xrds.php:73
-#: classes/Command.php:140 classes/Command.php:185 classes/Command.php:234
-#: classes/Command.php:271 lib/galleryaction.php:60 lib/mailbox.php:82
-#: lib/subs.php:34 lib/subs.php:109
-msgid "No such user."
-msgstr "没有这个用户。"
+#: actions/emailsettings.php:319
+msgid "No email address."
+msgstr "没有电子邮件地址。"
 
-#: ../actions/recoverpassword.php:211 actions/recoverpassword.php:217
-#: actions/recoverpassword.php:251
-msgid "No user with that email address or username."
-msgstr "没有拥有这个用户名或电子邮件的用户。"
+#: actions/emailsettings.php:326
+msgid "Cannot normalize that email address"
+msgstr "无法识别此电子邮件"
 
-#: ../lib/gallery.php:80 lib/gallery.php:85
-msgid "Nobody to show!"
-msgstr "不显示任何人！"
+#: actions/emailsettings.php:330 actions/siteadminpanel.php:158
+msgid "Not a valid email address"
+msgstr "不是有效的电子邮件"
 
-#: ../actions/recoverpassword.php:60 actions/recoverpassword.php:60
-#: actions/recoverpassword.php:66
-msgid "Not a recovery code."
-msgstr "不是恢复码。"
+#: actions/emailsettings.php:333
+msgid "That is already your email address."
+msgstr "您已登记此电子邮件。"
 
-#: ../scripts/maildaemon.php:50 scripts/maildaemon.php:50
-#: scripts/maildaemon.php:53
-msgid "Not a registered user."
-msgstr "不是已注册用户。"
+#: actions/emailsettings.php:336
+msgid "That email address already belongs to another 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
-msgid "Not a supported data format."
-msgstr "不支持的数据格式。"
+#: actions/emailsettings.php:352 actions/imsettings.php:317
+#: actions/smssettings.php:337
+msgid "Couldn't insert confirmation code."
+msgstr "无法插入验证码。"
 
-#: ../actions/imsettings.php:167 actions/imsettings.php:175
-#: actions/imsettings.php:290
-msgid "Not a valid Jabber ID"
-msgstr "不是有效的 Jabber ID"
+#: 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."
+msgstr ""
+"验证码已被发送到您新增的电子邮件。请检查收件箱(和垃圾箱)，找到验证码并按要求"
+"使用它。"
 
-#: ../lib/openid.php:131 lib/openid.php:131 lib/openid.php:140
-msgid "Not a valid OpenID."
-msgstr "不是有效的 OpenID。"
+#: actions/emailsettings.php:378 actions/imsettings.php:351
+#: actions/smssettings.php:370
+msgid "No pending confirmation to cancel."
+msgstr "没有可以取消的确认。"
 
-#: ../actions/emailsettings.php:185 actions/emailsettings.php:203
-#: actions/emailsettings.php:315
-msgid "Not a valid email address"
-msgstr "不是有效的电子邮件"
+#: actions/emailsettings.php:382 actions/imsettings.php:355
+msgid "That is the wrong IM address."
+msgstr "即时通讯帐号错误。"
 
-#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-msgid "Not a valid email address."
-msgstr "不是有效的电子邮件。"
+#: actions/emailsettings.php:394 actions/imsettings.php:367
+#: actions/smssettings.php:386
+msgid "Confirmation cancelled."
+msgstr "已取消确认。"
 
-#: ../actions/profilesettings.php:91 ../actions/register.php:71
-#: actions/profilesettings.php:206 actions/register.php:78
-#: actions/editgroup.php:186 actions/newgroup.php:137
-#: actions/profilesettings.php:195 actions/register.php:161
-msgid "Not a valid nickname."
-msgstr "不是有效的昵称。"
+#: actions/emailsettings.php:412
+msgid "That is not your email address."
+msgstr "这是他人的电子邮件。"
 
-#: ../actions/remotesubscribe.php:120 actions/remotesubscribe.php:129
-#: actions/remotesubscribe.php:159
-msgid "Not a valid profile URL (incorrect services)."
-msgstr "不是有效的个人信息URL(不正确的服务)。"
+#: actions/emailsettings.php:431 actions/imsettings.php:408
+#: actions/smssettings.php:425
+msgid "The address was removed."
+msgstr "地址被移除。"
 
-#: ../actions/remotesubscribe.php:113 actions/remotesubscribe.php:122
-#: actions/remotesubscribe.php:152
-msgid "Not a valid profile URL (no XRDS defined)."
-msgstr "不是有效的个人信息URL(未定义XRDS)。"
+#: actions/emailsettings.php:445 actions/smssettings.php:518
+msgid "No incoming email address."
+msgstr "没有发布用的电子邮件地址。"
 
-#: ../actions/remotesubscribe.php:104 actions/remotesubscribe.php:113
-#: actions/remotesubscribe.php:143
-msgid "Not a valid profile URL (no YADIS document)."
-msgstr "不是有效的个人信息URL(没有YADIS数据)。"
+#: actions/emailsettings.php:455 actions/emailsettings.php:477
+#: actions/smssettings.php:528 actions/smssettings.php:552
+msgid "Couldn't update user record."
+msgstr "无法更新用户记录。"
 
-#: ../actions/avatar.php:95 actions/profilesettings.php:332
-#: lib/imagefile.php:87
-msgid "Not an image or corrupt file."
-msgstr "不是图片文件或文件已损坏。"
+#: actions/emailsettings.php:458 actions/smssettings.php:531
+msgid "Incoming email address removed."
+msgstr "发布用的电子邮件被移除。"
 
-#: ../actions/finishremotesubscribe.php:51
-#: actions/finishremotesubscribe.php:53 actions/finishremotesubscribe.php:54
-msgid "Not authorized."
-msgstr "未认证。"
+#: actions/emailsettings.php:480 actions/smssettings.php:555
+msgid "New incoming email address added."
+msgstr "已添加新的发布用的电子邮件地址。"
 
-#: ../actions/finishremotesubscribe.php:38
-#: actions/finishremotesubscribe.php:38 actions/finishremotesubscribe.php:40
-msgid "Not expecting this response!"
-msgstr "未预料的响应！"
+#: actions/favorited.php:65 lib/popularnoticesection.php:87
+#: lib/publicgroupnav.php:93
+#, fuzzy
+msgid "Popular notices"
+msgstr "没有这份通告。"
 
-#: ../actions/twitapistatuses.php:422 actions/twitapistatuses.php:361
-#: actions/twitapistatuses.php:309
-msgid "Not found"
-msgstr "未找到"
+#: actions/favorited.php:67
+#, fuzzy, php-format
+msgid "Popular notices, page %d"
+msgstr "没有这份通告。"
 
-#: ../actions/finishaddopenid.php:29 ../actions/logout.php:33
-#: ../actions/newnotice.php:29 ../actions/subscribe.php:28
-#: ../actions/unsubscribe.php:25 ../lib/deleteaction.php:38
-#: ../lib/settingsaction.php:27 actions/disfavor.php:29 actions/favor.php:30
-#: actions/finishaddopenid.php:29 actions/logout.php:33
-#: actions/newmessage.php:28 actions/newnotice.php:29 actions/subscribe.php:28
-#: actions/unsubscribe.php:25 lib/deleteaction.php:38
-#: lib/settingsaction.php:27 actions/block.php:59 actions/disfavor.php:61
-#: actions/favor.php:64 actions/finishaddopenid.php:67 actions/logout.php:71
-#: actions/newmessage.php:83 actions/newnotice.php:90 actions/nudge.php:63
-#: actions/subedit.php:31 actions/subscribe.php:30 actions/unblock.php:60
-#: actions/unsubscribe.php:27 lib/deleteaction.php:66
-#: lib/settingsaction.php:72
-msgid "Not logged in."
-msgstr "未登录。"
+#: actions/favorited.php:79
+#, fuzzy
+msgid "The most popular notices on the site right now."
+msgstr "显示上周以来最流行的标签"
 
-#: ../lib/subs.php:91 lib/subs.php:104 lib/subs.php:122
-msgid "Not subscribed!."
-msgstr "未订阅！"
+#: actions/favorited.php:150
+msgid "Favorite notices appear on this page but no one has favorited one yet."
+msgstr ""
 
-#: ../actions/opensearch.php:35 actions/opensearch.php:35
-#: actions/opensearch.php:67
-msgid "Notice Search"
-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/showstream.php:82 actions/showstream.php:82
-#: actions/showstream.php:180 actions/showstream.php:187
-#: actions/showstream.php:192
+#: actions/favorited.php:156
 #, php-format
-msgid "Notice feed for %s"
-msgstr "%s 的通告聚合"
-
-#: ../actions/shownotice.php:39 actions/shownotice.php:39
-#: actions/shownotice.php:94
-msgid "Notice has no profile"
-msgstr "通告没有关联个人信息"
-
-#: ../actions/showstream.php:316 actions/showstream.php:331
-#: actions/showstream.php:504 lib/facebookaction.php:477 lib/mailbox.php:116
-#: lib/noticelist.php:87
-msgid "Notices"
-msgstr "通告"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to add a "
+"notice to your favorites!"
+msgstr ""
 
-#: ../actions/tag.php:35 ../actions/tag.php:81 actions/tag.php:35
-#: actions/tag.php:81 actions/tag.php:41
+#: actions/favoritesrss.php:111 actions/showfavorites.php:77
+#: lib/personalgroupnav.php:115
 #, php-format
-msgid "Notices tagged with %s"
-msgstr "带 %s 标签的通告"
-
-#: ../actions/password.php:39 actions/profilesettings.php:178
-#: actions/passwordsettings.php:97
-msgid "Old password"
-msgstr "旧密码"
+msgid "%s's favorite notices"
+msgstr "%s 收藏的通告"
 
-#: ../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
-msgid "OpenID"
-msgstr "OpenID"
-
-#: ../actions/finishopenidlogin.php:61 actions/finishopenidlogin.php:66
-#: actions/finishopenidlogin.php:73
-msgid "OpenID Account Setup"
-msgstr "OpenID 帐号设置"
-
-#: ../lib/openid.php:180 lib/openid.php:180 lib/openid.php:266
-msgid "OpenID Auto-Submit"
-msgstr "OpenID 自动提交"
-
-#: ../actions/finishaddopenid.php:99 ../actions/finishopenidlogin.php:140
-#: ../actions/openidlogin.php:60 actions/finishaddopenid.php:99
-#: actions/finishopenidlogin.php:146 actions/openidlogin.php:68
-#: actions/finishaddopenid.php:170 actions/openidlogin.php:80
-msgid "OpenID Login"
-msgstr "OpenID 登录"
-
-#: ../actions/openidlogin.php:65 ../actions/openidsettings.php:49
-#: actions/openidlogin.php:74 actions/openidsettings.php:50
-#: actions/openidlogin.php:102 actions/openidsettings.php:101
-msgid "OpenID URL"
-msgstr "OpenID URL"
-
-#: ../actions/finishaddopenid.php:42 ../actions/finishopenidlogin.php:103
-#: actions/finishaddopenid.php:42 actions/finishopenidlogin.php:109
-#: actions/finishaddopenid.php:88 actions/finishopenidlogin.php:130
-msgid "OpenID authentication cancelled."
-msgstr "OpenID 认证已取消。"
-
-#: ../actions/finishaddopenid.php:46 ../actions/finishopenidlogin.php:107
-#: actions/finishaddopenid.php:46 actions/finishopenidlogin.php:113
-#: actions/finishaddopenid.php:92 actions/finishopenidlogin.php:134
-#, php-format
-msgid "OpenID authentication failed: %s"
-msgstr "OpenID 认证失败：%s"
-
-#: ../lib/openid.php:133 lib/openid.php:133 lib/openid.php:142
-#, php-format
-msgid "OpenID failure: %s"
-msgstr "OpenID 失败：%s"
-
-#: ../actions/openidsettings.php:144 actions/openidsettings.php:153
-#: actions/openidsettings.php:231
-msgid "OpenID removed."
-msgstr "OpenID 已移除。"
-
-#: ../actions/openidsettings.php:37 actions/openidsettings.php:37
-#: actions/openidsettings.php:59
-msgid "OpenID settings"
-msgstr "OpenID 设置"
-
-#: ../actions/invite.php:135 actions/invite.php:143 actions/invite.php:180
-msgid "Optionally add a personal message to the invitation."
-msgstr "在邀请中加几句话(可选)。"
+#: actions/favoritesrss.php:115
+#, fuzzy, php-format
+msgid "Updates favored by %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/avatar.php:84 actions/profilesettings.php:321
-#: lib/imagefile.php:75
-msgid "Partial upload."
-msgstr "部分上传。"
+#: actions/favor.php:79
+msgid "This notice is already a favorite!"
+msgstr "已收藏此通告！"
 
-#: ../actions/finishopenidlogin.php:90 ../actions/login.php:102
-#: ../actions/register.php:153 ../lib/settingsaction.php:93
-#: actions/finishopenidlogin.php:96 actions/login.php:102
-#: actions/register.php:167 actions/finishopenidlogin.php:118
-#: actions/login.php:231 actions/register.php:372
-#: lib/accountsettingsaction.php:110 lib/facebookaction.php:311
-msgid "Password"
-msgstr "密码"
+#: actions/favor.php:92 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor favorite"
+msgstr "取消收藏"
 
-#: ../actions/recoverpassword.php:288 actions/recoverpassword.php:301
-#: actions/recoverpassword.php:335
-msgid "Password and confirmation do not match."
-msgstr "密码和确认不匹配。"
+#: actions/featured.php:69 lib/featureduserssection.php:87
+#: lib/publicgroupnav.php:89
+msgid "Featured users"
+msgstr "推荐用户"
 
-#: ../actions/recoverpassword.php:284 actions/recoverpassword.php:297
-#: actions/recoverpassword.php:331
-msgid "Password must be 6 chars or more."
-msgstr "密码必须是 6 个字符或更多。"
+#: actions/featured.php:71
+#, php-format
+msgid "Featured users, page %d"
+msgstr "推荐用户，第 %d 页"
 
-#: ../actions/recoverpassword.php:261 ../actions/recoverpassword.php:263
-#: actions/recoverpassword.php:267 actions/recoverpassword.php:269
-#: actions/recoverpassword.php:199 actions/recoverpassword.php:301
-msgid "Password recovery requested"
-msgstr "请求恢复密码"
+#: actions/featured.php:99
+#, php-format
+msgid "A selection of some of the great users on %s"
+msgstr "%s 优秀用户摘选"
 
-#: ../actions/password.php:89 ../actions/recoverpassword.php:313
-#: actions/profilesettings.php:408 actions/recoverpassword.php:326
-#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
-msgid "Password saved."
-msgstr "密码已保存。"
+#: actions/file.php:34
+#, fuzzy
+msgid "No notice id"
+msgstr "新通告"
 
-#: ../actions/password.php:61 ../actions/register.php:88
-#: actions/profilesettings.php:380 actions/register.php:98
-#: actions/passwordsettings.php:145 actions/register.php:183
-msgid "Passwords don't match."
-msgstr "密码不匹配。"
+#: actions/file.php:38
+#, fuzzy
+msgid "No notice"
+msgstr "新通告"
 
-#: ../lib/searchaction.php:100 lib/searchaction.php:100
-#: lib/searchgroupnav.php:80
-msgid "People"
-msgstr "用户"
+#: actions/file.php:42
+msgid "No attachments"
+msgstr ""
 
-#: ../actions/opensearch.php:33 actions/opensearch.php:33
-#: actions/opensearch.php:64
-msgid "People Search"
-msgstr "搜索用户"
+#: actions/file.php:51
+msgid "No uploaded attachments"
+msgstr ""
 
-#: ../actions/peoplesearch.php:33 actions/peoplesearch.php:33
-#: actions/peoplesearch.php:58
-msgid "People search"
-msgstr "搜索用户"
+#: actions/finishremotesubscribe.php:69
+msgid "Not expecting this response!"
+msgstr "未预料的响应！"
 
-#: ../lib/stream.php:50 lib/personal.php:50 lib/personalgroupnav.php:98
-msgid "Personal"
-msgstr "个人"
+#: actions/finishremotesubscribe.php:80
+#, fuzzy
+msgid "User being listened to does not exist."
+msgstr "要查看的用户不存在。"
 
-#: ../actions/invite.php:133 actions/invite.php:141 actions/invite.php:178
-msgid "Personal message"
-msgstr "个人消息"
+#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
+msgid "You can use the local subscription!"
+msgstr "您可以在这里订阅！"
 
-#: ../actions/smssettings.php:69 actions/smssettings.php:69
-msgid "Phone number, no punctuation or spaces, with area code"
-msgstr "电话号码，不带标点或空格，包含地区代码"
+#: actions/finishremotesubscribe.php:96
+msgid "That user has blocked you from subscribing."
+msgstr "那个用户阻止了你的订阅。"
 
-#: ../actions/userauthorization.php:78
-msgid ""
-"Please check these details to make sure that you want to subscribe to this "
-"user's notices. If you didn't just ask to subscribe to someone's notices, "
-"click \"Cancel\"."
-msgstr ""
-"请检查详细信息，确认希望订阅此用户的通告。如果您刚才没有要求订阅任何人的通"
-"告，请点击\"取消\"。"
+#: actions/finishremotesubscribe.php:106
+#, fuzzy
+msgid "You are not authorized."
+msgstr "未认证。"
 
-#: ../actions/imsettings.php:73 actions/imsettings.php:74
-#: actions/imsettings.php:142
-msgid "Post a notice when my Jabber/GTalk status changes."
-msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
+#: actions/finishremotesubscribe.php:109
+#, fuzzy
+msgid "Could not convert request token to access token."
+msgstr "无法将请求标记转换为访问令牌。"
 
-#: ../actions/emailsettings.php:85 ../actions/imsettings.php:67
-#: ../actions/smssettings.php:94 actions/emailsettings.php:86
-#: actions/imsettings.php:68 actions/smssettings.php:94
-#: actions/twittersettings.php:70 actions/emailsettings.php:147
-#: actions/imsettings.php:133 actions/smssettings.php:157
-#: actions/twittersettings.php:134
-msgid "Preferences"
-msgstr "首选项"
+#: actions/finishremotesubscribe.php:114
+#, fuzzy
+msgid "Remote service uses unknown version of OMB protocol."
+msgstr "此OMB协议版本无效。"
 
-#: ../actions/emailsettings.php:162 ../actions/imsettings.php:144
-#: ../actions/smssettings.php:163 actions/emailsettings.php:180
-#: actions/imsettings.php:152 actions/smssettings.php:171
-#: actions/emailsettings.php:286 actions/imsettings.php:258
-#: actions/othersettings.php:168 actions/smssettings.php:272
-msgid "Preferences saved."
-msgstr "首选项已保存。"
+#: actions/finishremotesubscribe.php:133 lib/oauthstore.php:306
+msgid "Error updating remote profile"
+msgstr "更新远程的个人信息时出错"
 
-#: ../actions/profilesettings.php:57 actions/profilesettings.php:90
-#: actions/profilesettings.php:129
-msgid "Preferred language"
-msgstr "首选语言"
+#: actions/foafgroup.php:44 actions/foafgroup.php:62 actions/groupblock.php:86
+#: actions/groupunblock.php:86 actions/leavegroup.php:83
+#: actions/makeadmin.php:86 lib/command.php:212 lib/command.php:263
+msgid "No such group."
+msgstr "没有这个组。"
 
-#: ../lib/util.php:328 lib/util.php:344 lib/action.php:572
-msgid "Privacy"
-msgstr "隐私"
+#: actions/getfile.php:75
+#, fuzzy
+msgid "No such file."
+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 "Problem saving notice."
-msgstr "保存通告时出错。"
+#: actions/getfile.php:79
+#, fuzzy
+msgid "Cannot read file."
+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
-msgid "Profile"
-msgstr "个人信息"
+#: actions/groupblock.php:71 actions/groupunblock.php:71
+#: actions/makeadmin.php:71 actions/subedit.php:46
+#: lib/profileformaction.php:70
+#, fuzzy
+msgid "No profile specified."
+msgstr "没有收件人。"
 
-#: ../actions/remotesubscribe.php:73 actions/remotesubscribe.php:82
-#: actions/remotesubscribe.php:109
-msgid "Profile URL"
-msgstr "个人信息URL"
+#: actions/groupblock.php:76 actions/groupunblock.php:76
+#: actions/makeadmin.php:76 actions/subedit.php:53 actions/tagother.php:46
+#: lib/profileformaction.php:77
+#, fuzzy
+msgid "No profile with that ID."
+msgstr "没有找到此ID的信息。"
 
-#: ../actions/profilesettings.php:34 actions/profilesettings.php:32
-#: actions/profilesettings.php:58
-msgid "Profile settings"
-msgstr "个人设置"
+#: actions/groupblock.php:81 actions/groupunblock.php:81
+#: actions/makeadmin.php:81
+#, fuzzy
+msgid "No group specified."
+msgstr "没有收件人。"
 
-#: ../actions/postnotice.php:51 ../actions/updateprofile.php:52
-#: actions/postnotice.php:52 actions/updateprofile.php:53
-#: actions/postnotice.php:55 actions/updateprofile.php:56
-msgid "Profile unknown"
-msgstr "未知的帐号"
+#: actions/groupblock.php:91
+msgid "Only an admin can block group members."
+msgstr ""
 
-#: ../actions/public.php:54 actions/public.php:54 actions/public.php:124
-msgid "Public Stream Feed"
-msgstr "公开的聚合"
+#: actions/groupblock.php:95
+#, fuzzy
+msgid "User is already blocked from group."
+msgstr "用户没有个人信息。"
 
-#: ../actions/public.php:33 actions/public.php:33 actions/public.php:109
-#: lib/publicgroupnav.php:77
-msgid "Public timeline"
-msgstr "公开的时间表"
+#: actions/groupblock.php:100
+#, fuzzy
+msgid "User is not a member of group."
+msgstr "您未告知此个人信息"
 
-#: ../actions/imsettings.php:79 actions/imsettings.php:80
-#: actions/imsettings.php:153
-msgid "Publish a MicroID for my Jabber/GTalk address."
-msgstr "公开Jabber/GTalk帐号的 MicroID。"
+#: actions/groupblock.php:136 actions/groupmembers.php:314
+#, fuzzy
+msgid "Block user from group"
+msgstr "阻止用户"
 
-#: ../actions/emailsettings.php:94 actions/emailsettings.php:101
-#: actions/emailsettings.php:178
-msgid "Publish a MicroID for my email address."
-msgstr "公开电子邮件的 MicroID。"
+#: actions/groupblock.php:162
+#, php-format
+msgid ""
+"Are you sure you want to block user \"%s\" from the group \"%s\"? They will "
+"be removed from the group, unable to post, and unable to subscribe to the "
+"group in the future."
+msgstr ""
 
-#: ../actions/tag.php:75 ../actions/tag.php:76 actions/tag.php:75
-#: actions/tag.php:76
-msgid "Recent Tags"
-msgstr "最近的标签"
+#: actions/groupblock.php:178
+#, fuzzy
+msgid "Do not block this user from this group"
+msgstr "该组成员列表。"
 
-#: ../actions/recoverpassword.php:166 actions/recoverpassword.php:171
-#: actions/recoverpassword.php:190
-msgid "Recover"
-msgstr "恢复"
+#: actions/groupblock.php:179
+#, fuzzy
+msgid "Block this user from this group"
+msgstr "该组成员列表。"
 
-#: ../actions/recoverpassword.php:156 actions/recoverpassword.php:161
-#: actions/recoverpassword.php:198
-msgid "Recover password"
-msgstr "恢复密码"
+#: actions/groupblock.php:196
+msgid "Database error blocking user from group."
+msgstr ""
 
-#: ../actions/recoverpassword.php:67 actions/recoverpassword.php:67
-#: actions/recoverpassword.php:73
-msgid "Recovery code for unknown user."
-msgstr "恢复码未知"
+#: actions/groupbyid.php:74
+msgid "No ID"
+msgstr "没有ID"
 
-#: ../actions/register.php:142 ../actions/register.php:193 ../lib/util.php:312
-#: actions/register.php:152 actions/register.php:207 lib/util.php:328
-#: actions/register.php:69 actions/register.php:436 lib/action.php:338
-#: lib/facebookaction.php:277 lib/logingroupnav.php:78
-msgid "Register"
-msgstr "注册"
+#: actions/groupdesignsettings.php:68
+#, fuzzy
+msgid "You must be logged in to edit a group."
+msgstr "您必须登录才能创建小组。"
 
-#: ../actions/register.php:28 actions/register.php:28
-#: actions/finishopenidlogin.php:196 actions/register.php:90
-msgid "Registration not allowed."
-msgstr "不允许注册。"
+#: actions/groupdesignsettings.php:141
+#, fuzzy
+msgid "Group design"
+msgstr "组"
 
-#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67
-msgid "Registration successful"
-msgstr "注册成功。"
+#: actions/groupdesignsettings.php:152
+msgid ""
+"Customize the way your group looks with a background image and a colour "
+"palette of your choice."
+msgstr ""
 
-#: ../actions/userauthorization.php:120 actions/userauthorization.php:127
-#: actions/userauthorization.php:144
-msgid "Reject"
-msgstr "拒绝"
+#: actions/groupdesignsettings.php:262 actions/userdesignsettings.php:186
+#: lib/designsettings.php:434 lib/designsettings.php:464
+#, fuzzy
+msgid "Couldn't update your design."
+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
-msgid "Remember me"
-msgstr "记住登录状态"
+#: actions/groupdesignsettings.php:286 actions/groupdesignsettings.php:296
+#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
+#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
+#, fuzzy
+msgid "Unable to save your design settings!"
+msgstr "无法保存 Twitter 设置！"
 
-#: ../actions/updateprofile.php:70 actions/updateprofile.php:71
-#: actions/updateprofile.php:74
-msgid "Remote profile with no matching profile"
-msgstr "没有匹配的远程个人信息"
+#: actions/groupdesignsettings.php:307 actions/userdesignsettings.php:231
+#, fuzzy
+msgid "Design preferences saved."
+msgstr "同步选项已保存。"
 
-#: ../actions/remotesubscribe.php:65 actions/remotesubscribe.php:73
-#: actions/remotesubscribe.php:88
-msgid "Remote subscribe"
-msgstr "远程订阅"
+#: actions/grouplogo.php:139 actions/grouplogo.php:192
+msgid "Group logo"
+msgstr "组logo"
 
-#: ../actions/emailsettings.php:47 ../actions/emailsettings.php:75
-#: ../actions/imsettings.php:48 ../actions/openidsettings.php:106
-#: ../actions/smssettings.php:50 ../actions/smssettings.php:84
-#: actions/emailsettings.php:48 actions/emailsettings.php:76
-#: actions/imsettings.php:49 actions/openidsettings.php:108
-#: actions/smssettings.php:50 actions/smssettings.php:84
-#: actions/twittersettings.php:59 actions/emailsettings.php:101
-#: actions/emailsettings.php:134 actions/imsettings.php:102
-#: actions/openidsettings.php:166 actions/smssettings.php:103
-#: actions/smssettings.php:146 actions/twittersettings.php:115
-msgid "Remove"
-msgstr "移除"
+#: actions/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/openidsettings.php:68 actions/openidsettings.php:69
-#: actions/openidsettings.php:123
-msgid "Remove OpenID"
-msgstr "移除OpenID"
+#: actions/grouplogo.php:362
+#, fuzzy
+msgid "Pick a square area of the image to be the logo."
+msgstr "请选择一块方形区域作为你的头像"
 
-#: ../actions/openidsettings.php:73
-msgid ""
-"Removing your only OpenID would make it impossible to log in! If you need to "
-"remove it, add another OpenID first."
-msgstr "移除唯一的OpenID可能使您无法登陆！如果需要移除它，请先添加一个新的。"
+#: actions/grouplogo.php:396
+msgid "Logo updated."
+msgstr "logo已更新。"
 
-#: ../lib/stream.php:55 lib/personal.php:55 lib/personalgroupnav.php:103
-msgid "Replies"
-msgstr "回复"
+#: actions/grouplogo.php:398
+#, fuzzy
+msgid "Failed updating logo."
+msgstr "更新logo失败。"
 
-#: ../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
+#: actions/groupmembers.php:93 lib/groupnav.php:92
 #, php-format
-msgid "Replies to %s"
-msgstr "%s 的回复"
+msgid "%s group members"
+msgstr "%s 组成员"
 
-#: ../actions/recoverpassword.php:183 actions/recoverpassword.php:189
-#: actions/recoverpassword.php:223
-msgid "Reset"
-msgstr "重置"
+#: actions/groupmembers.php:96
+#, php-format
+msgid "%s group members, page %d"
+msgstr "%s 组成员, 第 %d 页"
 
-#: ../actions/recoverpassword.php:173 actions/recoverpassword.php:178
-#: actions/recoverpassword.php:197
-msgid "Reset password"
-msgstr "重置密码"
+#: actions/groupmembers.php:111
+msgid "A list of the users in this group."
+msgstr "该组成员列表。"
 
-#: ../lib/settingsaction.php:99 lib/settingsaction.php:93
-#: actions/subscriptions.php:123 lib/connectsettingsaction.php:107
-msgid "SMS"
-msgstr "SMS短信"
+#: actions/groupmembers.php:175 lib/action.php:439 lib/groupnav.php:107
+msgid "Admin"
+msgstr "admin管理员"
 
-#: ../actions/smssettings.php:67 actions/smssettings.php:67
-#: actions/smssettings.php:126
-msgid "SMS Phone number"
-msgstr "SMS短信电话号码"
+#: actions/groupmembers.php:346 lib/blockform.php:69
+msgid "Block"
+msgstr "阻止"
 
-#: ../actions/smssettings.php:33 actions/smssettings.php:33
-#: actions/smssettings.php:58
-msgid "SMS Settings"
-msgstr "SMS短信设置"
+#: actions/groupmembers.php:441
+#, fuzzy
+msgid "Make user an admin of the group"
+msgstr "只有admin才能编辑这个组"
 
-#: ../lib/mail.php:219 lib/mail.php:225 lib/mail.php:437
-msgid "SMS confirmation"
-msgstr "SMS短信确认"
+#: actions/groupmembers.php:473
+#, fuzzy
+msgid "Make Admin"
+msgstr "admin管理员"
 
-#: ../actions/recoverpassword.php:182 actions/recoverpassword.php:188
-#: actions/recoverpassword.php:222
-msgid "Same as password above"
-msgstr "相同的密码"
+#: actions/groupmembers.php:473
+msgid "Make this user an admin"
+msgstr ""
 
-#: ../actions/register.php:156 actions/register.php:170
-#: actions/register.php:377
-msgid "Same as password above. Required."
-msgstr "相同的密码。此项必填。"
+#: actions/grouprss.php:133
+#, fuzzy, php-format
+msgid "Updates from members of %1$s on %2$s!"
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/emailsettings.php:97 ../actions/imsettings.php:81
-#: ../actions/profilesettings.php:67 ../actions/smssettings.php:100
-#: actions/emailsettings.php:104 actions/imsettings.php:82
-#: actions/profilesettings.php:101 actions/smssettings.php:100
-#: actions/twittersettings.php:83 actions/emailsettings.php:182
-#: actions/facebooksettings.php:114 actions/imsettings.php:157
-#: actions/othersettings.php:117 actions/profilesettings.php:150
-#: actions/smssettings.php:169 actions/subscriptions.php:124
-#: actions/tagother.php:152 actions/twittersettings.php:161
-#: lib/groupeditform.php:171
-msgid "Save"
-msgstr "保存"
+#: 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 个字符，多个搜索条件用空格分隔。"
 
-#: ../lib/searchaction.php:84 ../lib/util.php:300 lib/searchaction.php:84
-#: lib/util.php:316 lib/action.php:325
-msgid "Search"
-msgstr "搜索"
+#: actions/groupsearch.php:58
+msgid "Group search"
+msgstr "组检索"
 
-#: ../actions/noticesearch.php:80 actions/noticesearch.php:85
-#: actions/noticesearch.php:127
-msgid "Search Stream Feed"
-msgstr "搜索聚合"
+#: actions/groupsearch.php:79 actions/noticesearch.php:117
+#: actions/peoplesearch.php:83
+#, fuzzy
+msgid "No results."
+msgstr "没有结果"
 
-#: ../actions/noticesearch.php:30 actions/noticesearch.php:30
-#: actions/noticesearch.php:57
+#: actions/groupsearch.php:82
 #, php-format
 msgid ""
-"Search for notices on %%site.name%% by their contents. Separate search terms "
-"by spaces; they must be 3 characters or more."
+"If you can't find the group you're looking for, you can [create it](%%action."
+"newgroup%%) yourself."
 msgstr ""
-"在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用"
-"空格分隔。"
 
-#: ../actions/peoplesearch.php:28
+#: actions/groupsearch.php:85
 #, php-format
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-"Separate the terms by spaces; they must be 3 characters or more."
+"Why not [register an account](%%action.register%%) and [create the group](%%"
+"action.newgroup%%) yourself!"
 msgstr ""
-"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
-"含 3 个字符，多个搜索条件用空格分隔。"
 
-#: ../actions/smssettings.php:296 actions/smssettings.php:304
-#: actions/smssettings.php:457
-msgid "Select a carrier"
-msgstr "选择运营商"
-
-#: ../actions/invite.php:137 ../lib/util.php:1172 actions/invite.php:145
-#: lib/util.php:1306 lib/util.php:1731 actions/invite.php:182
-#: lib/messageform.php:167 lib/noticeform.php:177
-msgid "Send"
-msgstr "发送"
-
-#: ../actions/emailsettings.php:73 ../actions/smssettings.php:82
-#: actions/emailsettings.php:74 actions/smssettings.php:82
-#: actions/emailsettings.php:132 actions/smssettings.php:145
-msgid "Send email to this address to post new notices."
-msgstr "向这个电子邮件发信以发布新的通告。"
-
-#: ../actions/emailsettings.php:88 actions/emailsettings.php:89
-#: actions/emailsettings.php:152
-msgid "Send me notices of new subscriptions through email."
-msgstr "如果有新订阅，通过电子邮件告诉我。"
+#: actions/groups.php:62 lib/profileaction.php:220 lib/publicgroupnav.php:81
+#: lib/subgroupnav.php:98
+msgid "Groups"
+msgstr "组"
 
-#: ../actions/imsettings.php:70 actions/imsettings.php:71
-#: actions/imsettings.php:137
-msgid "Send me notices through Jabber/GTalk."
-msgstr "通过Jabber/GTalk发送通告。"
+#: actions/groups.php:64
+#, php-format
+msgid "Groups, page %d"
+msgstr "组，第 %d 页"
 
-#: ../actions/smssettings.php:97 actions/smssettings.php:97
+#: actions/groups.php:90
+#, php-format
 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 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 "Settings"
-msgstr "设置"
-
-#: ../actions/profilesettings.php:192 actions/profilesettings.php:307
-#: actions/profilesettings.php:319
-msgid "Settings saved."
-msgstr "设置已保存。"
-
-#: ../actions/tag.php:60 actions/tag.php:60
-msgid "Showing most popular tags from the last week"
-msgstr "显示上周以来最流行的标签"
-
-#: ../actions/finishaddopenid.php:66 actions/finishaddopenid.php:66
-#: actions/finishaddopenid.php:114
-msgid "Someone else already has this OpenID."
-msgstr "其他人已经使用了这个OpenID。"
-
-#: ../actions/finishopenidlogin.php:42 ../actions/openidsettings.php:126
-#: actions/finishopenidlogin.php:47 actions/openidsettings.php:135
-#: actions/finishopenidlogin.php:52 actions/openidsettings.php:202
-msgid "Something weird happened."
-msgstr "发生了奇怪的错误……"
-
-#: ../scripts/maildaemon.php:58 scripts/maildaemon.php:58
-#: scripts/maildaemon.php:61
-msgid "Sorry, no incoming email allowed."
-msgstr "对不起，发布用的电子邮件无法使用。"
+"%%%%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 ""
 
-#: ../scripts/maildaemon.php:54 scripts/maildaemon.php:54
-#: scripts/maildaemon.php:57
-msgid "Sorry, that is not your incoming email address."
-msgstr "对不起，这个发布用的电子邮件属于其他用户。"
+#: actions/groups.php:107 actions/usergroups.php:124 lib/groupeditform.php:122
+#, fuzzy
+msgid "Create a new group"
+msgstr "创建新组"
 
-#: ../lib/util.php:330 lib/util.php:346 lib/action.php:574
-msgid "Source"
-msgstr "来源"
+#: actions/groupunblock.php:91
+msgid "Only an admin can unblock group members."
+msgstr ""
 
-#: ../actions/showstream.php:296 actions/showstream.php:311
-#: actions/showstream.php:476
-msgid "Statistics"
-msgstr "统计"
+#: actions/groupunblock.php:95
+#, fuzzy
+msgid "User is not blocked from group."
+msgstr "用户没有个人信息。"
 
-#: ../actions/finishopenidlogin.php:182 ../actions/finishopenidlogin.php:246
-#: actions/finishopenidlogin.php:188 actions/finishopenidlogin.php:252
-#: actions/finishopenidlogin.php:222 actions/finishopenidlogin.php:290
-msgid "Stored OpenID not found."
-msgstr "未找到已有的OpenID。"
+#: actions/groupunblock.php:128 actions/unblock.php:77
+#, fuzzy
+msgid "Error removing the block."
+msgstr "保存用户时出错。"
 
-#: ../actions/remotesubscribe.php:75 ../actions/showstream.php:188
-#: ../actions/showstream.php:197 actions/remotesubscribe.php:84
-#: actions/showstream.php:197 actions/showstream.php:206
-#: actions/remotesubscribe.php:113 actions/showstream.php:376
-#: lib/subscribeform.php:139
-msgid "Subscribe"
-msgstr "订阅"
+#: actions/imsettings.php:59
+msgid "IM Settings"
+msgstr "IM 设置"
 
-#: ../actions/showstream.php:313 ../actions/subscribers.php:27
-#: actions/showstream.php:328 actions/subscribers.php:27
-#: actions/showstream.php:436 actions/showstream.php:498
-#: lib/subgroupnav.php:88
-msgid "Subscribers"
-msgstr "订阅者"
+#: actions/imsettings.php:70
+#, php-format
+msgid ""
+"You can send and receive notices through Jabber/GTalk [instant messages](%%"
+"doc.im%%). Configure your address and settings below."
+msgstr ""
+"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
+"们。"
 
-#: ../actions/userauthorization.php:310 actions/userauthorization.php:322
-#: actions/userauthorization.php:338
-msgid "Subscription authorized"
-msgstr "订阅已确认"
+#: actions/imsettings.php:89
+#, fuzzy
+msgid "IM is not available."
+msgstr "这个页面不提供您想要的媒体类型"
 
-#: ../actions/userauthorization.php:320 actions/userauthorization.php:332
-#: actions/userauthorization.php:349
-msgid "Subscription rejected"
-msgstr "订阅被拒绝"
+#: actions/imsettings.php:106
+msgid "Current confirmed Jabber/GTalk address."
+msgstr "已确认的Jabber/GTalk帐号。"
 
-#: ../actions/showstream.php:230 ../actions/showstream.php:307
-#: ../actions/subscriptions.php:27 actions/showstream.php:240
-#: actions/showstream.php:322 actions/subscriptions.php:27
-#: actions/showstream.php:407 actions/showstream.php:489
-#: lib/subgroupnav.php:80
-msgid "Subscriptions"
-msgstr "订阅"
+#: actions/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?)"
+msgstr ""
+"正在等待这个地址的确认。请查阅你Jabber/GTalk的帐户看有没有收到进一步的指示。"
+"（你是否已经添加 %s为你的好友？）"
 
-#: ../actions/avatar.php:87 actions/profilesettings.php:324
-#: lib/imagefile.php:78
-msgid "System error uploading file."
-msgstr "上传文件时出错。"
+#: actions/imsettings.php:124
+msgid "IM Address"
+msgstr "IM 帐号"
 
-#: ../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
-msgid "Tags"
-msgstr "标签"
+#: actions/imsettings.php:126
+#, php-format
+msgid ""
+"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
+"add %s to your buddy list in your IM client or on GTalk."
+msgstr ""
+"Jabber 或 GTalk 帐号，类似\"UserName@example.org\"。首先，必须在即时聊天工具"
+"或GTalk中将 %s 加为好友。"
 
-#: ../lib/searchaction.php:104 lib/searchaction.php:104
-msgid "Text"
-msgstr "文本"
+#: actions/imsettings.php:143
+msgid "Send me notices through Jabber/GTalk."
+msgstr "通过Jabber/GTalk发送通告。"
 
-#: ../actions/noticesearch.php:34 actions/noticesearch.php:34
-#: actions/noticesearch.php:67
-msgid "Text search"
-msgstr "搜索文本"
+#: actions/imsettings.php:148
+msgid "Post a notice when my Jabber/GTalk status changes."
+msgstr "当我的Jabber/GTalk状态改变时自动发布通告。"
 
-#: ../actions/openidsettings.php:140 actions/openidsettings.php:149
-#: actions/openidsettings.php:227
-msgid "That OpenID does not belong to you."
-msgstr "此OpenID属于他人。"
+#: actions/imsettings.php:153
+msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
+msgstr "如果我尚未订阅的用户回我消息，使用Jabber/GTalk通知我。"
 
-#: ../actions/confirmaddress.php:52 actions/confirmaddress.php:52
-#: actions/confirmaddress.php:94
-msgid "That address has already been confirmed."
-msgstr "此地址已被确认。"
+#: actions/imsettings.php:159
+msgid "Publish a MicroID for my Jabber/GTalk address."
+msgstr "公开Jabber/GTalk帐号的 MicroID。"
 
-#: ../actions/confirmaddress.php:43 actions/confirmaddress.php:43
-#: actions/confirmaddress.php:85
-msgid "That confirmation code is not for you!"
-msgstr "此确认码不适用！"
+#: actions/imsettings.php:285
+msgid "No Jabber ID."
+msgstr "没有 Jabber ID。"
 
-#: ../actions/emailsettings.php:191 actions/emailsettings.php:209
-msgid "That email address already belongs to another user."
-msgstr "此电子邮件属于其他用户。"
+#: actions/imsettings.php:292
+msgid "Cannot normalize that Jabber ID"
+msgstr "无法识别此Jabber ID"
 
-#: ../actions/avatar.php:80 actions/profilesettings.php:317
-#: lib/imagefile.php:71
-msgid "That file is too big."
-msgstr "文件超出大小限制。"
+#: actions/imsettings.php:296
+msgid "Not a valid Jabber ID"
+msgstr "不是有效的 Jabber ID"
 
-#: ../actions/imsettings.php:170 actions/imsettings.php:178
-#: 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
-#: actions/emailsettings.php:318
-msgid "That is already your email address."
-msgstr "您已登记此电子邮件。"
+#: actions/imsettings.php:302
+msgid "Jabber ID already belongs to another user."
+msgstr "Jabber ID 属于另一用户。"
 
-#: ../actions/smssettings.php:188 actions/smssettings.php:196
-#: actions/smssettings.php:306
-msgid "That is already your phone number."
-msgstr "您已登记此电话号码。"
+#: actions/imsettings.php:327
+#, php-format
+msgid ""
+"A confirmation code was sent to the IM address you added. You must approve %"
+"s for sending messages to you."
+msgstr "验证码已被发送到您新增的即时通讯帐号。您必须允许 %s 向您发送信息。"
 
-#: ../actions/imsettings.php:233 actions/imsettings.php:241
-#: 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
-#: actions/emailsettings.php:397
-msgid "That is not your email address."
-msgstr "这是他人的电子邮件。"
-
-#: ../actions/smssettings.php:257 actions/smssettings.php:265
-#: actions/smssettings.php:393
-msgid "That is not your phone number."
-msgstr "这是他人的电话号码。"
-
-#: ../actions/emailsettings.php:226 ../actions/imsettings.php:210
-#: actions/emailsettings.php:244 actions/imsettings.php:218
-#: actions/emailsettings.php:367 actions/imsettings.php:349
-msgid "That is the wrong IM address."
-msgstr "即时通讯帐号错误。"
-
-#: ../actions/smssettings.php:233 actions/smssettings.php:241
-#: actions/smssettings.php:362
-msgid "That is the wrong confirmation number."
-msgstr "确认码错误。"
-
-#: ../actions/smssettings.php:191 actions/smssettings.php:199
-#: actions/smssettings.php:309
-msgid "That phone number already belongs to another user."
-msgstr "这个电话号码属于另一个用户。"
-
-#: ../actions/newnotice.php:49 ../actions/twitapistatuses.php:408
-#: actions/newnotice.php:49 actions/twitapistatuses.php:330
-#: actions/facebookhome.php:243 actions/twitapistatuses.php:276
-msgid "That's too long. Max notice size is 140 chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
-
-#: ../actions/twitapiaccount.php:74 actions/twitapiaccount.php:72
-#: actions/twitapiaccount.php:62
-msgid "That's too long. Max notice size is 255 chars."
-msgstr "超出长度限制。不能超过 255 个字符。"
+#: actions/inbox.php:59
+#, php-format
+msgid "Inbox for %s - page %d"
+msgstr "%s 的收件箱 - 第 %d 页"
 
-#: ../actions/confirmaddress.php:92 actions/confirmaddress.php:92
+#: actions/inbox.php:62
 #, php-format
-msgid "The address \"%s\" has been confirmed for your account."
-msgstr "地址 \"%s\" 已确认。"
+msgid "Inbox for %s"
+msgstr "%s 的收件箱"
 
-#: ../actions/emailsettings.php:264 ../actions/imsettings.php:250
-#: ../actions/smssettings.php:274 actions/emailsettings.php:282
-#: actions/imsettings.php:258 actions/smssettings.php:282
-#: actions/emailsettings.php:416 actions/imsettings.php:402
-#: actions/smssettings.php:413
-msgid "The address was removed."
-msgstr "地址被移除。"
+#: actions/inbox.php:115
+msgid "This is your inbox, which lists your incoming private messages."
+msgstr "这是您的收件箱，包含发给您的私人消息。"
 
-#: ../actions/userauthorization.php:312
-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:"
+#: actions/invite.php:39
+msgid "Invites have been disabled."
 msgstr ""
-"订阅已确认，但是没有回传URL。请到此网站查看如何确认订阅。您的订阅标识是："
 
-#: ../actions/userauthorization.php:322
-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/invite.php:41
+#, php-format
+msgid "You must be logged in to invite other users to use %s"
+msgstr "您必须登录才能邀请其他人使用 %s"
 
-#: ../actions/subscribers.php:35 actions/subscribers.php:35
+#: actions/invite.php:72
 #, php-format
-msgid "These are the people who listen to %s's notices."
-msgstr "这些用户订阅了 %s 的通告。"
+msgid "Invalid email address: %s"
+msgstr "电子邮件地址 %s 不正确"
 
-#: ../actions/subscribers.php:33 actions/subscribers.php:33
-msgid "These are the people who listen to your notices."
-msgstr "这些用户订阅了您的通告。"
+#: actions/invite.php:110
+msgid "Invitation(s) sent"
+msgstr "已发送邀请"
 
-#: ../actions/subscriptions.php:35 actions/subscriptions.php:35
-#, php-format
-msgid "These are the people whose notices %s listens to."
-msgstr "这是 %s 订阅的用户。"
+#: actions/invite.php:112
+msgid "Invite new users"
+msgstr "邀请新用户"
 
-#: ../actions/subscriptions.php:33 actions/subscriptions.php:33
-msgid "These are the people whose notices you listen to."
-msgstr "这是您订阅的用户。"
+#: actions/invite.php:128
+msgid "You are already subscribed to these users:"
+msgstr "您已订阅这些用户："
+
+#: actions/invite.php:131 actions/invite.php:139
+#, php-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
 
-#: ../actions/invite.php:89 actions/invite.php:96 actions/invite.php:128
+#: actions/invite.php:136
 msgid ""
 "These people are already users and you were automatically subscribed to them:"
 msgstr "这些好友已注册，您已自动订阅这些用户。"
 
-#: ../actions/recoverpassword.php:88
-msgid "This confirmation code is too old. Please start again."
-msgstr "验证码超时，请重来。"
+#: actions/invite.php:144
+msgid "Invitation(s) sent to the following people:"
+msgstr "已发送邀请给这些人："
 
-#: ../lib/openid.php:195
+#: actions/invite.php:150
 msgid ""
-"This form should automatically submit itself. If not, click the submit "
-"button to go to your OpenID provider."
-msgstr "此表单会自动提交。如果没有，点击“提交”以转向 OpenID 提供者。"
+"You will be notified when your invitees accept the invitation and register "
+"on the site. Thanks for growing the community!"
+msgstr "如果其他人接受邀请并注册，您将得到通知。谢谢您推动了社区发展壮大！"
 
-#: ../actions/finishopenidlogin.php:56 actions/finishopenidlogin.php:61
-#: actions/finishopenidlogin.php:67
-#, php-format
+#: actions/invite.php:162
 msgid ""
-"This is the first time you've logged into %s so we must connect your OpenID "
-"to a local account. You can either create a new account, or connect with "
-"your existing account, if you have one."
-msgstr ""
-"这是您第一次登陆 %s，我们需要将 OpenID 连接到这里的帐号。您可以创建新帐号，或"
-"者连接到已有的帐号。"
+"Use this form to invite your friends and colleagues to use this service."
+msgstr "使用这个表单来邀请好友和同事加入。"
 
-#: ../actions/twitapifriendships.php:108 ../actions/twitapistatuses.php:586
-#: actions/twitapifavorites.php:127 actions/twitapifriendships.php:108
-#: actions/twitapistatuses.php:511 actions/twitapifavorites.php:97
-#: actions/twitapifriendships.php:85 actions/twitapistatuses.php:436
-msgid "This method requires a POST or DELETE."
-msgstr "此方法接受POST或DELETE请求。"
+#: actions/invite.php:187
+msgid "Email addresses"
+msgstr "电子邮件地址"
 
-#: ../actions/twitapiaccount.php:65 ../actions/twitapifriendships.php:44
-#: ../actions/twitapistatuses.php:381 actions/twitapiaccount.php:63
-#: actions/twitapidirect_messages.php:114 actions/twitapifriendships.php:44
-#: actions/twitapistatuses.php:303 actions/twitapiaccount.php:53
-#: actions/twitapidirect_messages.php:122 actions/twitapifriendships.php:32
-#: actions/twitapistatuses.php:244
-msgid "This method requires a POST."
-msgstr "此方法接受POST请求。"
+#: actions/invite.php:189
+msgid "Addresses of friends to invite (one per line)"
+msgstr "要邀请的好友地址(每行一个)"
 
-#: ../lib/util.php:164 lib/util.php:246
-msgid "This page is not available in a media type you accept"
-msgstr "这个页面不提供您想要的媒体类型"
+#: actions/invite.php:192
+msgid "Personal message"
+msgstr "个人消息"
 
-#: ../actions/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:138
-msgid "Timezone"
-msgstr "时区"
+#: actions/invite.php:194
+msgid "Optionally add a personal message to the invitation."
+msgstr "在邀请中加几句话(可选)。"
 
-#: ../actions/profilesettings.php:107 actions/profilesettings.php:222
-#: actions/profilesettings.php:211
-msgid "Timezone not selected."
-msgstr "未选择时区。"
+#: actions/invite.php:197 lib/messageform.php:181 lib/noticeform.php:208
+msgid "Send"
+msgstr "发送"
 
-#: ../actions/remotesubscribe.php:43
+#: actions/invite.php:226
+#, php-format
+msgid "%1$s has invited you to join them on %2$s"
+msgstr "%1$s 邀请您加入 %2$s"
+
+#: actions/invite.php:228
 #, 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."
+"%1$s has invited you to join them on %2$s (%3$s).\n"
+"\n"
+"%2$s is a micro-blogging service that lets you keep up-to-date with people "
+"you know and people who interest you.\n"
+"\n"
+"You can also share news about yourself, your thoughts, or your life online "
+"with people who know about you. It's also great for meeting new people who "
+"share your interests.\n"
+"\n"
+"%1$s said:\n"
+"\n"
+"%4$s\n"
+"\n"
+"You can see %1$s's profile page on %2$s here:\n"
+"\n"
+"%5$s\n"
+"\n"
+"If you'd like to try the service, click on the link below to accept the "
+"invitation.\n"
+"\n"
+"%6$s\n"
+"\n"
+"If not, you can ignore this message. Thanks for your patience and your "
+"time.\n"
+"\n"
+"Sincerely, %2$s\n"
 msgstr ""
-"要订阅，你可以登录 (%%action.login%%), 或注册(%%action.register%%) "
-"一个新帐号。如果你已经有在另一个兼容的微博客的帐号(%%doc.openmublog%%),  请填入你资料的互联网地址URL."
+"%1$s 邀请你加入 %2$s (%3$s).\n"
+"\n"
+"%2$s 是一个能让你和你认识的、感兴趣的人保持联系的微博客服务。 \n"
+"你可以和你认识的人分享你的近况、想法或者你的网络生活。你也可以结交有共同兴趣"
+"的新朋友。\n"
+"\n"
+"%1$s 说:\n"
+"\n"
+"%4$s\n"
+"\n"
+"你可以在这里查阅 %1$s's 的资料 %2$s :\n"
+"\n"
+"%5$s\n"
+"\n"
+"如果你想使用这个服务，请点击一下链接接受邀请。\n"
+"%6$s\n"
+"\n"
+"如果你不愿意，请跳过这条信息。感谢您的耐心和时间。\n"
+"\n"
+"诚挚的感谢, %2$s\n"
 
-#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
-#: actions/twitapifriendships.php:132
-msgid "Two user ids or screen_names must be supplied."
-msgstr "必须提供两个用户帐号或昵称。"
+#: actions/joingroup.php:60
+#, fuzzy
+msgid "You must be logged in to join a group."
+msgstr "您必须登录才能加入组。"
 
-#: ../actions/profilesettings.php:48 ../actions/register.php:169
-#: actions/profilesettings.php:81 actions/register.php:183
-#: actions/profilesettings.php:109
-msgid "URL of your homepage, blog, or profile on another site"
-msgstr "您的主页、博客或在其他站点的URL"
+#: actions/joingroup.php:90 lib/command.php:217
+msgid "You are already a member of that group"
+msgstr "您已经是该组成员"
 
-#: ../actions/remotesubscribe.php:74 actions/remotesubscribe.php:83
-#: actions/remotesubscribe.php:110
-msgid "URL of your profile on another compatible microblogging service"
-msgstr "您在其他兼容的微博客服务的个人信息URL"
+#: actions/joingroup.php:128 lib/command.php:234
+#, fuzzy, php-format
+msgid "Could not join user %s to group %s"
+msgstr "无法把 %s 用户添加到 %s 组"
 
-#: ../actions/emailsettings.php:130 ../actions/imsettings.php:110
-#: ../actions/recoverpassword.php:39 ../actions/smssettings.php:135
-#: actions/emailsettings.php:144 actions/imsettings.php:118
-#: actions/recoverpassword.php:39 actions/smssettings.php:143
-#: actions/twittersettings.php:108 actions/avatarsettings.php:258
-#: actions/emailsettings.php:242 actions/grouplogo.php:317
-#: actions/imsettings.php:214 actions/recoverpassword.php:44
-#: actions/smssettings.php:236 actions/twittersettings.php:302
-msgid "Unexpected form submission."
-msgstr "未预料的表单提交。"
+#: actions/joingroup.php:135 lib/command.php:239
+#, fuzzy, php-format
+msgid "%s joined group %s"
+msgstr "%s 加入 %s 组"
 
-#: ../actions/recoverpassword.php:276 actions/recoverpassword.php:289
-#: actions/recoverpassword.php:323
-msgid "Unexpected password reset."
-msgstr "未预料的密码重置。"
+#: actions/leavegroup.php:60
+#, fuzzy
+msgid "You must be logged in to leave a group."
+msgstr "您必须登录才能邀请其他人使用 %s"
 
-#: ../index.php:57 index.php:57 actions/recoverpassword.php:202
-msgid "Unknown action"
-msgstr "未知动作"
+#: actions/leavegroup.php:90 lib/command.php:268
+#, fuzzy
+msgid "You are not a member of that group."
+msgstr "您未告知此个人信息"
 
-#: ../actions/finishremotesubscribe.php:58
-#: actions/finishremotesubscribe.php:60 actions/finishremotesubscribe.php:61
-msgid "Unknown version of OMB protocol."
-msgstr "此OMB协议版本无效。"
+#: actions/leavegroup.php:119 lib/command.php:278
+#, fuzzy
+msgid "Could not find membership record."
+msgstr "无法更新用户记录。"
 
-#: ../lib/util.php:269 lib/util.php:285
-msgid ""
-"Unless otherwise specified, contents of this site are copyright by the "
-"contributors and available under the "
-msgstr "除非另外说明，此站点的内容由贡献者版权所有，授权方式为"
+#: actions/leavegroup.php:127 lib/command.php:284
+#, fuzzy, php-format
+msgid "Could not remove user %s to group %s"
+msgstr "无法订阅用户：未找到。"
 
-#: ../actions/confirmaddress.php:48 actions/confirmaddress.php:48
-#: actions/confirmaddress.php:90
+#: actions/leavegroup.php:134 lib/command.php:289
 #, php-format
-msgid "Unrecognized address type %s"
-msgstr "不可识别的地址类型 %s"
-
-#: ../actions/showstream.php:209 actions/showstream.php:219
-#: lib/unsubscribeform.php:137
-msgid "Unsubscribe"
-msgstr "退订"
-
-#: ../actions/postnotice.php:44 ../actions/updateprofile.php:45
-#: actions/postnotice.php:45 actions/updateprofile.php:46
-#: actions/postnotice.php:48 actions/updateprofile.php:49
-msgid "Unsupported OMB version"
-msgstr "不支持此OMB版本"
-
-#: ../actions/avatar.php:105 actions/profilesettings.php:342
-#: lib/imagefile.php:102
-msgid "Unsupported image file format."
-msgstr "不支持这种图像格式。"
+msgid "%s left group %s"
+msgstr "%s 离开群 %s"
 
-#: ../lib/settingsaction.php:100 lib/settingsaction.php:94
-#: lib/connectsettingsaction.php:108
-msgid "Updates by SMS"
-msgstr "使用SMS短信更新"
+#: actions/login.php:79 actions/register.php:137
+msgid "Already logged in."
+msgstr "已登录。"
 
-#: ../lib/settingsaction.php:103 lib/settingsaction.php:97
-#: lib/connectsettingsaction.php:105
-msgid "Updates by instant messenger (IM)"
-msgstr "使用即时通讯工具(IM)更新"
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+msgstr "通告内容不正确"
 
-#: ../actions/twitapistatuses.php:241 actions/twitapistatuses.php:158
-#: actions/twitapistatuses.php:129
-#, php-format
-msgid "Updates from %1$s and friends on %2$s!"
-msgstr "%2$s 上 %1$s 和好友的更新！"
+#: actions/login.php:143
+msgid "Incorrect username or password."
+msgstr "用户名或密码不正确。"
 
-#: ../actions/twitapistatuses.php:341 actions/twitapistatuses.php:268
-#: actions/twitapistatuses.php:202
-#, php-format
-msgid "Updates from %1$s on %2$s!"
-msgstr "%2$s 上 %1$s 的更新！"
+#: actions/login.php:149
+#, fuzzy
+msgid "Error setting user. You are probably not authorized."
+msgstr "未认证。"
 
-#: ../actions/avatar.php:68 actions/profilesettings.php:161
-#: actions/avatarsettings.php:162 actions/grouplogo.php:232
-msgid "Upload"
-msgstr "上传"
+#: actions/login.php:204 actions/login.php:257 lib/action.php:457
+#: lib/logingroupnav.php:79
+msgid "Login"
+msgstr "登录"
 
-#: ../actions/avatar.php:27
-msgid ""
-"Upload a new \"avatar\" (user image) here. You can't edit the picture after "
-"you upload it, so make sure it's more or less square. It must be under the "
-"site license, also. Use a picture that belongs to you and that you want to "
-"share."
-msgstr ""
-"在这里上传新的头像。上传后无法修改，请尽量使用正方形图片。图片必须使用与站点"
-"相同的授权。请使用您希望分享的属于您的图片。"
+#: actions/login.php:243
+msgid "Login to site"
+msgstr "登录"
 
-#: ../lib/settingsaction.php:91
-msgid "Upload a new profile image"
-msgstr "上传个人信息头像"
+#: actions/login.php:246 actions/profilesettings.php:106
+#: actions/register.php:423 actions/showgroup.php:236 actions/tagother.php:94
+#: lib/groupeditform.php:152 lib/userprofile.php:131
+msgid "Nickname"
+msgstr "昵称"
 
-#: ../actions/invite.php:114 actions/invite.php:121 actions/invite.php:154
-msgid ""
-"Use this form to invite your friends and colleagues to use this service."
-msgstr "使用这个表单来邀请好友和同事加入。"
+#: actions/login.php:249 actions/register.php:428
+#: lib/accountsettingsaction.php:116
+msgid "Password"
+msgstr "密码"
 
-#: ../actions/register.php:159 ../actions/register.php:162
-#: actions/register.php:173 actions/register.php:176
-msgid "Used only for updates, announcements, and password recovery"
-msgstr "只用于更新、通告或密码恢复"
+#: actions/login.php:252 actions/register.php:477
+msgid "Remember me"
+msgstr "记住登录状态"
 
-#: ../actions/finishremotesubscribe.php:86
-#: actions/finishremotesubscribe.php:88 actions/finishremotesubscribe.php:94
-msgid "User being listened to doesn't exist."
-msgstr "要查看的用户不存在。"
+#: actions/login.php:253 actions/register.php:479
+msgid "Automatically login in the future; not for shared computers!"
+msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录！"
 
-#: ../actions/all.php:41 ../actions/avatarbynickname.php:48
-#: ../actions/foaf.php:47 ../actions/replies.php:41
-#: ../actions/showstream.php:44 ../actions/twitapiaccount.php:82
-#: ../actions/twitapistatuses.php:319 ../actions/twitapistatuses.php:685
-#: ../actions/twitapiusers.php:82 actions/all.php:41
-#: actions/avatarbynickname.php:48 actions/foaf.php:47 actions/replies.php:41
-#: actions/showfavorites.php:41 actions/showstream.php:44
-#: actions/twitapiaccount.php:80 actions/twitapifavorites.php:68
-#: actions/twitapistatuses.php:235 actions/twitapistatuses.php:609
-#: actions/twitapiusers.php:87 lib/mailbox.php:50
-#: actions/avatarbynickname.php:80 actions/foaf.php:48 actions/replies.php:80
-#: actions/showstream.php:107 actions/twitapiaccount.php:70
-#: actions/twitapifavorites.php:42 actions/twitapistatuses.php:167
-#: actions/twitapistatuses.php:503 actions/twitapiusers.php:55
-#: actions/usergroups.php:99 lib/galleryaction.php:67 lib/twitterapi.php:626
-msgid "User has no profile."
-msgstr "用户没有个人信息。"
+#: actions/login.php:263
+msgid "Lost or forgotten password?"
+msgstr "忘记了密码？"
 
-#: ../actions/remotesubscribe.php:71 actions/remotesubscribe.php:80
-#: actions/remotesubscribe.php:105
-msgid "User nickname"
-msgstr "昵称"
+#: actions/login.php:282
+msgid ""
+"For security reasons, please re-enter your user name and password before "
+"changing your settings."
+msgstr "由于安全原因，修改设置前需要输入用户名和密码。"
 
-#: ../actions/twitapiusers.php:75 actions/twitapiusers.php:80
-msgid "User not found."
-msgstr "未找到用户。"
+#: actions/login.php:286
+#, 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/profilesettings.php:63 actions/profilesettings.php:96
-#: actions/profilesettings.php:139
-msgid "What timezone are you normally in?"
-msgstr "您一般处于哪个时区？"
+#: actions/makeadmin.php:91
+msgid "Only an admin can make another user an admin."
+msgstr ""
 
-#: ../lib/util.php:1159 lib/util.php:1293 lib/noticeform.php:141
+#: actions/makeadmin.php:95
 #, php-format
-msgid "What's up, %s?"
-msgstr "怎么样，%s？"
-
-#: ../actions/profilesettings.php:54 ../actions/register.php:175
-#: actions/profilesettings.php:87 actions/register.php:189
-#: actions/profilesettings.php:119
-msgid "Where you are, like \"City, State (or Region), Country\""
-msgstr "你的位置，格式类似\"城市，省份，国家\""
+msgid "%s is already an admin for group \"%s\"."
+msgstr ""
 
-#: ../actions/updateprofile.php:128 actions/updateprofile.php:129
-#: actions/updateprofile.php:132
+#: actions/makeadmin.php:132
 #, php-format
-msgid "Wrong image type for '%s'"
-msgstr "'%s' 图像格式错误"
+msgid "Can't get membership record for %s in group %s"
+msgstr ""
 
-#: ../actions/updateprofile.php:123 actions/updateprofile.php:124
-#: actions/updateprofile.php:127
+#: actions/makeadmin.php:145
 #, php-format
-msgid "Wrong size image at '%s'"
-msgstr "图像大小 '%s' 错误"
+msgid "Can't make %s an admin for group %s"
+msgstr ""
 
-#: ../actions/deletenotice.php:63 ../actions/deletenotice.php:72
-#: actions/deletenotice.php:64 actions/deletenotice.php:79
-#: actions/block.php:148 actions/deletenotice.php:122
-#: actions/deletenotice.php:141
-msgid "Yes"
-msgstr "是"
+#: actions/microsummary.php:69
+msgid "No current status"
+msgstr "没有当前状态"
 
-#: ../actions/finishaddopenid.php:64 actions/finishaddopenid.php:64
-#: actions/finishaddopenid.php:112
-msgid "You already have this OpenID!"
-msgstr "已登记此OpenID！"
+#: actions/newgroup.php:53
+msgid "New group"
+msgstr "新组"
 
-#: ../actions/deletenotice.php:37 actions/deletenotice.php:37
-msgid ""
-"You are about to permanently delete a notice.  Once this is done, it cannot "
-"be undone."
-msgstr "您选择了永久删除通告。这样做是无法恢复的。"
+#: actions/newgroup.php:110
+msgid "Use this form to create a new group."
+msgstr "使用此表格创建组。"
 
-#: ../actions/recoverpassword.php:31 actions/recoverpassword.php:31
-#: actions/recoverpassword.php:36
-msgid "You are already logged in!"
-msgstr "已登录！"
+#: actions/newmessage.php:71 actions/newmessage.php:231
+msgid "New message"
+msgstr "新消息"
 
-#: ../actions/invite.php:81 actions/invite.php:88 actions/invite.php:120
-msgid "You are already subscribed to these users:"
-msgstr "您已订阅这些用户："
+#: 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:144 actions/newnotice.php:136 lib/command.php:351
+#: lib/command.php:424
+msgid "No content!"
+msgstr "没有内容！"
 
-#: ../actions/twitapifriendships.php:128 actions/twitapifriendships.php:128
-#: actions/twitapifriendships.php:105
-msgid "You are not friends with the specified user."
-msgstr "您与此用户并非好友。"
+#: actions/newmessage.php:158
+msgid "No recipient specified."
+msgstr "没有收件人。"
 
-#: ../actions/password.php:27
-msgid "You can change your password here. Choose a good one!"
-msgstr "在这里修改密码。选择一个好密码！"
+#: 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/register.php:135 actions/register.php:145
-msgid "You can create a new account to start posting notices."
-msgstr "请创建新帐号，开始发布通告。"
+#: actions/newmessage.php:181
+#, fuzzy
+msgid "Message sent"
+msgstr "新消息"
 
-#: ../actions/smssettings.php:28 actions/smssettings.php:28
-#: actions/smssettings.php:69
+#: actions/newmessage.php:185 lib/command.php:375
 #, php-format
-msgid "You can receive SMS messages through email from %%site.name%%."
-msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
+msgid "Direct message to %s sent"
+msgstr "已向 %s 发送消息"
 
-#: ../actions/openidsettings.php:86
-msgid ""
-"You can remove an OpenID from your account by clicking the button marked "
-"\"Remove\"."
-msgstr "您可以点击\"移除\"按钮，移除帐号的 OpenID。"
+#: actions/newmessage.php:210 actions/newnotice.php:233 lib/channel.php:170
+msgid "Ajax Error"
+msgstr "Ajax错误"
+
+#: actions/newnotice.php:69
+msgid "New notice"
+msgstr "新通告"
+
+#: actions/newnotice.php:199
+msgid "Notice posted"
+msgstr "消息已发布。"
 
-#: ../actions/imsettings.php:28 actions/imsettings.php:28
+#: actions/noticesearch.php:68
 #, php-format
 msgid ""
-"You can send and receive notices through Jabber/GTalk [instant messages](%%"
-"doc.im%%). Configure your address and settings below."
+"Search for notices on %%site.name%% by their contents. Separate search terms "
+"by spaces; they must be 3 characters or more."
 msgstr ""
-"您可以通过Jabber/GTalk [即时通讯工具](%%doc.im%%)发送和接受通告。在这里配置它"
-"们。"
-
-#: ../actions/profilesettings.php:27
-msgid ""
-"You can update your personal profile info here so people know more about you."
-msgstr "在这里更新个人信息，让大家对您了解得更多。"
+"在 %%site.name%% 的通告内容中搜索。搜索条件至少包含 3 个字符，多个搜索条件用"
+"空格分隔。"
 
-#: ../actions/finishremotesubscribe.php:31 ../actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:31 actions/remotesubscribe.php:31
-#: actions/finishremotesubscribe.php:33 actions/finishremotesubscribe.php:85
-#: actions/finishremotesubscribe.php:101 actions/remotesubscribe.php:35
-msgid "You can use the local subscription!"
-msgstr "您可以在这里订阅！"
+#: actions/noticesearch.php:78
+msgid "Text search"
+msgstr "搜索文本"
 
-#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
-#: actions/finishopenidlogin.php:38 actions/register.php:68
-#: actions/finishopenidlogin.php:43
-msgid "You can't register if you don't agree to the license."
-msgstr "您必须同意此授权方可注册。"
+#: actions/noticesearch.php:91
+#, fuzzy, php-format
+msgid "Search results for \"%s\" on %s"
+msgstr "搜索有关\"%s\"的消息"
 
-#: ../actions/updateprofile.php:63 actions/updateprofile.php:64
-#: actions/updateprofile.php:67
-msgid "You did not send us that profile"
-msgstr "您未告知此个人信息"
+#: actions/noticesearch.php:121
+#, php-format
+msgid ""
+"Be the first to [post on this topic](%%%%action.newnotice%%%%?"
+"status_textarea=%s)!"
+msgstr ""
 
-#: ../lib/mail.php:147
+#: actions/noticesearch.php:124
 #, php-format
 msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
-"Send email to %2$s to post new messages.\n"
-"\n"
-"More email instructions at %3$s.\n"
-"\n"
-"Faithfully yours,\n"
-"%4$s"
+"Why not [register an account](%%%%action.register%%%%) and be the first to "
+"[post on this topic](%%%%action.newnotice%%%%?status_textarea=%s)!"
 msgstr ""
-"您的 %1$s 发布用地址已更新。\n"
-"\n"
-"发送邮件到 %2$s 来发布新消息。\n"
-"\n"
-"更多电子邮件的帮助请见 %3$s。\n"
-"\n"
-"为您效力的 %4$s"
 
-#: ../actions/twitapistatuses.php:612 actions/twitapistatuses.php:537
-#: actions/twitapistatuses.php:463
-msgid "You may not delete another user's status."
-msgstr "您不能删除其他用户的状态。"
+#: actions/noticesearchrss.php:89
+#, fuzzy, php-format
+msgid "Updates with \"%s\""
+msgstr "%2$s 上 %1$s 的更新！"
 
-#: ../actions/invite.php:31 actions/invite.php:31 actions/invite.php:39
-#, php-format
-msgid "You must be logged in to invite other users to use %s"
-msgstr "您必须登录才能邀请其他人使用 %s"
+#: actions/noticesearchrss.php:91
+#, fuzzy, php-format
+msgid "Updates matching search term \"%1$s\" on %2$s!"
+msgstr "所有匹配搜索条件\"%s\"的消息"
 
-#: ../actions/invite.php:103 actions/invite.php:110 actions/invite.php:142
+#: actions/nudge.php:85
 msgid ""
-"You will be notified when your invitees accept the invitation and register "
-"on the site. Thanks for growing the community!"
-msgstr "如果其他人接受邀请并注册，您将得到通知。谢谢您推动了社区发展壮大！"
+"This user doesn't allow nudges or hasn't confirmed or set his email yet."
+msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
 
-#: ../actions/recoverpassword.php:149
-msgid "You've been identified. Enter a  new password below. "
-msgstr "您已得到确认。请输入新密码。"
+#: actions/nudge.php:94
+msgid "Nudge sent"
+msgstr "振铃呼叫发出。"
 
-#: ../actions/openidlogin.php:67 actions/openidlogin.php:76
-#: actions/openidlogin.php:104
-msgid "Your OpenID URL"
-msgstr "您的OpenID URL"
+#: actions/nudge.php:97
+msgid "Nudge sent!"
+msgstr "振铃呼叫已经发出！"
 
-#: ../actions/recoverpassword.php:164
-msgid "Your nickname on this server, or your registered email address."
-msgstr "您在此服务器的昵称，或注册邮箱。"
+#: actions/oembed.php:79 actions/shownotice.php:100
+msgid "Notice has no profile"
+msgstr "通告没有关联个人信息"
 
-#: ../actions/openidsettings.php:28
+#: actions/oembed.php:86 actions/shownotice.php:180
 #, php-format
-msgid ""
-"[OpenID](%%doc.openid%%) lets you log into many sites  with the same user "
-"account.  Manage your associated OpenIDs from here."
+msgid "%1$s's status on %2$s"
+msgstr "%1$s 的 %2$s 状态"
+
+#: actions/oembed.php:157
+#, fuzzy
+msgid "content type "
+msgstr "连接"
+
+#: actions/oembed.php:160
+msgid "Only "
 msgstr ""
-"[OpenID](%%doc.openid%%)允许您使用相同的帐号登录许多不同的站点。在这里管理已"
-"关联的 OpenID。"
 
-#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945
-msgid "a few seconds ago"
-msgstr "几秒前"
+#: actions/oembed.php:181 actions/oembed.php:200 lib/api.php:999
+#: lib/api.php:1027 lib/api.php:1137
+msgid "Not a supported data format."
+msgstr "不支持的数据格式。"
 
-#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957
-#, php-format
-msgid "about %d days ago"
-msgstr "%d 天前"
+#: actions/opensearch.php:64
+msgid "People Search"
+msgstr "搜索用户"
 
-#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953
-#, php-format
-msgid "about %d hours ago"
-msgstr "%d 小时前"
+#: actions/opensearch.php:67
+msgid "Notice Search"
+msgstr "搜索通告"
 
-#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949
-#, php-format
-msgid "about %d minutes ago"
-msgstr "%d 分钟前"
+#: actions/othersettings.php:60
+#, fuzzy
+msgid "Other Settings"
+msgstr "Twitter 设置"
 
-#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961
-#, php-format
-msgid "about %d months ago"
-msgstr "%d 个月前"
+#: actions/othersettings.php:71
+msgid "Manage various other options."
+msgstr "管理其他选项。"
 
-#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955
-msgid "about a day ago"
-msgstr "一天前"
+#: actions/othersettings.php:108
+msgid " (free service)"
+msgstr ""
 
-#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947
-msgid "about a minute ago"
-msgstr "一分钟前"
+#: actions/othersettings.php:116
+msgid "Shorten URLs with"
+msgstr ""
 
-#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959
-msgid "about a month ago"
-msgstr "一个月前"
+#: actions/othersettings.php:117
+msgid "Automatic shortening service to use."
+msgstr "要使用的自动缩短服务。"
 
-#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963
-msgid "about a year ago"
-msgstr "一年前"
+#: actions/othersettings.php:122
+#, fuzzy
+msgid "View profile designs"
+msgstr "个人设置"
 
-#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951
-msgid "about an hour ago"
-msgstr "一小时前"
+#: actions/othersettings.php:123
+msgid "Show or hide profile designs."
+msgstr ""
 
-#: ../actions/showstream.php:423 ../lib/stream.php:132
-#: actions/showstream.php:441 lib/stream.php:99
-msgid "delete"
-msgstr "删除"
+#: actions/othersettings.php:153
+#, fuzzy
+msgid "URL shortening service is too long (max 50 chars)."
+msgstr "URL缩短服务超长(最多50个字符)。"
 
-#: ../actions/noticesearch.php:130 ../actions/showstream.php:408
-#: ../lib/stream.php:117 actions/noticesearch.php:136
-#: actions/showstream.php:426 lib/stream.php:84 actions/noticesearch.php:187
-msgid "in reply to..."
-msgstr "先前……"
+#: actions/outbox.php:58
+#, php-format
+msgid "Outbox for %s - page %d"
+msgstr "%s 的发件箱 - 第 %d 页"
 
-#: ../actions/noticesearch.php:137 ../actions/showstream.php:415
-#: ../lib/stream.php:124 actions/noticesearch.php:143
-#: actions/showstream.php:433 lib/stream.php:91 actions/noticesearch.php:194
-msgid "reply"
-msgstr "回复"
+#: actions/outbox.php:61
+#, php-format
+msgid "Outbox for %s"
+msgstr "%s 的发件箱"
 
-#: ../actions/password.php:44 actions/profilesettings.php:183
-#: actions/passwordsettings.php:106
-msgid "same as password above"
-msgstr "相同的密码"
+#: actions/outbox.php:116
+msgid "This is your outbox, which lists private messages you have sent."
+msgstr "这是您的发件箱，包含您发送的私人消息。"
 
-#: ../actions/twitapistatuses.php:755 actions/twitapistatuses.php:678
-#: actions/twitapistatuses.php:555
-msgid "unsupported file type"
-msgstr "不支持这种类型的文件"
+#: actions/passwordsettings.php:58
+msgid "Change password"
+msgstr "修改密码"
 
-#: ../lib/util.php:1309 lib/util.php:1443
+#: actions/passwordsettings.php:69
 #, fuzzy
-msgid "« After"
-msgstr "« 之后"
-
-#: actions/deletenotice.php:74 actions/disfavor.php:43
-#: actions/emailsettings.php:127 actions/favor.php:45
-#: actions/finishopenidlogin.php:33 actions/imsettings.php:105
-#: actions/invite.php:46 actions/newmessage.php:45 actions/openidlogin.php:36
-#: actions/openidsettings.php:123 actions/profilesettings.php:47
-#: actions/recoverpassword.php:282 actions/register.php:42
-#: actions/remotesubscribe.php:40 actions/smssettings.php:124
-#: actions/subscribe.php:44 actions/twittersettings.php:97
-#: actions/unsubscribe.php:41 actions/userauthorization.php:35
-#: actions/block.php:64 actions/disfavor.php:74 actions/favor.php:77
-#: actions/finishopenidlogin.php:38 actions/invite.php:54 actions/nudge.php:80
-#: actions/openidlogin.php:37 actions/recoverpassword.php:316
-#: actions/subscribe.php:46 actions/unblock.php:65 actions/unsubscribe.php:43
-msgid "There was a problem with your session token. Try again, please."
-msgstr "会话标识有问题，请重试。"
+msgid "Change your password."
+msgstr "修改密码"
 
-#: actions/disfavor.php:55 actions/disfavor.php:81
-msgid "This notice is not a favorite!"
-msgstr "此通告未被收藏！"
+#: actions/passwordsettings.php:96 actions/recoverpassword.php:231
+#, fuzzy
+msgid "Password change"
+msgstr "密码已保存。"
 
-#: actions/disfavor.php:63 actions/disfavor.php:87
-msgid "Could not delete favorite."
-msgstr "无法删除收藏。"
+#: actions/passwordsettings.php:104
+msgid "Old password"
+msgstr "旧密码"
 
-#: actions/disfavor.php:72 lib/favorform.php:140
-msgid "Favor"
-msgstr "收藏"
+#: actions/passwordsettings.php:108 actions/recoverpassword.php:235
+msgid "New password"
+msgstr "新密码"
 
-#: actions/emailsettings.php:92
-msgid "Send me email when someone adds my notice as a favorite."
-msgstr "如果有人收藏我的通告，发邮件通知我。"
+#: actions/passwordsettings.php:109
+msgid "6 or more characters"
+msgstr "6 个或更多字符"
 
-#: actions/emailsettings.php:95 actions/emailsettings.php:163
-msgid "Send me email when someone sends me a private message."
-msgstr "如果收到私人信息，发邮件通知我。"
+#: actions/passwordsettings.php:112 actions/recoverpassword.php:239
+#: actions/register.php:432 actions/smssettings.php:134
+msgid "Confirm"
+msgstr "确认"
 
-#: actions/favor.php:53 actions/twitapifavorites.php:142 actions/favor.php:81
-#: actions/twitapifavorites.php:118
-msgid "This notice is already a favorite!"
-msgstr "已收藏此通告！"
+#: actions/passwordsettings.php:113
+msgid "same as password above"
+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 "Could not create favorite."
-msgstr "无法创建收藏。"
+#: actions/passwordsettings.php:117
+msgid "Change"
+msgstr "修改"
 
-#: actions/favor.php:70
-msgid "Disfavor"
-msgstr "取消收藏"
+#: actions/passwordsettings.php:154 actions/register.php:230
+msgid "Password must be 6 or more characters."
+msgstr "密码必须包含 6 个或更多字符。"
 
-#: actions/favoritesrss.php:60 actions/showfavorites.php:47
-#: actions/favoritesrss.php:100 actions/showfavorites.php:77
-#, php-format
-msgid "%s favorite notices"
-msgstr "%s 收藏的通告"
+#: actions/passwordsettings.php:157 actions/register.php:233
+msgid "Passwords don't match."
+msgstr "密码不匹配。"
 
-#: actions/favoritesrss.php:64 actions/favoritesrss.php:104
-#, php-format
-msgid "Feed of favorite notices of %s"
-msgstr "%s 的收藏的聚合"
+#: actions/passwordsettings.php:165
+msgid "Incorrect old password"
+msgstr "旧密码不正确"
 
-#: actions/inbox.php:28 actions/inbox.php:59
-#, php-format
-msgid "Inbox for %s - page %d"
-msgstr "%s 的收件箱 - 第 %d 页"
+#: actions/passwordsettings.php:181
+msgid "Error saving user; invalid."
+msgstr "保存用户时出错；不正确。"
 
-#: actions/inbox.php:30 actions/inbox.php:62
-#, php-format
-msgid "Inbox for %s"
-msgstr "%s 的收件箱"
+#: actions/passwordsettings.php:186 actions/recoverpassword.php:368
+msgid "Can't save new password."
+msgstr "无法保存新密码。"
 
-#: actions/inbox.php:53 actions/inbox.php:115
-msgid "This is your inbox, which lists your incoming private messages."
-msgstr "这是您的收件箱，包含发给您的私人消息。"
+#: actions/passwordsettings.php:192 actions/recoverpassword.php:211
+msgid "Password saved."
+msgstr "密码已保存。"
 
-#: actions/invite.php:178 actions/invite.php:213
+#: actions/peoplesearch.php:52
 #, php-format
 msgid ""
-"%1$s has invited you to join them on %2$s (%3$s).\n"
-"\n"
+"Search for people on %%site.name%% by their name, location, or interests. "
+"Separate the terms by spaces; they must be 3 characters or more."
 msgstr ""
-"%1$s 邀请您加入 %2$s (%3$s)。\n"
-"\n"
+"在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。搜索条件至少包"
+"含 3 个字符，多个搜索条件用空格分隔。"
 
-#: actions/login.php:104 actions/login.php:235 actions/openidlogin.php:108
-#: actions/register.php:416
-msgid "Automatically login in the future; "
-msgstr "保持登录状态；"
+#: actions/peoplesearch.php:58
+msgid "People search"
+msgstr "搜索用户"
 
-#: actions/login.php:122 actions/login.php:264
-msgid "For security reasons, please re-enter your "
-msgstr "由于安全原因，请重新输入"
+#: actions/peopletag.php:70
+#, fuzzy, php-format
+msgid "Not a valid people tag: %s"
+msgstr "不是有效的电子邮件"
 
-#: actions/login.php:126 actions/login.php:268
-msgid "Login with your username and password. "
-msgstr "输入用户名和密码以登录。"
+#: actions/peopletag.php:144
+#, php-format
+msgid "Users self-tagged with %s - page %d"
+msgstr "用户自加标签 %s - 第 %d 页"
 
-#: actions/newmessage.php:58 actions/twitapidirect_messages.php:130
-#: actions/twitapidirect_messages.php:141
-msgid "That's too long. Max message size is 140 chars."
-msgstr "超出长度限制。不能超过 140 个字符。"
+#: actions/postnotice.php:84
+msgid "Invalid notice content"
+msgstr "通告内容不正确"
 
-#: actions/newmessage.php:65 actions/newmessage.php:128
-msgid "No recipient specified."
-msgstr "没有收件人。"
+#: actions/postnotice.php:90
+#, php-format
+msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
+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 "You can't send a message to this user."
-msgstr "无法向此用户发送消息。"
+#: actions/profilesettings.php:60
+msgid "Profile settings"
+msgstr "个人设置"
 
-#: actions/newmessage.php:71 actions/twitapidirect_messages.php:146
-#: classes/Command.php:209 actions/twitapidirect_messages.php:158
-#: classes/Command.php:240
+#: actions/profilesettings.php:71
 msgid ""
-"Don't send a message to yourself; just say it to yourself quietly instead."
-msgstr "不要向自己发送消息；跟自己悄悄说就得了。"
+"You can update your personal profile info here so people know more about you."
+msgstr "在这里更新个人信息，让大家对您了解得更多。"
 
-#: actions/newmessage.php:108 actions/microsummary.php:62
-#: actions/newmessage.php:163
-msgid "No such user"
-msgstr "未找到用户"
+#: actions/profilesettings.php:99
+#, fuzzy
+msgid "Profile information"
+msgstr "未知的帐号"
 
-#: actions/newmessage.php:117 actions/newmessage.php:67
-msgid "New message"
-msgstr "新消息"
+#: actions/profilesettings.php:108 lib/groupeditform.php:154
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
+msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
 
-#: actions/noticesearch.php:95 actions/noticesearch.php:146
-msgid "Notice without matching profile"
-msgstr "找不到匹配的通告"
+#: actions/profilesettings.php:111 actions/register.php:447
+#: actions/showgroup.php:247 actions/tagother.php:104
+#: lib/groupeditform.php:157 lib/userprofile.php:149
+msgid "Full name"
+msgstr "全名"
 
-#: actions/openidsettings.php:28 actions/openidsettings.php:70
-#, php-format
-msgid "[OpenID](%%doc.openid%%) lets you log into many sites "
-msgstr "[OpenID](%%doc.openid%%)允许您登录许多不同的站点"
+#: actions/profilesettings.php:115 actions/register.php:452
+#: lib/groupeditform.php:161
+msgid "Homepage"
+msgstr "主页"
 
-#: actions/openidsettings.php:46 actions/openidsettings.php:96
-msgid "If you want to add an OpenID to your account, "
-msgstr "如果您希望添加OpenID，"
+#: actions/profilesettings.php:117 actions/register.php:454
+msgid "URL of your homepage, blog, or profile on another site"
+msgstr "您的主页、博客或在其他站点的URL"
 
-#: actions/openidsettings.php:74
-msgid "Removing your only OpenID would make it impossible to log in! "
-msgstr "移除仅有的OpenID可能使您无法登陆！"
+#: actions/profilesettings.php:122 actions/register.php:460
+#, fuzzy, php-format
+msgid "Describe yourself and your interests in %d chars"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: actions/openidsettings.php:87 actions/openidsettings.php:143
-msgid "You can remove an OpenID from your account "
-msgstr "您可以移除一个OpenID"
+#: actions/profilesettings.php:125 actions/register.php:463
+#, fuzzy
+msgid "Describe yourself and your interests"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: actions/outbox.php:28 actions/outbox.php:58
-#, php-format
-msgid "Outbox for %s - page %d"
-msgstr "%s 的发件箱 - 第 %d 页"
+#: actions/profilesettings.php:127 actions/register.php:465
+msgid "Bio"
+msgstr "自述"
 
-#: actions/outbox.php:30 actions/outbox.php:61
-#, php-format
-msgid "Outbox for %s"
-msgstr "%s 的发件箱"
+#: actions/profilesettings.php:132 actions/register.php:470
+#: actions/showgroup.php:256 actions/tagother.php:112
+#: actions/userauthorization.php:158 lib/groupeditform.php:177
+#: lib/userprofile.php:164
+msgid "Location"
+msgstr "位置"
 
-#: actions/outbox.php:53 actions/outbox.php:116
-msgid "This is your outbox, which lists private messages you have sent."
-msgstr "这是您的发件箱，包含您发送的私人消息。"
+#: actions/profilesettings.php:134 actions/register.php:472
+msgid "Where you are, like \"City, State (or Region), Country\""
+msgstr "你的位置，格式类似\"城市，省份，国家\""
 
-#: actions/peoplesearch.php:28 actions/peoplesearch.php:52
-#, php-format
+#: actions/profilesettings.php:138 actions/tagother.php:149
+#: actions/tagother.php:209 lib/subscriptionlist.php:106
+#: lib/subscriptionlist.php:108 lib/userprofile.php:209
+msgid "Tags"
+msgstr "标签"
+
+#: actions/profilesettings.php:140
 msgid ""
-"Search for people on %%site.name%% by their name, location, or interests. "
-msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。"
+"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
+msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
 
-#: actions/profilesettings.php:27 actions/profilesettings.php:69
-msgid "You can update your personal profile info here "
-msgstr "您可以在这里更新个人信息。"
+#: actions/profilesettings.php:144 actions/siteadminpanel.php:309
+msgid "Language"
+msgstr "语言"
 
-#: actions/profilesettings.php:115 actions/remotesubscribe.php:320
-#: actions/userauthorization.php:159 actions/userrss.php:76
-#: actions/avatarsettings.php:104 actions/avatarsettings.php:179
-#: actions/grouplogo.php:177 actions/remotesubscribe.php:367
-#: actions/userauthorization.php:176 actions/userrss.php:82
-msgid "User without matching profile"
-msgstr "找不到匹配的用户。"
+#: actions/profilesettings.php:145
+msgid "Preferred language"
+msgstr "首选语言"
 
-#: actions/recoverpassword.php:91 actions/recoverpassword.php:97
-msgid "This confirmation code is too old. "
-msgstr "验证码超时。"
+#: actions/profilesettings.php:154
+msgid "Timezone"
+msgstr "时区"
 
-#: actions/recoverpassword.php:141 actions/recoverpassword.php:152
-msgid "If you've forgotten or lost your"
-msgstr "如果您忘记或丢失了您的"
+#: actions/profilesettings.php:155
+msgid "What timezone are you normally in?"
+msgstr "您一般处于哪个时区？"
 
-#: actions/recoverpassword.php:154 actions/recoverpassword.php:158
-msgid "You've been identified. Enter a "
-msgstr "您已得到确认。输入"
+#: actions/profilesettings.php:160
+msgid ""
+"Automatically subscribe to whoever subscribes to me (best for non-humans)"
+msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
 
-#: actions/recoverpassword.php:169 actions/recoverpassword.php:188
-msgid "Your nickname on this server, "
-msgstr "您在服务器上的昵称，"
+#: actions/profilesettings.php:221 actions/register.php:223
+#, fuzzy, php-format
+msgid "Bio is too long (max %d chars)."
+msgstr "自述过长(不能超过140字符)。"
 
-#: actions/recoverpassword.php:271 actions/recoverpassword.php:304
-msgid "Instructions for recovering your password "
-msgstr "恢复密码的步骤"
+#: actions/profilesettings.php:228 actions/siteadminpanel.php:165
+msgid "Timezone not selected."
+msgstr "未选择时区。"
 
-#: actions/recoverpassword.php:327 actions/recoverpassword.php:361
-msgid "New password successfully saved. "
-msgstr "新密码已保存。"
+#: actions/profilesettings.php:234
+msgid "Language is too long (max 50 chars)."
+msgstr "语言过长(不能超过50个字符)。"
 
-#: actions/register.php:95 actions/register.php:180
-msgid "Password must be 6 or more characters."
-msgstr "密码必须包含 6 个或更多字符。"
+#: actions/profilesettings.php:246 actions/tagother.php:178
+#, fuzzy, php-format
+msgid "Invalid tag: \"%s\""
+msgstr "主页'%s'不正确"
 
-#: actions/register.php:216
-#, php-format
-msgid ""
-"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
-"want to..."
-msgstr "祝贺你，%s！欢迎来到 %%%%site.name%%%%。在这里，您可以……"
+#: actions/profilesettings.php:295
+msgid "Couldn't update user for autosubscribe."
+msgstr "无法更新用户的自动订阅选项。"
 
-#: actions/register.php:227
-msgid "(You should receive a message by email momentarily, with "
-msgstr "(您将立即收到一封电子邮件，含有"
+#: actions/profilesettings.php:328
+msgid "Couldn't save profile."
+msgstr "无法保存个人信息。"
 
-#: actions/remotesubscribe.php:51 actions/remotesubscribe.php:74
-#, php-format
-msgid "To subscribe, you can [login](%%action.login%%),"
-msgstr "要订阅，请先[登录](%%action.login%%)，"
+#: actions/profilesettings.php:336
+#, fuzzy
+msgid "Couldn't save tags."
+msgstr "无法保存个人信息。"
 
-#: actions/showfavorites.php:61 actions/showfavorites.php:145
+#: actions/profilesettings.php:344 lib/adminpanelaction.php:126
+msgid "Settings saved."
+msgstr "设置已保存。"
+
+#: actions/public.php:83
 #, php-format
-msgid "Feed for favorites of %s"
-msgstr "%s 的收藏的聚合"
+msgid "Beyond the page limit (%s)"
+msgstr ""
 
-#: actions/showfavorites.php:84 actions/twitapifavorites.php:85
-#: actions/showfavorites.php:202 actions/twitapifavorites.php:59
-msgid "Could not retrieve favorite notices."
+#: actions/public.php:92
+#, fuzzy
+msgid "Could not retrieve public stream."
 msgstr "无法获取收藏的通告。"
 
-#: actions/showmessage.php:33 actions/showmessage.php:81
-msgid "No such message."
-msgstr "未找到此消息。"
+#: actions/public.php:129
+#, fuzzy, php-format
+msgid "Public timeline, page %d"
+msgstr "公开的时间表"
 
-#: actions/showmessage.php:42
-msgid "Only the sender and recipient may read this message."
-msgstr "只有发送和接受双方可以阅读此消息。"
+#: actions/public.php:131 lib/publicgroupnav.php:79
+msgid "Public timeline"
+msgstr "公开的时间表"
 
-#: actions/showmessage.php:61 actions/showmessage.php:108
-#, php-format
-msgid "Message to %1$s on %2$s"
-msgstr "发送给 %1$s 的 %2$s 消息"
+#: actions/public.php:151
+#, fuzzy
+msgid "Public Stream Feed (RSS 1.0)"
+msgstr "公开的聚合"
 
-#: actions/showmessage.php:66 actions/showmessage.php:113
-#, php-format
-msgid "Message from %1$s on %2$s"
-msgstr "来自 %1$s 的 %2$s 消息"
+#: actions/public.php:155
+#, fuzzy
+msgid "Public Stream Feed (RSS 2.0)"
+msgstr "公开的聚合"
 
-#: actions/showstream.php:154
-msgid "Send a message"
-msgstr "发送消息"
+#: actions/public.php:159
+#, fuzzy
+msgid "Public Stream Feed (Atom)"
+msgstr "公开的聚合"
 
-#: actions/smssettings.php:312 actions/smssettings.php:464
+#: actions/public.php:179
 #, php-format
-msgid "Mobile carrier for your phone. "
-msgstr "手机的运营商。"
+msgid ""
+"This is the public timeline for %%site.name%% but no one has posted anything "
+"yet."
+msgstr ""
 
-#: actions/twitapidirect_messages.php:76 actions/twitapidirect_messages.php:68
-#, php-format
-msgid "Direct messages to %s"
-msgstr "发给 %s 的直接消息"
+#: actions/public.php:182
+msgid "Be the first to post!"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:77 actions/twitapidirect_messages.php:69
+#: actions/public.php:186
 #, php-format
-msgid "All the direct messages sent to %s"
-msgstr "发给 %s 的直接消息"
-
-#: actions/twitapidirect_messages.php:81 actions/twitapidirect_messages.php:73
-msgid "Direct Messages You've Sent"
-msgstr "您已发送的直接消息"
+msgid ""
+"Why not [register an account](%%action.register%%) and be the first to post!"
+msgstr ""
 
-#: actions/twitapidirect_messages.php:82 actions/twitapidirect_messages.php:74
+#: actions/public.php:233
 #, php-format
-msgid "All the direct messages sent from %s"
-msgstr "%s 发送的直接消息"
-
-#: actions/twitapidirect_messages.php:128
-#: actions/twitapidirect_messages.php:137
-msgid "No message text!"
-msgstr "消息没有正文！"
+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/twitapidirect_messages.php:138
-#: actions/twitapidirect_messages.php:150
-msgid "Recipient user not found."
-msgstr "未找到收件人。"
+#: 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/twitapidirect_messages.php:141
-#: actions/twitapidirect_messages.php:153
-msgid "Can't send direct messages to users who aren't your friend."
-msgstr "无法向并非好友的用户发送直接消息。"
+#: actions/publictagcloud.php:57
+#, fuzzy
+msgid "Public tag cloud"
+msgstr "公开的聚合"
 
-#: actions/twitapifavorites.php:92 actions/twitapifavorites.php:66
+#: actions/publictagcloud.php:63
 #, php-format
-msgid "%s / Favorites from %s"
-msgstr "%s 的收藏 / %s"
+msgid "These are most popular recent tags on %s "
+msgstr "这些是最近的 %s 流行标签 "
 
-#: actions/twitapifavorites.php:95 actions/twitapifavorites.php:69
+#: actions/publictagcloud.php:69
 #, php-format
-msgid "%s updates favorited by %s / %s."
-msgstr "%s 收藏了 %s 的 %s 通告。"
+msgid "No one has posted a notice with a [hashtag](%%doc.tags%%) yet."
+msgstr ""
 
-#: actions/twitapifavorites.php:187 lib/mail.php:275
-#: actions/twitapifavorites.php:164 lib/mail.php:553
-#, php-format
-msgid "%s added your notice as a favorite"
-msgstr "%s 收藏了您的通告"
+#: actions/publictagcloud.php:72
+msgid "Be the first to post one!"
+msgstr ""
 
-#: actions/twitapifavorites.php:188 lib/mail.php:276
-#: actions/twitapifavorites.php:165
+#: actions/publictagcloud.php:75
 #, php-format
 msgid ""
-"%1$s just added your notice from %2$s as one of their favorites.\n"
-"\n"
+"Why not [register an account](%%action.register%%) and be the first to post "
+"one!"
 msgstr ""
-"%1$s 收藏了您的 %2$s 通告。\n"
-"\n"
-
-#: actions/twittersettings.php:27
-msgid ""
-"Add your Twitter account to automatically send your notices to Twitter, "
-msgstr "添加 Twitter 帐号，自动向 Twitter 发送更新。"
 
-#: actions/twittersettings.php:41 actions/twittersettings.php:60
-msgid "Twitter settings"
-msgstr "Twitter 设置"
-
-#: actions/twittersettings.php:48 actions/twittersettings.php:105
-msgid "Twitter Account"
-msgstr "Twitter 帐号"
+#: actions/publictagcloud.php:135
+msgid "Tag cloud"
+msgstr "标签云聚集"
 
-#: actions/twittersettings.php:56 actions/twittersettings.php:113
-msgid "Current verified Twitter account."
-msgstr "已验证的 Twitter 帐号。"
+#: actions/recoverpassword.php:36
+msgid "You are already logged in!"
+msgstr "已登录！"
 
-#: actions/twittersettings.php:63
-msgid "Twitter Username"
-msgstr "Twitter 用户名"
+#: actions/recoverpassword.php:62
+msgid "No such recovery code."
+msgstr "没有这个恢复码。"
 
-#: actions/twittersettings.php:65 actions/twittersettings.php:123
-msgid "No spaces, please."
-msgstr "请不要包含空格。"
+#: actions/recoverpassword.php:66
+msgid "Not a recovery code."
+msgstr "不是恢复码。"
 
-#: actions/twittersettings.php:67
-msgid "Twitter Password"
-msgstr "Twitter 密码"
+#: actions/recoverpassword.php:73
+msgid "Recovery code for unknown user."
+msgstr "恢复码未知"
 
-#: actions/twittersettings.php:72 actions/twittersettings.php:139
-msgid "Automatically send my notices to Twitter."
-msgstr "自动将我的通告转发到 Twitter。"
+#: actions/recoverpassword.php:86
+msgid "Error with confirmation code."
+msgstr "验证码出错。"
 
-#: actions/twittersettings.php:75 actions/twittersettings.php:146
-msgid "Send local \"@\" replies to Twitter."
-msgstr "将这里的 \"@\" 回复发送到 Twitter。"
+#: actions/recoverpassword.php:97
+msgid "This confirmation code is too old. Please start again."
+msgstr "验证码超时，请重来。"
 
-#: actions/twittersettings.php:78 actions/twittersettings.php:153
-msgid "Subscribe to my Twitter friends here."
-msgstr "在这里订阅 Twitter 好友。"
+#: actions/recoverpassword.php:111
+msgid "Could not update user with confirmed email address."
+msgstr "无法更新已确认的电子邮件。"
 
-#: actions/twittersettings.php:122
+#: actions/recoverpassword.php:152
 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 "Could not verify your Twitter credentials!"
-msgstr "不能验证 Twitter 帐号！"
+"If you have forgotten or lost your password, you can get a new one sent to "
+"the email address you have stored in your account."
+msgstr ""
 
-#: actions/twittersettings.php:137
-#, php-format
-msgid "Unable to retrieve account information for \"%s\" from Twitter."
-msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
+#: actions/recoverpassword.php:158
+msgid "You have been identified. Enter a new password below. "
+msgstr ""
 
-#: actions/twittersettings.php:151 actions/twittersettings.php:170
-#: actions/twittersettings.php:348 actions/twittersettings.php:368
-msgid "Unable to save your Twitter settings!"
-msgstr "无法保存 Twitter 设置！"
+#: actions/recoverpassword.php:188
+msgid "Password recovery"
+msgstr ""
 
-#: actions/twittersettings.php:174 actions/twittersettings.php:376
-msgid "Twitter settings saved."
-msgstr "Twitter 设置已保存。"
+#: actions/recoverpassword.php:191
+msgid "Nickname or email address"
+msgstr ""
 
-#: actions/twittersettings.php:192 actions/twittersettings.php:395
-msgid "That is not your Twitter account."
-msgstr "此 Twitter 帐号属于他人。"
+#: actions/recoverpassword.php:193
+msgid "Your nickname on this server, or your registered email address."
+msgstr "您在此服务器的昵称，或注册邮箱。"
 
-#: actions/twittersettings.php:200 actions/twittersettings.php:208
-#: actions/twittersettings.php:403
-msgid "Couldn't remove Twitter user."
-msgstr "无法移除 Twitter 用户。"
+#: actions/recoverpassword.php:199 actions/recoverpassword.php:200
+msgid "Recover"
+msgstr "恢复"
 
-#: actions/twittersettings.php:212 actions/twittersettings.php:407
-msgid "Twitter account removed."
-msgstr "Twitter 帐号已移除。"
+#: actions/recoverpassword.php:208
+msgid "Reset password"
+msgstr "重置密码"
 
-#: actions/twittersettings.php:225 actions/twittersettings.php:239
-#: actions/twittersettings.php:428 actions/twittersettings.php:439
-#: actions/twittersettings.php:453
-msgid "Couldn't save Twitter preferences."
-msgstr "无法保存 Twitter 首选项。"
+#: actions/recoverpassword.php:209
+msgid "Recover password"
+msgstr "恢复密码"
 
-#: actions/twittersettings.php:245 actions/twittersettings.php:461
-msgid "Twitter preferences saved."
-msgstr "Twitter 首选项已保存。"
+#: actions/recoverpassword.php:210 actions/recoverpassword.php:322
+msgid "Password recovery requested"
+msgstr "请求恢复密码"
 
-#: actions/userauthorization.php:84 actions/userauthorization.php:86
-msgid "Please check these details to make sure "
-msgstr "请检查详细信息"
+#: actions/recoverpassword.php:213
+msgid "Unknown action"
+msgstr "未知动作"
 
-#: actions/userauthorization.php:324 actions/userauthorization.php:340
-msgid "The subscription has been authorized, but no "
-msgstr "订阅已确认，但是"
+#: actions/recoverpassword.php:236
+msgid "6 or more characters, and don't forget it!"
+msgstr "6 个或更多字符，不能忘记！"
 
-#: actions/userauthorization.php:334 actions/userauthorization.php:351
-msgid "The subscription has been rejected, but no "
-msgstr "订阅已拒绝，但是"
+#: actions/recoverpassword.php:240
+msgid "Same as password above"
+msgstr "相同的密码"
 
-#: classes/Channel.php:113 classes/Channel.php:132 classes/Channel.php:151
-msgid "Command results"
-msgstr "执行结果"
+#: actions/recoverpassword.php:243
+msgid "Reset"
+msgstr "重置"
 
-#: classes/Channel.php:148 classes/Channel.php:204
-msgid "Command complete"
-msgstr "执行完毕"
+#: actions/recoverpassword.php:252
+msgid "Enter a nickname or email address."
+msgstr "输入昵称或电子邮件。"
 
-#: classes/Channel.php:158 classes/Channel.php:215
-msgid "Command failed"
-msgstr "执行失败"
+#: actions/recoverpassword.php:272
+msgid "No user with that email address or username."
+msgstr "没有拥有这个用户名或电子邮件的用户。"
 
-#: classes/Command.php:39 classes/Command.php:44
-msgid "Sorry, this command is not yet implemented."
-msgstr "对不起，这个命令还没有实现。"
+#: actions/recoverpassword.php:287
+msgid "No registered email address for that user."
+msgstr "用户没有注册电子邮件。"
 
-#: classes/Command.php:96 classes/Command.php:113
-#, php-format
-msgid "Subscriptions: %1$s\n"
-msgstr "订阅：%1$s\n"
+#: actions/recoverpassword.php:301
+msgid "Error saving address confirmation."
+msgstr "保存地址确认时出错。"
 
-#: classes/Command.php:125 classes/Command.php:242 classes/Command.php:145
-#: classes/Command.php:276
-msgid "User has no last notice"
-msgstr "用户没有通告。"
+#: actions/recoverpassword.php:325
+msgid ""
+"Instructions for recovering your password have been sent to the email "
+"address registered to your account."
+msgstr "恢复密码的指示已被发送到您的注册邮箱。"
 
-#: classes/Command.php:146 classes/Command.php:166
-msgid "Notice marked as fave."
-msgstr "通告被标记为收藏。"
+#: actions/recoverpassword.php:344
+msgid "Unexpected password reset."
+msgstr "未预料的密码重置。"
 
-#: classes/Command.php:166 classes/Command.php:189
-#, php-format
-msgid "%1$s (%2$s)"
-msgstr "%1$s (%2$s)"
+#: actions/recoverpassword.php:352
+msgid "Password must be 6 chars or more."
+msgstr "密码必须是 6 个字符或更多。"
 
-#: classes/Command.php:169 classes/Command.php:192
-#, php-format
-msgid "Fullname: %s"
-msgstr "全名：%s"
+#: actions/recoverpassword.php:356
+msgid "Password and confirmation do not match."
+msgstr "密码和确认不匹配。"
 
-#: classes/Command.php:172 classes/Command.php:195
-#, php-format
-msgid "Location: %s"
-msgstr "位置：%s"
+#: actions/recoverpassword.php:375 actions/register.php:248
+msgid "Error setting user."
+msgstr "保存用户设置时出错。"
 
-#: classes/Command.php:175 classes/Command.php:198
-#, php-format
-msgid "Homepage: %s"
-msgstr "主页：%s"
+#: actions/recoverpassword.php:382
+msgid "New password successfully saved. You are now logged in."
+msgstr "新密码已保存，您现在已登录。"
 
-#: classes/Command.php:178 classes/Command.php:201
-#, php-format
-msgid "About: %s"
-msgstr "关于：%s"
+#: actions/register.php:85 actions/register.php:189 actions/register.php:404
+msgid "Sorry, only invited people can register."
+msgstr "对不起，请邀请那些能注册的人。"
 
-#: classes/Command.php:200 classes/Command.php:228
-#, php-format
-msgid "Message too long - maximum is 140 characters, you sent %d"
-msgstr "您的消息包含 %d 个字符，超出长度限制 - 不能超过 140 个字符。"
+#: actions/register.php:92
+#, fuzzy
+msgid "Sorry, invalid invitation code."
+msgstr "验证码出错。"
 
-#: classes/Command.php:214 classes/Command.php:245
-#, php-format
-msgid "Direct message to %s sent"
-msgstr "已向 %s 发送消息"
+#: actions/register.php:112
+msgid "Registration successful"
+msgstr "注册成功。"
 
-#: classes/Command.php:216 classes/Command.php:247
-msgid "Error sending direct message."
-msgstr "发送消息出错。"
+#: actions/register.php:114 actions/register.php:502 lib/action.php:454
+#: lib/logingroupnav.php:85
+msgid "Register"
+msgstr "注册"
 
-#: classes/Command.php:263 classes/Command.php:300
-msgid "Specify the name of the user to subscribe to"
-msgstr "指定要订阅的用户名"
+#: actions/register.php:135
+msgid "Registration not allowed."
+msgstr "不允许注册。"
 
-#: classes/Command.php:270 classes/Command.php:307
-#, php-format
-msgid "Subscribed to %s"
-msgstr "订阅 %s"
+#: actions/register.php:198
+msgid "You can't register if you don't agree to the license."
+msgstr "您必须同意此授权方可注册。"
 
-#: classes/Command.php:288 classes/Command.php:328
-msgid "Specify the name of the user to unsubscribe from"
-msgstr "指定要取消订阅的用户名"
+#: actions/register.php:201
+msgid "Not a valid email address."
+msgstr "不是有效的电子邮件。"
 
-#: classes/Command.php:295 classes/Command.php:335
-#, php-format
-msgid "Unsubscribed from %s"
-msgstr "取消订阅 %s"
+#: actions/register.php:212
+msgid "Email address already exists."
+msgstr "电子邮件地址已存在。"
 
-#: classes/Command.php:310 classes/Command.php:330 classes/Command.php:353
-#: classes/Command.php:376
-msgid "Command not yet implemented."
-msgstr "命令尚未实现。"
+#: actions/register.php:243 actions/register.php:264
+msgid "Invalid username or password."
+msgstr "用户名或密码不正确。"
 
-#: classes/Command.php:313 classes/Command.php:356
-msgid "Notification off."
-msgstr "通告关闭。"
+#: actions/register.php:342
+msgid ""
+"With this form you can create  a new account. You can then post notices and "
+"link up to friends and colleagues. "
+msgstr ""
 
-#: classes/Command.php:315 classes/Command.php:358
-msgid "Can't turn off notification."
-msgstr "无法关闭通告。"
+#: actions/register.php:424
+msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
+msgstr "1 到 64 个小写字母或数字，不包含标点及空白。此项必填。"
 
-#: classes/Command.php:333 classes/Command.php:379
-msgid "Notification on."
-msgstr "通告开启。"
+#: actions/register.php:429
+msgid "6 or more characters. Required."
+msgstr "6 个或更多字符。此项必填。"
 
-#: classes/Command.php:335 classes/Command.php:381
-msgid "Can't turn on notification."
-msgstr "无法开启通告。"
+#: actions/register.php:433
+msgid "Same as password above. Required."
+msgstr "相同的密码。此项必填。"
 
-#: classes/Command.php:344 classes/Command.php:392
-msgid "Commands:\n"
-msgstr "命令：\n"
+#: actions/register.php:437 actions/register.php:441
+#: actions/siteadminpanel.php:287 lib/accountsettingsaction.php:120
+msgid "Email"
+msgstr "电子邮件"
 
-#: classes/Message.php:53 classes/Message.php:56
-msgid "Could not insert message."
-msgstr "无法添加信息。"
+#: actions/register.php:438 actions/register.php:442
+msgid "Used only for updates, announcements, and password recovery"
+msgstr "只用于更新、通告或密码恢复"
 
-#: classes/Message.php:63 classes/Message.php:66
-msgid "Could not update message with new URI."
-msgstr "无法添加新URI的信息。"
+#: actions/register.php:449
+msgid "Longer name, preferably your \"real\" name"
+msgstr "长名字，最好是“实名”"
 
-#: lib/gallery.php:46
-msgid "User without matching profile in system."
-msgstr "系统中没有相应用户的信息。"
+#: actions/register.php:493
+msgid "My text and files are available under "
+msgstr "我的文字和文件采用的授权方式为"
 
-#: lib/mail.php:147 lib/mail.php:289
-#, php-format
-msgid ""
-"You have a new posting address on %1$s.\n"
-"\n"
+#: actions/register.php:495
+msgid "Creative Commons Attribution 3.0"
 msgstr ""
-"您的新的发布用的地址是 %1$s。\n"
-"\n"
 
-#: lib/mail.php:249 lib/mail.php:508
-#, php-format
-msgid "New private message from %s"
-msgstr "%s 发送了新的私人信息"
+#: actions/register.php:496
+#, fuzzy
+msgid ""
+" except this private data: password, email address, IM address, and phone "
+"number."
+msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
 
-#: lib/mail.php:253 lib/mail.php:512
+#: actions/register.php:537
 #, php-format
 msgid ""
-"%1$s (%2$s) sent you a private message:\n"
+"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
+"want to...\n"
 "\n"
+"* Go to [your profile](%s) and post your first message.\n"
+"* Add a [Jabber/GTalk address](%%%%action.imsettings%%%%) so you can send "
+"notices through instant messages.\n"
+"* [Search for people](%%%%action.peoplesearch%%%%) that you may know or that "
+"share your interests. \n"
+"* Update your [profile settings](%%%%action.profilesettings%%%%) to tell "
+"others more about you. \n"
+"* Read over the [online docs](%%%%doc.help%%%%) for features you may have "
+"missed. \n"
+"\n"
+"Thanks for signing up and we hope you enjoy using this service."
 msgstr ""
-"%1$s (%2$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"
+"* 请阅读 [online docs](%%%%doc.help%%%%) 有的功能也许你还不熟悉。\n"
+"\n"
+"感谢您的注册，希望您喜欢这个服务。"
 
-#: lib/mailbox.php:43 lib/mailbox.php:89
-msgid "Only the user can read their own mailboxes."
-msgstr "只有用户自己可以访问邮箱。"
-
-#: lib/openid.php:195 lib/openid.php:203
-msgid "This form should automatically submit itself. "
-msgstr "此表单会自动提交。"
-
-#: lib/personal.php:65 lib/personalgroupnav.php:113
-msgid "Favorites"
-msgstr "收藏夹"
+#: actions/register.php:561
+msgid ""
+"(You should receive a message by email momentarily, with instructions on how "
+"to confirm your email address.)"
+msgstr "(您将收到一封邮件，包含了如何确认邮件地址的说明。)"
 
-#: lib/personal.php:66 lib/personalgroupnav.php:114
+#: actions/remotesubscribe.php:98
 #, php-format
-msgid "%s's favorite notices"
-msgstr "%s 收藏的通告"
-
-#: lib/personal.php:66 lib/personalgroupnav.php:114
-msgid "User"
-msgstr "用户"
-
-#: lib/personal.php:75 lib/personalgroupnav.php:123
-msgid "Inbox"
-msgstr "收件箱"
-
-#: lib/personal.php:76 lib/personalgroupnav.php:124
-msgid "Your incoming messages"
-msgstr "您接收的消息"
-
-#: lib/personal.php:80 lib/personalgroupnav.php:128
-msgid "Outbox"
-msgstr "发件箱"
-
-#: lib/personal.php:81 lib/personalgroupnav.php:129
-msgid "Your sent messages"
-msgstr "您发送的消息"
-
-#: lib/settingsaction.php:99 lib/connectsettingsaction.php:110
-msgid "Twitter"
-msgstr "Twitter"
-
-#: lib/settingsaction.php:100 lib/connectsettingsaction.php:111
-msgid "Twitter integration options"
-msgstr "Twitter 整合选项"
-
-#: lib/util.php:1718 lib/messageform.php:139 lib/noticelist.php:422
-msgid "To"
-msgstr "到"
-
-#: scripts/maildaemon.php:45 scripts/maildaemon.php:48
-msgid "Could not parse message."
-msgstr "无法解析消息。"
-
-#: actions/all.php:63 actions/facebookhome.php:162
-#, fuzzy, php-format
-msgid "%s and friends, page %d"
-msgstr "%s 及好友"
-
-#: actions/avatarsettings.php:76
-msgid "You can upload your personal avatar."
-msgstr "您可以在这里上传个人头像。"
-
-#: actions/avatarsettings.php:117 actions/avatarsettings.php:191
-#: actions/grouplogo.php:250
-msgid "Avatar settings"
-msgstr "头像设置"
+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."
 
-#: actions/avatarsettings.php:124 actions/avatarsettings.php:199
-#: actions/grouplogo.php:198 actions/grouplogo.php:258
-msgid "Original"
-msgstr "原来的"
+#: actions/remotesubscribe.php:112
+msgid "Remote subscribe"
+msgstr "远程订阅"
 
-#: actions/avatarsettings.php:139 actions/avatarsettings.php:211
-#: actions/grouplogo.php:209 actions/grouplogo.php:270
-msgid "Preview"
-msgstr "预览"
+#: actions/remotesubscribe.php:124
+#, fuzzy
+msgid "Subscribe to a remote user"
+msgstr "订阅 %s"
 
-#: actions/avatarsettings.php:225 actions/grouplogo.php:284
-msgid "Crop"
-msgstr "剪裁"
+#: actions/remotesubscribe.php:129
+msgid "User nickname"
+msgstr "昵称"
 
-#: actions/avatarsettings.php:248 actions/deletenotice.php:133
-#: actions/emailsettings.php:224 actions/grouplogo.php:307
-#: actions/imsettings.php:200 actions/login.php:102 actions/newmessage.php:100
-#: actions/newnotice.php:96 actions/openidsettings.php:188
-#: actions/othersettings.php:136 actions/passwordsettings.php:131
-#: actions/profilesettings.php:172 actions/register.php:113
-#: actions/remotesubscribe.php:53 actions/smssettings.php:216
-#: actions/subedit.php:38 actions/twittersettings.php:290
-#: actions/userauthorization.php:39
-#, fuzzy
-msgid "There was a problem with your session token. "
-msgstr "会话标识有问题，请重试。"
+#: actions/remotesubscribe.php:130
+msgid "Nickname of the user you want to follow"
+msgstr "希望订阅的用户的昵称"
 
-#: actions/avatarsettings.php:303 actions/grouplogo.php:360
-msgid "Pick a square area of the image to be your avatar"
-msgstr "请选择一块方形区域作为你的头像"
+#: actions/remotesubscribe.php:133
+msgid "Profile URL"
+msgstr "个人信息URL"
 
-#: actions/avatarsettings.php:327 actions/grouplogo.php:384
-msgid "Lost our file data."
-msgstr "文件数据丢失"
+#: actions/remotesubscribe.php:134
+msgid "URL of your profile on another compatible microblogging service"
+msgstr "您在其他兼容的微博客服务的个人信息URL"
 
-#: actions/avatarsettings.php:334 actions/grouplogo.php:391
-#: classes/User_group.php:112
-#, fuzzy
-msgid "Lost our file."
-msgstr "没有这份通告。"
+#: actions/remotesubscribe.php:137 lib/subscribeform.php:139
+#: lib/userprofile.php:356
+msgid "Subscribe"
+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
-msgid "Unknown file type"
-msgstr "未知文件类型"
+#: actions/remotesubscribe.php:159
+msgid "Invalid profile URL (bad format)"
+msgstr "个人信息URL不正确(格式错误)"
 
-#: actions/block.php:69 actions/subedit.php:46 actions/unblock.php:70
+#: actions/remotesubscribe.php:168
 #, fuzzy
-msgid "No profile specified."
-msgstr "没有收件人。"
+msgid ""
+"Not a valid profile URL (no YADIS document or no or invalid XRDS defined)."
+msgstr "不是有效的个人信息URL(没有YADIS数据)。"
 
-#: actions/block.php:74 actions/subedit.php:53 actions/tagother.php:46
-#: actions/unblock.php:75
+#: actions/remotesubscribe.php:176
 #, fuzzy
-msgid "No profile with that ID."
-msgstr "没有找到此ID的信息。"
+msgid "That’s a local profile! Login to subscribe."
+msgstr "那是一个本地资料！需要登录才能订阅。"
 
-#: actions/block.php:111
+#: actions/remotesubscribe.php:183
 #, fuzzy
-msgid "Block user"
-msgstr "阻止用户"
+msgid "Couldn’t get a request token."
+msgstr "无法获得一份请求标记。"
 
-#: actions/block.php:129
-#, fuzzy
-msgid "Are you sure you want to block this user? "
-msgstr "确定要阻止该用户吗？"
+#: actions/replies.php:125 actions/repliesrss.php:68
+#: lib/personalgroupnav.php:105
+#, php-format
+msgid "Replies to %s"
+msgstr "%s 的回复"
 
-#: actions/block.php:162
-msgid "You have already blocked this user."
-msgstr "您已成功阻止该用户："
+#: actions/replies.php:127
+#, fuzzy, php-format
+msgid "Replies to %s, page %d"
+msgstr "%s 的回复，第 % 页"
 
-#: actions/block.php:167
-msgid "Failed to save block information."
-msgstr "保存阻止信息失败。"
+#: actions/replies.php:144
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/confirmaddress.php:159
-#, php-format
-msgid "The address \"%s\" has been "
-msgstr "该地址 \"%s\" 已被"
+#: actions/replies.php:151
+#, fuzzy, php-format
+msgid "Replies feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/deletenotice.php:73
-#, fuzzy
-msgid "You are about to permanently delete a notice. "
-msgstr "您将要永久删除这条通告。"
+#: actions/replies.php:158
+#, fuzzy, php-format
+msgid "Replies feed for %s (Atom)"
+msgstr "%s 的通告聚合"
 
-#: actions/disfavor.php:94
-msgid "Add to favorites"
-msgstr "加入收藏"
+#: 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/editgroup.php:54
+#: actions/replies.php:203
 #, php-format
-msgid "Edit %s group"
-msgstr "编辑 %s 组"
+msgid ""
+"You can engage other users in a conversation, subscribe to more people or "
+"[join groups](%%action.groups%%)."
+msgstr ""
 
-#: actions/editgroup.php:66 actions/groupbyid.php:72 actions/grouplogo.php:66
-#: actions/joingroup.php:60 actions/newgroup.php:65 actions/showgroup.php:100
-#, fuzzy
-msgid "Inboxes must be enabled for groups to work"
-msgstr "使用组功能前必须使能邮箱"
+#: actions/replies.php:205
+#, php-format
+msgid ""
+"You can try to [nudge %s](../%s) or [post something to his or her attention]"
+"(%%%%action.newnotice%%%%?status_textarea=%s)."
+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
-msgid "You must be logged in to create a group."
-msgstr "您必须登录才能创建小组。"
+#: actions/repliesrss.php:72
+#, fuzzy, php-format
+msgid "Replies to %1$s on %2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
 
-#: actions/editgroup.php:87 actions/grouplogo.php:87
-#: actions/groupmembers.php:76 actions/joingroup.php:81
-#: actions/showgroup.php:121
+#: actions/sandbox.php:65 actions/unsandbox.php:65
 #, 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
-msgid "No such group"
-msgstr "没有这个组"
-
-#: actions/editgroup.php:106 actions/editgroup.php:165
-#: actions/grouplogo.php:107
-msgid "You must be an admin to edit the group"
-msgstr "只有admin才能编辑这个组"
-
-#: actions/editgroup.php:157
-msgid "Use this form to edit the group."
-msgstr "使用这个表单来编辑组"
+msgid "You cannot sandbox users on this site."
+msgstr "无法向此用户发送消息。"
 
-#: actions/editgroup.php:179 actions/newgroup.php:130 actions/register.php:156
+#: actions/sandbox.php:72
 #, fuzzy
-msgid "Nickname must have only lowercase letters "
-msgstr "昵称只能使用小写字母"
-
-#: actions/editgroup.php:198 actions/newgroup.php:149
-msgid "description is too long (max 140 chars)."
-msgstr "描述过长(不能超过140字符)。"
+msgid "User is already sandboxed."
+msgstr "用户没有个人信息。"
 
-#: actions/editgroup.php:218
-msgid "Could not update group."
-msgstr "无法更新组"
+#: actions/showfavorites.php:79
+#, fuzzy, php-format
+msgid "%s's favorite notices, page %d"
+msgstr "%s 收藏的通告"
 
-#: actions/editgroup.php:226
-msgid "Options saved."
-msgstr "选项已保存。"
+#: actions/showfavorites.php:132
+msgid "Could not retrieve favorite notices."
+msgstr "无法获取收藏的通告。"
 
-#: actions/emailsettings.php:107 actions/imsettings.php:108
+#: actions/showfavorites.php:170
 #, php-format
-msgid "Awaiting confirmation on this address. "
-msgstr "正在等待这个地址的确认。"
+msgid "Feed for favorites of %s (RSS 1.0)"
+msgstr "%s 好友的聚合"
 
-#: actions/emailsettings.php:139 actions/smssettings.php:150
-#, fuzzy
-msgid "Make a new email address for posting to; "
-msgstr "新的电子邮件地址，用于发布 %s 信息"
+#: actions/showfavorites.php:177
+#, php-format
+msgid "Feed for favorites of %s (RSS 2.0)"
+msgstr "%s 好友的聚合"
 
-#: actions/emailsettings.php:157
-#, fuzzy
-msgid "Send me email when someone "
-msgstr "如果收到私人信息，发邮件通知我。"
+#: actions/showfavorites.php:184
+#, php-format
+msgid "Feed for favorites of %s (Atom)"
+msgstr "%s 好友的聚合"
 
-#: actions/emailsettings.php:168
-msgid "Allow friends to nudge me and send me an email."
-msgstr "允许朋友们呼叫并给我发送邮件。"
+#: 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/emailsettings.php:321
-#, fuzzy
-msgid "That email address already belongs "
-msgstr "此电子邮件属于其他用户。"
+#: 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/emailsettings.php:343
-#, fuzzy
-msgid "A confirmation code was sent to the email address you added. "
-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/facebookhome.php:110
-msgid "Server error - couldn't get user!"
-msgstr "服务器报错 -- 无法找到该用户。"
+#: actions/showfavorites.php:242
+msgid "This is a way to share what you like."
+msgstr ""
 
-#: actions/facebookhome.php:196
+#: actions/showgroup.php:82 lib/groupnav.php:86
 #, php-format
-msgid "If you would like the %s app to automatically update "
-msgstr "如果你想使用 %s 程序自动更新"
+msgid "%s group"
+msgstr "%s 组"
 
-#: actions/facebookhome.php:213 actions/facebooksettings.php:137
+#: actions/showgroup.php:84
 #, php-format
-msgid "Allow %s to update my Facebook status"
-msgstr "允许 %s 更新我Facebook 的状态"
-
-#: actions/facebookhome.php:218
-msgid "Skip"
-msgstr "跳过"
+msgid "%s group, page %d"
+msgstr "%s 组, 第 %d 页"
 
-#: actions/facebookhome.php:235
+#: actions/showgroup.php:218
 #, fuzzy
-msgid "No notice content!"
-msgstr "没有内容！"
-
-#: actions/facebookhome.php:295 lib/action.php:870 lib/facebookaction.php:399
-msgid "Pagination"
-msgstr "分页"
+msgid "Group profile"
+msgstr "组资料"
 
-#: actions/facebookhome.php:304 lib/action.php:879 lib/facebookaction.php:408
-#, fuzzy
-msgid "After"
-msgstr "« 之后"
+#: actions/showgroup.php:263 actions/tagother.php:118
+#: actions/userauthorization.php:167 lib/userprofile.php:177
+msgid "URL"
+msgstr "URL 互联网地址"
 
-#: actions/facebookhome.php:312 lib/action.php:887 lib/facebookaction.php:416
+#: actions/showgroup.php:274 actions/tagother.php:128
+#: actions/userauthorization.php:179 lib/userprofile.php:194
 #, fuzzy
-msgid "Before"
-msgstr "之前 »"
+msgid "Note"
+msgstr "通告"
 
-#: actions/facebookinvite.php:70
-#, php-format
-msgid "Thanks for inviting your friends to use %s"
-msgstr "感谢您邀请朋友使用 %s"
+#: actions/showgroup.php:284 lib/groupeditform.php:184
+msgid "Aliases"
+msgstr ""
 
-#: actions/facebookinvite.php:72
-#, fuzzy
-msgid "Invitations have been sent to the following users:"
-msgstr "已发送邀请给这些人："
+#: actions/showgroup.php:293
+msgid "Group actions"
+msgstr "组动作"
 
-#: actions/facebookinvite.php:96
+#: actions/showgroup.php:328
 #, fuzzy, php-format
-msgid "You have been invited to %s"
-msgstr "您已被邀请到 %s"
+msgid "Notice feed for %s group (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/facebookinvite.php:105
+#: actions/showgroup.php:334
 #, fuzzy, php-format
-msgid "Invite your friends to use %s"
-msgstr "%s 好友的聚合"
+msgid "Notice feed for %s group (RSS 2.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/facebookinvite.php:113
-#, php-format
-msgid "Friends already using %s:"
-msgstr "已经正在使用 %s 的朋友："
+#: actions/showgroup.php:340
+#, fuzzy, php-format
+msgid "Notice feed for %s group (Atom)"
+msgstr "%s 的通告聚合"
 
-#: actions/facebookinvite.php:130
+#: actions/showgroup.php:345
 #, php-format
-msgid "Send invitations"
-msgstr "发出邀请"
-
-#: actions/facebookremove.php:56
-#, fuzzy
-msgid "Couldn't remove Facebook user."
-msgstr "无法移除 facebook用户。"
+msgid "FOAF for %s group"
+msgstr "%s 的发件箱"
 
-#: actions/facebooksettings.php:65
+#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91
 #, fuzzy
-msgid "There was a problem saving your sync preferences!"
-msgstr "会话标识有问题，请重试。"
+msgid "Members"
+msgstr "注册于"
 
-#: actions/facebooksettings.php:67
-msgid "Sync preferences saved."
-msgstr "同步选项已保存。"
+#: actions/showgroup.php:386 lib/profileaction.php:117
+#: lib/profileaction.php:148 lib/profileaction.php:226 lib/section.php:95
+#: lib/tagcloudsection.php:71
+msgid "(None)"
+msgstr "（没有）"
 
-#: actions/facebooksettings.php:90
-#, fuzzy
-msgid "Automatically update my Facebook status with my notices."
-msgstr "自动将我的通告转发到 Twitter。"
+#: actions/showgroup.php:392
+msgid "All members"
+msgstr "所有成员"
 
-#: actions/facebooksettings.php:97
-#, fuzzy
-msgid "Send \"@\" replies to Facebook."
-msgstr "将这里的 \"@\" 回复发送到 Twitter。"
+#: actions/showgroup.php:429 lib/profileaction.php:173
+msgid "Statistics"
+msgstr "统计"
 
-#: actions/facebooksettings.php:106
+#: actions/showgroup.php:432
 #, fuzzy
-msgid "Prefix"
-msgstr "个人信息"
-
-#: actions/facebooksettings.php:108
-msgid "A string to prefix notices with."
-msgstr "消息以一字符串为前缀。"
+msgid "Created"
+msgstr "创建"
 
-#: actions/facebooksettings.php:124
+#: actions/showgroup.php:448
 #, php-format
-msgid "If you would like %s to automatically update "
-msgstr "如果你希望 %s 自动更新。"
-
-#: actions/facebooksettings.php:147
-msgid "Sync preferences"
-msgstr "同步设置"
-
-#: actions/favor.php:94 lib/disfavorform.php:140
-#, fuzzy
-msgid "Disfavor favorite"
-msgstr "取消收藏"
-
-#: actions/favorited.php:65 lib/popularnoticesection.php:76
-#: lib/publicgroupnav.php:91
-#, fuzzy
-msgid "Popular notices"
-msgstr "没有这份通告。"
+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/favorited.php:67
+#: actions/showgroup.php:454
 #, fuzzy, php-format
-msgid "Popular notices, page %d"
-msgstr "没有这份通告。"
+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/favorited.php:79
+#: actions/showgroup.php:482
 #, fuzzy
-msgid "The most popular notices on the site right now."
-msgstr "显示上周以来最流行的标签"
+msgid "Admins"
+msgstr "admin管理员"
 
-#: actions/featured.php:69 lib/featureduserssection.php:82
-#: lib/publicgroupnav.php:87
-msgid "Featured users"
-msgstr "推荐用户"
+#: actions/showmessage.php:81
+msgid "No such message."
+msgstr "未找到此消息。"
 
-#: actions/featured.php:71
+#: actions/showmessage.php:98
+msgid "Only the sender and recipient may read this message."
+msgstr "只有发送和接受双方可以阅读此消息。"
+
+#: actions/showmessage.php:108
 #, php-format
-msgid "Featured users, page %d"
-msgstr "推荐用户，第 %d 页"
+msgid "Message to %1$s on %2$s"
+msgstr "发送给 %1$s 的 %2$s 消息"
 
-#: actions/featured.php:99
+#: actions/showmessage.php:113
 #, php-format
-msgid "A selection of some of the great users on %s"
-msgstr "%s 优秀用户摘选"
+msgid "Message from %1$s on %2$s"
+msgstr "来自 %1$s 的 %2$s 消息"
 
-#: actions/finishremotesubscribe.php:188
-msgid "That user has blocked you from subscribing."
-msgstr "那个用户阻止了你的订阅。"
+#: actions/shownotice.php:90
+#, fuzzy
+msgid "Notice deleted."
+msgstr "消息已发布。"
 
-#: actions/groupbyid.php:79
-msgid "No ID"
-msgstr "没有ID"
+#: actions/showstream.php:73
+#, fuzzy, php-format
+msgid " tagged %s"
+msgstr "带 %s 标签的通告"
 
-#: actions/grouplogo.php:138 actions/grouplogo.php:191
-msgid "Group logo"
-msgstr "组logo"
+#: actions/showstream.php:79
+#, fuzzy, php-format
+msgid "%s, page %d"
+msgstr "%s 的收件箱 - 第 %d 页"
 
-#: actions/grouplogo.php:149
-msgid "You can upload a logo image for your group."
-msgstr "你可以给你的组上载一个logo图。"
+#: actions/showstream.php:122
+#, fuzzy, php-format
+msgid "Notice feed for %s tagged %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/grouplogo.php:448
-msgid "Logo updated."
-msgstr "logo已更新。"
+#: actions/showstream.php:129
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/grouplogo.php:450
-#, fuzzy
-msgid "Failed updating logo."
-msgstr "更新logo失败。"
+#: actions/showstream.php:136
+#, fuzzy, php-format
+msgid "Notice feed for %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
 
-#: actions/groupmembers.php:93 lib/groupnav.php:91
-#, php-format
-msgid "%s group members"
-msgstr "%s 组成员"
+#: actions/showstream.php:143
+#, fuzzy, php-format
+msgid "Notice feed for %s (Atom)"
+msgstr "%s 的通告聚合"
 
-#: actions/groupmembers.php:96
-#, php-format
-msgid "%s group members, page %d"
-msgstr "%s 组成员, 第 %d 页"
+#: actions/showstream.php:148
+#, fuzzy, php-format
+msgid "FOAF for %s"
+msgstr "%s 的发件箱"
 
-#: actions/groupmembers.php:111
-msgid "A list of the users in this group."
-msgstr "该组成员列表。"
+#: actions/showstream.php:191
+#, php-format
+msgid "This is the timeline for %s but %s hasn't posted anything yet."
+msgstr ""
 
-#: actions/groups.php:62 actions/showstream.php:518 lib/publicgroupnav.php:79
-#: lib/subgroupnav.php:96
-msgid "Groups"
-msgstr "组"
+#: actions/showstream.php:196
+msgid ""
+"Seen anything interesting recently? You haven't posted any notices yet, now "
+"would be a good time to start :)"
+msgstr ""
 
-#: actions/groups.php:64
+#: actions/showstream.php:198
 #, php-format
-msgid "Groups, page %d"
-msgstr "组，第 %d 页"
+msgid ""
+"You can try to nudge %s or [post something to his or her attention](%%%%"
+"action.newnotice%%%%?status_textarea=%s)."
+msgstr ""
 
-#: actions/groups.php:90
+#: actions/showstream.php:234
 #, php-format
-#, fuzzy
-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
-#, fuzzy
-msgid "Create a new group"
-msgstr "创建新组"
+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/groupsearch.php:57
+#: actions/showstream.php:239
 #, fuzzy, php-format
 msgid ""
-"Search for groups on %%site.name%% by their name, location, or description. "
-msgstr "在 %%site.name%% 的用户信息中搜索，可以搜索姓名、未知和爱好。"
-
-#: actions/groupsearch.php:63
-msgid "Group search"
-msgstr "组检索"
-
-#: actions/imsettings.php:70
-#, fuzzy
-msgid "You can send and receive notices through "
-msgstr "收发可以通过"
-
-#: actions/imsettings.php:120
-#, php-format
-msgid "Jabber or GTalk address, "
-msgstr "Jabber 或者 GTalk 地址, "
+"**%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/imsettings.php:147
+#: actions/silence.php:65 actions/unsilence.php:65
 #, fuzzy
-msgid "Send me replies through Jabber/GTalk "
-msgstr "通过Jabber/GTalk发送通告。"
-
-#: actions/imsettings.php:321
-#, php-format
-msgid "A confirmation code was sent "
-msgstr "确认消息已经发送"
+msgid "You cannot silence users on this site."
+msgstr "无法向此用户发送消息。"
 
-#: actions/joingroup.php:65
+#: actions/silence.php:72
 #, fuzzy
-msgid "You must be logged in to join a group."
-msgstr "您必须登录才能加入组。"
-
-#: actions/joingroup.php:95
-msgid "You are already a member of that group"
-msgstr "您已经是该组成员"
-
-#: actions/joingroup.php:128
-#, fuzzy, php-format
-msgid "Could not join user %s to group %s"
-msgstr "无法把 %s 用户添加到 %s 组"
-
-#: actions/joingroup.php:135
-#, fuzzy, php-format
-msgid "%s joined group %s"
-msgstr "%s 加入 %s 组"
-
-#: actions/leavegroup.php:60
-msgid "Inboxes must be enabled for groups to work."
-msgstr "邮箱必须使能组才能工作。"
+msgid "User is already silenced."
+msgstr "用户没有个人信息。"
 
-#: actions/leavegroup.php:65
+#: actions/siteadminpanel.php:58 lib/adminpanelaction.php:299
 #, fuzzy
-msgid "You must be logged in to leave a group."
-msgstr "您必须登录才能邀请其他人使用 %s"
-
-#: actions/leavegroup.php:88
-msgid "No such group."
-msgstr "没有这个组。"
+msgid "Site"
+msgstr "邀请"
 
-#: actions/leavegroup.php:95
-#, fuzzy
-msgid "You are not a member of that group."
-msgstr "您未告知此个人信息"
+#: actions/siteadminpanel.php:69
+msgid "Basic settings for this StatusNet site."
+msgstr ""
 
-#: actions/leavegroup.php:100
-#, fuzzy
-msgid "You may not leave a group while you are its administrator."
-msgstr "您不能删除其他用户的状态。"
+#: actions/siteadminpanel.php:147
+msgid "Site name must have non-zero length."
+msgstr ""
 
-#: actions/leavegroup.php:130
+#: actions/siteadminpanel.php:155
 #, fuzzy
-msgid "Could not find membership record."
-msgstr "无法更新用户记录。"
-
-#: actions/leavegroup.php:138
-#, fuzzy, php-format
-msgid "Could not remove user %s to group %s"
-msgstr "无法订阅用户：未找到。"
+msgid "You must have a valid contact email address"
+msgstr "不是有效的电子邮件"
 
-#: actions/leavegroup.php:145
+#: actions/siteadminpanel.php:173
 #, php-format
-msgid "%s left group %s"
-msgstr "%s 离开群 %s"
+msgid "Unknown language \"%s\""
+msgstr ""
 
-#: actions/login.php:225 lib/facebookaction.php:304
-msgid "Login to site"
-msgstr "登录"
+#: actions/siteadminpanel.php:180
+msgid "Invalid snapshot report URL."
+msgstr ""
 
-#: actions/microsummary.php:69
-msgid "No current status"
-msgstr "没有当前状态"
+#: actions/siteadminpanel.php:186
+msgid "Invalid snapshot run value."
+msgstr ""
 
-#: actions/newgroup.php:53
-msgid "New group"
-msgstr "新组"
+#: actions/siteadminpanel.php:192
+msgid "Snapshot frequency must be a number."
+msgstr ""
 
-#: actions/newgroup.php:115
-msgid "Use this form to create a new group."
-msgstr "使用此表格创建组。"
+#: actions/siteadminpanel.php:199
+msgid "You must set an SSL sever when enabling SSL."
+msgstr ""
 
-#: actions/newgroup.php:177
-msgid "Could not create group."
-msgstr "无法创建组。"
+#: actions/siteadminpanel.php:204
+msgid "Invalid SSL server. Max length is 255 characters."
+msgstr ""
 
-#: actions/newgroup.php:191
-#, fuzzy
-msgid "Could not set group membership."
-msgstr "无法删除订阅。"
+#: actions/siteadminpanel.php:210
+msgid "Minimum text limit is 140c."
+msgstr ""
 
-#: actions/newmessage.php:119 actions/newnotice.php:132
-#, fuzzy
-msgid "That's too long. "
-msgstr "文件超出大小限制。"
+#: actions/siteadminpanel.php:216
+msgid "Dupe limit must 1 or more seconds."
+msgstr ""
 
-#: actions/newmessage.php:134
-#, fuzzy
-msgid "Don't send a message to yourself; "
-msgstr "无法向此用户发送消息。"
+#: actions/siteadminpanel.php:224
+#, php-format
+msgid "Locales directory not readable: %s"
+msgstr ""
 
-#: actions/newnotice.php:166
-msgid "Notice posted"
-msgstr "消息已发布。"
+#: actions/siteadminpanel.php:275
+#, fuzzy
+msgid "Site name"
+msgstr "新通告"
 
-#: actions/newnotice.php:200 classes/Channel.php:163
-msgid "Ajax Error"
-msgstr "Ajax错误"
+#: actions/siteadminpanel.php:276
+msgid "The name of your site, like \"Yourcompany Microblog\""
+msgstr ""
 
-#: actions/nudge.php:85
-msgid ""
-"This user doesn't allow nudges or hasn't confirmed or set his email yet."
-msgstr "此用户不允许振铃呼叫或者还没有确认或设置TA的电子邮件。"
+#: actions/siteadminpanel.php:279
+msgid "Brought by"
+msgstr ""
 
-#: actions/nudge.php:94
-msgid "Nudge sent"
-msgstr "振铃呼叫发出。"
+#: actions/siteadminpanel.php:280
+msgid "Text used for credits link in footer of each page"
+msgstr ""
 
-#: actions/nudge.php:97
-msgid "Nudge sent!"
-msgstr "振铃呼叫已经发出！"
+#: actions/siteadminpanel.php:283
+msgid "Brought by URL"
+msgstr ""
 
-#: actions/openidlogin.php:97
-#, fuzzy
-msgid "OpenID login"
-msgstr "OpenID 登录"
+#: actions/siteadminpanel.php:284
+msgid "URL used for credits link in footer of each page"
+msgstr ""
 
-#: actions/openidsettings.php:128
+#: actions/siteadminpanel.php:288
 #, fuzzy
-msgid "Removing your only OpenID "
-msgstr "移除OpenID"
+msgid "contact email address for your site"
+msgstr "新的电子邮件地址，用于发布 %s 信息"
 
-#: actions/othersettings.php:60
-#, fuzzy
-msgid "Other Settings"
-msgstr "Twitter 设置"
+#: actions/siteadminpanel.php:302
+msgid "Default timezone"
+msgstr ""
 
-#: actions/othersettings.php:71
-msgid "Manage various other options."
-msgstr "管理其他选项。"
+#: actions/siteadminpanel.php:303
+msgid "Default timezone for the site; usually UTC."
+msgstr ""
 
-#: actions/othersettings.php:93
-msgid "URL Auto-shortening"
-msgstr "URL自动缩短"
+#: actions/siteadminpanel.php:310
+#, fuzzy
+msgid "Default site language"
+msgstr "首选语言"
 
-#: actions/othersettings.php:112
-msgid "Service"
-msgstr "服务"
+#: actions/siteadminpanel.php:316
+msgid "Path to locales"
+msgstr ""
 
-#: actions/othersettings.php:113
-msgid "Automatic shortening service to use."
-msgstr "要使用的自动缩短服务。"
+#: actions/siteadminpanel.php:316
+msgid "Directory path to locales"
+msgstr ""
 
-#: actions/othersettings.php:144
+#: actions/siteadminpanel.php:320
 #, fuzzy
-msgid "URL shortening service is too long (max 50 chars)."
-msgstr "URL缩短服务超长(最多50个字符)。"
+msgid "Server"
+msgstr "恢复"
 
-#: actions/passwordsettings.php:69
-#, fuzzy
-msgid "Change your password."
-msgstr "修改密码"
+#: actions/siteadminpanel.php:320
+msgid "Site's server hostname."
+msgstr ""
 
-#: actions/passwordsettings.php:89
-#, fuzzy
-msgid "Password change"
-msgstr "密码已保存。"
+#: actions/siteadminpanel.php:324
+msgid "Path"
+msgstr ""
 
-#: actions/peopletag.php:35
-#, fuzzy, php-format
-msgid "Not a valid people tag: %s"
-msgstr "不是有效的电子邮件"
+#: actions/siteadminpanel.php:324
+#, fuzzy
+msgid "Site path"
+msgstr "新通告"
 
-#: actions/peopletag.php:47
-#, php-format
-msgid "Users self-tagged with %s - page %d"
-msgstr "用户自加标签 %s - 第 %d 页"
+#: actions/siteadminpanel.php:328
+msgid "Fancy URLs"
+msgstr ""
 
-#: actions/peopletag.php:91
-#, php-format
-msgid "These are users who have tagged themselves \"%s\" "
-msgstr "这些是自我标识为 \"%s\"  的用户"
+#: actions/siteadminpanel.php:330
+msgid "Use fancy (more readable and memorable) URLs?"
+msgstr ""
 
-#: actions/profilesettings.php:91
+#: actions/siteadminpanel.php:334
 #, fuzzy
-msgid "Profile information"
-msgstr "未知的帐号"
+msgid "Private"
+msgstr "隐私"
 
-#: actions/profilesettings.php:124
-msgid ""
-"Tags for yourself (letters, numbers, -, ., and _), comma- or space- separated"
-msgstr "你的标签 (字母letters, 数字numbers, -, ., 和 _), 以逗号或空格分隔"
+#: actions/siteadminpanel.php:336
+msgid "Prohibit anonymous users (not logged in) from viewing site?"
+msgstr ""
 
-#: actions/profilesettings.php:144
+#: actions/siteadminpanel.php:340
 #, fuzzy
-msgid "Automatically subscribe to whoever "
-msgstr "自动订阅任何订阅我的更新的人(这个选项最适合机器人)"
+msgid "Invite only"
+msgstr "邀请"
 
-#: actions/profilesettings.php:229 actions/tagother.php:176
-#, fuzzy, php-format
-msgid "Invalid tag: \"%s\""
-msgstr "主页'%s'不正确"
+#: actions/siteadminpanel.php:342
+msgid "Make registration invitation only."
+msgstr ""
 
-#: actions/profilesettings.php:311
+#: actions/siteadminpanel.php:346 actions/useradminpanel.php:171
 #, fuzzy
-msgid "Couldn't save tags."
-msgstr "无法保存个人信息。"
+msgid "Closed"
+msgstr "阻止"
 
-#: actions/public.php:107
-#, fuzzy, php-format
-msgid "Public timeline, page %d"
-msgstr "公开的时间表"
+#: actions/siteadminpanel.php:348
+msgid "Disable new registrations."
+msgstr ""
 
-#: actions/public.php:173
-#, fuzzy
-msgid "Could not retrieve public stream."
-msgstr "无法获取收藏的通告。"
+#: actions/siteadminpanel.php:353
+msgid "Randomly during Web hit"
+msgstr ""
 
-#: actions/public.php:220
-#, php-format
-msgid ""
-"This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) service "
+#: actions/siteadminpanel.php:354
+msgid "In a scheduled job"
 msgstr ""
-"这里是 %%site.name%%,一个微博客 [micro-blogging](http://en.wikipedia.org/wiki/Micro-"
-"blogging) 服务"
 
-#: actions/publictagcloud.php:57
+#: actions/siteadminpanel.php:355 actions/siteadminpanel.php:380
 #, fuzzy
-msgid "Public tag cloud"
-msgstr "公开的聚合"
+msgid "Never"
+msgstr "恢复"
 
-#: actions/publictagcloud.php:63
-#, php-format
-msgid "These are most popular recent tags on %s "
-msgstr "这些是最近的 %s 流行标签 "
+#: actions/siteadminpanel.php:357
+msgid "Data snapshots"
+msgstr ""
 
-#: actions/publictagcloud.php:119
-msgid "Tag cloud"
-msgstr "标签云聚集"
+#: actions/siteadminpanel.php:358
+msgid "When to send statistical data to status.net servers"
+msgstr ""
 
-#: actions/register.php:139 actions/register.php:349
-msgid "Sorry, only invited people can register."
-msgstr "对不起，请邀请那些能注册的人。"
+#: actions/siteadminpanel.php:364
+msgid "Frequency"
+msgstr ""
 
-#: actions/register.php:149
-#, fuzzy
-msgid "You can't register if you don't "
-msgstr "您必须同意此授权方可注册。"
+#: actions/siteadminpanel.php:365
+msgid "Snapshots will be sent once every N Web hits"
+msgstr ""
 
-#: actions/register.php:286
-msgid "With this form you can create "
-msgstr "使用这个表格你可以创建"
+#: actions/siteadminpanel.php:372
+msgid "Report URL"
+msgstr ""
 
-#: actions/register.php:368
-#, fuzzy
-msgid "1-64 lowercase letters or numbers, "
-msgstr "1 到 64 个小写字母或数字，不包含标点及空白"
+#: actions/siteadminpanel.php:373
+msgid "Snapshots will be sent to this URL"
+msgstr ""
 
-#: actions/register.php:382 actions/register.php:386
+#: actions/siteadminpanel.php:381
 #, fuzzy
-msgid "Used only for updates, announcements, "
-msgstr "只用于更新、通告或密码恢复"
+msgid "Sometimes"
+msgstr "通告"
 
-#: actions/register.php:398
-#, fuzzy
-msgid "URL of your homepage, blog, "
-msgstr "您的主页、博客或在其他站点的URL"
+#: actions/siteadminpanel.php:382
+msgid "Always"
+msgstr ""
 
-#: actions/register.php:404
-#, fuzzy
-msgid "Describe yourself and your "
-msgstr "用不超过140个字符描述您自己和您的爱好"
+#: actions/siteadminpanel.php:384
+msgid "Use SSL"
+msgstr ""
 
-#: actions/register.php:410
-#, fuzzy
-msgid "Where you are, like \"City, "
-msgstr "你的位置，格式类似\"城市，省份，国家\""
+#: actions/siteadminpanel.php:385
+msgid "When to use SSL"
+msgstr ""
 
-#: actions/register.php:432
-#, fuzzy
-msgid " except this private data: password, "
-msgstr "除了隐私内容：密码，电子邮件，即时通讯帐号，电话号码。"
+#: actions/siteadminpanel.php:391
+msgid "SSL Server"
+msgstr ""
 
-#: actions/register.php:471
-#, fuzzy, php-format
-msgid "Congratulations, %s! And welcome to %%%%site.name%%%%. "
-msgstr "祝贺你，%s！欢迎来到 %%%%site.name%%%%。在这里，您可以……"
+#: actions/siteadminpanel.php:392
+msgid "Server to direct SSL requests to"
+msgstr ""
 
-#: actions/register.php:495
-#, fuzzy
-msgid "(You should receive a message by email "
-msgstr "(您将立即收到一封电子邮件，含有"
+#: actions/siteadminpanel.php:396
+msgid "Text limit"
+msgstr ""
 
-#: actions/remotesubscribe.php:166 actions/remotesubscribe.php:171
-msgid "That's a local profile! Login to subscribe."
-msgstr "那是一个本地资料！需要登录才能订阅。"
+#: actions/siteadminpanel.php:396
+msgid "Maximum number of characters for notices."
+msgstr ""
 
-#: actions/replies.php:118
-#, fuzzy, php-format
-msgid "Replies to %s, page %d"
-msgstr "%s 的回复，第 % 页"
+#: actions/siteadminpanel.php:400
+msgid "Dupe limit"
+msgstr ""
 
-#: actions/showfavorites.php:79
-#, fuzzy, php-format
-msgid "%s favorite notices, page %d"
-msgstr "%s 收藏的通告"
+#: actions/siteadminpanel.php:400
+msgid "How long users must wait (in seconds) to post the same thing again."
+msgstr ""
 
-#: actions/showgroup.php:77 lib/groupnav.php:85
-#, php-format
-msgid "%s group"
-msgstr "%s 组"
+#: actions/siteadminpanel.php:414 actions/useradminpanel.php:226
+#, fuzzy
+msgid "Save site settings"
+msgstr "头像设置"
+
+#: actions/smssettings.php:58
+msgid "SMS Settings"
+msgstr "SMS短信设置"
 
-#: actions/showgroup.php:79
+#: actions/smssettings.php:69
 #, php-format
-msgid "%s group, page %d"
-msgstr "%s 组, 第 %d 页"
+msgid "You can receive SMS messages through email from %%site.name%%."
+msgstr "您可以通过 %%site.name%% 的电子邮件接收SMS短信。"
 
-#: actions/showgroup.php:206
+#: actions/smssettings.php:91
 #, fuzzy
-msgid "Group profile"
-msgstr "组资料"
-
-#: actions/showgroup.php:251 actions/showstream.php:278
-#: actions/tagother.php:119 lib/grouplist.php:134 lib/profilelist.php:133
-msgid "URL"
-msgstr "URL 互联网地址"
+msgid "SMS is not available."
+msgstr "这个页面不提供您想要的媒体类型"
 
-#: actions/showgroup.php:262 actions/showstream.php:289
-#: actions/tagother.php:129 lib/grouplist.php:145 lib/profilelist.php:144
-#, fuzzy
-msgid "Note"
-msgstr "通告"
+#: actions/smssettings.php:112
+msgid "Current confirmed SMS-enabled phone number."
+msgstr "已确认的可以发送SMS短消息的电话号码。"
 
-#: actions/showgroup.php:270
-msgid "Group actions"
-msgstr "组动作"
+#: actions/smssettings.php:123
+msgid "Awaiting confirmation on this phone number."
+msgstr "等待确认此电话号码。"
 
-#: actions/showgroup.php:323
-#, fuzzy, php-format
-msgid "Notice feed for %s group"
-msgstr "%s 的通告聚合"
+#: actions/smssettings.php:130
+msgid "Confirmation code"
+msgstr "确认码"
 
-#: actions/showgroup.php:357 lib/groupnav.php:90
-#, fuzzy
-msgid "Members"
-msgstr "注册于"
+#: actions/smssettings.php:131
+msgid "Enter the code you received on your phone."
+msgstr "输入手机收到的验证码。"
 
-#: actions/showgroup.php:363 actions/showstream.php:413
-#: actions/showstream.php:442 actions/showstream.php:524 lib/section.php:95
-#: lib/tagcloudsection.php:71
-msgid "(None)"
-msgstr "（没有）"
+#: actions/smssettings.php:138
+msgid "SMS Phone number"
+msgstr "SMS短信电话号码"
 
-#: actions/showgroup.php:370
-msgid "All members"
-msgstr "所有成员"
+#: actions/smssettings.php:140
+msgid "Phone number, no punctuation or spaces, with area code"
+msgstr "电话号码，不带标点或空格，包含地区代码"
 
-#: actions/showgroup.php:378
-#, php-format
+#: actions/smssettings.php:174
 msgid ""
-"**%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)"
-
-#: actions/showmessage.php:98
-#, fuzzy
-msgid "Only the sender and recipient "
-msgstr "只有发送和接受双方可以阅读此消息。"
+"Send me notices through SMS; I understand I may incur exorbitant charges "
+"from my carrier."
+msgstr "通过SMS短信将通告发给我；我了解这样也许会给我带来不菲的开支。"
 
-#: actions/showstream.php:73
-#, fuzzy, php-format
-msgid "%s, page %d"
-msgstr "%s 的收件箱 - 第 %d 页"
+#: actions/smssettings.php:306
+msgid "No phone number."
+msgstr "没有电话号码。"
 
-#: actions/showstream.php:143
-#, fuzzy
-msgid "'s profile"
-msgstr "个人信息"
+#: actions/smssettings.php:311
+msgid "No carrier selected."
+msgstr "未选择运营商。"
 
-#: actions/showstream.php:236 actions/tagother.php:77
-#, fuzzy
-msgid "User profile"
-msgstr "用户没有个人信息。"
+#: actions/smssettings.php:318
+msgid "That is already your phone number."
+msgstr "您已登记此电话号码。"
 
-#: actions/showstream.php:240 actions/tagother.php:81
-msgid "Photo"
-msgstr "相片"
+#: actions/smssettings.php:321
+msgid "That phone number already belongs to another user."
+msgstr "这个电话号码属于另一个用户。"
 
-#: actions/showstream.php:317
+#: actions/smssettings.php:347
 #, fuzzy
-msgid "User actions"
-msgstr "未知动作"
+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/showstream.php:342
-#, fuzzy
-msgid "Send a direct message to this user"
-msgstr "无法向此用户发送消息。"
+#: actions/smssettings.php:374
+msgid "That is the wrong confirmation number."
+msgstr "确认码错误。"
 
-#: actions/showstream.php:343
-#, fuzzy
-msgid "Message"
-msgstr "新消息"
+#: actions/smssettings.php:405
+msgid "That is not your phone number."
+msgstr "这是他人的电话号码。"
 
-#: actions/showstream.php:451
+#: actions/smssettings.php:465
 #, fuzzy
-msgid "All subscribers"
-msgstr "订阅者"
+msgid "Mobile carrier"
+msgstr "选择运营商"
 
-#: actions/showstream.php:533
-msgid "All groups"
-msgstr "所有组"
+#: actions/smssettings.php:469
+msgid "Select a carrier"
+msgstr "选择运营商"
 
-#: actions/showstream.php:542
+#: actions/smssettings.php:476
 #, php-format
 msgid ""
-"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
-"wikipedia.org/wiki/Micro-blogging) service "
+"Mobile carrier for your phone. If you know a carrier that accepts SMS over "
+"email but isn't listed here, send email to let us know at %s."
 msgstr ""
-"**%s** 有一个帐号在 %%%%site.name%%%%, 一个微博客服务 [micro-"
-"blogging](http://en.wikipedia.org/wiki/Micro-blogging)"
-
-#: actions/smssettings.php:128
-#, fuzzy
-msgid "Phone number, no punctuation or spaces, "
-msgstr "电话号码，不带标点或空格，包含地区代码"
-
-#: actions/smssettings.php:162
-#, fuzzy
-msgid "Send me notices through SMS; "
-msgstr "通过Jabber/GTalk发送通告。"
-
-#: actions/smssettings.php:335
-#, fuzzy
-msgid "A confirmation code was sent to the phone number you added. "
-msgstr "等待确认此电话号码。"
+"电话的服务商。如果您的服务商支持通过电子邮件发送SMS短信，而这里尚未列出，请联"
+"系 %s 以告知。"
 
-#: actions/smssettings.php:453
-#, fuzzy
-msgid "Mobile carrier"
-msgstr "选择运营商"
+#: actions/smssettings.php:498
+msgid "No code entered"
+msgstr "没有输入验证码"
 
 #: actions/subedit.php:70
 #, fuzzy
@@ -4250,15 +3494,32 @@ msgid "%s subscribers, page %d"
 msgstr "%s 订阅者, 第 %d 页"
 
 #: actions/subscribers.php:63
-#, fuzzy
-msgid "These are the people who listen to "
-msgstr "这些用户订阅了 %s 的通告。"
+msgid "These are the people who listen to your notices."
+msgstr "这些用户订阅了您的通告。"
 
 #: actions/subscribers.php:67
-#, fuzzy, php-format
-msgid "These are the people who "
+#, php-format
+msgid "These are the people who listen to %s's notices."
 msgstr "这些用户订阅了 %s 的通告。"
 
+#: 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:52
 #, fuzzy, php-format
 msgid "%s subscriptions"
@@ -4270,29 +3531,37 @@ msgid "%s subscriptions, page %d"
 msgstr "所有订阅"
 
 #: actions/subscriptions.php:65
-#, fuzzy
-msgid "These are the people whose notices "
-msgstr "这是 %s 订阅的用户。"
+msgid "These are the people whose notices you listen to."
+msgstr "这是您订阅的用户。"
 
 #: actions/subscriptions.php:69
+#, php-format
+msgid "These are the people whose notices %s listens to."
+msgstr "这是 %s 订阅的用户。"
+
+#: 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:123 actions/subscriptions.php:127
 #, fuzzy, php-format
-msgid "These are the people whose "
-msgstr "这些用户订阅了 %s 的通告。"
+msgid "%s is not listening to anyone."
+msgstr "%1$s 开始关注您的 %2$s 信息。"
 
-#: actions/subscriptions.php:122
+#: actions/subscriptions.php:194
 #, fuzzy
 msgid "Jabber"
 msgstr "没有 Jabber ID。"
 
-#: actions/tag.php:43
-#, fuzzy, php-format
-msgid "Notices tagged with %s, page %d"
-msgstr "带 %s 标签的通告"
-
-#: actions/tag.php:66
-#, php-format
-msgid "Messages tagged \"%s\", most recent first"
-msgstr "有 \"%s\" 标签的消息，最近的排序在前"
+#: actions/subscriptions.php:199 lib/connectsettingsaction.php:115
+msgid "SMS"
+msgstr "SMS短信"
 
 #: actions/tagother.php:33
 #, fuzzy
@@ -4309,269 +3578,939 @@ msgstr "没有这份文档。"
 msgid "Tag %s"
 msgstr "标签"
 
+#: actions/tagother.php:77 lib/userprofile.php:75
+#, fuzzy
+msgid "User profile"
+msgstr "用户没有个人信息。"
+
+#: actions/tagother.php:81 lib/userprofile.php:102
+msgid "Photo"
+msgstr "相片"
+
 #: actions/tagother.php:141
 #, fuzzy
 msgid "Tag user"
 msgstr "标签"
 
-#: actions/tagother.php:149
+#: actions/tagother.php:151
 msgid ""
 "Tags for this user (letters, numbers, -, ., and _), comma- or space- "
 "separated"
-msgstr "给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
-
-#: actions/tagother.php:164
-#, fuzzy
-msgid "There was a problem with your session token."
-msgstr "会话标识有问题，请重试。"
+msgstr ""
+"给这个用户加注标签 (字母letters, 数字numbers, -, ., and _), 逗号或空格分隔"
 
-#: 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 "你只能给你订阅的人或订阅你的人加标签。"
 
-#: actions/tagother.php:198
+#: actions/tagother.php:200
 #, fuzzy
 msgid "Could not save tags."
 msgstr "无法保存头像"
 
-#: actions/tagother.php:233
+#: actions/tagother.php:236
 msgid "Use this form to add tags to your subscribers or subscriptions."
 msgstr "使用这个表格给你的关注者或你的订阅加注标签。"
 
+#: actions/tag.php:68
+#, fuzzy, php-format
+msgid "Notices tagged with %s, page %d"
+msgstr "带 %s 标签的通告"
+
+#: actions/tag.php:86
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 1.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:92
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (RSS 2.0)"
+msgstr "%s 的通告聚合"
+
+#: actions/tag.php:98
+#, fuzzy, php-format
+msgid "Notice feed for tag %s (Atom)"
+msgstr "%s 的通告聚合"
+
 #: actions/tagrss.php:35
 #, fuzzy
 msgid "No such tag."
 msgstr "未找到此消息。"
 
-#: actions/tagrss.php:66
-#, fuzzy, php-format
-msgid "Microblog tagged with %s"
-msgstr "带 %s 标签的通告"
+#: actions/twitapitrends.php:87
+msgid "API method under construction."
+msgstr "API 方法尚未实现。"
 
-#: actions/twitapiblocks.php:47
-msgid "Block user failed."
-msgstr "阻止用户失败。"
+#: actions/unblock.php:59
+#, fuzzy
+msgid "You haven't blocked that user."
+msgstr "您已成功阻止该用户："
 
-#: actions/twitapiblocks.php:69
-msgid "Unblock user failed."
-msgstr "取消阻止用户失败。"
+#: actions/unsandbox.php:72
+#, fuzzy
+msgid "User is not sandboxed."
+msgstr "用户没有个人信息。"
 
-#: actions/twitapiusers.php:48
+#: actions/unsilence.php:72
 #, fuzzy
-msgid "Not found."
-msgstr "未找到"
+msgid "User is not silenced."
+msgstr "用户没有个人信息。"
 
-#: actions/twittersettings.php:71
+#: actions/unsubscribe.php:77
 #, fuzzy
-msgid "Add your Twitter account to automatically send "
-msgstr "添加 Twitter 帐号，自动向 Twitter 发送更新。"
+msgid "No profile id in request."
+msgstr "服务器没有返回个人信息URL。"
 
-#: actions/twittersettings.php:119
+#: actions/unsubscribe.php:84
 #, fuzzy
-msgid "Twitter user name"
-msgstr "Twitter 用户名"
+msgid "No profile with that id."
+msgstr "没有找到此ID的信息。"
 
-#: actions/twittersettings.php:126
+#: actions/unsubscribe.php:98
 #, fuzzy
-msgid "Twitter password"
-msgstr "Twitter 密码"
+msgid "Unsubscribed"
+msgstr "退订"
+
+#: actions/updateprofile.php:62 actions/userauthorization.php:330
+#, php-format
+msgid "Listenee stream license ‘%s’ is not compatible with site license ‘%s’."
+msgstr ""
 
-#: actions/twittersettings.php:228
+#: actions/useradminpanel.php:58 lib/personalgroupnav.php:115
+msgid "User"
+msgstr "用户"
+
+#: actions/useradminpanel.php:69
+msgid "User settings for this StatusNet site."
+msgstr ""
+
+#: actions/useradminpanel.php:173
+msgid "Is registration on this site prohibited?"
+msgstr ""
+
+#: actions/useradminpanel.php:178
 #, fuzzy
-msgid "Twitter Friends"
-msgstr "Twitter 设置"
+msgid "Invite-only"
+msgstr "邀请"
 
-#: actions/twittersettings.php:327
-msgid "Username must have only numbers, "
-msgstr "用户名只能有数字，"
+#: actions/useradminpanel.php:180
+msgid "Is registration on this site only open to invited users?"
+msgstr ""
 
-#: actions/twittersettings.php:341
-#, fuzzy, php-format
-msgid "Unable to retrieve account information "
-msgstr "无法从 Twitter 获取\"%s\"的帐号信息。"
+#: actions/userauthorization.php:105
+msgid "Authorize subscription"
+msgstr "确认订阅"
 
-#: actions/unblock.php:108
+#: actions/userauthorization.php:110
 #, fuzzy
-msgid "Error removing the block."
-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/unsubscribe.php:50
+#: actions/userauthorization.php:188
 #, fuzzy
-msgid "No profile id in request."
-msgstr "服务器没有返回个人信息URL。"
+msgid "License"
+msgstr "注册证"
+
+#: actions/userauthorization.php:209
+msgid "Accept"
+msgstr "接受"
 
-#: actions/unsubscribe.php:57
+#: actions/userauthorization.php:210 lib/subscribeform.php:115
+#: lib/subscribeform.php:139
 #, fuzzy
-msgid "No profile with that id."
-msgstr "没有找到此ID的信息。"
+msgid "Subscribe to this user"
+msgstr "订阅 %s"
+
+#: actions/userauthorization.php:211
+msgid "Reject"
+msgstr "拒绝"
 
-#: actions/unsubscribe.php:71
+#: actions/userauthorization.php:212
 #, fuzzy
-msgid "Unsubscribed"
-msgstr "退订"
+msgid "Reject this subscription"
+msgstr "所有订阅"
+
+#: actions/userauthorization.php:225
+msgid "No authorization request!"
+msgstr "未收到认证请求！"
+
+#: actions/userauthorization.php:247
+msgid "Subscription authorized"
+msgstr "订阅已确认"
 
-#: actions/usergroups.php:63
+#: 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:259
+msgid "Subscription rejected"
+msgstr "订阅被拒绝"
+
+#: 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 "%s groups"
-msgstr "%s 群组"
+msgid "Listener URI ‘%s’ not found here"
+msgstr ""
+
+#: actions/userauthorization.php:301
+#, php-format
+msgid "Listenee URI ‘%s’ is too long."
+msgstr ""
 
-#: actions/usergroups.php:65
+#: 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' 图像格式错误"
+
+#: actions/userbyid.php:70
+msgid "No id."
+msgstr "没有 id。"
+
+#: 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:64
 #, php-format
 msgid "%s groups, page %d"
 msgstr "%s 群组, 第 %d 页"
 
-#: classes/Notice.php:104
+#: actions/usergroups.php:130
+#, fuzzy
+msgid "Search for more groups"
+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: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:147
+#, php-format
+msgid "A file this large would exceed your user quota of %d bytes."
+msgstr ""
+
+#: classes/File.php:154
+#, php-format
+msgid "A file this large would exceed your monthly quota of %d bytes."
+msgstr ""
+
+#: classes/Message.php:45
+#, fuzzy
+msgid "You are banned from sending direct messages."
+msgstr "发送消息出错。"
+
+#: classes/Message.php:61
+msgid "Could not insert message."
+msgstr "无法添加信息。"
+
+#: classes/Message.php:71
+msgid "Could not update message with new URI."
+msgstr "无法添加新URI的信息。"
+
+#: classes/Notice.php:164
+#, php-format
+msgid "DB error inserting hashtag: %s"
+msgstr "添加标签时数据库出错：%s"
+
+#: classes/Notice.php:179
+#, fuzzy
+msgid "Problem saving notice. Too long."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:183
 #, fuzzy
 msgid "Problem saving notice. Unknown user."
 msgstr "保存通告时出错。"
 
-#: classes/Notice.php:109
+#: classes/Notice.php:188
 msgid ""
 "Too many notices too fast; take a breather and post again in a few minutes."
 msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
 
-#: classes/Notice.php:116
+#: classes/Notice.php:194
+#, fuzzy
+msgid ""
+"Too many duplicate messages too quickly; take a breather and post again in a "
+"few minutes."
+msgstr "你在短时间里发布了过多的消息，请深呼吸，过几分钟再发消息。"
+
+#: classes/Notice.php:200
 msgid "You are banned from posting notices on this site."
 msgstr "在这个网站你被禁止发布消息。"
 
+#: classes/Notice.php:265 classes/Notice.php:290
+msgid "Problem saving notice."
+msgstr "保存通告时出错。"
+
+#: classes/Notice.php:1117
+#, php-format
+msgid "DB error inserting reply: %s"
+msgstr "添加回复时数据库出错：%s"
+
+#: classes/User_group.php:380
+msgid "Could not create group."
+msgstr "无法创建组。"
+
+#: classes/User_group.php:409
+#, fuzzy
+msgid "Could not set group membership."
+msgstr "无法删除订阅。"
+
+#: classes/User.php:347
+#, fuzzy, php-format
+msgid "Welcome to %1$s, @%2$s!"
+msgstr "发送给 %1$s 的 %2$s 消息"
+
+#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109
+msgid "Profile"
+msgstr "个人信息"
+
 #: lib/accountsettingsaction.php:108
+msgid "Change your profile settings"
+msgstr "修改您的个人信息"
+
+#: lib/accountsettingsaction.php:112
 msgid "Upload an avatar"
 msgstr "上载一个头像。"
 
-#: lib/accountsettingsaction.php:119
+#: lib/accountsettingsaction.php:116
+msgid "Change your password"
+msgstr "修改密码"
+
+#: lib/accountsettingsaction.php:120
+msgid "Change email handling"
+msgstr "修改电子邮件"
+
+#: lib/accountsettingsaction.php:124
+#, fuzzy
+msgid "Design your profile"
+msgstr "用户没有个人信息。"
+
+#: lib/accountsettingsaction.php:128
 msgid "Other"
 msgstr "其他"
 
-#: lib/accountsettingsaction.php:120
+#: lib/accountsettingsaction.php:128
 msgid "Other options"
 msgstr "其他选项"
 
-#: lib/action.php:130
+#: lib/action.php:144
 #, fuzzy, php-format
 msgid "%s - %s"
 msgstr "%s (%s)"
 
-#: lib/action.php:145
+#: lib/action.php:159
 msgid "Untitled page"
 msgstr "无标题页"
 
-#: lib/action.php:316
+#: lib/action.php:424
 msgid "Primary site navigation"
 msgstr "主站导航"
 
-#: lib/action.php:322
+#: lib/action.php:430
+msgid "Home"
+msgstr "主页"
+
+#: lib/action.php:430
 msgid "Personal profile and friends timeline"
 msgstr "个人资料及朋友年表"
 
-#: lib/action.php:325
-msgid "Search for people or text"
-msgstr "检索人或文字"
-
-#: lib/action.php:328
+#: lib/action.php:432
 msgid "Account"
 msgstr "帐号"
 
-#: lib/action.php:328
+#: lib/action.php:432
 #, fuzzy
 msgid "Change your email, avatar, password, profile"
 msgstr "修改资料"
 
-#: lib/action.php:330
-msgid "Connect to IM, SMS, Twitter"
-msgstr "与IM，手机短信，Twitter的连接"
+#: lib/action.php:435
+msgid "Connect"
+msgstr "连接"
 
-#: lib/action.php:332
+#: lib/action.php:435
+#, fuzzy
+msgid "Connect to services"
+msgstr "无法重定向到服务器：%s"
+
+#: lib/action.php:439
+#, fuzzy
+msgid "Change site configuration"
+msgstr "主站导航"
+
+#: lib/action.php:443 lib/subgroupnav.php:105
+msgid "Invite"
+msgstr "邀请"
+
+#: lib/action.php:444 lib/subgroupnav.php:106
+#, fuzzy, php-format
+msgid "Invite friends and colleagues to join you on %s"
+msgstr "使用这个表单来邀请好友和同事加入。"
+
+#: lib/action.php:449
+msgid "Logout"
+msgstr "登出"
+
+#: lib/action.php:449
 msgid "Logout from the site"
 msgstr "登出本站"
 
-#: lib/action.php:335
-msgid "Login to the site"
-msgstr "登入本站"
-
-#: lib/action.php:338
+#: lib/action.php:454
 #, fuzzy
 msgid "Create an account"
 msgstr "创建新帐号"
 
-#: lib/action.php:341
-#, fuzzy
-msgid "Login with OpenID"
-msgstr "没有这个 OpenID。"
+#: lib/action.php:457
+msgid "Login to the site"
+msgstr "登入本站"
+
+#: lib/action.php:460 lib/action.php:723
+msgid "Help"
+msgstr "帮助"
 
-#: lib/action.php:344
+#: lib/action.php:460
 #, fuzzy
 msgid "Help me!"
 msgstr "帮助"
 
-#: lib/action.php:362
+#: lib/action.php:463
+msgid "Search"
+msgstr "搜索"
+
+#: lib/action.php:463
+msgid "Search for people or text"
+msgstr "检索人或文字"
+
+#: lib/action.php:484
 #, fuzzy
 msgid "Site notice"
 msgstr "新通告"
 
-#: lib/action.php:417
+#: lib/action.php:550
 msgid "Local views"
 msgstr "本地显示"
 
-#: lib/action.php:472
+#: lib/action.php:616
 #, fuzzy
 msgid "Page notice"
 msgstr "新通告"
 
-#: lib/action.php:562
+#: lib/action.php:718
 #, fuzzy
 msgid "Secondary site navigation"
 msgstr "次项站导航"
 
-#: lib/action.php:602 lib/action.php:623
+#: lib/action.php:725
+msgid "About"
+msgstr "关于"
+
+#: lib/action.php:727
+msgid "FAQ"
+msgstr "常见问题FAQ"
+
+#: lib/action.php:731
+msgid "TOS"
+msgstr ""
+
+#: lib/action.php:734
+msgid "Privacy"
+msgstr "隐私"
+
+#: lib/action.php:736
+msgid "Source"
+msgstr "来源"
+
+#: lib/action.php:738
+msgid "Contact"
+msgstr "联系人"
+
+#: lib/action.php:740
+#, fuzzy
+msgid "Badge"
+msgstr "呼叫"
+
+#: lib/action.php:768
 msgid "StatusNet software license"
 msgstr "StatusNet软件注册证"
 
-#: lib/action.php:630
+#: lib/action.php:771
+#, php-format
+msgid ""
+"**%%site.name%%** is a microblogging service brought to you by [%%site."
+"broughtby%%](%%site.broughtbyurl%%). "
+msgstr ""
+"**%%site.name%%** 是一个微博客服务，提供者为 [%%site.broughtby%%](%%site."
+"broughtbyurl%%)。"
+
+#: lib/action.php:773
+#, php-format
+msgid "**%%site.name%%** is a microblogging service. "
+msgstr "**%%site.name%%** 是一个微博客服务。"
+
+#: lib/action.php:775
+#, php-format
+msgid ""
+"It runs the [StatusNet](http://status.net/) microblogging software, version %"
+"s, available under the [GNU Affero General Public License](http://www.fsf."
+"org/licensing/licenses/agpl-3.0.html)."
+msgstr ""
+"它运行[StatusNet](http://status.net/)微博客服务，版本 %s，采用[GNU Affero "
+"General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html)"
+"授权。"
+
+#: lib/action.php:789
+#, fuzzy
+msgid "Site content license"
+msgstr "StatusNet软件注册证"
+
+#: lib/action.php:798
 msgid "All "
 msgstr "全部"
 
-#: lib/action.php:635
+#: lib/action.php:803
 msgid "license."
 msgstr "注册证"
 
-#: lib/blockform.php:123 lib/blockform.php:153
+#: lib/action.php:1067
+msgid "Pagination"
+msgstr "分页"
+
+#: lib/action.php:1076
 #, fuzzy
-msgid "Block this user"
-msgstr "阻止该用户"
+msgid "After"
+msgstr "« 之后"
 
-#: lib/blockform.php:153
-msgid "Block"
-msgstr "阻止"
+#: lib/action.php:1084
+#, fuzzy
+msgid "Before"
+msgstr "之前 »"
 
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/action.php:1132
 #, fuzzy
-msgid "Disfavor this notice"
-msgstr "%s 收藏的通告"
+msgid "There was a problem with your session token."
+msgstr "会话标识有问题，请重试。"
+
+#: lib/adminpanelaction.php:96
+#, fuzzy
+msgid "You cannot make changes to this site."
+msgstr "无法向此用户发送消息。"
+
+#: lib/adminpanelaction.php:195
+#, fuzzy
+msgid "showForm() not implemented."
+msgstr "命令尚未实现。"
+
+#: lib/adminpanelaction.php:224
+#, fuzzy
+msgid "saveSettings() not implemented."
+msgstr "命令尚未实现。"
+
+#: lib/adminpanelaction.php:247
+#, fuzzy
+msgid "Unable to delete design setting."
+msgstr "无法保存 Twitter 设置！"
+
+#: lib/adminpanelaction.php:300
+#, fuzzy
+msgid "Basic site configuration"
+msgstr "电子邮件地址确认"
+
+#: lib/adminpanelaction.php:303
+#, fuzzy
+msgid "Design configuration"
+msgstr "SMS短信确认"
+
+#: lib/attachmentlist.php:87
+msgid "Attachments"
+msgstr ""
+
+#: lib/attachmentlist.php:265
+msgid "Author"
+msgstr ""
+
+#: lib/attachmentlist.php:278
+#, fuzzy
+msgid "Provider"
+msgstr "个人信息"
 
-#: lib/facebookaction.php:268
+#: lib/attachmentnoticesection.php:67
+msgid "Notices where this attachment appears"
+msgstr ""
+
+#: lib/attachmenttagcloudsection.php:48
+msgid "Tags for this attachment"
+msgstr ""
+
+#: lib/channel.php:138 lib/channel.php:158
+msgid "Command results"
+msgstr "执行结果"
+
+#: lib/channel.php:210
+msgid "Command complete"
+msgstr "执行完毕"
+
+#: lib/channel.php:221
+msgid "Command failed"
+msgstr "执行失败"
+
+#: lib/command.php:44
+msgid "Sorry, this command is not yet implemented."
+msgstr "对不起，这个命令还没有实现。"
+
+#: 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:126
 #, php-format
-msgid "To use the %s Facebook Application you need to login "
-msgstr "你需要登录方能使用%sFacebook程序"
+msgid ""
+"Subscriptions: %1$s\n"
+"Subscribers: %2$s\n"
+"Notices: %3$s"
+msgstr ""
+
+#: lib/command.php:152 lib/command.php:400
+msgid "Notice with that id does not exist"
+msgstr ""
 
-#: lib/facebookaction.php:271
+#: lib/command.php:168 lib/command.php:416 lib/command.php:471
+msgid "User has no last notice"
+msgstr "用户没有通告。"
+
+#: lib/command.php:190
+msgid "Notice marked as fave."
+msgstr "通告被标记为收藏。"
+
+#: lib/command.php:315
+#, php-format
+msgid "%1$s (%2$s)"
+msgstr "%1$s (%2$s)"
+
+#: lib/command.php:318
+#, php-format
+msgid "Fullname: %s"
+msgstr "全名：%s"
+
+#: lib/command.php:321
+#, php-format
+msgid "Location: %s"
+msgstr "位置：%s"
+
+#: lib/command.php:324
+#, php-format
+msgid "Homepage: %s"
+msgstr "主页：%s"
+
+#: lib/command.php:327
+#, php-format
+msgid "About: %s"
+msgstr "关于：%s"
+
+#: 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:377
+msgid "Error sending direct message."
+msgstr "发送消息出错。"
+
+#: 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 " a new account."
-msgstr "一个新帐号"
+msgid "Error saving notice."
+msgstr "保存通告时出错。"
+
+#: lib/command.php:495
+msgid "Specify the name of the user to subscribe to"
+msgstr "指定要订阅的用户名"
 
-#: lib/facebookaction.php:557 lib/mailbox.php:214 lib/noticelist.php:354
-msgid "Published"
-msgstr "已发布"
+#: lib/command.php:502
+#, php-format
+msgid "Subscribed to %s"
+msgstr "订阅 %s"
+
+#: lib/command.php:523
+msgid "Specify the name of the user to unsubscribe from"
+msgstr "指定要取消订阅的用户名"
+
+#: lib/command.php:530
+#, php-format
+msgid "Unsubscribed from %s"
+msgstr "取消订阅 %s"
+
+#: lib/command.php:548 lib/command.php:571
+msgid "Command not yet implemented."
+msgstr "命令尚未实现。"
+
+#: lib/command.php:551
+msgid "Notification off."
+msgstr "通告关闭。"
+
+#: lib/command.php:553
+msgid "Can't turn off notification."
+msgstr "无法关闭通告。"
+
+#: lib/command.php:574
+msgid "Notification on."
+msgstr "通告开启。"
+
+#: lib/command.php:576
+msgid "Can't turn on notification."
+msgstr "无法开启通告。"
+
+#: lib/command.php:597
+#, fuzzy, php-format
+msgid "Could not create login token for %s"
+msgstr "无法创建 OpenID 表单：%s"
+
+#: lib/command.php:602
+#, php-format
+msgid "This link is useable only once, and is good for only 2 minutes: %s"
+msgstr ""
+
+#: lib/command.php:618
+#, fuzzy
+msgid "You are not subscribed to anyone."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:620
+#, fuzzy
+msgid "You are subscribed to this person:"
+msgid_plural "You are subscribed to these people:"
+msgstr[0] "您未告知此个人信息"
+msgstr[1] "您未告知此个人信息"
+
+#: lib/command.php:640
+#, fuzzy
+msgid "No one is subscribed to you."
+msgstr "无法订阅他人更新。"
+
+#: lib/command.php:642
+#, fuzzy
+msgid "This person is subscribed to you:"
+msgid_plural "These people are subscribed to you:"
+msgstr[0] "无法订阅他人更新。"
+msgstr[1] "无法订阅他人更新。"
+
+#: lib/command.php:662
+#, fuzzy
+msgid "You are not a member of any groups."
+msgstr "您未告知此个人信息"
+
+#: lib/command.php:664
+#, fuzzy
+msgid "You are a member of this group:"
+msgid_plural "You are a member of these groups:"
+msgstr[0] "您未告知此个人信息"
+msgstr[1] "您未告知此个人信息"
+
+#: lib/command.php:678
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"groups - lists the groups you have joined\n"
+"subscriptions - list the people you follow\n"
+"subscribers - list the people that follow you\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"
+"login - Get a link to login to the web interface\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:199
+#, fuzzy
+msgid "No configuration file found. "
+msgstr "没有验证码"
+
+#: lib/common.php:200
+msgid "I looked for configuration files in the following places: "
+msgstr ""
+
+#: lib/common.php:201
+msgid "You may wish to run the installer to fix this."
+msgstr ""
+
+#: lib/common.php:202
+#, fuzzy
+msgid "Go to the installer."
+msgstr "登入本站"
+
+#: lib/connectsettingsaction.php:110
+msgid "IM"
+msgstr "即时通讯IM"
+
+#: lib/connectsettingsaction.php:111
+msgid "Updates by instant messenger (IM)"
+msgstr "使用即时通讯工具(IM)更新"
+
+#: lib/connectsettingsaction.php:116
+msgid "Updates by SMS"
+msgstr "使用SMS短信更新"
+
+#: lib/dberroraction.php:60
+msgid "Database error"
+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:372
+msgid "Bad default color settings: "
+msgstr ""
+
+#: lib/designsettings.php:468
+msgid "Design defaults restored."
+msgstr ""
+
+#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#, fuzzy
+msgid "Disfavor this notice"
+msgstr "%s 收藏的通告"
 
 #: lib/favorform.php:114 lib/favorform.php:140
 #, fuzzy
 msgid "Favor this notice"
 msgstr "%s 收藏的通告"
 
+#: lib/favorform.php:140
+msgid "Favor"
+msgstr "收藏"
+
 #: lib/feedlist.php:64
 msgid "Export data"
 msgstr "导出数据"
 
+#: 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/galleryaction.php:121
 #, fuzzy
 msgid "Filter tags"
@@ -4581,63 +4520,89 @@ msgstr "%s 标签的聚合"
 msgid "All"
 msgstr "全部"
 
-#: lib/galleryaction.php:137
+#: lib/galleryaction.php:139
+#, fuzzy
+msgid "Select tag to filter"
+msgstr "选择运营商"
+
+#: lib/galleryaction.php:140
 #, fuzzy
 msgid "Tag"
 msgstr "标签"
 
-#: lib/galleryaction.php:138
+#: lib/galleryaction.php:141
 msgid "Choose a tag to narrow list"
 msgstr "选择标签缩小清单"
 
-#: lib/galleryaction.php:139
+#: lib/galleryaction.php:143
 msgid "Go"
 msgstr "执行"
 
-#: lib/groupeditform.php:148
+#: lib/groupeditform.php:163
 #, fuzzy
 msgid "URL of the homepage or blog of the group or topic"
 msgstr "您的主页、博客或在其他站点的URL"
 
-#: lib/groupeditform.php:151
+#: lib/groupeditform.php:168
 #, fuzzy
-msgid "Description"
-msgstr "描述"
+msgid "Describe the group or topic"
+msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: lib/groupeditform.php:153
-#, fuzzy
-msgid "Describe the group or topic in 140 chars"
+#: lib/groupeditform.php:170
+#, fuzzy, php-format
+msgid "Describe the group or topic in %d characters"
 msgstr "用不超过140个字符描述您自己和您的爱好"
 
-#: lib/groupeditform.php:158
+#: lib/groupeditform.php:172
+#, fuzzy
+msgid "Description"
+msgstr "描述"
+
+#: lib/groupeditform.php:179
 #, fuzzy
 msgid ""
 "Location for the group, if any, like \"City, State (or Region), Country\""
 msgstr "你的位置，格式类似\"城市，省份，国家\""
 
-#: lib/groupnav.php:84 lib/searchgroupnav.php:84
+#: lib/groupeditform.php:187
+#, php-format
+msgid "Extra nicknames for the group, comma- or space- separated, max %d"
+msgstr ""
+
+#: lib/groupnav.php:85 lib/searchgroupnav.php:84
 msgid "Group"
 msgstr "组"
 
-#: lib/groupnav.php:100
-msgid "Admin"
-msgstr "admin管理员"
-
 #: lib/groupnav.php:101
+#, fuzzy
+msgid "Blocked"
+msgstr "阻止"
+
+#: lib/groupnav.php:102
+#, fuzzy, php-format
+msgid "%s blocked users"
+msgstr "阻止用户"
+
+#: lib/groupnav.php:108
 #, php-format
 msgid "Edit %s group properties"
 msgstr "编辑 %s群选项"
 
-#: lib/groupnav.php:106
+#: lib/groupnav.php:113
 #, fuzzy
 msgid "Logo"
 msgstr "Logo图标"
 
-#: lib/groupnav.php:107
+#: lib/groupnav.php:114
 #, php-format
 msgid "Add or edit %s logo"
 msgstr "添加或编辑 %s 图标"
 
+#: lib/groupnav.php:120
+#, fuzzy, php-format
+msgid "Add or edit %s design"
+msgstr "添加或编辑 %s 图标"
+
 #: lib/groupsbymemberssection.php:71
 msgid "Groups with most members"
 msgstr "人气最旺的群"
@@ -4652,10 +4617,44 @@ msgid "Tags in %s group's notices"
 msgstr "这个组所发布的消息的标签"
 
 #: lib/htmloutputter.php:104
-#, fuzzy
-msgid "This page is not available in a "
+msgid "This page is not available in a media type you accept"
 msgstr "这个页面不提供您想要的媒体类型"
 
+#: lib/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"
+
+#: lib/imagefile.php:80
+msgid "Partial upload."
+msgstr "部分上传。"
+
+#: lib/imagefile.php:88 lib/mediafile.php:170
+msgid "System error uploading file."
+msgstr "上传文件时出错。"
+
+#: lib/imagefile.php:96
+msgid "Not an image or corrupt file."
+msgstr "不是图片文件或文件已损坏。"
+
+#: lib/imagefile.php:105
+msgid "Unsupported image file format."
+msgstr "不支持这种图像格式。"
+
+#: lib/imagefile.php:118
+#, fuzzy
+msgid "Lost our file."
+msgstr "没有这份通告。"
+
+#: lib/imagefile.php:150 lib/imagefile.php:197
+msgid "Unknown file type"
+msgstr "未知文件类型"
+
+#: lib/jabber.php:192
+#, php-format
+msgid "[%s]"
+msgstr ""
+
 #: lib/joinform.php:114
 #, fuzzy
 msgid "Join"
@@ -4666,34 +4665,77 @@ msgstr "加入"
 msgid "Leave"
 msgstr "保存"
 
-#: lib/logingroupnav.php:76
+#: lib/logingroupnav.php:80
 #, fuzzy
 msgid "Login with a username and password"
 msgstr "输入用户名和密码以登录。"
 
-#: lib/logingroupnav.php:79
+#: lib/logingroupnav.php:86
 #, fuzzy
 msgid "Sign up for a new account"
 msgstr "创建新帐号"
 
-#: lib/logingroupnav.php:82
-msgid "Login or register with OpenID"
-msgstr "使用openID登录或注册"
+#: lib/mailbox.php:89
+msgid "Only the user can read their own mailboxes."
+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/mailbox.php:227 lib/noticelist.php:424
+#, fuzzy
+msgid "from"
+msgstr " 从 "
+
+#: lib/mail.php:172
+msgid "Email address confirmation"
+msgstr "电子邮件地址确认"
 
-#: lib/mail.php:175
+#: lib/mail.php:174
 #, php-format
 msgid ""
 "Hey, %s.\n"
 "\n"
-msgstr ""
-"你好，%s.\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:236
-#, fuzzy, php-format
-msgid "%1$s is now listening to "
+#, php-format
+msgid "%1$s is now listening to your notices on %2$s."
 msgstr "%1$s 开始关注您的 %2$s 信息。"
 
+#: lib/mail.php:241
+#, 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:254
 #, fuzzy, php-format
 msgid "Location: %s\n"
@@ -4713,66 +4755,230 @@ msgstr ""
 "自传Bio: %s\n"
 "\n"
 
-#: lib/mail.php:461
+#: lib/mail.php:286
+#, php-format
+msgid "New email address for posting to %s"
+msgstr "新的电子邮件地址，用于发布 %s 信息"
+
+#: lib/mail.php:289
+#, php-format
+msgid ""
+"You have a new posting address on %1$s.\n"
+"\n"
+"Send email to %2$s to post new messages.\n"
+"\n"
+"More email instructions at %3$s.\n"
+"\n"
+"Faithfully yours,\n"
+"%4$s"
+msgstr ""
+"您的 %1$s 发布用地址已更新。\n"
+"\n"
+"发送邮件到 %2$s 来发布新消息。\n"
+"\n"
+"更多电子邮件的帮助请见 %3$s。\n"
+"\n"
+"为您效力的 %4$s"
+
+#: lib/mail.php:413
+#, php-format
+msgid "%s status"
+msgstr "%s 状态"
+
+#: lib/mail.php:439
+msgid "SMS confirmation"
+msgstr "SMS短信确认"
+
+#: lib/mail.php:463
 #, php-format
 msgid "You've been nudged by %s"
 msgstr "%s 振铃呼叫你"
 
-#: lib/mail.php:465
-#, fuzzy, php-format
-msgid "%1$s (%2$s) is wondering what you are up to "
-msgstr "%1$s (%2$s) 发送了新的私人信息："
+#: lib/mail.php:467
+#, 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:555
+#: lib/mail.php:510
+#, php-format
+msgid "New private message from %s"
+msgstr "%s 发送了新的私人信息"
+
+#: lib/mail.php:514
+#, 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:559
 #, fuzzy, php-format
-msgid "%1$s just added your notice from %2$s"
-msgstr "%1$s 收藏了您的 %2$s 通告"
+msgid "%s (@%s) added your notice as a favorite"
+msgstr "%s 收藏了您的通告"
 
-#: lib/mailbox.php:229 lib/noticelist.php:380
-#, fuzzy
-msgid "From"
-msgstr "从 "
+#: lib/mail.php:561
+#, 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:620
+#, php-format
+msgid "%s (@%s) sent a notice to your attention"
+msgstr ""
+
+#: lib/mail.php:622
+#, 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/mediafile.php:98 lib/mediafile.php:123
+msgid "There was a database error while saving your file. Please try again."
+msgstr ""
+
+#: lib/mediafile.php:142
+msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
+msgstr ""
+
+#: lib/mediafile.php:147
+msgid ""
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
+"the HTML form."
+msgstr ""
+
+#: lib/mediafile.php:152
+msgid "The uploaded file was only partially uploaded."
+msgstr ""
 
-#: lib/messageform.php:110
+#: lib/mediafile.php:159
+msgid "Missing a temporary folder."
+msgstr ""
+
+#: lib/mediafile.php:162
+msgid "Failed to write file to disk."
+msgstr ""
+
+#: lib/mediafile.php:165
+msgid "File upload stopped by extension."
+msgstr ""
+
+#: lib/mediafile.php:179 lib/mediafile.php:216
+msgid "File exceeds user's quota!"
+msgstr ""
+
+#: lib/mediafile.php:196 lib/mediafile.php:233
+msgid "File could not be moved to destination directory."
+msgstr ""
+
+#: lib/mediafile.php:201 lib/mediafile.php:237
+msgid "Could not determine file's mime-type!"
+msgstr "无法获取收藏的通告。"
+
+#: lib/mediafile.php:270
+#, php-format
+msgid " Try using another %s format."
+msgstr ""
+
+#: lib/mediafile.php:275
+#, php-format
+msgid "%s is not a supported filetype on this server."
+msgstr ""
+
+#: lib/messageform.php:120
 #, fuzzy
 msgid "Send a direct notice"
 msgstr "删除通告"
 
-#: lib/noticeform.php:125
-#, fuzzy
-msgid "Send a notice"
-msgstr "发送消息"
+#: lib/messageform.php:146
+msgid "To"
+msgstr "到"
 
-#: lib/noticeform.php:152
+#: lib/messageform.php:162 lib/noticeform.php:173
 #, fuzzy
 msgid "Available characters"
 msgstr "6 个或更多字符"
 
-#: lib/noticelist.php:426
+#: lib/noticeform.php:145
 #, fuzzy
-msgid "in reply to"
-msgstr "先前……"
+msgid "Send a notice"
+msgstr "发送消息"
+
+#: lib/noticeform.php:158
+#, php-format
+msgid "What's up, %s?"
+msgstr "怎么样，%s？"
+
+#: lib/noticeform.php:180
+msgid "Attach"
+msgstr ""
 
-#: lib/noticelist.php:447 lib/noticelist.php:450
+#: lib/noticeform.php:184
+msgid "Attach a file"
+msgstr ""
+
+#: lib/noticelist.php:478
+#, fuzzy
+msgid "in context"
+msgstr "没有内容！"
+
+#: lib/noticelist.php:498
 #, fuzzy
 msgid "Reply to this notice"
 msgstr "无法删除通告。"
 
-#: lib/noticelist.php:451
+#: lib/noticelist.php:499
 #, fuzzy
 msgid "Reply"
 msgstr "回复"
 
-#: lib/noticelist.php:471 lib/noticelist.php:474
-#, fuzzy
-msgid "Delete this notice"
-msgstr "删除通告"
-
-#: lib/noticelist.php:474
-#, fuzzy
-msgid "Delete"
-msgstr "删除"
-
 #: lib/nudgeform.php:116
 msgid "Nudge this user"
 msgstr "呼叫这个用户"
@@ -4786,42 +4992,163 @@ msgstr "呼叫"
 msgid "Send a nudge to this user"
 msgstr "呼叫这个用户"
 
+#: lib/oauthstore.php:283
+msgid "Error inserting new profile"
+msgstr "添加个人信息出错"
+
+#: lib/oauthstore.php:291
+msgid "Error inserting avatar"
+msgstr "添加头像出错"
+
+#: lib/oauthstore.php:311
+msgid "Error inserting remote profile"
+msgstr "添加远程的个人信息出错"
+
+#: lib/oauthstore.php:345
+#, fuzzy
+msgid "Duplicate notice"
+msgstr "删除通告"
+
+#: lib/oauthstore.php:466 lib/subs.php:48
+#, fuzzy
+msgid "You have been banned from subscribing."
+msgstr "那个用户阻止了你的订阅。"
+
+#: lib/oauthstore.php:491
+msgid "Couldn't insert new subscription."
+msgstr "无法添加新的订阅。"
+
+#: lib/personalgroupnav.php:99
+msgid "Personal"
+msgstr "个人"
+
+#: lib/personalgroupnav.php:104
+msgid "Replies"
+msgstr "回复"
+
+#: lib/personalgroupnav.php:114
+msgid "Favorites"
+msgstr "收藏夹"
+
+#: lib/personalgroupnav.php:124
+msgid "Inbox"
+msgstr "收件箱"
+
+#: lib/personalgroupnav.php:125
+msgid "Your incoming messages"
+msgstr "您接收的消息"
+
+#: lib/personalgroupnav.php:129
+msgid "Outbox"
+msgstr "发件箱"
+
+#: lib/personalgroupnav.php:130
+msgid "Your sent messages"
+msgstr "您发送的消息"
+
 #: lib/personaltagcloudsection.php:56
 #, fuzzy, php-format
 msgid "Tags in %s's notices"
 msgstr "%s's 的消息的标签"
 
-#: lib/profilelist.php:182
-msgid "(none)"
-msgstr "(none 没有)"
+#: lib/profileaction.php:109 lib/profileaction.php:191 lib/subgroupnav.php:82
+msgid "Subscriptions"
+msgstr "订阅"
+
+#: lib/profileaction.php:126
+msgid "All subscriptions"
+msgstr "所有订阅"
+
+#: lib/profileaction.php:140 lib/profileaction.php:200 lib/subgroupnav.php:90
+msgid "Subscribers"
+msgstr "订阅者"
 
-#: lib/publicgroupnav.php:76
+#: lib/profileaction.php:157
+#, fuzzy
+msgid "All subscribers"
+msgstr "订阅者"
+
+#: lib/profileaction.php:177
+#, fuzzy
+msgid "User ID"
+msgstr "用户"
+
+#: lib/profileaction.php:182
+msgid "Member since"
+msgstr "用户始于"
+
+#: lib/profileaction.php:235
+msgid "All groups"
+msgstr "所有组"
+
+#: lib/profileformaction.php:123
+#, fuzzy
+msgid "No return-to arguments"
+msgstr "没有这份文档。"
+
+#: lib/profileformaction.php:137
+msgid "unimplemented method"
+msgstr ""
+
+#: lib/publicgroupnav.php:78
 msgid "Public"
 msgstr "公告"
 
-#: lib/publicgroupnav.php:80
+#: lib/publicgroupnav.php:82
 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 "最近的标签"
 
-#: lib/publicgroupnav.php:86
+#: lib/publicgroupnav.php:88
 msgid "Featured"
 msgstr "特征"
 
-#: lib/publicgroupnav.php:90
+#: lib/publicgroupnav.php:92
 #, fuzzy
 msgid "Popular"
 msgstr "用户"
 
+#: lib/sandboxform.php:67
+#, fuzzy
+msgid "Sandbox"
+msgstr "收件箱"
+
+#: lib/sandboxform.php:78
+#, fuzzy
+msgid "Sandbox this user"
+msgstr "取消阻止次用户"
+
+#: lib/searchaction.php:120
+#, fuzzy
+msgid "Search site"
+msgstr "搜索"
+
+#: lib/searchaction.php:162
+#, fuzzy
+msgid "Search help"
+msgstr "搜索"
+
+#: lib/searchgroupnav.php:80
+msgid "People"
+msgstr "用户"
+
+#: lib/searchgroupnav.php:81
+msgid "Find people on this site"
+msgstr "搜索用户信息"
+
 #: lib/searchgroupnav.php:82
 #, fuzzy
 msgid "Notice"
 msgstr "通告"
 
+#: lib/searchgroupnav.php:83
+msgid "Find content of notices"
+msgstr "搜索通告内容"
+
 #: lib/searchgroupnav.php:85
 #, fuzzy
 msgid "Find groups on this site"
@@ -4831,35 +5158,74 @@ msgstr "搜索用户信息"
 msgid "Untitled section"
 msgstr "无标题章节"
 
-#: lib/subgroupnav.php:81
+#: lib/section.php:106
+msgid "More..."
+msgstr ""
+
+#: lib/silenceform.php:67
+#, fuzzy
+msgid "Silence"
+msgstr "新通告"
+
+#: lib/silenceform.php:78
+#, fuzzy
+msgid "Silence this user"
+msgstr "阻止该用户"
+
+#: lib/subgroupnav.php:83
 #, fuzzy, php-format
 msgid "People %s subscribes to"
 msgstr "%s 订阅的人"
 
-#: lib/subgroupnav.php:89
+#: lib/subgroupnav.php:91
 #, fuzzy, php-format
 msgid "People subscribed to %s"
 msgstr "订阅 %s"
 
-#: lib/subgroupnav.php:97
+#: lib/subgroupnav.php:99
 #, php-format
 msgid "Groups %s is a member of"
 msgstr "%s 组是成员组成了"
 
-#: lib/subgroupnav.php:104
-#, fuzzy, php-format
-msgid "Invite friends and colleagues to join you on %s"
-msgstr "使用这个表单来邀请好友和同事加入。"
+#: lib/subscriberspeopleselftagcloudsection.php:48
+#: lib/subscriptionspeopleselftagcloudsection.php:48
+msgid "People Tagcloud as self-tagged"
+msgstr ""
 
-#: lib/subs.php:53
+#: lib/subscriberspeopletagcloudsection.php:48
+#: lib/subscriptionspeopletagcloudsection.php:48
+msgid "People Tagcloud as tagged"
+msgstr ""
+
+#: lib/subscriptionlist.php:126
+msgid "(none)"
+msgstr "(none 没有)"
+
+#: lib/subs.php:52
+msgid "Already subscribed!"
+msgstr ""
+
+#: lib/subs.php:56
 #, fuzzy
 msgid "User has blocked you."
 msgstr "用户没有个人信息。"
 
-#: lib/subscribeform.php:115 lib/subscribeform.php:139
+#: lib/subs.php:60
+msgid "Could not subscribe."
+msgstr "无法订阅。"
+
+#: lib/subs.php:79
+msgid "Could not subscribe other to you."
+msgstr "无法订阅他人更新。"
+
+#: lib/subs.php:128
 #, fuzzy
-msgid "Subscribe to this user"
-msgstr "订阅 %s"
+msgid "Not subscribed!"
+msgstr "未订阅！"
+
+#: lib/subs.php:140
+msgid "Couldn't delete subscription."
+msgstr "无法删除订阅。"
 
 #: lib/tagcloudsection.php:56
 #, fuzzy
@@ -4871,36 +5237,136 @@ msgstr "否"
 msgid "Top posters"
 msgstr "灌水精英"
 
-#: lib/unblockform.php:120 lib/unblockform.php:150
+#: lib/unsandboxform.php:69
+msgid "Unsandbox"
+msgstr ""
+
+#: lib/unsandboxform.php:80
 #, fuzzy
-msgid "Unblock this user"
+msgid "Unsandbox this user"
 msgstr "取消阻止次用户"
 
-#: lib/unblockform.php:150
-msgid "Unblock"
-msgstr "取消阻止"
+#: lib/unsilenceform.php:67
+msgid "Unsilence"
+msgstr ""
+
+#: lib/unsilenceform.php:78
+#, fuzzy
+msgid "Unsilence this user"
+msgstr "取消阻止次用户"
 
 #: lib/unsubscribeform.php:113 lib/unsubscribeform.php:137
 #, fuzzy
 msgid "Unsubscribe from this user"
 msgstr "取消订阅 %s"
 
+#: lib/unsubscribeform.php:137
+msgid "Unsubscribe"
+msgstr "退订"
+
+#: lib/userprofile.php:116
+#, fuzzy
+msgid "Edit Avatar"
+msgstr "头像"
+
+#: lib/userprofile.php:236
+#, fuzzy
+msgid "User actions"
+msgstr "未知动作"
+
+#: lib/userprofile.php:248
 #, fuzzy
-#~ msgid "Code not yet ready."
-#~ msgstr "命令尚未实现。"
+msgid "Edit profile settings"
+msgstr "个人设置"
+
+#: lib/userprofile.php:249
+msgid "Edit"
+msgstr ""
 
+#: lib/userprofile.php:272
 #, fuzzy
-#~ msgid "Delete my account"
-#~ msgstr "创建新帐号"
+msgid "Send a direct message to this user"
+msgstr "无法向此用户发送消息。"
 
+#: lib/userprofile.php:273
 #, fuzzy
-#~ msgid "Delete my account confirmation"
-#~ msgstr "无法删除电子邮件确认。"
+msgid "Message"
+msgstr "新消息"
+
+#: lib/util.php:826
+msgid "a few seconds ago"
+msgstr "几秒前"
+
+#: lib/util.php:828
+msgid "about a minute ago"
+msgstr "一分钟前"
+
+#: lib/util.php:830
+#, php-format
+msgid "about %d minutes ago"
+msgstr "%d 分钟前"
+
+#: lib/util.php:832
+msgid "about an hour ago"
+msgstr "一小时前"
+
+#: lib/util.php:834
+#, php-format
+msgid "about %d hours ago"
+msgstr "%d 小时前"
+
+#: lib/util.php:836
+msgid "about a day ago"
+msgstr "一天前"
+
+#: lib/util.php:838
+#, php-format
+msgid "about %d days ago"
+msgstr "%d 天前"
+
+#: lib/util.php:840
+msgid "about a month ago"
+msgstr "一个月前"
+
+#: lib/util.php:842
+#, php-format
+msgid "about %d months ago"
+msgstr "%d 个月前"
+
+#: lib/util.php:844
+msgid "about a year ago"
+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 ""
+
+#: scripts/maildaemon.php:48
+msgid "Could not parse message."
+msgstr "无法解析消息。"
+
+#: scripts/maildaemon.php:53
+msgid "Not a registered user."
+msgstr "不是已注册用户。"
+
+#: scripts/maildaemon.php:57
+msgid "Sorry, that is not your incoming email address."
+msgstr "对不起，这个发布用的电子邮件属于其他用户。"
+
+#: scripts/maildaemon.php:61
+msgid "Sorry, no incoming email allowed."
+msgstr "对不起，发布用的电子邮件无法使用。"
 
 #, fuzzy
-#~ msgid "Check if you are sure you want to delete your account."
-#~ msgstr "确定要删除这条通告吗？"
+#~ msgid "Unlock this user"
+#~ msgstr "取消阻止次用户"
 
 #, fuzzy
-#~ msgid "Showing recently popular notices"
-#~ msgstr "搜索通告内容"
+#~ msgid "These people are subscribed to you: "
+#~ msgstr "订阅 %s"
author	Zach Copley <zach@status.net>	2009-11-19 20:12:46 -0800
committer	Zach Copley <zach@status.net>	2009-11-19 20:12:46 -0800
commit	4b98edf75f4e255f8c61087bd1525d89653a521f (patch)
tree	b2a7eb6d77429eadb1beabe2d5e6ae1c1a2831d6 /locale/zh_CN/LC_MESSAGES
parent	f92574dbcb1f2d7cd0aaf3c9362db46fa066e888 (diff)
parent	c213477081afefb1720c8ae729d1965e7a1dac63 (diff)