summaryrefslogtreecommitdiff
path: root/locale/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'locale/zh_CN')
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.mobin94043 -> 94302 bytes
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po236
2 files changed, 167 insertions, 69 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo
index ce757eea5..c92d6cdb6 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.mo
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo
Binary files differ
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 05ab5243f..18a80ee8b 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -10,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-11-06 13:16+0000\n"
-"PO-Revision-Date: 2009-11-06 15:44:51+0000\n"
+"POT-Creation-Date: 2009-11-07 21:23+0000\n"
+"PO-Revision-Date: 2009-11-07 21:26:14+0000\n"
"Language-Team: Simplified Chinese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.16alpha(r58648); Translate extension (2009-08-03)\n"
+"X-Generator: MediaWiki 1.16alpha(r58733); Translate extension (2009-08-03)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
"X-Message-Group: out-statusnet\n"
@@ -197,7 +197,7 @@ msgid "%s updates from everyone!"
msgstr "来自所有人的 %s 消息!"
#: ../actions/register.php:213 actions/register.php:497
-#: actions/register.php:545 actions/register.php:555
+#: actions/register.php:545 actions/register.php:555 actions/register.php:561
msgid ""
"(You should receive a message by email momentarily, with instructions on how "
"to confirm your email address.)"
@@ -233,6 +233,7 @@ msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
#: ../actions/register.php:152 actions/register.php:166
#: actions/register.php:368 actions/register.php:414 actions/register.php:418
+#: actions/register.php:424
msgid "1-64 lowercase letters or numbers, no punctuation or spaces. Required."
msgstr "1 到 64 个小写字母或数字,不包含标点及空白。此项必填。"
@@ -249,6 +250,7 @@ msgstr "6 个或更多字符,不能忘记!"
#: ../actions/register.php:154 actions/register.php:168
#: actions/register.php:373 actions/register.php:419 actions/register.php:423
+#: actions/register.php:429
msgid "6 or more characters. Required."
msgstr "6 个或更多字符。此项必填。"
@@ -425,7 +427,7 @@ msgstr "所有匹配搜索条件\"%s\"的消息"
#: actions/openidlogin.php:29 actions/register.php:30
#: actions/finishopenidlogin.php:34 actions/login.php:77
#: actions/openidlogin.php:30 actions/register.php:92 actions/register.php:131
-#: actions/login.php:79
+#: actions/login.php:79 actions/register.php:137
msgid "Already logged in."
msgstr "已登录。"
@@ -448,7 +450,7 @@ msgstr "确认订阅"
#: ../actions/login.php:104 ../actions/register.php:178
#: actions/register.php:192 actions/login.php:218 actions/openidlogin.php:117
#: actions/register.php:416 actions/register.php:463 actions/login.php:226
-#: actions/register.php:473
+#: actions/register.php:473 actions/login.php:253 actions/register.php:479
msgid "Automatically login in the future; not for shared computers!"
msgstr "保持这台机器上的登录状态。不要在共用的机器上保持登录!"
@@ -506,7 +508,7 @@ msgstr "下一页 »"
#: actions/profilesettings.php:82 actions/register.php:184
#: actions/profilesettings.php:112 actions/register.php:402
#: actions/register.php:448 actions/profilesettings.php:127
-#: actions/register.php:459
+#: actions/register.php:459 actions/register.php:465
msgid "Bio"
msgstr "自述"
@@ -535,6 +537,7 @@ msgstr "无法访问头像URL '%s'"
#: actions/passwordsettings.php:169 actions/recoverpassword.php:347
#: actions/passwordsettings.php:174 actions/recoverpassword.php:365
#: actions/passwordsettings.php:180 actions/recoverpassword.php:368
+#: actions/passwordsettings.php:185
msgid "Can't save new password."
msgstr "无法保存新密码。"
@@ -597,6 +600,7 @@ msgstr "修改您的个人信息"
#: actions/recoverpassword.php:236 actions/register.php:422
#: actions/passwordsettings.php:111 actions/recoverpassword.php:239
#: actions/register.php:426 actions/smssettings.php:134
+#: actions/register.php:432
msgid "Confirm"
msgstr "确认"
@@ -626,7 +630,7 @@ msgid "Confirmation code not found."
msgstr "未找到确认码。"
#: ../actions/register.php:202 actions/register.php:473
-#: actions/register.php:521 actions/register.php:531
+#: actions/register.php:521 actions/register.php:531 actions/register.php:537
#, php-format
msgid ""
"Congratulations, %s! And welcome to %%%%site.name%%%%. From here, you may "
@@ -884,7 +888,8 @@ msgstr "用不超过140个字符描述您自己和您的爱好"
#: actions/register.php:175 lib/settingsaction.php:87 actions/register.php:381
#: actions/register.php:385 lib/accountsettingsaction.php:113
#: actions/register.php:427 actions/register.php:431 actions/register.php:435
-#: lib/accountsettingsaction.php:117
+#: lib/accountsettingsaction.php:117 actions/register.php:437
+#: actions/register.php:441
msgid "Email"
msgstr "电子邮件"
@@ -899,7 +904,7 @@ msgid "Email Settings"
msgstr "电子邮件设置"
#: ../actions/register.php:73 actions/register.php:80 actions/register.php:163
-#: actions/register.php:200 actions/register.php:206
+#: actions/register.php:200 actions/register.php:206 actions/register.php:212
msgid "Email address already exists."
msgstr "电子邮件地址已存在。"
@@ -985,7 +990,7 @@ msgstr "保存用户时出错。"
#: ../actions/password.php:80 actions/profilesettings.php:399
#: actions/passwordsettings.php:164 actions/passwordsettings.php:169
-#: actions/passwordsettings.php:175
+#: actions/passwordsettings.php:175 actions/passwordsettings.php:180
msgid "Error saving user; invalid."
msgstr "保存用户时出错;不正确。"
@@ -997,6 +1002,7 @@ msgstr "保存用户时出错;不正确。"
#: actions/login.php:120 actions/recoverpassword.php:372
#: actions/register.php:235 actions/login.php:122
#: actions/recoverpassword.php:375 actions/register.php:242
+#: actions/login.php:149 actions/register.php:248
msgid "Error setting user."
msgstr "保存用户设置时出错。"
@@ -1062,6 +1068,7 @@ msgid "Find people on this site"
msgstr "搜索用户信息"
#: ../actions/login.php:122 actions/login.php:247 actions/login.php:255
+#: actions/login.php:282
msgid ""
"For security reasons, please re-enter your user name and password before "
"changing your settings."
@@ -1077,6 +1084,7 @@ msgstr "由于安全原因,修改设置前需要输入用户名和密码。"
#: actions/showstream.php:220 lib/groupeditform.php:157
#: actions/profilesettings.php:111 actions/register.php:441
#: actions/showgroup.php:247 actions/showstream.php:267
+#: actions/register.php:447 lib/userprofile.php:149
msgid "Full name"
msgstr "全名"
@@ -1090,7 +1098,7 @@ msgstr "全名"
#: actions/profilesettings.php:203 actions/register.php:208
#: actions/apigroupcreate.php:253 actions/editgroup.php:198
#: actions/newgroup.php:142 actions/profilesettings.php:218
-#: actions/register.php:214
+#: actions/register.php:214 actions/register.php:220
msgid "Full name is too long (max 255 chars)."
msgstr "全名过长(不能超过 255 个字符)。"
@@ -1111,7 +1119,7 @@ msgstr "主页"
#: actions/profilesettings.php:107 actions/register.php:396
#: lib/groupeditform.php:146 actions/register.php:442
#: lib/groupeditform.php:161 actions/profilesettings.php:115
-#: actions/register.php:446
+#: actions/register.php:446 actions/register.php:452
msgid "Homepage"
msgstr "主页"
@@ -1123,7 +1131,7 @@ msgstr "主页"
#: actions/profilesettings.php:200 actions/register.php:205
#: actions/apigroupcreate.php:244 actions/editgroup.php:195
#: actions/newgroup.php:139 actions/profilesettings.php:215
-#: actions/register.php:211
+#: actions/register.php:211 actions/register.php:217
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
@@ -1189,7 +1197,7 @@ msgstr "旧密码不正确"
#: ../actions/login.php:67 actions/login.php:67 actions/facebookhome.php:131
#: actions/login.php:132 actions/facebookhome.php:130 actions/login.php:114
-#: actions/facebookhome.php:129 actions/login.php:116
+#: actions/facebookhome.php:129 actions/login.php:116 actions/login.php:143
msgid "Incorrect username or password."
msgstr "用户名或密码不正确。"
@@ -1267,6 +1275,7 @@ msgstr "大小不正确。"
#: actions/register.php:211 actions/finishopenidlogin.php:284
#: actions/finishopenidlogin.php:307 actions/register.php:230
#: actions/register.php:251 actions/register.php:237 actions/register.php:258
+#: actions/register.php:243 actions/register.php:264
msgid "Invalid username or password."
msgstr "用户名或密码不正确。"
@@ -1343,7 +1352,7 @@ msgstr "语言过长(不能超过50个字符)。"
#: actions/profilesettings.php:132 actions/register.php:464
#: actions/showgroup.php:256 actions/showstream.php:282
#: actions/userauthorization.php:158 lib/groupeditform.php:177
-#: lib/profilelist.php:218
+#: lib/profilelist.php:218 actions/register.php:470 lib/userprofile.php:164
msgid "Location"
msgstr "位置"
@@ -1357,7 +1366,7 @@ msgstr "位置"
#: actions/profilesettings.php:209 actions/register.php:214
#: actions/apigroupcreate.php:272 actions/editgroup.php:204
#: actions/newgroup.php:148 actions/profilesettings.php:225
-#: actions/register.php:221
+#: actions/register.php:221 actions/register.php:227
msgid "Location is too long (max 255 chars)."
msgstr "位置过长(不能超过255个字符)。"
@@ -1371,6 +1380,7 @@ msgstr "位置过长(不能超过255个字符)。"
#: lib/facebookaction.php:293 lib/facebookaction.php:319 lib/action.php:443
#: lib/facebookaction.php:295 lib/facebookaction.php:321 actions/login.php:177
#: actions/login.php:230 lib/action.php:453 lib/logingroupnav.php:79
+#: actions/login.php:204 actions/login.php:257
#, php-format
msgid "Login"
msgstr "登录"
@@ -1398,12 +1408,13 @@ msgstr "登出"
#: ../actions/register.php:166 actions/register.php:180
#: actions/register.php:393 actions/register.php:439 actions/register.php:443
+#: actions/register.php:449
msgid "Longer name, preferably your \"real\" name"
msgstr "长名字,最好是“实名”"
#: ../actions/login.php:110 actions/login.php:110 actions/login.php:245
#: lib/facebookaction.php:320 actions/login.php:228 lib/facebookaction.php:325
-#: lib/facebookaction.php:327 actions/login.php:236
+#: lib/facebookaction.php:327 actions/login.php:236 actions/login.php:263
msgid "Lost or forgotten password?"
msgstr "忘记了密码?"
@@ -1445,7 +1456,7 @@ msgstr ""
#: actions/finishopenidlogin.php:85 actions/register.php:202
#: actions/finishopenidlogin.php:107 actions/register.php:429
#: actions/register.php:430 actions/finishopenidlogin.php:106
-#: actions/register.php:477 actions/register.php:487
+#: actions/register.php:477 actions/register.php:487 actions/register.php:493
msgid "My text and files are available under "
msgstr "我的文字和文件采用的授权方式为"
@@ -1503,7 +1514,8 @@ msgstr "新密码已保存,您现在已登录。"
#: actions/showgroup.php:231 actions/showstream.php:209
#: lib/facebookaction.php:314 lib/groupeditform.php:152 actions/login.php:219
#: actions/profilesettings.php:106 actions/register.php:417
-#: actions/showgroup.php:236 actions/showstream.php:249
+#: actions/showgroup.php:236 actions/showstream.php:249 actions/login.php:246
+#: actions/register.php:423 lib/userprofile.php:131
msgid "Nickname"
msgstr "昵称"
@@ -1517,7 +1529,7 @@ msgstr "昵称"
#: actions/profilesettings.php:215 actions/register.php:196
#: actions/apigroupcreate.php:221 actions/editgroup.php:186
#: actions/newgroup.php:130 actions/profilesettings.php:231
-#: actions/register.php:202
+#: actions/register.php:202 actions/register.php:208
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
@@ -1533,7 +1545,7 @@ msgstr "昵称已被使用,换一个吧。"
#: actions/profilesettings.php:193 actions/register.php:193
#: actions/apigroupcreate.php:212 actions/editgroup.php:182
#: actions/newgroup.php:126 actions/profilesettings.php:208
-#: actions/register.php:199
+#: actions/register.php:199 actions/register.php:205
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字,不包含空格。"
@@ -1772,7 +1784,8 @@ msgstr "不是已注册用户。"
#: lib/twitterapi.php:566 lib/twitterapi.php:483 lib/twitterapi.php:511
#: lib/twitterapi.php:601 lib/twitterapi.php:620 lib/twitterapi.php:648
#: lib/twitterapi.php:741 actions/oembed.php:181 actions/oembed.php:200
-#: lib/api.php:954 lib/api.php:982 lib/api.php:1092
+#: lib/api.php:954 lib/api.php:982 lib/api.php:1092 lib/api.php:963
+#: lib/api.php:991 lib/api.php:1101
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -1793,7 +1806,7 @@ msgid "Not a valid email address"
msgstr "不是有效的电子邮件"
#: ../actions/register.php:63 actions/register.php:70 actions/register.php:152
-#: actions/register.php:189 actions/register.php:195
+#: actions/register.php:189 actions/register.php:195 actions/register.php:201
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
@@ -1805,7 +1818,7 @@ msgstr "不是有效的电子邮件。"
#: actions/profilesettings.php:196 actions/register.php:198
#: actions/apigroupcreate.php:228 actions/editgroup.php:189
#: actions/newgroup.php:133 actions/profilesettings.php:211
-#: actions/register.php:204
+#: actions/register.php:204 actions/register.php:210
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
@@ -1990,7 +2003,8 @@ msgstr "部分上传。"
#: actions/login.php:214 lib/facebookaction.php:315
#: actions/finishopenidlogin.php:117 actions/register.php:418
#: lib/facebookaction.php:317 actions/login.php:222 actions/register.php:422
-#: lib/accountsettingsaction.php:114
+#: lib/accountsettingsaction.php:114 actions/login.php:249
+#: actions/register.php:428
msgid "Password"
msgstr "密码"
@@ -2019,6 +2033,7 @@ msgstr "请求恢复密码"
#: actions/passwordsettings.php:173 actions/recoverpassword.php:200
#: actions/passwordsettings.php:178 actions/recoverpassword.php:208
#: actions/passwordsettings.php:184 actions/recoverpassword.php:211
+#: actions/passwordsettings.php:191
msgid "Password saved."
msgstr "密码已保存。"
@@ -2027,6 +2042,7 @@ msgstr "密码已保存。"
#: actions/passwordsettings.php:145 actions/register.php:183
#: actions/passwordsettings.php:150 actions/register.php:220
#: actions/passwordsettings.php:156 actions/register.php:227
+#: actions/register.php:233
msgid "Passwords don't match."
msgstr "密码不匹配。"
@@ -2189,19 +2205,19 @@ msgstr "恢复码未知"
#: actions/register.php:438 lib/action.php:415 lib/facebookaction.php:279
#: actions/register.php:108 actions/register.php:486 lib/action.php:440
#: lib/facebookaction.php:281 actions/register.php:496 lib/action.php:450
-#: lib/logingroupnav.php:85
+#: lib/logingroupnav.php:85 actions/register.php:114 actions/register.php:502
msgid "Register"
msgstr "注册"
#: ../actions/register.php:28 actions/register.php:28
#: actions/finishopenidlogin.php:196 actions/register.php:90
#: actions/finishopenidlogin.php:195 actions/finishopenidlogin.php:204
-#: actions/register.php:129
+#: actions/register.php:129 actions/register.php:135
msgid "Registration not allowed."
msgstr "不允许注册。"
#: ../actions/register.php:200 actions/register.php:214
-#: actions/register.php:67 actions/register.php:106
+#: actions/register.php:67 actions/register.php:106 actions/register.php:112
msgid "Registration successful"
msgstr "注册成功。"
@@ -2215,6 +2231,7 @@ msgstr "拒绝"
#: actions/register.php:190 actions/login.php:234 actions/openidlogin.php:107
#: actions/register.php:414 actions/login.php:217 actions/openidlogin.php:116
#: actions/register.php:461 actions/login.php:225 actions/register.php:471
+#: actions/login.php:252 actions/register.php:477
msgid "Remember me"
msgstr "记住登录状态"
@@ -2311,6 +2328,7 @@ msgstr "相同的密码"
#: ../actions/register.php:156 actions/register.php:170
#: actions/register.php:377 actions/register.php:423 actions/register.php:427
+#: actions/register.php:433
msgid "Same as password above. Required."
msgstr "相同的密码。此项必填。"
@@ -2470,6 +2488,7 @@ msgstr "未找到已有的OpenID。"
#: actions/remotesubscribe.php:113 actions/showstream.php:376
#: lib/subscribeform.php:139 actions/showstream.php:345
#: actions/remotesubscribe.php:137 actions/showstream.php:439
+#: lib/userprofile.php:321
msgid "Subscribe"
msgstr "订阅"
@@ -2516,6 +2535,7 @@ msgstr "上传文件时出错。"
#: actions/profilesettings.php:123 actions/showstream.php:255
#: lib/subscriptionlist.php:106 lib/subscriptionlist.php:108
#: actions/profilesettings.php:138 actions/showstream.php:327
+#: lib/userprofile.php:209
msgid "Tags"
msgstr "标签"
@@ -2727,6 +2747,7 @@ msgstr "此方法接受POST或DELETE请求。"
#: actions/apifriendshipsdestroy.php:91 actions/apigroupcreate.php:104
#: actions/apigroupjoin.php:91 actions/apigroupleave.php:91
#: actions/apistatusesupdate.php:109
+#: actions/apiaccountupdateprofileimage.php:84
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
@@ -2760,7 +2781,7 @@ msgstr ""
#: ../actions/twitapifriendships.php:163 actions/twitapifriendships.php:167
#: actions/twitapifriendships.php:132 actions/twitapifriendships.php:139
-#: actions/apifriendshipsexists.php:103
+#: actions/apifriendshipsexists.php:103 actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
msgstr "必须提供两个用户帐号或昵称。"
@@ -2768,7 +2789,7 @@ msgstr "必须提供两个用户帐号或昵称。"
#: actions/profilesettings.php:81 actions/register.php:183
#: actions/profilesettings.php:109 actions/register.php:398
#: actions/register.php:444 actions/profilesettings.php:117
-#: actions/register.php:448
+#: actions/register.php:448 actions/register.php:454
msgid "URL of your homepage, blog, or profile on another site"
msgstr "您的主页、博客或在其他站点的URL"
@@ -2896,7 +2917,7 @@ msgstr "使用这个表单来邀请好友和同事加入。"
#: ../actions/register.php:159 ../actions/register.php:162
#: actions/register.php:173 actions/register.php:176 actions/register.php:382
#: actions/register.php:386 actions/register.php:428 actions/register.php:432
-#: actions/register.php:436
+#: actions/register.php:436 actions/register.php:438 actions/register.php:442
msgid "Used only for updates, announcements, and password recovery"
msgstr "只用于更新、通告或密码恢复"
@@ -2924,7 +2945,7 @@ msgstr "要查看的用户不存在。"
#: actions/twitapistatuses.php:535 actions/twitapiusers.php:59
#: actions/foaf.php:65 actions/replies.php:79 actions/twitapiusers.php:57
#: actions/usergroups.php:98 lib/galleryaction.php:66 lib/profileaction.php:84
-#: actions/apiusershow.php:108
+#: actions/apiusershow.php:108 actions/apiaccountupdateprofileimage.php:124
msgid "User has no profile."
msgstr "用户没有个人信息。"
@@ -2953,7 +2974,7 @@ msgstr "怎么样,%s?"
#: actions/profilesettings.php:87 actions/register.php:189
#: actions/profilesettings.php:119 actions/register.php:410
#: actions/register.php:456 actions/profilesettings.php:134
-#: actions/register.php:466
+#: actions/register.php:466 actions/register.php:472
msgid "Where you are, like \"City, State (or Region), Country\""
msgstr "你的位置,格式类似\"城市,省份,国家\""
@@ -3051,7 +3072,7 @@ msgstr "您可以在这里订阅!"
#: ../actions/finishopenidlogin.php:33 ../actions/register.php:61
#: actions/finishopenidlogin.php:38 actions/register.php:68
#: actions/finishopenidlogin.php:43 actions/register.php:149
-#: actions/register.php:186 actions/register.php:192
+#: actions/register.php:186 actions/register.php:192 actions/register.php:198
msgid "You can't register if you don't agree to the license."
msgstr "您必须同意此授权方可注册。"
@@ -3123,56 +3144,56 @@ msgstr ""
"关联的 OpenID。"
#: ../lib/util.php:943 lib/util.php:992 lib/util.php:945 lib/util.php:756
-#: lib/util.php:770 lib/util.php:816
+#: lib/util.php:770 lib/util.php:816 lib/util.php:844
msgid "a few seconds ago"
msgstr "几秒前"
#: ../lib/util.php:955 lib/util.php:1004 lib/util.php:957 lib/util.php:768
-#: lib/util.php:782 lib/util.php:828
+#: lib/util.php:782 lib/util.php:828 lib/util.php:856
#, php-format
msgid "about %d days ago"
msgstr "%d 天前"
#: ../lib/util.php:951 lib/util.php:1000 lib/util.php:953 lib/util.php:764
-#: lib/util.php:778 lib/util.php:824
+#: lib/util.php:778 lib/util.php:824 lib/util.php:852
#, php-format
msgid "about %d hours ago"
msgstr "%d 小时前"
#: ../lib/util.php:947 lib/util.php:996 lib/util.php:949 lib/util.php:760
-#: lib/util.php:774 lib/util.php:820
+#: lib/util.php:774 lib/util.php:820 lib/util.php:848
#, php-format
msgid "about %d minutes ago"
msgstr "%d 分钟前"
#: ../lib/util.php:959 lib/util.php:1008 lib/util.php:961 lib/util.php:772
-#: lib/util.php:786 lib/util.php:832
+#: lib/util.php:786 lib/util.php:832 lib/util.php:860
#, php-format
msgid "about %d months ago"
msgstr "%d 个月前"
#: ../lib/util.php:953 lib/util.php:1002 lib/util.php:955 lib/util.php:766
-#: lib/util.php:780 lib/util.php:826
+#: lib/util.php:780 lib/util.php:826 lib/util.php:854
msgid "about a day ago"
msgstr "一天前"
#: ../lib/util.php:945 lib/util.php:994 lib/util.php:947 lib/util.php:758
-#: lib/util.php:772 lib/util.php:818
+#: lib/util.php:772 lib/util.php:818 lib/util.php:846
msgid "about a minute ago"
msgstr "一分钟前"
#: ../lib/util.php:957 lib/util.php:1006 lib/util.php:959 lib/util.php:770
-#: lib/util.php:784 lib/util.php:830
+#: lib/util.php:784 lib/util.php:830 lib/util.php:858
msgid "about a month ago"
msgstr "一个月前"
#: ../lib/util.php:961 lib/util.php:1010 lib/util.php:963 lib/util.php:774
-#: lib/util.php:788 lib/util.php:834
+#: lib/util.php:788 lib/util.php:834 lib/util.php:862
msgid "about a year ago"
msgstr "一年前"
#: ../lib/util.php:949 lib/util.php:998 lib/util.php:951 lib/util.php:762
-#: lib/util.php:776 lib/util.php:822
+#: lib/util.php:776 lib/util.php:822 lib/util.php:850
msgid "about an hour ago"
msgstr "一小时前"
@@ -3242,7 +3263,8 @@ msgstr "« 之后"
#: actions/profilesettings.php:187 actions/recoverpassword.php:337
#: actions/register.php:159 actions/remotesubscribe.php:77
#: actions/smssettings.php:228 actions/unsubscribe.php:69
-#: actions/userauthorization.php:52
+#: actions/userauthorization.php:52 actions/login.php:131
+#: actions/register.php:165
msgid "There was a problem with your session token. Try again, please."
msgstr "会话标识有问题,请重试。"
@@ -3464,6 +3486,7 @@ msgstr "新密码已保存。"
#: actions/register.php:95 actions/register.php:180
#: actions/passwordsettings.php:147 actions/register.php:217
#: actions/passwordsettings.php:153 actions/register.php:224
+#: actions/register.php:230
msgid "Password must be 6 or more characters."
msgstr "密码必须包含 6 个或更多字符。"
@@ -4505,7 +4528,7 @@ msgid "%s left group %s"
msgstr "%s 离开群 %s"
#: actions/login.php:225 lib/facebookaction.php:304 actions/login.php:208
-#: actions/login.php:216
+#: actions/login.php:216 actions/login.php:243
msgid "Login to site"
msgstr "登录"
@@ -4696,7 +4719,8 @@ msgstr "标签云聚集"
#: actions/register.php:139 actions/register.php:349 actions/register.php:79
#: actions/register.php:177 actions/register.php:394 actions/register.php:183
-#: actions/register.php:398
+#: actions/register.php:398 actions/register.php:85 actions/register.php:189
+#: actions/register.php:404
msgid "Sorry, only invited people can register."
msgstr "对不起,请邀请那些能注册的人。"
@@ -4787,7 +4811,7 @@ msgstr "组资料"
#: actions/showstream.php:236 actions/userauthorization.php:137
#: lib/profilelist.php:197 actions/showgroup.php:263
#: actions/showstream.php:295 actions/userauthorization.php:167
-#: lib/profilelist.php:230
+#: lib/profilelist.php:230 lib/userprofile.php:177
msgid "URL"
msgstr "URL 互联网地址"
@@ -4798,7 +4822,7 @@ msgstr "URL 互联网地址"
#: actions/showstream.php:247 actions/userauthorization.php:149
#: lib/profilelist.php:212 actions/showgroup.php:274
#: actions/showstream.php:312 actions/userauthorization.php:179
-#: lib/profilelist.php:245
+#: lib/profilelist.php:245 lib/userprofile.php:194
#, fuzzy
msgid "Note"
msgstr "通告"
@@ -4850,6 +4874,7 @@ msgid "Only the sender and recipient "
msgstr "只有发送和接受双方可以阅读此消息。"
#: actions/showstream.php:73 actions/showstream.php:78
+#: actions/showstream.php:79
#, fuzzy, php-format
msgid "%s, page %d"
msgstr "%s 的收件箱 - 第 %d 页"
@@ -4861,31 +4886,32 @@ msgstr "个人信息"
#: actions/showstream.php:236 actions/tagother.php:77
#: actions/showstream.php:220 actions/showstream.php:185
-#: actions/showstream.php:193
+#: actions/showstream.php:193 lib/userprofile.php:75
#, fuzzy
msgid "User profile"
msgstr "用户没有个人信息。"
#: actions/showstream.php:240 actions/tagother.php:81
#: actions/showstream.php:224 actions/showstream.php:189
-#: actions/showstream.php:220
+#: actions/showstream.php:220 lib/userprofile.php:102
msgid "Photo"
msgstr "相片"
#: actions/showstream.php:317 actions/showstream.php:309
#: actions/showstream.php:274 actions/showstream.php:354
+#: lib/userprofile.php:236
#, fuzzy
msgid "User actions"
msgstr "未知动作"
#: actions/showstream.php:342 actions/showstream.php:307
-#: actions/showstream.php:390
+#: actions/showstream.php:390 lib/userprofile.php:272
#, fuzzy
msgid "Send a direct message to this user"
msgstr "无法向此用户发送消息。"
#: actions/showstream.php:343 actions/showstream.php:308
-#: actions/showstream.php:391
+#: actions/showstream.php:391 lib/userprofile.php:273
#, fuzzy
msgid "Message"
msgstr "新消息"
@@ -5788,10 +5814,12 @@ msgid ""
msgstr ""
#: actions/register.php:432 actions/register.php:479 actions/register.php:489
+#: actions/register.php:495
msgid "Creative Commons Attribution 3.0"
msgstr ""
#: actions/register.php:433 actions/register.php:480 actions/register.php:490
+#: actions/register.php:496
#, fuzzy
msgid ""
" except this private data: password, email address, IM address, and phone "
@@ -5826,44 +5854,48 @@ msgid "%s's profile"
msgstr "个人信息"
#: actions/showstream.php:163 actions/showstream.php:128
+#: actions/showstream.php:129
#, fuzzy, php-format
msgid "Notice feed for %s (RSS 1.0)"
msgstr "%s 的通告聚合"
#: actions/showstream.php:170 actions/showstream.php:135
+#: actions/showstream.php:136
#, fuzzy, php-format
msgid "Notice feed for %s (RSS 2.0)"
msgstr "%s 的通告聚合"
#: actions/showstream.php:177 actions/showstream.php:142
+#: actions/showstream.php:143
#, fuzzy, php-format
msgid "Notice feed for %s (Atom)"
msgstr "%s 的通告聚合"
#: actions/showstream.php:182 actions/showstream.php:147
+#: actions/showstream.php:148
#, fuzzy, php-format
msgid "FOAF for %s"
msgstr "%s 的发件箱"
#: actions/showstream.php:237 actions/showstream.php:202
-#: actions/showstream.php:234
+#: actions/showstream.php:234 lib/userprofile.php:116
#, fuzzy
msgid "Edit Avatar"
msgstr "头像"
#: actions/showstream.php:316 actions/showstream.php:281
-#: actions/showstream.php:366
+#: actions/showstream.php:366 lib/userprofile.php:248
#, fuzzy
msgid "Edit profile settings"
msgstr "个人设置"
#: actions/showstream.php:317 actions/showstream.php:282
-#: actions/showstream.php:367
+#: actions/showstream.php:367 lib/userprofile.php:249
msgid "Edit"
msgstr ""
#: actions/showstream.php:542 actions/showstream.php:388
-#: actions/showstream.php:487
+#: actions/showstream.php:487 actions/showstream.php:234
#, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -5908,6 +5940,7 @@ msgstr ""
#: actions/apistatusesupdate.php:125 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:70 actions/apitimelinefriends.php:79
#: actions/apitimelinementions.php:79 actions/apitimelineuser.php:81
+#: actions/apiaccountupdateprofileimage.php:91
#, fuzzy
msgid "No such user!"
msgstr "未找到用户"
@@ -6161,6 +6194,7 @@ msgstr ""
#: actions/all.php:91 actions/replies.php:190 actions/showstream.php:361
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:455
+#: actions/showstream.php:202
#, php-format
msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
@@ -6606,7 +6640,7 @@ msgstr "您已得到确认。请输入新密码。"
msgid "Password recover"
msgstr "请求恢复密码"
-#: actions/register.php:86
+#: actions/register.php:86 actions/register.php:92
#, fuzzy
msgid "Sorry, invalid invitation code."
msgstr "验证码出错。"
@@ -6708,28 +6742,31 @@ msgstr "admin管理员"
msgid "Not a local notice"
msgstr "没有这个用户。"
-#: actions/showstream.php:72
+#: actions/showstream.php:72 actions/showstream.php:73
#, fuzzy, php-format
msgid " tagged %s"
msgstr "带 %s 标签的通告"
-#: actions/showstream.php:121
+#: actions/showstream.php:121 actions/showstream.php:122
#, fuzzy, php-format
msgid "Notice feed for %s tagged %s (RSS 1.0)"
msgstr "%s 的通告聚合"
#: actions/showstream.php:350 actions/showstream.php:444
+#: actions/showstream.php:191
#, php-format
msgid "This is the timeline for %s but %s hasn't posted anything yet."
msgstr ""
#: actions/showstream.php:355 actions/showstream.php:449
+#: 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/showstream.php:357 actions/showstream.php:451
+#: actions/showstream.php:198
#, php-format
msgid ""
"You can try to nudge %s or [post something to his or her attention](%%%%"
@@ -6737,6 +6774,7 @@ msgid ""
msgstr ""
#: actions/showstream.php:393 actions/showstream.php:492
+#: actions/showstream.php:239
#, fuzzy, php-format
msgid ""
"**%s** has an account on %%%%site.name%%%%, a [micro-blogging](http://en."
@@ -6889,6 +6927,7 @@ msgid "Problem saving notice. Too long."
msgstr "保存通告时出错。"
#: classes/User.php:319 classes/User.php:327 classes/User.php:334
+#: classes/User.php:333
#, fuzzy, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
@@ -7209,6 +7248,7 @@ msgid "Status deleted."
msgstr "头像已更新。"
#: actions/apistatusesupdate.php:132
+#: actions/apiaccountupdateprofileimage.php:99
msgid "Unable to handle that much POST data!"
msgstr ""
@@ -7283,7 +7323,7 @@ msgstr "%2$s 上 %1$s 的更新!"
msgid "IM is not available."
msgstr "这个页面不提供您想要的媒体类型"
-#: actions/login.php:259
+#: actions/login.php:259 actions/login.php:286
#, fuzzy, php-format
msgid ""
"Login with your username and password. Don't have a username yet? [Register]"
@@ -7317,21 +7357,24 @@ msgid "Notice license ‘%s’ is not compatible with site license ‘%s’."
msgstr ""
#: actions/profilesettings.php:122 actions/register.php:454
+#: actions/register.php:460
#, fuzzy, php-format
msgid "Describe yourself and your interests in %d chars"
msgstr "用不超过140个字符描述您自己和您的爱好"
#: actions/profilesettings.php:125 actions/register.php:457
+#: actions/register.php:463
#, fuzzy
msgid "Describe yourself and your interests"
msgstr "用不超过140个字符描述您自己和您的爱好"
#: actions/profilesettings.php:221 actions/register.php:217
+#: actions/register.php:223
#, fuzzy, php-format
msgid "Bio is too long (max %d chars)."
msgstr "自述过长(不能超过140字符)。"
-#: actions/register.php:336
+#: actions/register.php:336 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. "
@@ -7374,17 +7417,17 @@ msgid "Replies to %1$s on %2$s!"
msgstr "发送给 %1$s 的 %2$s 消息"
#: actions/showfavorites.php:170
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
msgstr "%s 好友的聚合"
#: actions/showfavorites.php:177
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (RSS 2.0)"
msgstr "%s 好友的聚合"
#: actions/showfavorites.php:184
-#, fuzzy, php-format
+#, php-format
msgid "Feed for favorites of %s (Atom)"
msgstr "%s 好友的聚合"
@@ -7397,7 +7440,7 @@ msgid ""
msgstr ""
#: actions/showgroup.php:345
-#, fuzzy, php-format
+#, php-format
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
@@ -7600,7 +7643,7 @@ msgid "Describe the group or topic in %d characters"
msgstr "用不超过140个字符描述您自己和您的爱好"
#: lib/jabber.php:192
-#, fuzzy, php-format
+#, php-format
msgid "notice id: %s"
msgstr "新通告"
@@ -7660,7 +7703,6 @@ msgid "File exceeds user's quota!"
msgstr ""
#: lib/mediafile.php:201 lib/mediafile.php:237
-#, fuzzy
msgid "Could not determine file's mime-type!"
msgstr "无法获取收藏的通告。"
@@ -7668,3 +7710,59 @@ msgstr "无法获取收藏的通告。"
#, fuzzy
msgid "Duplicate notice"
msgstr "删除通告"
+
+#: actions/login.php:110 actions/login.php:120
+#, fuzzy
+msgid "Invalid or expired token."
+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:613
+msgid ""
+"Commands:\n"
+"on - turn on notifications\n"
+"off - turn off notifications\n"
+"help - show this help\n"
+"follow <nickname> - subscribe to user\n"
+"leave <nickname> - unsubscribe from user\n"
+"d <nickname> <text> - direct message to user\n"
+"get <nickname> - get last notice from user\n"
+"whois <nickname> - get profile info on user\n"
+"fav <nickname> - add user's last notice as a 'fave'\n"
+"fav #<notice_id> - add notice with the given id as a 'fave'\n"
+"reply #<notice_id> - reply to notice with a given id\n"
+"reply <nickname> - reply to the last notice from user\n"
+"join <group> - join group\n"
+"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/imagefile.php:75
+#, fuzzy, php-format
+msgid "That file is too big. The maximum file size is %s."
+msgstr "你可以给你的组上载一个logo图。"