summaryrefslogtreecommitdiff
path: root/locale/zh_CN
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2010-10-05 14:09:17 -0400
committerEvan Prodromou <evan@status.net>2010-10-05 14:09:17 -0400
commit8aa9c271dffe6ec6766b94486c0635c9db588db7 (patch)
treef6cb465062767bdf5642121e61d143bdd2e4dcfe /locale/zh_CN
parent829a017a5d0104f495cd0b645ecb1f3cdeda25ac (diff)
parent5c4723919fa757b3e14a59350415cfe53e0900d1 (diff)
Merge remote branch 'gitorious/1.0.x' into 1.0.x
Diffstat (limited to 'locale/zh_CN')
-rw-r--r--locale/zh_CN/LC_MESSAGES/statusnet.po1497
1 files changed, 922 insertions, 575 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po
index 12a240ef6..3fdee114c 100644
--- a/locale/zh_CN/LC_MESSAGES/statusnet.po
+++ b/locale/zh_CN/LC_MESSAGES/statusnet.po
@@ -1,33 +1,34 @@
-# Translation of StatusNet to Simplified Chinese
+# Translation of StatusNet - Core to Simplified Chinese (‪中文(简体)‬)
+# Expored from translatewiki.net
#
-# Author@translatewiki.net: Chenxiaoqino
-# Author@translatewiki.net: Shizhao
-# Author@translatewiki.net: Sweeite012f
-# Author@translatewiki.net: Tommyang
-# Author@translatewiki.net: ZhengYiFeng
+# Author: Chenxiaoqino
+# Author: Shizhao
+# Author: Sweeite012f
+# Author: Tommyang
+# Author: ZhengYiFeng
# --
-# Messages of identi.ca
-# Copyright (C) 2008 Gouki <gouki@goukihq.org>
# This file is distributed under the same license as the StatusNet package.
#
msgid ""
msgstr ""
-"Project-Id-Version: StatusNet\n"
+"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-08 22:33+0000\n"
-"PO-Revision-Date: 2010-09-09 17:38:22+0000\n"
-"Language-Team: Simplified Chinese\n"
+"POT-Creation-Date: 2010-10-03 19:53+0000\n"
+"PO-Revision-Date: 2010-10-03 19:56:19+0000\n"
+"Language-Team: Simplified Chinese <http://translatewiki.net/wiki/Portal:zh-"
+"hans>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: MediaWiki 1.17alpha (r72348); Translate extension (2010-08-20)\n"
+"X-Generator: MediaWiki 1.17alpha (r74231); Translate extension (2010-09-17)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: zh-hans\n"
-"X-Message-Group: out-statusnet\n"
+"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+"X-POT-Import-Date: 2010-10-01 20:37:46+0000\n"
#. TRANS: Page title
#. TRANS: Menu item for site administration
-#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:376
+#: actions/accessadminpanel.php:55 lib/adminpanelaction.php:363
msgid "Access"
msgstr "访问"
@@ -80,10 +81,10 @@ msgstr "保存访问设置"
#. TRANS: Button label to save e-mail preferences.
#. TRANS: Button label to save IM preferences.
#. TRANS: Button label to save SMS preferences.
-#. TRANS: Button label
-#: actions/accessadminpanel.php:203 actions/emailsettings.php:224
-#: actions/imsettings.php:184 actions/smssettings.php:209
-#: lib/applicationeditform.php:361
+#. TRANS: Button label in the "Edit application" form.
+#: actions/accessadminpanel.php:203 actions/emailsettings.php:228
+#: actions/imsettings.php:187 actions/smssettings.php:209
+#: lib/applicationeditform.php:355
msgctxt "BUTTON"
msgid "Save"
msgstr "保存"
@@ -96,15 +97,15 @@ msgstr "没有这个页面。"
#. TRANS: Error text shown when trying to send a direct message to a user that does not exist.
#: actions/all.php:79 actions/allrss.php:68
-#: actions/apiaccountupdatedeliverydevice.php:114
-#: actions/apiaccountupdateprofile.php:105
-#: actions/apiaccountupdateprofilebackgroundimage.php:116
-#: actions/apiaccountupdateprofileimage.php:105 actions/apiblockcreate.php:97
-#: actions/apiblockdestroy.php:96 actions/apidirectmessage.php:77
-#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:113
-#: actions/apigroupismember.php:91 actions/apigroupjoin.php:100
-#: actions/apigroupleave.php:100 actions/apigrouplist.php:73
-#: actions/apistatusesupdate.php:229 actions/apisubscriptions.php:87
+#: actions/apiaccountupdatedeliverydevice.php:115
+#: actions/apiaccountupdateprofile.php:106
+#: actions/apiaccountupdateprofilebackgroundimage.php:117
+#: actions/apiaccountupdateprofileimage.php:106 actions/apiblockcreate.php:98
+#: actions/apiblockdestroy.php:97 actions/apidirectmessage.php:77
+#: actions/apidirectmessagenew.php:74 actions/apigroupcreate.php:114
+#: actions/apigroupismember.php:91 actions/apigroupjoin.php:101
+#: actions/apigroupleave.php:101 actions/apigrouplist.php:73
+#: actions/apistatusesupdate.php:230 actions/apisubscriptions.php:87
#: actions/apitimelinefavorites.php:72 actions/apitimelinefriends.php:174
#: actions/apitimelinehome.php:80 actions/apitimelinementions.php:80
#: actions/apitimelineuser.php:82 actions/avatarbynickname.php:75
@@ -114,7 +115,7 @@ msgstr "没有这个页面。"
#: actions/remotesubscribe.php:154 actions/replies.php:73
#: actions/repliesrss.php:38 actions/rsd.php:116 actions/showfavorites.php:105
#: actions/userbyid.php:74 actions/usergroups.php:93 actions/userrss.php:40
-#: actions/xrds.php:71 lib/command.php:498 lib/galleryaction.php:59
+#: actions/xrds.php:71 lib/command.php:495 lib/galleryaction.php:59
#: lib/mailbox.php:82 lib/profileaction.php:77
msgid "No such user."
msgstr "没有这个用户。"
@@ -166,7 +167,7 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
-"尝试关注更多的人、[加入一个小组] (%%action.groups%%) 或者自己发一些东西。"
+"尝试关注更多的人、[加入一个小组](%%action.groups%%) 或者自己发一些东西。"
#. TRANS: %1$s is user nickname, %2$s is user nickname, %2$s is user nickname prefixed with "@"
#: actions/all.php:146
@@ -200,16 +201,16 @@ msgid "Updates from %1$s and friends on %2$s!"
msgstr "%2$s上%1$s和好友们的更新!"
#: actions/apiaccountratelimitstatus.php:72
-#: actions/apiaccountupdatedeliverydevice.php:94
-#: actions/apiaccountupdateprofile.php:97
-#: actions/apiaccountupdateprofilebackgroundimage.php:94
-#: actions/apiaccountupdateprofilecolors.php:118
+#: actions/apiaccountupdatedeliverydevice.php:95
+#: actions/apiaccountupdateprofile.php:98
+#: actions/apiaccountupdateprofilebackgroundimage.php:95
+#: actions/apiaccountupdateprofilecolors.php:119
#: actions/apiaccountverifycredentials.php:70 actions/apidirectmessage.php:156
-#: actions/apifavoritecreate.php:100 actions/apifavoritedestroy.php:101
-#: actions/apifriendshipscreate.php:100 actions/apifriendshipsdestroy.php:100
-#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:139
-#: actions/apigroupismember.php:115 actions/apigroupjoin.php:156
-#: actions/apigroupleave.php:142 actions/apigrouplist.php:137
+#: actions/apifavoritecreate.php:101 actions/apifavoritedestroy.php:102
+#: actions/apifriendshipscreate.php:101 actions/apifriendshipsdestroy.php:101
+#: actions/apifriendshipsshow.php:128 actions/apigroupcreate.php:140
+#: actions/apigroupismember.php:115 actions/apigroupjoin.php:157
+#: actions/apigroupleave.php:143 actions/apigrouplist.php:137
#: actions/apigrouplistall.php:122 actions/apigroupmembership.php:107
#: actions/apigroupshow.php:116 actions/apihelptest.php:88
#: actions/apistatusesdestroy.php:104 actions/apistatusesretweets.php:112
@@ -224,48 +225,50 @@ msgstr "%2$s上%1$s和好友们的更新!"
msgid "API method not found."
msgstr "API方法没有找到。"
-#: actions/apiaccountupdatedeliverydevice.php:86
-#: actions/apiaccountupdateprofile.php:89
-#: actions/apiaccountupdateprofilebackgroundimage.php:86
-#: actions/apiaccountupdateprofilecolors.php:110
-#: actions/apiaccountupdateprofileimage.php:84 actions/apiblockcreate.php:89
-#: actions/apiblockdestroy.php:88 actions/apidirectmessagenew.php:109
-#: actions/apifavoritecreate.php:91 actions/apifavoritedestroy.php:92
-#: actions/apifriendshipscreate.php:91 actions/apifriendshipsdestroy.php:91
-#: actions/apigroupcreate.php:105 actions/apigroupjoin.php:92
-#: actions/apigroupleave.php:92 actions/apimediaupload.php:67
-#: actions/apistatusesretweet.php:65 actions/apistatusesupdate.php:198
+#. TRANS: Client error message. POST is a HTTP command. It should not be translated.
+#. TRANS: Client error. POST is a HTTP command. It should not be translated.
+#: actions/apiaccountupdatedeliverydevice.php:87
+#: actions/apiaccountupdateprofile.php:90
+#: actions/apiaccountupdateprofilebackgroundimage.php:87
+#: actions/apiaccountupdateprofilecolors.php:111
+#: actions/apiaccountupdateprofileimage.php:85 actions/apiblockcreate.php:90
+#: actions/apiblockdestroy.php:89 actions/apidirectmessagenew.php:110
+#: actions/apifavoritecreate.php:92 actions/apifavoritedestroy.php:93
+#: actions/apifriendshipscreate.php:92 actions/apifriendshipsdestroy.php:92
+#: actions/apigroupcreate.php:106 actions/apigroupjoin.php:93
+#: actions/apigroupleave.php:93 actions/apimediaupload.php:68
+#: actions/apistatusesretweet.php:66 actions/apistatusesupdate.php:199
msgid "This method requires a POST."
msgstr "此方法接受POST请求。"
-#: actions/apiaccountupdatedeliverydevice.php:106
+#: actions/apiaccountupdatedeliverydevice.php:107
msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none."
msgstr ""
"你必须指定一个名为'device'的参数,值可以是以下中的一个:sms, im, none。"
-#: actions/apiaccountupdatedeliverydevice.php:133
+#: actions/apiaccountupdatedeliverydevice.php:134
msgid "Could not update user."
msgstr "无法更新用户。"
-#: actions/apiaccountupdateprofile.php:112
-#: actions/apiaccountupdateprofilebackgroundimage.php:194
-#: actions/apiaccountupdateprofilecolors.php:185
-#: actions/apiaccountupdateprofileimage.php:130 actions/apiusershow.php:108
+#: actions/apiaccountupdateprofile.php:113
+#: actions/apiaccountupdateprofilebackgroundimage.php:195
+#: actions/apiaccountupdateprofilecolors.php:186
+#: actions/apiaccountupdateprofileimage.php:131 actions/apiusershow.php:108
#: actions/avatarbynickname.php:80 actions/foaf.php:65 actions/hcard.php:74
#: actions/replies.php:80 actions/usergroups.php:100 lib/galleryaction.php:66
#: lib/profileaction.php:84
msgid "User has no profile."
msgstr "用户没有个人信息。"
-#: actions/apiaccountupdateprofile.php:147
+#: actions/apiaccountupdateprofile.php:148
msgid "Could not save profile."
msgstr "无法保存个人信息。"
-#: actions/apiaccountupdateprofilebackgroundimage.php:108
-#: actions/apiaccountupdateprofileimage.php:97 actions/apimediaupload.php:80
-#: actions/apistatusesupdate.php:212 actions/avatarsettings.php:257
+#: actions/apiaccountupdateprofilebackgroundimage.php:109
+#: actions/apiaccountupdateprofileimage.php:98 actions/apimediaupload.php:81
+#: actions/apistatusesupdate.php:213 actions/avatarsettings.php:257
#: actions/designadminpanel.php:123 actions/editapplication.php:118
#: actions/newapplication.php:101 actions/newnotice.php:94
#: lib/designsettings.php:283
@@ -275,30 +278,30 @@ msgid ""
"current configuration."
msgstr "服务器当前的设置无法处理这么多的 POST 数据(%s bytes)。"
-#: actions/apiaccountupdateprofilebackgroundimage.php:136
-#: actions/apiaccountupdateprofilebackgroundimage.php:146
-#: actions/apiaccountupdateprofilecolors.php:164
-#: actions/apiaccountupdateprofilecolors.php:174
+#: actions/apiaccountupdateprofilebackgroundimage.php:137
+#: actions/apiaccountupdateprofilebackgroundimage.php:147
+#: actions/apiaccountupdateprofilecolors.php:165
+#: actions/apiaccountupdateprofilecolors.php:175
#: actions/groupdesignsettings.php:290 actions/groupdesignsettings.php:300
#: actions/userdesignsettings.php:210 actions/userdesignsettings.php:220
#: actions/userdesignsettings.php:263 actions/userdesignsettings.php:273
msgid "Unable to save your design settings."
msgstr "无法保存你的外观设置。"
-#: actions/apiaccountupdateprofilebackgroundimage.php:187
-#: actions/apiaccountupdateprofilecolors.php:142
+#: actions/apiaccountupdateprofilebackgroundimage.php:188
+#: actions/apiaccountupdateprofilecolors.php:143
msgid "Could not update your design."
msgstr "无法更新你的外观。"
-#: actions/apiblockcreate.php:105
+#: actions/apiblockcreate.php:106
msgid "You cannot block yourself!"
msgstr "你不能屏蔽自己!"
-#: actions/apiblockcreate.php:126
+#: actions/apiblockcreate.php:127
msgid "Block user failed."
msgstr "屏蔽用户失败。"
-#: actions/apiblockdestroy.php:114
+#: actions/apiblockdestroy.php:115
msgid "Unblock user failed."
msgstr "取消屏蔽用户失败。"
@@ -322,59 +325,59 @@ msgstr "发给%s的私信"
msgid "All the direct messages sent to %s"
msgstr "所有发给%s的私信"
-#: actions/apidirectmessagenew.php:118
+#: actions/apidirectmessagenew.php:119
msgid "No message text!"
msgstr "消息没有正文!"
-#: actions/apidirectmessagenew.php:127 actions/newmessage.php:150
+#: actions/apidirectmessagenew.php:128 actions/newmessage.php:150
#, php-format
msgid "That's too long. Max message size is %d chars."
msgstr "太长了。最长的信息长度是%d个字符。"
-#: actions/apidirectmessagenew.php:138
+#: actions/apidirectmessagenew.php:139
msgid "Recipient user not found."
msgstr "未找到收件人。"
-#: actions/apidirectmessagenew.php:142
+#: actions/apidirectmessagenew.php:143
msgid "Can't send direct messages to users who aren't your friend."
msgstr "不能给未成为好友的用户发送私信。"
-#: actions/apifavoritecreate.php:109 actions/apifavoritedestroy.php:110
+#: actions/apifavoritecreate.php:110 actions/apifavoritedestroy.php:111
#: actions/apistatusesdestroy.php:121
msgid "No status found with that ID."
msgstr "没有找到此 ID 的消息。"
-#: actions/apifavoritecreate.php:120
+#: actions/apifavoritecreate.php:121
msgid "This status is already a favorite."
msgstr "已收藏此状态。"
#. TRANS: Error message text shown when a favorite could not be set.
-#: actions/apifavoritecreate.php:131 actions/favor.php:84 lib/command.php:296
+#: actions/apifavoritecreate.php:132 actions/favor.php:84 lib/command.php:294
msgid "Could not create favorite."
msgstr "无法创建收藏。"
-#: actions/apifavoritedestroy.php:123
+#: actions/apifavoritedestroy.php:124
msgid "That status is not a favorite."
msgstr "此状态未被收藏。"
-#: actions/apifavoritedestroy.php:135 actions/disfavor.php:87
+#: actions/apifavoritedestroy.php:136 actions/disfavor.php:87
msgid "Could not delete favorite."
msgstr "无法删除收藏。"
-#: actions/apifriendshipscreate.php:109
+#: actions/apifriendshipscreate.php:110
msgid "Could not follow user: profile not found."
msgstr "无法关注用户:未找到用户。"
-#: actions/apifriendshipscreate.php:118
+#: actions/apifriendshipscreate.php:119
#, php-format
msgid "Could not follow user: %s is already on your list."
msgstr "无法关注用户:你已经关注了%s。"
-#: actions/apifriendshipsdestroy.php:109
+#: actions/apifriendshipsdestroy.php:110
msgid "Could not unfollow user: User not found."
msgstr "无法取消关注用户:未找到用户。"
-#: actions/apifriendshipsdestroy.php:120
+#: actions/apifriendshipsdestroy.php:121
msgid "You cannot unfollow yourself."
msgstr "你不能取消关注自己。"
@@ -390,102 +393,102 @@ msgstr "无法确定源用户。"
msgid "Could not find target user."
msgstr "无法找到目标用户。"
-#: actions/apigroupcreate.php:167 actions/editgroup.php:186
+#: actions/apigroupcreate.php:168 actions/editgroup.php:186
#: actions/newgroup.php:126 actions/profilesettings.php:215
#: actions/register.php:212
msgid "Nickname must have only lowercase letters and numbers and no spaces."
msgstr "昵称只能使用小写字母和数字且不能使用空格。"
-#: actions/apigroupcreate.php:176 actions/editgroup.php:190
+#: actions/apigroupcreate.php:177 actions/editgroup.php:190
#: actions/newgroup.php:130 actions/profilesettings.php:238
#: actions/register.php:215
msgid "Nickname already in use. Try another one."
msgstr "昵称已被使用,换一个吧。"
-#: actions/apigroupcreate.php:183 actions/editgroup.php:193
+#: actions/apigroupcreate.php:184 actions/editgroup.php:193
#: actions/newgroup.php:133 actions/profilesettings.php:218
#: actions/register.php:217
msgid "Not a valid nickname."
msgstr "不是有效的昵称。"
-#: actions/apigroupcreate.php:199 actions/editapplication.php:215
+#: actions/apigroupcreate.php:200 actions/editapplication.php:215
#: actions/editgroup.php:199 actions/newapplication.php:203
#: actions/newgroup.php:139 actions/profilesettings.php:222
#: actions/register.php:224
msgid "Homepage is not a valid URL."
msgstr "主页的URL不正确。"
-#: actions/apigroupcreate.php:208 actions/editgroup.php:202
+#: actions/apigroupcreate.php:209 actions/editgroup.php:202
#: actions/newgroup.php:142 actions/profilesettings.php:225
#: actions/register.php:227
msgid "Full name is too long (max 255 chars)."
msgstr "全名过长(不能超过 255 个字符)。"
-#: actions/apigroupcreate.php:216 actions/editapplication.php:190
+#: actions/apigroupcreate.php:217 actions/editapplication.php:190
#: actions/newapplication.php:172
#, php-format
msgid "Description is too long (max %d chars)."
msgstr "描述过长(不能超过%d 个字符)。"
-#: actions/apigroupcreate.php:227 actions/editgroup.php:208
+#: actions/apigroupcreate.php:228 actions/editgroup.php:208
#: actions/newgroup.php:148 actions/profilesettings.php:232
#: actions/register.php:234
msgid "Location is too long (max 255 chars)."
msgstr "位置过长(不能超过255个字符)。"
-#: actions/apigroupcreate.php:246 actions/editgroup.php:219
+#: actions/apigroupcreate.php:247 actions/editgroup.php:219
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr "太多别名了!最多%d 个。"
-#: actions/apigroupcreate.php:267
+#: actions/apigroupcreate.php:268
#, php-format
msgid "Invalid alias: \"%s\"."
msgstr "无效的别名:“%s”。"
-#: actions/apigroupcreate.php:276 actions/editgroup.php:232
+#: actions/apigroupcreate.php:277 actions/editgroup.php:232
#: actions/newgroup.php:172
#, php-format
msgid "Alias \"%s\" already in use. Try another one."
msgstr "%s这个别名已被使用,换一个吧。"
-#: actions/apigroupcreate.php:289 actions/editgroup.php:238
+#: actions/apigroupcreate.php:290 actions/editgroup.php:238
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr "别名不能和昵称相同。"
-#: actions/apigroupismember.php:96 actions/apigroupjoin.php:105
-#: actions/apigroupleave.php:105 actions/apigroupmembership.php:92
+#: actions/apigroupismember.php:96 actions/apigroupjoin.php:106
+#: actions/apigroupleave.php:106 actions/apigroupmembership.php:92
#: actions/apigroupshow.php:83 actions/apitimelinegroup.php:92
msgid "Group not found."
msgstr "小组未找到。"
#. TRANS: Error text shown a user tries to join a group they already are a member of.
-#: actions/apigroupjoin.php:111 actions/joingroup.php:100 lib/command.php:336
+#: actions/apigroupjoin.php:112 actions/joingroup.php:100 lib/command.php:333
msgid "You are already a member of that group."
msgstr "你已经是该小组成员。"
#. TRANS: Error text shown when a user tries to join a group they are blocked from joining.
-#: actions/apigroupjoin.php:120 actions/joingroup.php:105 lib/command.php:341
+#: actions/apigroupjoin.php:121 actions/joingroup.php:105 lib/command.php:338
msgid "You have been blocked from that group by the admin."
msgstr "你已经被管理员从该小组中屏蔽。"
#. TRANS: Message given having failed to add a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupjoin.php:139 actions/joingroup.php:134 lib/command.php:353
+#: actions/apigroupjoin.php:140 actions/joingroup.php:134 lib/command.php:350
#, php-format
msgid "Could not join user %1$s to group %2$s."
msgstr "无法把用户%1$s添加到%2$s小组"
-#: actions/apigroupleave.php:115
+#: actions/apigroupleave.php:116
msgid "You are not a member of this group."
msgstr "你不是该小组成员。"
#. TRANS: Message given having failed to remove a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: actions/apigroupleave.php:125 actions/leavegroup.php:129
-#: lib/command.php:401
+#: actions/apigroupleave.php:126 actions/leavegroup.php:129
+#: lib/command.php:398
#, php-format
msgid "Could not remove user %1$s from group %2$s."
msgstr "无法把用户%1$s从%2$s小组删除"
@@ -514,7 +517,7 @@ msgstr "%s 的小组"
msgid "groups on %s"
msgstr "在%s上的小组"
-#: actions/apimediaupload.php:99
+#: actions/apimediaupload.php:100
msgid "Upload failed."
msgstr "上传失败"
@@ -528,9 +531,9 @@ msgstr "无效的 token。"
#: actions/apioauthauthorize.php:123 actions/avatarsettings.php:268
#: actions/deletenotice.php:169 actions/disfavor.php:74
-#: actions/emailsettings.php:267 actions/favor.php:75 actions/geocode.php:55
+#: actions/emailsettings.php:271 actions/favor.php:75 actions/geocode.php:55
#: actions/groupblock.php:66 actions/grouplogo.php:312
-#: actions/groupunblock.php:66 actions/imsettings.php:227
+#: actions/groupunblock.php:66 actions/imsettings.php:230
#: actions/invite.php:56 actions/login.php:137 actions/makeadmin.php:66
#: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80
#: actions/oauthappssettings.php:159 actions/oauthconnectionssettings.php:135
@@ -573,8 +576,8 @@ msgstr "%s的 request token 被拒绝并被取消。"
#. TRANS: Message given submitting a form with an unknown action in SMS settings.
#: actions/apioauthauthorize.php:232 actions/avatarsettings.php:281
#: actions/designadminpanel.php:104 actions/editapplication.php:139
-#: actions/emailsettings.php:286 actions/grouplogo.php:322
-#: actions/imsettings.php:242 actions/newapplication.php:121
+#: actions/emailsettings.php:290 actions/grouplogo.php:322
+#: actions/imsettings.php:245 actions/newapplication.php:121
#: actions/oauthconnectionssettings.php:147 actions/recoverpassword.php:44
#: actions/smssettings.php:277 lib/designsettings.php:304
msgid "Unexpected form submission."
@@ -599,7 +602,7 @@ msgstr ""
"strong>你的%4$s账户数据。你应该只允许你信任信任的第三方程序访问你的%4$s账户。"
#. TRANS: Main menu option when logged in for access to user settings
-#: actions/apioauthauthorize.php:310 lib/action.php:463
+#: actions/apioauthauthorize.php:310 lib/action.php:462
msgid "Account"
msgstr "帐号"
@@ -613,7 +616,7 @@ msgstr "昵称"
#. TRANS: Link description in user account settings menu.
#: actions/apioauthauthorize.php:316 actions/login.php:255
-#: actions/register.php:436 lib/accountsettingsaction.php:125
+#: actions/register.php:436 lib/accountsettingsaction.php:120
msgid "Password"
msgstr "密码"
@@ -637,18 +640,18 @@ msgstr "此方法接受POST或DELETE请求。"
msgid "You may not delete another user's status."
msgstr "你不能删除其他用户的消息。"
-#: actions/apistatusesretweet.php:75 actions/apistatusesretweets.php:72
+#: actions/apistatusesretweet.php:76 actions/apistatusesretweets.php:72
#: actions/deletenotice.php:52 actions/shownotice.php:92
msgid "No such notice."
msgstr "没有这条消息。"
#. TRANS: Error text shown when trying to repeat an own notice.
-#: actions/apistatusesretweet.php:83 lib/command.php:538
+#: actions/apistatusesretweet.php:84 lib/command.php:535
msgid "Cannot repeat your own notice."
msgstr "不能转发你自己的消息。"
#. TRANS: Error text shown when trying to repeat an notice that was already repeated by the user.
-#: actions/apistatusesretweet.php:91 lib/command.php:544
+#: actions/apistatusesretweet.php:92 lib/command.php:541
msgid "Already repeated that notice."
msgstr "已转发了该消息。"
@@ -660,26 +663,26 @@ msgstr "消息已删除。"
msgid "No status with that ID found."
msgstr "没有找到此 ID 的消息。"
-#: actions/apistatusesupdate.php:221
+#: actions/apistatusesupdate.php:222
msgid "Client must provide a 'status' parameter with a value."
msgstr "客户端必须提供一个包含内容的“状态”参数。"
-#: actions/apistatusesupdate.php:242 actions/newnotice.php:157
+#: actions/apistatusesupdate.php:243 actions/newnotice.php:157
#: lib/mailhandler.php:60
#, php-format
msgid "That's too long. Max notice size is %d chars."
msgstr "太长了。最长的消息长度是%d个字符。"
-#: actions/apistatusesupdate.php:283 actions/apiusershow.php:96
+#: actions/apistatusesupdate.php:284 actions/apiusershow.php:96
msgid "Not found."
msgstr "未找到。"
-#: actions/apistatusesupdate.php:306 actions/newnotice.php:181
+#: actions/apistatusesupdate.php:307 actions/newnotice.php:181
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr "每条消息最长%d字符,包括附件的链接 URL。"
-#: actions/apisubscriptions.php:232 actions/apisubscriptions.php:262
+#: actions/apisubscriptions.php:233 actions/apisubscriptions.php:263
msgid "Unsupported format."
msgstr "不支持的格式。"
@@ -731,7 +734,7 @@ msgstr "带 %s 标签的消息"
#: actions/apitimelinetag.php:107 actions/tagrss.php:65
#, php-format
msgid "Updates tagged with %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s 上有 %1$s 标签的消息!"
#: actions/apitrends.php:87
msgid "API method under construction."
@@ -758,7 +761,7 @@ msgstr "大小不正确。"
#. TRANS: Link description in user account settings menu.
#: actions/avatarsettings.php:67 actions/showgroup.php:230
-#: lib/accountsettingsaction.php:118
+#: lib/accountsettingsaction.php:113
msgid "Avatar"
msgstr "头像"
@@ -789,7 +792,7 @@ msgid "Preview"
msgstr "预览"
#: actions/avatarsettings.php:149 actions/showapplication.php:252
-#: lib/deleteuserform.php:66 lib/noticelist.php:657
+#: lib/deleteuserform.php:66 lib/noticelist.php:667
msgid "Delete"
msgstr "删除"
@@ -873,7 +876,8 @@ msgid "Yes"
msgstr "是"
#. TRANS: Submit button title for 'Yes' when blocking a user.
-#: actions/block.php:164 actions/groupmembers.php:392 lib/blockform.php:80
+#. TRANS: Description of the form to block a user.
+#: actions/block.php:164 lib/blockform.php:79
msgid "Block this user"
msgstr "屏蔽这个用户"
@@ -892,8 +896,8 @@ msgstr "保存屏蔽信息失败。"
#: actions/groupunblock.php:86 actions/joingroup.php:82
#: actions/joingroup.php:93 actions/leavegroup.php:82
#: actions/leavegroup.php:93 actions/makeadmin.php:86
-#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:170
-#: lib/command.php:383
+#: actions/showgroup.php:138 actions/showgroup.php:146 lib/command.php:168
+#: lib/command.php:380
msgid "No such group."
msgstr "没有这个组。"
@@ -915,11 +919,13 @@ msgstr "被屏蔽加入此小组的用户列表。"
msgid "Unblock user from group"
msgstr "取消小组对用户的屏蔽。"
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:69
+#. TRANS: Title for the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:70
msgid "Unblock"
msgstr "取消屏蔽"
-#: actions/blockedfromgroup.php:320 lib/unblockform.php:80
+#. TRANS: Description of the form to unblock a user.
+#: actions/blockedfromgroup.php:320 lib/unblockform.php:82
msgid "Unblock this user"
msgstr "取消屏蔽这个用户。"
@@ -958,9 +964,9 @@ msgstr "此地址已被确认过了。"
#. TRANS: Server error thrown on database error removing a registered IM address.
#. TRANS: Server error thrown on database error updating SMS preferences.
#. TRANS: Server error thrown on database error removing a registered SMS phone number.
-#: actions/confirmaddress.php:116 actions/emailsettings.php:327
-#: actions/emailsettings.php:473 actions/imsettings.php:280
-#: actions/imsettings.php:439 actions/othersettings.php:174
+#: actions/confirmaddress.php:116 actions/emailsettings.php:331
+#: actions/emailsettings.php:477 actions/imsettings.php:283
+#: actions/imsettings.php:442 actions/othersettings.php:174
#: actions/profilesettings.php:283 actions/smssettings.php:308
#: actions/smssettings.php:464
msgid "Couldn't update user."
@@ -968,7 +974,7 @@ msgstr "无法更新用户。"
#. TRANS: Server error thrown on database error canceling e-mail address confirmation.
#. TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-#: actions/confirmaddress.php:128 actions/emailsettings.php:433
+#: actions/confirmaddress.php:128 actions/emailsettings.php:437
#: actions/smssettings.php:422
msgid "Couldn't delete email confirmation."
msgstr "无法删除电子邮件确认。"
@@ -1004,6 +1010,7 @@ msgstr "未找到应用。"
msgid "You are not the owner of this application."
msgstr "你不是该应用的拥有者。"
+#. TRANS: Client error text when there is a problem with the session token.
#: actions/deleteapplication.php:102 actions/editapplication.php:127
#: actions/newapplication.php:110 actions/showapplication.php:118
#: lib/action.php:1307
@@ -1039,7 +1046,7 @@ msgstr "删除这个应用"
#: actions/makeadmin.php:61 actions/newmessage.php:87 actions/newnotice.php:89
#: actions/nudge.php:63 actions/subedit.php:31 actions/subscribe.php:96
#: actions/tagother.php:33 actions/unsubscribe.php:52
-#: lib/adminpanelaction.php:73 lib/profileformaction.php:64
+#: lib/adminpanelaction.php:71 lib/profileformaction.php:64
#: lib/settingsaction.php:72
msgid "Not logged in."
msgstr "未登录。"
@@ -1068,7 +1075,7 @@ msgid "Do not delete this notice"
msgstr "不要删除这个消息"
#. TRANS: Submit button title for 'Yes' when deleting a notice.
-#: actions/deletenotice.php:158 lib/noticelist.php:657
+#: actions/deletenotice.php:158 lib/noticelist.php:667
msgid "Delete this notice"
msgstr "删除"
@@ -1098,62 +1105,61 @@ msgstr "删除这个用户"
#. TRANS: Message used as title for design settings for the site.
#. TRANS: Link description in user account settings menu.
-#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:139
-#: lib/groupnav.php:119
+#: actions/designadminpanel.php:63 lib/accountsettingsaction.php:134
msgid "Design"
msgstr "外观"
#: actions/designadminpanel.php:74
-msgid "Design settings for this StatusNet site."
+msgid "Design settings for this StatusNet site"
msgstr "这个 StatusNet 网站的外观设置"
-#: actions/designadminpanel.php:318
+#: actions/designadminpanel.php:331
msgid "Invalid logo URL."
msgstr "无效的 logo URL。"
-#: actions/designadminpanel.php:322
+#: actions/designadminpanel.php:335
#, php-format
msgid "Theme not available: %s."
msgstr "主题不可用:%s。"
-#: actions/designadminpanel.php:426
+#: actions/designadminpanel.php:439
msgid "Change logo"
msgstr "更换 logo"
-#: actions/designadminpanel.php:431
+#: actions/designadminpanel.php:444
msgid "Site logo"
msgstr "网站 logo"
-#: actions/designadminpanel.php:443
+#: actions/designadminpanel.php:456
msgid "Change theme"
msgstr "更换主题"
-#: actions/designadminpanel.php:460
+#: actions/designadminpanel.php:473
msgid "Site theme"
msgstr "网站主题"
-#: actions/designadminpanel.php:461
+#: actions/designadminpanel.php:474
msgid "Theme for the site."
msgstr "这个网站的主题。"
-#: actions/designadminpanel.php:467
+#: actions/designadminpanel.php:480
msgid "Custom theme"
msgstr "自定义主题"
-#: actions/designadminpanel.php:471
+#: actions/designadminpanel.php:484
msgid "You can upload a custom StatusNet theme as a .ZIP archive."
msgstr "你可以上传一个 .ZIP 压缩文件作为一个自定义的 StatusNet 主题"
-#: actions/designadminpanel.php:486 lib/designsettings.php:101
+#: actions/designadminpanel.php:499 lib/designsettings.php:101
msgid "Change background image"
msgstr "更换背景图像"
-#: actions/designadminpanel.php:491 actions/designadminpanel.php:574
+#: actions/designadminpanel.php:504 actions/designadminpanel.php:587
#: lib/designsettings.php:178
msgid "Background"
msgstr "背景"
-#: actions/designadminpanel.php:496
+#: actions/designadminpanel.php:509
#, php-format
msgid ""
"You can upload a background image for the site. The maximum file size is %1"
@@ -1161,75 +1167,76 @@ msgid ""
msgstr "你可以为网站上传一个背景图像。文件大小限制在%1$s以下。"
#. TRANS: Used as radio button label to add a background image.
-#: actions/designadminpanel.php:527 lib/designsettings.php:139
+#: actions/designadminpanel.php:540 lib/designsettings.php:139
msgid "On"
msgstr "打开"
#. TRANS: Used as radio button label to not add a background image.
-#: actions/designadminpanel.php:544 lib/designsettings.php:155
+#: actions/designadminpanel.php:557 lib/designsettings.php:155
msgid "Off"
msgstr "关闭"
-#: actions/designadminpanel.php:545 lib/designsettings.php:156
+#: actions/designadminpanel.php:558 lib/designsettings.php:156
msgid "Turn background image on or off."
msgstr "打开或关闭背景图片"
-#: actions/designadminpanel.php:550 lib/designsettings.php:161
+#: actions/designadminpanel.php:563 lib/designsettings.php:161
msgid "Tile background image"
msgstr "平铺背景图片"
-#: actions/designadminpanel.php:564 lib/designsettings.php:170
+#: actions/designadminpanel.php:577 lib/designsettings.php:170
msgid "Change colours"
msgstr "改变颜色"
-#: actions/designadminpanel.php:587 lib/designsettings.php:191
+#: actions/designadminpanel.php:600 lib/designsettings.php:191
msgid "Content"
msgstr "内容"
-#: actions/designadminpanel.php:600 lib/designsettings.php:204
+#: actions/designadminpanel.php:613 lib/designsettings.php:204
msgid "Sidebar"
msgstr "边栏"
-#: actions/designadminpanel.php:613 lib/designsettings.php:217
+#: actions/designadminpanel.php:626 lib/designsettings.php:217
msgid "Text"
msgstr "文字"
-#: actions/designadminpanel.php:626 lib/designsettings.php:230
+#: actions/designadminpanel.php:639 lib/designsettings.php:230
msgid "Links"
msgstr "链接"
-#: actions/designadminpanel.php:651
+#: actions/designadminpanel.php:664
msgid "Advanced"
msgstr "高级"
-#: actions/designadminpanel.php:655
+#: actions/designadminpanel.php:668
msgid "Custom CSS"
msgstr "自定义CSS"
-#: actions/designadminpanel.php:676 lib/designsettings.php:247
+#: actions/designadminpanel.php:689 lib/designsettings.php:247
msgid "Use defaults"
msgstr "使用默认值"
-#: actions/designadminpanel.php:677 lib/designsettings.php:248
+#: actions/designadminpanel.php:690 lib/designsettings.php:248
msgid "Restore default designs"
msgstr "恢复默认外观"
-#: actions/designadminpanel.php:683 lib/designsettings.php:254
+#: actions/designadminpanel.php:696 lib/designsettings.php:254
msgid "Reset back to default"
msgstr "重置到默认"
-#. TRANS: Submit button title
-#: actions/designadminpanel.php:685 actions/othersettings.php:126
-#: actions/pathsadminpanel.php:351 actions/profilesettings.php:174
-#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/sitenoticeadminpanel.php:195 actions/snapshotadminpanel.php:245
-#: actions/subscriptions.php:226 actions/tagother.php:154
-#: actions/useradminpanel.php:294 lib/applicationeditform.php:363
-#: lib/designsettings.php:256 lib/groupeditform.php:202
+#. TRANS: Submit button title.
+#: actions/designadminpanel.php:698 actions/licenseadminpanel.php:319
+#: actions/othersettings.php:126 actions/pathsadminpanel.php:351
+#: actions/profilesettings.php:174 actions/sessionsadminpanel.php:199
+#: actions/siteadminpanel.php:292 actions/sitenoticeadminpanel.php:195
+#: actions/snapshotadminpanel.php:245 actions/subscriptions.php:226
+#: actions/tagother.php:154 actions/useradminpanel.php:295
+#: lib/applicationeditform.php:357 lib/designsettings.php:256
+#: lib/groupeditform.php:202
msgid "Save"
msgstr "保存"
-#: actions/designadminpanel.php:686 lib/designsettings.php:257
+#: actions/designadminpanel.php:699 lib/designsettings.php:257
msgid "Save design"
msgstr "保存外观"
@@ -1307,7 +1314,7 @@ msgstr "调回地址(callback)过长。"
msgid "Callback URL is not valid."
msgstr "调回地址(Callback URL)无效。"
-#: actions/editapplication.php:258
+#: actions/editapplication.php:261
msgid "Could not update application."
msgstr "无法更新应用。"
@@ -1344,7 +1351,7 @@ msgid "Could not update group."
msgstr "无法更新小组"
#. TRANS: Server exception thrown when creating group aliases failed.
-#: actions/editgroup.php:264 classes/User_group.php:514
+#: actions/editgroup.php:264 classes/User_group.php:513
msgid "Could not create aliases."
msgstr "无法创建别名。"
@@ -1380,7 +1387,7 @@ msgstr "当前确认的电子邮件。"
#. TRANS: Button label to remove a confirmed IM address.
#. TRANS: Button label to remove a confirmed SMS address.
#. TRANS: Button label for removing a set sender SMS e-mail address to post notices from.
-#: actions/emailsettings.php:115 actions/emailsettings.php:158
+#: actions/emailsettings.php:115 actions/emailsettings.php:162
#: actions/imsettings.php:116 actions/smssettings.php:124
#: actions/smssettings.php:180
msgctxt "BUTTON"
@@ -1398,22 +1405,26 @@ msgstr ""
#. TRANS: Button label to cancel an e-mail address confirmation procedure.
#. TRANS: Button label to cancel an IM address confirmation procedure.
#. TRANS: Button label to cancel a SMS address confirmation procedure.
-#. TRANS: Button label
+#. TRANS: Button label in the "Edit application" form.
#: actions/emailsettings.php:127 actions/imsettings.php:131
-#: actions/smssettings.php:137 lib/applicationeditform.php:357
+#: actions/smssettings.php:137 lib/applicationeditform.php:351
msgctxt "BUTTON"
msgid "Cancel"
msgstr "取消"
-#. TRANS: Instructions for e-mail address input form.
-#: actions/emailsettings.php:135
+#. TRANS: Instructions for e-mail address input form. Do not translate
+#. TRANS: "example.org". It is one of the domain names reserved for
+#. TRANS: use in examples by http://www.rfc-editor.org/rfc/rfc2606.txt.
+#. TRANS: Any other domain may be owned by a legitimate person or
+#. TRANS: organization.
+#: actions/emailsettings.php:139
msgid "Email address, like \"UserName@example.org\""
msgstr "电子邮件,类似 \"UserName@example.org\""
#. TRANS: Button label for adding an e-mail address in e-mail settings form.
#. TRANS: Button label for adding an IM address in IM settings form.
#. TRANS: Button label for adding a SMS phone number in SMS settings form.
-#: actions/emailsettings.php:139 actions/imsettings.php:148
+#: actions/emailsettings.php:143 actions/imsettings.php:151
#: actions/smssettings.php:162
msgctxt "BUTTON"
msgid "Add"
@@ -1421,110 +1432,110 @@ msgstr "添加"
#. TRANS: Form legend for incoming e-mail settings form.
#. TRANS: Form legend for incoming SMS settings form.
-#: actions/emailsettings.php:147 actions/smssettings.php:171
+#: actions/emailsettings.php:151 actions/smssettings.php:171
msgid "Incoming email"
msgstr "接收用 email"
#. TRANS: Form instructions for incoming e-mail form in e-mail settings.
#. TRANS: Form instructions for incoming SMS e-mail address form in SMS settings.
-#: actions/emailsettings.php:155 actions/smssettings.php:178
+#: actions/emailsettings.php:159 actions/smssettings.php:178
msgid "Send email to this address to post new notices."
msgstr "通过发送电子邮件到这个地址来发布新的消息。"
#. TRANS: Instructions for incoming e-mail address input form.
#. TRANS: Instructions for incoming SMS e-mail address input form.
-#: actions/emailsettings.php:164 actions/smssettings.php:186
+#: actions/emailsettings.php:168 actions/smssettings.php:186
msgid "Make a new email address for posting to; cancels the old one."
msgstr "生成新的电子邮件地址用于发布消息;取消旧的。"
#. TRANS: Button label for adding an e-mail address to send notices from.
#. TRANS: Button label for adding an SMS e-mail address to send notices from.
-#: actions/emailsettings.php:168 actions/smssettings.php:189
+#: actions/emailsettings.php:172 actions/smssettings.php:189
msgctxt "BUTTON"
msgid "New"
msgstr "新增"
#. TRANS: Form legend for e-mail preferences form.
-#: actions/emailsettings.php:174
+#: actions/emailsettings.php:178
msgid "Email preferences"
msgstr "Email 偏好"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:180
+#: actions/emailsettings.php:184
msgid "Send me notices of new subscriptions through email."
msgstr "将新的关注通过电子邮件发送给我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:186
+#: actions/emailsettings.php:190
msgid "Send me email when someone adds my notice as a favorite."
msgstr "有人收藏我的消息时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:193
+#: actions/emailsettings.php:197
msgid "Send me email when someone sends me a private message."
msgstr "有人给我发送私信时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:199
+#: actions/emailsettings.php:203
msgid "Send me email when someone sends me an \"@-reply\"."
msgstr "有人给我发送 @ 消息时,发邮件通知我。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:205
+#: actions/emailsettings.php:209
msgid "Allow friends to nudge me and send me an email."
msgstr "允许朋友们呼叫我并给我发送邮件。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:212
+#: actions/emailsettings.php:216
msgid "I want to post notices by email."
msgstr "我希望通过邮件发布信息。"
#. TRANS: Checkbox label in e-mail preferences form.
-#: actions/emailsettings.php:219
+#: actions/emailsettings.php:223
msgid "Publish a MicroID for my email address."
msgstr "公开电子邮件的 MicroID。"
#. TRANS: Confirmation message for successful e-mail preferences save.
-#: actions/emailsettings.php:334
+#: actions/emailsettings.php:338
msgid "Email preferences saved."
msgstr "Email 偏好已保存。"
#. TRANS: Message given saving e-mail address without having provided one.
-#: actions/emailsettings.php:353
+#: actions/emailsettings.php:357
msgid "No email address."
msgstr "没有电子邮件地址。"
#. TRANS: Message given saving e-mail address that cannot be normalised.
-#: actions/emailsettings.php:361
+#: actions/emailsettings.php:365
msgid "Cannot normalize that email address"
msgstr "无法识别此电子邮件"
#. TRANS: Message given saving e-mail address that not valid.
-#: actions/emailsettings.php:366 actions/register.php:208
+#: actions/emailsettings.php:370 actions/register.php:208
#: actions/siteadminpanel.php:144
msgid "Not a valid email address."
msgstr "不是有效的电子邮件。"
#. TRANS: Message given saving e-mail address that is already set.
-#: actions/emailsettings.php:370
+#: actions/emailsettings.php:374
msgid "That is already your email address."
msgstr "你已登记此电子邮件。"
#. TRANS: Message given saving e-mail address that is already set for another user.
-#: actions/emailsettings.php:374
+#: actions/emailsettings.php:378
msgid "That email address already belongs to another user."
msgstr "此电子邮件属于其他用户。"
#. TRANS: Server error thrown on database error adding e-mail confirmation code.
#. TRANS: Server error thrown on database error adding IM confirmation code.
#. TRANS: Server error thrown on database error adding SMS confirmation code.
-#: actions/emailsettings.php:391 actions/imsettings.php:348
+#: actions/emailsettings.php:395 actions/imsettings.php:351
#: actions/smssettings.php:373
msgid "Couldn't insert confirmation code."
msgstr "无法插入确认码。"
#. TRANS: Message given saving valid e-mail address that is to be confirmed.
-#: actions/emailsettings.php:398
+#: actions/emailsettings.php:402
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."
@@ -1535,50 +1546,50 @@ msgstr ""
#. TRANS: Message given canceling e-mail address confirmation that is not pending.
#. TRANS: Message given canceling IM address confirmation that is not pending.
#. TRANS: Message given canceling SMS phone number confirmation that is not pending.
-#: actions/emailsettings.php:419 actions/imsettings.php:383
+#: actions/emailsettings.php:423 actions/imsettings.php:386
#: actions/smssettings.php:408
msgid "No pending confirmation to cancel."
msgstr "没有可以取消的确认。"
#. TRANS: Message given canceling e-mail address confirmation for the wrong e-mail address.
-#: actions/emailsettings.php:424
+#: actions/emailsettings.php:428
msgid "That is the wrong email address."
msgstr "这是错误的电子邮件地址。"
#. TRANS: Message given after successfully canceling e-mail address confirmation.
-#: actions/emailsettings.php:438
+#: actions/emailsettings.php:442
msgid "Email confirmation cancelled."
msgstr "Email 确认已取消。"
#. TRANS: Message given trying to remove an e-mail address that is not
#. TRANS: registered for the active user.
-#: actions/emailsettings.php:458
+#: actions/emailsettings.php:462
msgid "That is not your email address."
msgstr "这个不是你的电子邮件地址。"
#. TRANS: Message given after successfully removing a registered e-mail address.
-#: actions/emailsettings.php:479
+#: actions/emailsettings.php:483
msgid "The email address was removed."
msgstr "电子邮件地址已被删除。"
-#: actions/emailsettings.php:493 actions/smssettings.php:568
+#: actions/emailsettings.php:497 actions/smssettings.php:568
msgid "No incoming email address."
msgstr "没有发布用的电子邮件地址。"
#. TRANS: Server error thrown on database error removing incoming e-mail address.
#. TRANS: Server error thrown on database error adding incoming e-mail address.
-#: actions/emailsettings.php:504 actions/emailsettings.php:528
+#: actions/emailsettings.php:508 actions/emailsettings.php:532
#: actions/smssettings.php:578 actions/smssettings.php:602
msgid "Couldn't update user record."
msgstr "无法更新用户记录。"
#. TRANS: Message given after successfully removing an incoming e-mail address.
-#: actions/emailsettings.php:508 actions/smssettings.php:581
+#: actions/emailsettings.php:512 actions/smssettings.php:581
msgid "Incoming email address removed."
msgstr "发布用的电子邮件被删除。"
#. TRANS: Message given after successfully adding an incoming e-mail address.
-#: actions/emailsettings.php:532 actions/smssettings.php:605
+#: actions/emailsettings.php:536 actions/smssettings.php:605
msgid "New incoming email address added."
msgstr "已添加新的发布用的电子邮件地址。"
@@ -1586,23 +1597,23 @@ msgstr "已添加新的发布用的电子邮件地址。"
msgid "This notice is already a favorite!"
msgstr "已收藏过此消息!"
-#: actions/favor.php:92 lib/disfavorform.php:140
+#: actions/favor.php:92 lib/disfavorform.php:144
msgid "Disfavor favorite"
msgstr "取消收藏"
#: actions/favorited.php:65 lib/popularnoticesection.php:91
#: lib/publicgroupnav.php:93
msgid "Popular notices"
-msgstr "收藏最多的消息"
+msgstr "最新被收藏的消息"
#: actions/favorited.php:67
#, php-format
msgid "Popular notices, page %d"
-msgstr "收藏最多的消息,第%d页"
+msgstr "最新被收藏的消息,第%d页"
#: actions/favorited.php:79
msgid "The most popular notices on the site right now."
-msgstr "目前网站上被收藏最多的消息。"
+msgstr "目前网站上最新被收藏的消息。"
#: actions/favorited.php:150
msgid "Favorite notices appear on this page but no one has favorited one yet."
@@ -1630,7 +1641,7 @@ msgstr "%s收藏的消息"
#: actions/favoritesrss.php:115
#, php-format
msgid "Updates favored by %1$s on %2$s!"
-msgstr ""
+msgstr "%2$s 上被 %1$s 收藏的消息!"
#: actions/featured.php:69 lib/featureduserssection.php:87
#: lib/publicgroupnav.php:89
@@ -1691,7 +1702,7 @@ msgstr "无法将 request token 转换为 access token。"
msgid "Remote service uses unknown version of OMB protocol."
msgstr "远程服务使用了未知版本的 OMB 协议。"
-#: actions/finishremotesubscribe.php:138
+#: actions/finishremotesubscribe.php:138 lib/oauthstore.php:306
msgid "Error updating remote profile."
msgstr "更新远程的个人信息时出错。"
@@ -1748,7 +1759,7 @@ msgstr "用户已经被小组屏蔽。"
msgid "User is not a member of group."
msgstr "用户不是小组成员。"
-#: actions/groupblock.php:134 actions/groupmembers.php:360
+#: actions/groupblock.php:134 actions/groupmembers.php:364
msgid "Block user from group"
msgstr "从小组中屏蔽用户"
@@ -1825,45 +1836,61 @@ msgstr "logo已更新。"
msgid "Failed updating logo."
msgstr "更新 logo 失败。"
-#: actions/groupmembers.php:100 lib/groupnav.php:92
+#. TRANS: Title of the page showing group members.
+#. TRANS: %s is the name of the group.
+#: actions/groupmembers.php:102
#, php-format
msgid "%s group members"
msgstr "%s 的小组成员"
-#: actions/groupmembers.php:103
+#. TRANS: Title of the page showing group members.
+#. TRANS: %1$s is the name of the group, %2$d is the page number of the members list.
+#: actions/groupmembers.php:107
#, php-format
msgid "%1$s group members, page %2$d"
msgstr "%s 的小组成员,第%2$d页"
-#: actions/groupmembers.php:118
+#: actions/groupmembers.php:122
msgid "A list of the users in this group."
msgstr "该小组的成员列表。"
-#: actions/groupmembers.php:182 lib/groupnav.php:107
+#: actions/groupmembers.php:186
msgid "Admin"
msgstr "管理"
-#: actions/groupmembers.php:392 lib/blockform.php:69
+#. TRANS: Button text for the form that will block a user from a group.
+#: actions/groupmembers.php:399
+msgctxt "BUTTON"
msgid "Block"
msgstr "屏蔽"
-#: actions/groupmembers.php:487
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:403
+msgctxt "TOOLTIP"
+msgid "Block this user"
+msgstr "屏蔽这个用户"
+
+#: actions/groupmembers.php:498
msgid "Make user an admin of the group"
msgstr "使用户成为小组的管理员"
-#: actions/groupmembers.php:519
+#. TRANS: Button text for the form that will make a user administrator.
+#: actions/groupmembers.php:533
+msgctxt "BUTTON"
msgid "Make Admin"
msgstr "设置管理员"
-#: actions/groupmembers.php:519
+#. TRANS: Submit button title.
+#: actions/groupmembers.php:537
+msgctxt "TOOLTIP"
msgid "Make this user an admin"
-msgstr "使这个用户成为管理员"
+msgstr "将这个用户设为管理员"
#. TRANS: Message is used as link title. %s is a user nickname.
#. TRANS: Title in atom group notice feed. %s is a group name.
#. TRANS: Title in atom user notice feed. %s is a user name.
#: actions/grouprss.php:139 actions/userrss.php:94
-#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:69
+#: lib/atomgroupnoticefeed.php:63 lib/atomusernoticefeed.php:68
#, php-format
msgid "%s timeline"
msgstr "%s的时间线"
@@ -1993,7 +2020,10 @@ msgstr ""
#. TRANS: IM address input field instructions in IM settings form.
#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:140
+#. TRANS: Do not translate "example.org". It is one of the domain names reserved for use in examples by
+#. TRANS: http://www.rfc-editor.org/rfc/rfc2606.txt. Any other domain may be owned by a legitimate
+#. TRANS: person or organization.
+#: actions/imsettings.php:143
#, php-format
msgid ""
"Jabber or GTalk address, like \"UserName@example.org\". First, make sure to "
@@ -2003,63 +2033,63 @@ msgstr ""
"或 GTalk 中将 %s 加为好友。"
#. TRANS: Form legend for IM preferences form.
-#: actions/imsettings.php:155
+#: actions/imsettings.php:158
msgid "IM preferences"
msgstr "IM 首选项已保存。"
#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:160
+#: actions/imsettings.php:163
msgid "Send me notices through Jabber/GTalk."
msgstr "通过 Jabber/GTalk 发送通告。"
#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:166
+#: actions/imsettings.php:169
msgid "Post a notice when my Jabber/GTalk status changes."
msgstr "当我的 Jabber/GTalk 状态改变时自动发布消息。"
#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:172
+#: actions/imsettings.php:175
msgid "Send me replies through Jabber/GTalk from people I'm not subscribed to."
msgstr "将我没有关注的用户给我的回复通过 Jabber/GTalk 发送给我。"
#. TRANS: Checkbox label in IM preferences form.
-#: actions/imsettings.php:179
+#: actions/imsettings.php:182
msgid "Publish a MicroID for my Jabber/GTalk address."
msgstr "公开 Jabber/GTalk 帐号的 MicroID。"
#. TRANS: Confirmation message for successful IM preferences save.
-#: actions/imsettings.php:287 actions/othersettings.php:180
+#: actions/imsettings.php:290 actions/othersettings.php:180
msgid "Preferences saved."
msgstr "首选项已保存。"
#. TRANS: Message given saving IM address without having provided one.
-#: actions/imsettings.php:309
+#: actions/imsettings.php:312
msgid "No Jabber ID."
msgstr "没有 Jabber ID。"
#. TRANS: Message given saving IM address that cannot be normalised.
-#: actions/imsettings.php:317
+#: actions/imsettings.php:320
msgid "Cannot normalize that Jabber ID"
msgstr "无法识别此 Jabber ID"
#. TRANS: Message given saving IM address that not valid.
-#: actions/imsettings.php:322
+#: actions/imsettings.php:325
msgid "Not a valid Jabber ID"
msgstr "不是有效的 Jabber ID"
#. TRANS: Message given saving IM address that is already set.
-#: actions/imsettings.php:326
+#: actions/imsettings.php:329
msgid "That is already your Jabber ID."
msgstr "这个已经是你的 Jabber 帐号了。"
#. TRANS: Message given saving IM address that is already set for another user.
-#: actions/imsettings.php:330
+#: actions/imsettings.php:333
msgid "Jabber ID already belongs to another user."
msgstr "Jabber ID 属于另一用户。"
#. TRANS: Message given saving valid IM address that is to be confirmed.
#. TRANS: %s is the IM address set for the site.
-#: actions/imsettings.php:358
+#: actions/imsettings.php:361
#, php-format
msgid ""
"A confirmation code was sent to the IM address you added. You must approve %"
@@ -2067,28 +2097,28 @@ msgid ""
msgstr "验证码已被发送到你新增的 IM 地址。你必须允许 %s 向你发送信息。"
#. TRANS: Message given canceling IM address confirmation for the wrong IM address.
-#: actions/imsettings.php:388
+#: actions/imsettings.php:391
msgid "That is the wrong IM address."
msgstr "IM 地址错误。"
#. TRANS: Server error thrown on database error canceling IM address confirmation.
-#: actions/imsettings.php:397
+#: actions/imsettings.php:400
msgid "Couldn't delete IM confirmation."
msgstr "无法删除 IM 确认。"
#. TRANS: Message given after successfully canceling IM address confirmation.
-#: actions/imsettings.php:402
+#: actions/imsettings.php:405
msgid "IM confirmation cancelled."
msgstr "IM 确认已取消。"
#. TRANS: Message given trying to remove an IM address that is not
#. TRANS: registered for the active user.
-#: actions/imsettings.php:424
+#: actions/imsettings.php:427
msgid "That is not your Jabber ID."
msgstr "这不是你的 Jabber ID。"
#. TRANS: Message given after successfully removing a registered IM address.
-#: actions/imsettings.php:447
+#: actions/imsettings.php:450
msgid "The IM address was removed."
msgstr "IM 地址已删除。"
@@ -2134,7 +2164,7 @@ msgstr "你已经关注了这些用户:"
#. TRANS: Whois output.
#. TRANS: %1$s nickname of the queried user, %2$s is their profile URL.
-#: actions/invite.php:131 actions/invite.php:139 lib/command.php:430
+#: actions/invite.php:131 actions/invite.php:139 lib/command.php:426
#, php-format
msgid "%1$s (%2$s)"
msgstr "%1$s (%2$s)"
@@ -2259,7 +2289,7 @@ msgid "You must be logged in to leave a group."
msgstr "你必须登录才能离开小组。"
#. TRANS: Error text shown when trying to leave an existing group the user is not a member of.
-#: actions/leavegroup.php:100 lib/command.php:389
+#: actions/leavegroup.php:100 lib/command.php:386
msgid "You are not a member of that group."
msgstr "你不是该群小组成员。"
@@ -2268,6 +2298,110 @@ msgstr "你不是该群小组成员。"
msgid "%1$s left group %2$s"
msgstr "%1$s离开了%2$s小组。"
+#. TRANS: User admin panel title
+#: actions/licenseadminpanel.php:56
+msgctxt "TITLE"
+msgid "License"
+msgstr "许可协议"
+
+#: actions/licenseadminpanel.php:67
+msgid "License for this StatusNet site"
+msgstr "这个 StatusNet 网站的许可协议"
+
+#: actions/licenseadminpanel.php:139
+msgid "Invalid license selection."
+msgstr "无效的许可协议选择。"
+
+#: actions/licenseadminpanel.php:149
+msgid ""
+"You must specify the owner of the content when using the All Rights Reserved "
+"license."
+msgstr "当使用版权所有的许可协议时,你必须指定内容的所有者。"
+
+#: actions/licenseadminpanel.php:156
+msgid "Invalid license title. Max length is 255 characters."
+msgstr "无效的许可协议标题。最大长度255个字符。"
+
+#: actions/licenseadminpanel.php:168
+msgid "Invalid license URL."
+msgstr "无效的许可协议 URL。"
+
+#: actions/licenseadminpanel.php:171
+msgid "Invalid license image URL."
+msgstr "无效的许可协议图片 URL。"
+
+#: actions/licenseadminpanel.php:179
+msgid "License URL must be blank or a valid URL."
+msgstr "许可协议 URL 必须是个有效的 URL 或者为空。"
+
+#: actions/licenseadminpanel.php:187
+msgid "License image must be blank or valid URL."
+msgstr "许可协议图片 URL 必须是个有效的 URL 或者为空。"
+
+#: actions/licenseadminpanel.php:239
+msgid "License selection"
+msgstr "许可协议选择"
+
+#: actions/licenseadminpanel.php:245
+msgid "Private"
+msgstr "私有"
+
+#: actions/licenseadminpanel.php:246
+msgid "All Rights Reserved"
+msgstr "版权所有"
+
+#: actions/licenseadminpanel.php:247
+msgid "Creative Commons"
+msgstr "创作共用"
+
+#: actions/licenseadminpanel.php:252
+msgid "Type"
+msgstr "类型"
+
+#: actions/licenseadminpanel.php:254
+msgid "Select license"
+msgstr "选择许可协议"
+
+#: actions/licenseadminpanel.php:268
+msgid "License details"
+msgstr "许可协议细节"
+
+#: actions/licenseadminpanel.php:274
+msgid "Owner"
+msgstr "所有者"
+
+#: actions/licenseadminpanel.php:275
+msgid "Name of the owner of the site's content (if applicable)."
+msgstr "这个网站内容的所有者姓名(如果适用)。"
+
+#: actions/licenseadminpanel.php:283
+msgid "License Title"
+msgstr "许可协议标题"
+
+#: actions/licenseadminpanel.php:284
+msgid "The title of the license."
+msgstr "许可协议的标题。"
+
+#: actions/licenseadminpanel.php:292
+msgid "License URL"
+msgstr "许可协议 URL"
+
+#: actions/licenseadminpanel.php:293
+msgid "URL for more information about the license."
+msgstr "更多许可协议信息的 URL。"
+
+#: actions/licenseadminpanel.php:300
+msgid "License Image URL"
+msgstr "许可协议图片 URL。"
+
+#: actions/licenseadminpanel.php:301
+msgid "URL for an image to display with the license."
+msgstr "与许可协议一起出现的图片 URL。"
+
+#: actions/licenseadminpanel.php:319
+msgid "Save license settings"
+msgstr "保存许可协议设置"
+
#: actions/login.php:102 actions/otp.php:62 actions/register.php:144
msgid "Already logged in."
msgstr "已登录。"
@@ -2372,14 +2506,14 @@ msgid "New message"
msgstr "新消息"
#. TRANS: Error text shown when trying to send a direct message to a user without a mutual subscription (each user must be subscribed to the other).
-#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:502
+#: actions/newmessage.php:121 actions/newmessage.php:161 lib/command.php:499
msgid "You can't send a message to this user."
msgstr "无法向此用户发送消息。"
#. TRANS: Command exception text shown when trying to send a direct message to another user without content.
#. TRANS: Command exception text shown when trying to reply to a notice without providing content for the reply.
-#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:481
-#: lib/command.php:582
+#: actions/newmessage.php:144 actions/newnotice.php:138 lib/command.php:478
+#: lib/command.php:579
msgid "No content!"
msgstr "没有内容!"
@@ -2388,7 +2522,7 @@ msgid "No recipient specified."
msgstr "没有收件人。"
#. TRANS: Error text shown when trying to send a direct message to self.
-#: actions/newmessage.php:164 lib/command.php:506
+#: actions/newmessage.php:164 lib/command.php:503
msgid ""
"Don't send a message to yourself; just say it to yourself quietly instead."
msgstr "不要向自己发送消息;跟自己悄悄说就得了。"
@@ -2399,12 +2533,12 @@ msgstr "消息已发送"
#. TRANS: Message given have sent a direct message to another user.
#. TRANS: %s is the name of the other user.
-#: actions/newmessage.php:185 lib/command.php:514
+#: actions/newmessage.php:185 lib/command.php:511
#, php-format
msgid "Direct message to %s sent."
msgstr "向%s发送私信成功。"
-#: actions/newmessage.php:210 actions/newnotice.php:261 lib/channel.php:189
+#: actions/newmessage.php:210 actions/newnotice.php:261
msgid "Ajax Error"
msgstr "Ajax错误"
@@ -2497,8 +2631,8 @@ msgid "Connected applications"
msgstr "关联的应用"
#: actions/oauthconnectionssettings.php:83
-msgid "You have allowed the following applications to access you account."
-msgstr "你已允许以下程序访问你的账户。"
+msgid "You have allowed the following applications to access your account."
+msgstr "你已允许以下程序访问你的帐号。"
#: actions/oauthconnectionssettings.php:175
msgid "You are not a user of that application."
@@ -2521,10 +2655,10 @@ msgstr "开发者可以修改他们程序的登记设置 "
msgid "Notice has no profile."
msgstr "消息没有对应用户。"
-#: actions/oembed.php:87 actions/shownotice.php:175
+#: actions/oembed.php:87 actions/shownotice.php:176
#, php-format
msgid "%1$s's status on %2$s"
-msgstr "%1$s在的%2$s上的消息"
+msgstr "%1$s在%2$s时发的消息"
#. TRANS: Error message displaying attachments. %s is a raw MIME type (eg 'image/png')
#: actions/oembed.php:159
@@ -2539,8 +2673,8 @@ msgid "Only %s URLs over plain HTTP please."
msgstr "请只用HTTP明文的%sURLs的地址。"
#. TRANS: Client error on an API request with an unsupported data format.
-#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1215
-#: lib/apiaction.php:1243 lib/apiaction.php:1366
+#: actions/oembed.php:184 actions/oembed.php:203 lib/apiaction.php:1200
+#: lib/apiaction.php:1227 lib/apiaction.php:1350
msgid "Not a supported data format."
msgstr "不支持的数据格式。"
@@ -2680,13 +2814,13 @@ msgid "Password saved."
msgstr "密码已保存。"
#. TRANS: Menu item for site administration
-#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:384
+#: actions/pathsadminpanel.php:59 lib/adminpanelaction.php:371
msgid "Paths"
msgstr "路径"
#: actions/pathsadminpanel.php:70
-msgid "Path and server settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的路径和服务器设置"
+msgid "Path and server settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的路径和服务器设置。"
#: actions/pathsadminpanel.php:157
#, php-format
@@ -2879,7 +3013,7 @@ msgstr "个人信息"
#: actions/profilesettings.php:108 lib/groupeditform.php:154
msgid "1-64 lowercase letters or numbers, no punctuation or spaces"
-msgstr "1 到 64 个小写字母或数字,不包含标点及空白"
+msgstr "1 到 64 个小写字母或数字,不包含标点或空格"
#: actions/profilesettings.php:111 actions/register.php:455
#: actions/showgroup.php:256 actions/tagother.php:104
@@ -2889,7 +3023,7 @@ msgstr "全名"
#. TRANS: Form input field label.
#: actions/profilesettings.php:115 actions/register.php:460
-#: lib/applicationeditform.php:244 lib/groupeditform.php:161
+#: lib/applicationeditform.php:236 lib/groupeditform.php:161
msgid "Homepage"
msgstr "主页"
@@ -2992,7 +3126,7 @@ msgid "Couldn't save tags."
msgstr "无法保存标签。"
#. TRANS: Message after successful saving of administrative settings.
-#: actions/profilesettings.php:391 lib/adminpanelaction.php:141
+#: actions/profilesettings.php:391 lib/adminpanelaction.php:138
msgid "Settings saved."
msgstr "设置已保存。"
@@ -3269,7 +3403,7 @@ msgstr "与上面输入相同的密码。此项必填。"
#. TRANS: Link description in user account settings menu.
#: actions/register.php:445 actions/register.php:449
-#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:132
+#: actions/siteadminpanel.php:238 lib/accountsettingsaction.php:127
msgid "Email"
msgstr "电子邮件"
@@ -3309,8 +3443,8 @@ msgid ""
"My text and files are available under %s except this private data: password, "
"email address, IM address, and phone number."
msgstr ""
-"我的文字和文件在%s下提供,除了隐私内容:密码、电子邮件地址、IM 地址和电话号"
-"码。"
+"我的文字和文件在%s下提供,除了如下隐私内容:密码、电子邮件地址、IM 地址和电话"
+"号码。"
#: actions/register.php:583
#, php-format
@@ -3420,7 +3554,7 @@ msgstr "你不能重复自己的消息。"
msgid "You already repeated that notice."
msgstr "你已转发过了那个消息。"
-#: actions/repeat.php:114 lib/noticelist.php:676
+#: actions/repeat.php:114 lib/noticelist.php:686
msgid "Repeated"
msgstr "已转发"
@@ -3505,13 +3639,13 @@ msgstr "用于已经在沙盒中了。"
#. TRANS: Menu item for site administration
#: actions/sessionsadminpanel.php:54 actions/sessionsadminpanel.php:170
-#: lib/adminpanelaction.php:392
+#: lib/adminpanelaction.php:379
msgid "Sessions"
msgstr "Sessions"
#: actions/sessionsadminpanel.php:65
-msgid "Session settings for this StatusNet site."
-msgstr "这个 StatusNet 网站的外观设置"
+msgid "Session settings for this StatusNet site"
+msgstr "这个 StatusNet 网站的 session 设置"
#: actions/sessionsadminpanel.php:175
msgid "Handle sessions"
@@ -3530,7 +3664,6 @@ msgid "Turn on debugging output for sessions."
msgstr "打开 sessions 的调试输出。"
#: actions/sessionsadminpanel.php:199 actions/siteadminpanel.php:292
-#: actions/useradminpanel.php:294
msgid "Save site settings"
msgstr "保存访问设置"
@@ -3543,24 +3676,24 @@ msgid "Application profile"
msgstr "未找到应用。"
#. TRANS: Form input field label for application icon.
-#: actions/showapplication.php:159 lib/applicationeditform.php:182
+#: actions/showapplication.php:159 lib/applicationeditform.php:173
msgid "Icon"
msgstr "图标"
#. TRANS: Form input field label for application name.
#: actions/showapplication.php:169 actions/version.php:197
-#: lib/applicationeditform.php:199
+#: lib/applicationeditform.php:190
msgid "Name"
msgstr "名称"
#. TRANS: Form input field label.
-#: actions/showapplication.php:178 lib/applicationeditform.php:235
+#: actions/showapplication.php:178 lib/applicationeditform.php:227
msgid "Organization"
msgstr "组织名称必填。"
#. TRANS: Form input field label.
#: actions/showapplication.php:187 actions/version.php:200
-#: lib/applicationeditform.php:216 lib/groupeditform.php:172
+#: lib/applicationeditform.php:208 lib/groupeditform.php:172
msgid "Description"
msgstr "描述"
@@ -3669,7 +3802,7 @@ msgstr ""
msgid "This is a way to share what you like."
msgstr "这是一种分享你喜欢的内容的方式。"
-#: actions/showgroup.php:82 lib/groupnav.php:86
+#: actions/showgroup.php:82
#, php-format
msgid "%s group"
msgstr "%s 小组"
@@ -3721,7 +3854,7 @@ msgstr "%s小组的消息聚合 (Atom)"
msgid "FOAF for %s group"
msgstr "%s 的发件箱"
-#: actions/showgroup.php:393 actions/showgroup.php:445 lib/groupnav.php:91
+#: actions/showgroup.php:393 actions/showgroup.php:445
msgid "Members"
msgstr "小组成员"
@@ -4162,7 +4295,7 @@ msgstr "没有输入验证码"
#. TRANS: Menu item for site administration
#: actions/snapshotadminpanel.php:54 actions/snapshotadminpanel.php:196
-#: lib/adminpanelaction.php:408
+#: lib/adminpanelaction.php:395
msgid "Snapshots"
msgstr "快照"
@@ -4324,7 +4457,7 @@ msgstr "%s没有关注任何人。"
msgid "Jabber"
msgstr "Jabber"
-#: actions/subscriptions.php:222 lib/connectsettingsaction.php:115
+#: actions/subscriptions.php:222
msgid "SMS"
msgstr "SMS"
@@ -4421,74 +4554,78 @@ msgid ""
msgstr "Listenee stream 许可证“‘%1$s” 与本网站的许可证 “%2$s”不兼容。"
#. TRANS: User admin panel title
-#: actions/useradminpanel.php:59
+#: actions/useradminpanel.php:60
msgctxt "TITLE"
msgid "User"
msgstr "用户"
-#: actions/useradminpanel.php:70
-msgid "User settings for this StatusNet site."
+#: actions/useradminpanel.php:71
+msgid "User settings for this StatusNet site"
msgstr "这个 StatusNet 网站的用户设置"
-#: actions/useradminpanel.php:149
+#: actions/useradminpanel.php:150
msgid "Invalid bio limit. Must be numeric."
msgstr "无效的自述限制,必须为数字。"
-#: actions/useradminpanel.php:155
+#: actions/useradminpanel.php:156
msgid "Invalid welcome text. Max length is 255 characters."
msgstr "无效的欢迎文字。最大长度255个字符。"
-#: actions/useradminpanel.php:165
+#: actions/useradminpanel.php:166
#, php-format
msgid "Invalid default subscripton: '%1$s' is not user."
msgstr "无效的默认关注:“%1$s”不是一个用户。"
#. TRANS: Link description in user account settings menu.
-#: actions/useradminpanel.php:218 lib/accountsettingsaction.php:111
+#: actions/useradminpanel.php:219 lib/accountsettingsaction.php:106
#: lib/personalgroupnav.php:109
msgid "Profile"
msgstr "个人信息"
-#: actions/useradminpanel.php:222
+#: actions/useradminpanel.php:223
msgid "Bio Limit"
msgstr "自述限制"
-#: actions/useradminpanel.php:223
+#: actions/useradminpanel.php:224
msgid "Maximum length of a profile bio in characters."
msgstr "个人资料自述最长的字符数。"
-#: actions/useradminpanel.php:231
+#: actions/useradminpanel.php:232
msgid "New users"
msgstr "新用户"
-#: actions/useradminpanel.php:235
+#: actions/useradminpanel.php:236
msgid "New user welcome"
msgstr "新用户欢迎"
-#: actions/useradminpanel.php:236
+#: actions/useradminpanel.php:237
msgid "Welcome text for new users (Max 255 chars)."
msgstr "给新用户的欢迎文字(不能超过255个字符)。"
-#: actions/useradminpanel.php:241
+#: actions/useradminpanel.php:242
msgid "Default subscription"
msgstr "默认关注"
-#: actions/useradminpanel.php:242
+#: actions/useradminpanel.php:243
msgid "Automatically subscribe new users to this user."
msgstr "自动关注所有关注我的人 (这个选项适合机器人)"
-#: actions/useradminpanel.php:251
+#: actions/useradminpanel.php:252
msgid "Invitations"
msgstr "邀请"
-#: actions/useradminpanel.php:256
+#: actions/useradminpanel.php:257
msgid "Invitations enabled"
msgstr "邀请已启用"
-#: actions/useradminpanel.php:258
+#: actions/useradminpanel.php:259
msgid "Whether to allow users to invite new users."
msgstr "是否允许用户发送注册邀请。"
+#: actions/useradminpanel.php:295
+msgid "Save user settings"
+msgstr "保存用户设置"
+
#: actions/userauthorization.php:105
msgid "Authorize subscription"
msgstr "授权关注"
@@ -4502,7 +4639,9 @@ msgstr ""
"请检查这些详细信息,确认希望关注此用户的消息。如果你不想关注,请点击\\\"拒绝"
"\\\"。"
+#. TRANS: Menu item for site administration
#: actions/userauthorization.php:196 actions/version.php:167
+#: lib/adminpanelaction.php:403
msgid "License"
msgstr "许可协议"
@@ -4626,7 +4765,7 @@ msgstr "试一下[搜索小组](%%action.groupsearch%%)并加入他们。"
#. TRANS: Message is used as a subtitle in atom user notice feed.
#. TRANS: %1$s is a user name, %2$s is a site name.
#: actions/userrss.php:97 lib/atomgroupnoticefeed.php:70
-#: lib/atomusernoticefeed.php:76
+#: lib/atomusernoticefeed.php:75
#, php-format
msgid "Updates from %1$s on %2$s!"
msgstr "%2$s 上 %1$s 的更新!"
@@ -4680,7 +4819,7 @@ msgid "Plugins"
msgstr "插件"
#. TRANS: Secondary navigation menu option leading to version information on the StatusNet site.
-#: actions/version.php:198 lib/action.php:805
+#: actions/version.php:198 lib/action.php:802
msgid "Version"
msgstr "版本"
@@ -4688,20 +4827,25 @@ msgstr "版本"
msgid "Author(s)"
msgstr "作者"
+#. TRANS: Activity title when marking a notice as favorite.
+#: classes/Fave.php:148 lib/favorform.php:143
+msgid "Favor"
+msgstr "收藏"
+
#. TRANS: Server exception thrown when a URL cannot be processed.
-#: classes/File.php:143
+#: classes/File.php:142
#, php-format
msgid "Cannot process URL '%s'"
msgstr "不能处理 URL “%s”"
#. TRANS: Server exception thrown when... Robin thinks something is impossible!
-#: classes/File.php:175
+#: classes/File.php:174
msgid "Robin thinks something is impossible."
msgstr "麦子认为卖烧麦是份很令人愉快的工作。"
#. TRANS: Message given if an upload is larger than the configured maximum.
#. TRANS: %1$d is the byte limit for uploads, %2$d is the byte count for the uploaded file.
-#: classes/File.php:190
+#: classes/File.php:189
#, php-format
msgid ""
"No file may be larger than %1$d bytes and the file you sent was %2$d bytes. "
@@ -4711,20 +4855,20 @@ msgstr ""
#. TRANS: Message given if an upload would exceed user quota.
#. TRANS: %d (number) is the user quota in bytes.
-#: classes/File.php:202
+#: classes/File.php:201
#, php-format
msgid "A file this large would exceed your user quota of %d bytes."
msgstr "这么大的文件会超过你%d字节的用户配额。"
#. TRANS: Message given id an upload would exceed a user's monthly quota.
#. TRANS: $d (number) is the monthly user quota in bytes.
-#: classes/File.php:211
+#: classes/File.php:210
#, php-format
msgid "A file this large would exceed your monthly quota of %d bytes."
msgstr "这么大的文件会超过你%d字节的每月配额。"
#. TRANS: Client exception thrown if a file upload does not have a valid name.
-#: classes/File.php:248 classes/File.php:263
+#: classes/File.php:247 classes/File.php:262
msgid "Invalid filename."
msgstr "无效的文件名。"
@@ -4743,6 +4887,32 @@ msgstr "不是小组成员。"
msgid "Group leave failed."
msgstr "离开小组失败。"
+#. TRANS: Exception thrown providing an invalid profile ID.
+#. TRANS: %s is the invalid profile ID.
+#: classes/Group_member.php:76
+#, php-format
+msgid "Profile ID %s is invalid."
+msgstr ""
+
+#. TRANS: Exception thrown providing an invalid group ID.
+#. TRANS: %s is the invalid group ID.
+#: classes/Group_member.php:89
+#, fuzzy, php-format
+msgid "Group ID %s is invalid."
+msgstr "保存用户时出错;无效。"
+
+#. TRANS: Activity title.
+#: classes/Group_member.php:113 lib/joinform.php:114
+msgid "Join"
+msgstr "加入"
+
+#. TRANS: Success message for subscribe to group attempt through OStatus.
+#. TRANS: %1$s is the member name, %2$s is the subscribed group's name.
+#: classes/Group_member.php:117
+#, php-format
+msgid "%1$s has joined group %2$s."
+msgstr "%1$s加入了%2$s小组。"
+
#. TRANS: Server exception thrown when updating a local group fails.
#: classes/Local_group.php:42
msgid "Could not update local group."
@@ -4761,17 +4931,17 @@ msgid "No database name or DSN found anywhere."
msgstr "没有找到数据库名称或者 DSN。"
#. TRANS: Client exception thrown when a user tries to send a direct message while being banned from sending them.
-#: classes/Message.php:46
+#: classes/Message.php:45
msgid "You are banned from sending direct messages."
msgstr "你被禁止发送私信。"
#. TRANS: Message given when a message could not be stored on the server.
-#: classes/Message.php:63
+#: classes/Message.php:62
msgid "Could not insert message."
msgstr "无法添加信息。"
#. TRANS: Message given when a message could not be updated on the server.
-#: classes/Message.php:74
+#: classes/Message.php:73
msgid "Could not update message with new URI."
msgstr "无法通过新的 URI 更新消息。"
@@ -4823,32 +4993,32 @@ msgid "Problem saving notice."
msgstr "保存消息时出错。"
#. TRANS: Server exception thrown when no array is provided to the method saveKnownGroups().
-#: classes/Notice.php:899
+#: classes/Notice.php:907
msgid "Bad type provided to saveKnownGroups"
msgstr "对 saveKnownGroups 提供的类型无效"
#. TRANS: Server exception thrown when an update for a group inbox fails.
-#: classes/Notice.php:998
+#: classes/Notice.php:1006
msgid "Problem saving group inbox."
msgstr "保存小组收件箱时出错。"
#. TRANS: Message used to repeat a notice. RT is the abbreviation of 'retweet'.
#. TRANS: %1$s is the repeated user's name, %2$s is the repeated notice.
-#: classes/Notice.php:1759
+#: classes/Notice.php:1822
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
#. TRANS: Exception thrown when trying to revoke an existing role for a user that does not exist.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:737
+#: classes/Profile.php:785
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; does not exist."
msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限,不存在。"
#. TRANS: Exception thrown when trying to revoke a role for a user with a failing database query.
#. TRANS: %1$s is the role name, %2$s is the user ID (number).
-#: classes/Profile.php:746
+#: classes/Profile.php:794
#, php-format
msgid "Cannot revoke role \"%1$s\" for user #%2$d; database error."
msgstr "无法取消用户#%2$d的\\\"%1$s\\\"权限,数据库错误。"
@@ -4859,12 +5029,12 @@ msgid "Missing profile."
msgstr "丢失的个人信息。"
#. TRANS: Exception thrown when a tag cannot be saved.
-#: classes/Status_network.php:339
+#: classes/Status_network.php:338
msgid "Unable to save tag."
msgstr "无法保存标签。"
#. TRANS: Exception thrown when trying to subscribe while being banned from subscribing.
-#: classes/Subscription.php:75 lib/oauthstore.php:465
+#: classes/Subscription.php:75 lib/oauthstore.php:466
msgid "You have been banned from subscribing."
msgstr "你被禁止添加关注。"
@@ -4898,65 +5068,70 @@ msgstr "无法删除关注 OMB token。"
msgid "Could not delete subscription."
msgstr "无法取消关注。"
+#. TRANS: Activity tile when subscribing to another person.
+#: classes/Subscription.php:255
+msgid "Follow"
+msgstr "关注"
+
#. TRANS: Notice given on user registration.
#. TRANS: %1$s is the sitename, $2$s is the registering user's nickname.
-#: classes/User.php:365
+#: classes/User.php:384
#, php-format
msgid "Welcome to %1$s, @%2$s!"
msgstr "欢迎来到 %1$s,@%2$s!"
#. TRANS: Server exception thrown when creating a group failed.
-#: classes/User_group.php:496
+#: classes/User_group.php:495
msgid "Could not create group."
msgstr "无法创建小组。"
#. TRANS: Server exception thrown when updating a group URI failed.
-#: classes/User_group.php:506
+#: classes/User_group.php:505
msgid "Could not set group URI."
msgstr "无法设置小组 URI。"
#. TRANS: Server exception thrown when setting group membership failed.
-#: classes/User_group.php:529
+#: classes/User_group.php:528
msgid "Could not set group membership."
msgstr "无法设置小组成员。"
#. TRANS: Server exception thrown when saving local group information failed.
-#: classes/User_group.php:544
+#: classes/User_group.php:543
msgid "Could not save local group info."
msgstr "无法保存本地小组信息。"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:109
+#: lib/accountsettingsaction.php:104
msgid "Change your profile settings"
msgstr "修改你的个人信息"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:116
+#: lib/accountsettingsaction.php:111
msgid "Upload an avatar"
msgstr "上传一个头像。"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:123
+#: lib/accountsettingsaction.php:118
msgid "Change your password"
msgstr "修改密码"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:130
+#: lib/accountsettingsaction.php:125
msgid "Change email handling"
msgstr "修改电子邮件"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:137
+#: lib/accountsettingsaction.php:132
msgid "Design your profile"
msgstr "设计你的个人页面外观"
#. TRANS: Link title attribute in user account settings menu.
-#: lib/accountsettingsaction.php:144
+#: lib/accountsettingsaction.php:139
msgid "Other options"
msgstr "其他选项"
#. TRANS: Link description in user account settings menu.
-#: lib/accountsettingsaction.php:146
+#: lib/accountsettingsaction.php:141
msgid "Other"
msgstr "其他"
@@ -4972,188 +5147,193 @@ msgid "Untitled page"
msgstr "无标题页"
#. TRANS: DT element for primary navigation menu. String is hidden in default CSS.
-#: lib/action.php:449
+#: lib/action.php:448
msgid "Primary site navigation"
msgstr "主站导航"
#. TRANS: Tooltip for main menu option "Personal"
-#: lib/action.php:455
+#: lib/action.php:454
msgctxt "TOOLTIP"
msgid "Personal profile and friends timeline"
msgstr "个人资料及朋友的时间线"
#. TRANS: Main menu option when logged in for access to personal profile and friends timeline
-#: lib/action.php:458
+#: lib/action.php:457
msgctxt "MENU"
msgid "Personal"
msgstr "个人"
#. TRANS: Tooltip for main menu option "Account"
-#: lib/action.php:460
+#: lib/action.php:459
msgctxt "TOOLTIP"
msgid "Change your email, avatar, password, profile"
msgstr "修改你的 email 地址、头像、密码、资料"
#. TRANS: Tooltip for main menu option "Services"
-#: lib/action.php:465
+#: lib/action.php:464
msgctxt "TOOLTIP"
msgid "Connect to services"
msgstr "关联的服务"
#. TRANS: Main menu option when logged in and connection are possible for access to options to connect to other services
-#: lib/action.php:468
+#: lib/action.php:467
msgid "Connect"
msgstr "关联"
#. TRANS: Tooltip for menu option "Admin"
-#: lib/action.php:471
+#: lib/action.php:470
msgctxt "TOOLTIP"
msgid "Change site configuration"
msgstr "更改网站配置"
#. TRANS: Main menu option when logged in and site admin for access to site configuration
-#: lib/action.php:474
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/action.php:473 lib/groupnav.php:117
msgctxt "MENU"
msgid "Admin"
msgstr "管理"
#. TRANS: Tooltip for main menu option "Invite"
-#: lib/action.php:478
+#: lib/action.php:477
#, php-format
msgctxt "TOOLTIP"
msgid "Invite friends and colleagues to join you on %s"
msgstr "邀请好友和同事加入%s。"
#. TRANS: Main menu option when logged in and invitations are allowed for inviting new users
-#: lib/action.php:481
+#: lib/action.php:480
msgctxt "MENU"
msgid "Invite"
msgstr "邀请"
#. TRANS: Tooltip for main menu option "Logout"
-#: lib/action.php:487
+#: lib/action.php:486
msgctxt "TOOLTIP"
msgid "Logout from the site"
msgstr "从网站登出"
#. TRANS: Main menu option when logged in to log out the current user
-#: lib/action.php:490
+#: lib/action.php:489
msgctxt "MENU"
msgid "Logout"
msgstr "登出"
#. TRANS: Tooltip for main menu option "Register"
-#: lib/action.php:495
+#: lib/action.php:494
msgctxt "TOOLTIP"
msgid "Create an account"
msgstr "创建一个账户"
#. TRANS: Main menu option when not logged in to register a new account
-#: lib/action.php:498
+#: lib/action.php:497
msgctxt "MENU"
msgid "Register"
msgstr "注册"
#. TRANS: Tooltip for main menu option "Login"
-#: lib/action.php:501
+#: lib/action.php:500
msgctxt "TOOLTIP"
msgid "Login to the site"
msgstr "登录这个网站"
-#: lib/action.php:504
+#: lib/action.php:503
msgctxt "MENU"
msgid "Login"
msgstr "登录"
#. TRANS: Tooltip for main menu option "Help"
-#: lib/action.php:507
+#: lib/action.php:506
msgctxt "TOOLTIP"
msgid "Help me!"
msgstr "帮助我!"
-#: lib/action.php:510
+#: lib/action.php:509
msgctxt "MENU"
msgid "Help"
msgstr "帮助"
#. TRANS: Tooltip for main menu option "Search"
-#: lib/action.php:513
+#: lib/action.php:512
msgctxt "TOOLTIP"
msgid "Search for people or text"
msgstr "搜索人或文字"
-#: lib/action.php:516
+#: lib/action.php:515
msgctxt "MENU"
msgid "Search"
msgstr "搜索"
#. TRANS: DT element for site notice. String is hidden in default CSS.
#. TRANS: Menu item for site administration
-#: lib/action.php:538 lib/adminpanelaction.php:400
+#: lib/action.php:537 lib/adminpanelaction.php:387
msgid "Site notice"
msgstr "网站消息"
#. TRANS: DT element for local views block. String is hidden in default CSS.
-#: lib/action.php:605
+#: lib/action.php:604
msgid "Local views"
msgstr "本地显示"
#. TRANS: DT element for page notice. String is hidden in default CSS.
-#: lib/action.php:675
+#: lib/action.php:674
msgid "Page notice"
msgstr "页面消息"
#. TRANS: DT element for secondary navigation menu. String is hidden in default CSS.
-#: lib/action.php:778
+#: lib/action.php:775
msgid "Secondary site navigation"
msgstr "副站导航"
#. TRANS: Secondary navigation menu option leading to help on StatusNet.
-#: lib/action.php:784
+#: lib/action.php:781
msgid "Help"
msgstr "帮助"
#. TRANS: Secondary navigation menu option leading to text about StatusNet site.
-#: lib/action.php:787
+#: lib/action.php:784
msgid "About"
msgstr "关于"
#. TRANS: Secondary navigation menu option leading to Frequently Asked Questions.
-#: lib/action.php:790
+#: lib/action.php:787
msgid "FAQ"
msgstr "FAQ"
#. TRANS: Secondary navigation menu option leading to Terms of Service.
-#: lib/action.php:795
+#: lib/action.php:792
msgid "TOS"
msgstr "条款"
#. TRANS: Secondary navigation menu option leading to privacy policy.
-#: lib/action.php:799
+#: lib/action.php:796
msgid "Privacy"
msgstr "隐私"
#. TRANS: Secondary navigation menu option.
-#: lib/action.php:802
+#: lib/action.php:799
msgid "Source"
msgstr "源码"
#. TRANS: Secondary navigation menu option leading to contact information on the StatusNet site.
-#: lib/action.php:808
+#: lib/action.php:805
msgid "Contact"
msgstr "联系"
-#: lib/action.php:810
+#. TRANS: Secondary navigation menu option.
+#: lib/action.php:808
msgid "Badge"
msgstr "挂件"
#. TRANS: DT element for StatusNet software license.
-#: lib/action.php:839
+#: lib/action.php:837
msgid "StatusNet software license"
msgstr "StatusNet 软件许可证"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
-#: lib/action.php:843
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
+#: lib/action.php:844
#, php-format
msgid ""
"**%%site.name%%** is a microblogging service brought to you by [%%site."
@@ -5163,13 +5343,16 @@ msgstr ""
"broughtbyurl%%)。"
#. TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
-#: lib/action.php:846
+#: lib/action.php:847
#, php-format
msgid "**%%site.name%%** is a microblogging service."
msgstr "**%%site.name%%** 是一个微博客服务。"
#. TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
-#: lib/action.php:850
+#. TRANS: Make sure there is no whitespace between "]" and "(".
+#. TRANS: Text between [] is a link description, text between () is the link itself.
+#. TRANS: %s is the version of StatusNet that is being used.
+#: lib/action.php:854
#, php-format
msgid ""
"It runs the [StatusNet](http://status.net/) microblogging software, version %"
@@ -5180,341 +5363,408 @@ msgstr ""
"(http://www.fsf.org/licensing/licenses/agpl-3.0.html)授权。"
#. TRANS: DT element for StatusNet site content license.
-#: lib/action.php:866
+#: lib/action.php:870
msgid "Site content license"
msgstr "网站内容许可协议"
#. TRANS: Content license displayed when license is set to 'private'.
#. TRANS: %1$s is the site name.
-#: lib/action.php:873
+#: lib/action.php:877
#, php-format
msgid "Content and data of %1$s are private and confidential."
msgstr "%1$s的内容和数据是私人且保密的。"
#. TRANS: Content license displayed when license is set to 'allrightsreserved'.
#. TRANS: %1$s is the copyright owner.
-#: lib/action.php:880
+#: lib/action.php:884
#, php-format
msgid "Content and data copyright by %1$s. All rights reserved."
msgstr "内容和数据%1$s版权所有并保留所有权利。"
#. TRANS: Content license displayed when license is set to 'allrightsreserved' and no owner is set.
-#: lib/action.php:884
+#: lib/action.php:888
msgid "Content and data copyright by contributors. All rights reserved."
msgstr "内容和数据贡献者版权所有并保留所有权利。"
-#. TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
-#: lib/action.php:897
+#. TRANS: license message in footer.
+#. TRANS: %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
+#: lib/action.php:902
#, php-format
msgid "All %1$s content and data are available under the %2$s license."
msgstr "所有%1$s的内容和数据在%2$s许可下有效。"
#. TRANS: DT element for pagination (previous/next, etc.).
-#: lib/action.php:1236
+#: lib/action.php:1238
msgid "Pagination"
msgstr "分页"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: present than the currently displayed information.
-#: lib/action.php:1247
+#: lib/action.php:1249
msgid "After"
msgstr "之后"
#. TRANS: Pagination message to go to a page displaying information more in the
#. TRANS: past than the currently displayed information.
-#: lib/action.php:1257
+#: lib/action.php:1259
msgid "Before"
msgstr "之前"
#. TRANS: Client exception thrown when a feed instance is a DOMDocument.
-#: lib/activity.php:122
+#: lib/activity.php:120
msgid "Expecting a root feed element but got a whole XML document."
msgstr "只期待一个 root feed 元素但收到了整个的 XML 文档。"
-#: lib/activityutils.php:208
+#. TRANS: Client exception thrown when there is no source attribute.
+#: lib/activityutils.php:200
msgid "Can't handle remote content yet."
msgstr "还不能处理远程内容。"
-#: lib/activityutils.php:244
+#. TRANS: Client exception thrown when there embedded XML content is found that cannot be processed yet.
+#: lib/activityutils.php:237
msgid "Can't handle embedded XML content yet."
msgstr "还不能处理嵌入式 XML 内容。"
-#: lib/activityutils.php:248
+#. TRANS: Client exception thrown when base64 encoded content is found that cannot be processed yet.
+#: lib/activityutils.php:242
msgid "Can't handle embedded Base64 content yet."
msgstr "还不能处理嵌入式 Base64 内容。"
#. TRANS: Client error message thrown when a user tries to change admin settings but has no access rights.
-#: lib/adminpanelaction.php:98
+#: lib/adminpanelaction.php:96
msgid "You cannot make changes to this site."
msgstr "你不能在这个站点上修改。"
#. TRANS: Client error message throw when a certain panel's settings cannot be changed.
-#: lib/adminpanelaction.php:110
+#: lib/adminpanelaction.php:108
msgid "Changes to that panel are not allowed."
msgstr "不允许对该面板进行修改。"
#. TRANS: Client error message.
-#: lib/adminpanelaction.php:229
+#: lib/adminpanelaction.php:222
msgid "showForm() not implemented."
msgstr "showForm() 尚未实现。"
#. TRANS: Client error message
-#: lib/adminpanelaction.php:259
+#: lib/adminpanelaction.php:250
msgid "saveSettings() not implemented."
msgstr "saveSettings() 尚未实现。"
#. TRANS: Client error message thrown if design settings could not be deleted in
#. TRANS: the admin panel Design.
-#: lib/adminpanelaction.php:284
+#: lib/adminpanelaction.php:274
msgid "Unable to delete design setting."
msgstr "无法删除外观设置。"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:350
+#: lib/adminpanelaction.php:337
msgid "Basic site configuration"
msgstr "基本网站配置"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:352
+#: lib/adminpanelaction.php:339
msgctxt "MENU"
msgid "Site"
msgstr "网站"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:358
+#: lib/adminpanelaction.php:345
msgid "Design configuration"
msgstr "外观配置"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:360
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/adminpanelaction.php:347 lib/groupnav.php:135
msgctxt "MENU"
msgid "Design"
msgstr "外观"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:366
+#: lib/adminpanelaction.php:353
msgid "User configuration"
msgstr "用户配置"
#. TRANS: Menu item for site administration
-#: lib/adminpanelaction.php:368 lib/personalgroupnav.php:115
+#: lib/adminpanelaction.php:355 lib/personalgroupnav.php:115
msgid "User"
msgstr "用户"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:374
+#: lib/adminpanelaction.php:361
msgid "Access configuration"
msgstr "访问配置"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:382
+#: lib/adminpanelaction.php:369
msgid "Paths configuration"
msgstr "路径配置"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:390
+#: lib/adminpanelaction.php:377
msgid "Sessions configuration"
msgstr "会话配置"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:398
+#: lib/adminpanelaction.php:385
msgid "Edit site notice"
msgstr "编辑网站消息"
#. TRANS: Menu item title/tooltip
-#: lib/adminpanelaction.php:406
+#: lib/adminpanelaction.php:393
msgid "Snapshots configuration"
msgstr "更改站点配置"
+#. TRANS: Menu item title/tooltip
+#: lib/adminpanelaction.php:401
+msgid "Set site license"
+msgstr "设置网站许可协议"
+
#. TRANS: Client error 401.
-#: lib/apiauth.php:113
+#: lib/apiauth.php:111
msgid "API resource requires read-write access, but you only have read access."
msgstr "API 资源需要读写的访问权限,但是你只有只读的权限。"
+#. TRANS: OAuth exception thrown when no application is found for a given consumer key.
+#: lib/apiauth.php:175
+msgid "No application for that consumer key."
+msgstr "没有应用使用这个 consumer key。"
+
+#. TRANS: OAuth exception given when an incorrect access token was given for a user.
+#: lib/apiauth.php:212
+msgid "Bad access token."
+msgstr "无效的 access token。"
+
+#. TRANS: OAuth exception given when no user was found for a given token (no token was found).
+#: lib/apiauth.php:217
+msgid "No user for that token."
+msgstr "没有用户使用这个 token。"
+
+#. TRANS: Client error thrown when authentication fails becaus a user clicked "Cancel".
+#. TRANS: Client error thrown when authentication fails.
+#: lib/apiauth.php:258 lib/apiauth.php:290
+msgid "Could not authenticate you."
+msgstr "无法验证你。"
+
+#. TRANS: Exception thrown when an attempt is made to revoke an unknown token.
+#: lib/apioauthstore.php:178
+msgid "Tried to revoke unknown token."
+msgstr "尝试了取消未知的 token。"
+
+#. TRANS: Exception thrown when an attempt is made to remove a revoked token.
+#: lib/apioauthstore.php:183
+msgid "Failed to delete revoked token."
+msgstr "删除取消的 token 失败。"
+
#. TRANS: Form legend.
-#: lib/applicationeditform.php:137
+#: lib/applicationeditform.php:129
msgid "Edit application"
msgstr "编辑应用"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:187
+#: lib/applicationeditform.php:178
msgid "Icon for this application"
msgstr "该应用的图标"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:209
-#, php-format
-msgid "Describe your application in %d characters"
-msgstr "用不超过%d个字符描述你的应用"
+#. TRANS: %d is the number of available characters for the description.
+#: lib/applicationeditform.php:201
+#, fuzzy, php-format
+msgid "Describe your application in %d character"
+msgid_plural "Describe your application in %d characters"
+msgstr[0] "用不超过%d个字符描述你的应用"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:213
+#: lib/applicationeditform.php:205
msgid "Describe your application"
msgstr "描述你的应用"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:224
+#: lib/applicationeditform.php:216
msgid "URL of the homepage of this application"
msgstr "这个应用的主页 URL"
#. TRANS: Form input field label.
-#: lib/applicationeditform.php:226
+#: lib/applicationeditform.php:218
msgid "Source URL"
msgstr "来源网址"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:233
+#: lib/applicationeditform.php:225
msgid "Organization responsible for this application"
msgstr "该应用的负责组织"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:242
+#: lib/applicationeditform.php:234
msgid "URL for the homepage of the organization"
msgstr "这个组织的主页 URL"
#. TRANS: Form input field instructions.
-#: lib/applicationeditform.php:251
+#: lib/applicationeditform.php:243
msgid "URL to redirect to after authentication"
msgstr "通过授权后转向的 URL"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:278
+#: lib/applicationeditform.php:271
msgid "Browser"
msgstr "浏览器"
#. TRANS: Radio button label for application type
-#: lib/applicationeditform.php:295
+#: lib/applicationeditform.php:288
msgid "Desktop"
msgstr "桌面"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:297
+#: lib/applicationeditform.php:290
msgid "Type of application, browser or desktop"
msgstr "应用的类型,浏览器或桌面"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:320
+#: lib/applicationeditform.php:314
msgid "Read-only"
msgstr "只读"
#. TRANS: Radio button label for access type.
-#: lib/applicationeditform.php:339
+#: lib/applicationeditform.php:334
msgid "Read-write"
msgstr "读写"
#. TRANS: Form guide.
-#: lib/applicationeditform.php:341
+#: lib/applicationeditform.php:336
msgid "Default access for this application: read-only, or read-write"
msgstr "该应用默认的访问权限:只读或读写"
-#. TRANS: Submit button title
-#: lib/applicationeditform.php:359
+#. TRANS: Submit button title.
+#: lib/applicationeditform.php:353
msgid "Cancel"
msgstr "取消"
#. TRANS: Application access type
-#: lib/applicationlist.php:136
+#: lib/applicationlist.php:134
msgid "read-write"
msgstr "读写"
#. TRANS: Application access type
-#: lib/applicationlist.php:138
+#: lib/applicationlist.php:136
msgid "read-only"
msgstr "只读"
-#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type (read-write or read-only)
-#: lib/applicationlist.php:144
+#. TRANS: Used in application list. %1$s is a modified date, %2$s is access type ("read-write" or "read-only")
+#: lib/applicationlist.php:142
#, php-format
msgid "Approved %1$s - \"%2$s\" access."
msgstr "通过了%1$s - \"%2$s\"的访问权限。"
#. TRANS: Button label
-#: lib/applicationlist.php:159
+#: lib/applicationlist.php:157
msgctxt "BUTTON"
msgid "Revoke"
msgstr "取消"
+#: lib/atom10feed.php:112
+msgid "author element must contain a name element."
+msgstr ""
+
#. TRANS: DT element label in attachment list.
-#: lib/attachmentlist.php:88
+#: lib/attachmentlist.php:85
msgid "Attachments"
msgstr "附件"
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:265
+#: lib/attachmentlist.php:256
msgid "Author"
msgstr "作者"
#. TRANS: DT element label in attachment list item.
-#: lib/attachmentlist.php:279
+#: lib/attachmentlist.php:270
msgid "Provider"
msgstr "提供者"
+#. TRANS: Title.
#: lib/attachmentnoticesection.php:67
msgid "Notices where this attachment appears"
msgstr "出现这个附件的消息"
+#. TRANS: Title.
#: lib/attachmenttagcloudsection.php:48
msgid "Tags for this attachment"
msgstr "此附件的标签"
-#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:226
-msgid "Password changing failed"
+#. TRANS: Exception thrown when a password change fails.
+#: lib/authenticationplugin.php:221 lib/authenticationplugin.php:227
+#, fuzzy
+msgid "Password changing failed."
msgstr "不允许更改密码"
-#: lib/authenticationplugin.php:236
-msgid "Password changing is not allowed"
+#. TRANS: Exception thrown when a password change attempt fails because it is not allowed.
+#: lib/authenticationplugin.php:238
+#, fuzzy
+msgid "Password changing is not allowed."
msgstr "不允许更改密码"
-#: lib/channel.php:157 lib/channel.php:177
+#. TRANS: Title for the form to block a user.
+#: lib/blockform.php:68
+msgid "Block"
+msgstr "屏蔽"
+
+#. TRANS: Title for command results.
+#: lib/channel.php:160 lib/channel.php:181
msgid "Command results"
msgstr "执行结果"
-#: lib/channel.php:229 lib/mailhandler.php:142
+#. TRANS: Title for command results.
+#: lib/channel.php:194
+#, fuzzy
+msgid "AJAX error"
+msgstr "Ajax错误"
+
+#. TRANS: E-mail subject when a command has completed.
+#: lib/channel.php:233 lib/mailhandler.php:142
msgid "Command complete"
msgstr "执行完毕"
-#: lib/channel.php:240
+#. TRANS: E-mail subject when a command has failed.
+#: lib/channel.php:244
msgid "Command failed"
msgstr "执行失败"
#. TRANS: Command exception text shown when a notice ID is requested that does not exist.
-#: lib/command.php:84 lib/command.php:108
+#: lib/command.php:82 lib/command.php:106
msgid "Notice with that id does not exist."
msgstr "没有此 id 的消息。"
#. TRANS: Command exception text shown when a last user notice is requested and it does not exist.
#. TRANS: Error text shown when a last user notice is requested and it does not exist.
-#: lib/command.php:101 lib/command.php:630
+#: lib/command.php:99 lib/command.php:626
msgid "User has no last notice."
msgstr "用户没有最后一条的消息。"
#. TRANS: Message given requesting a profile for a non-existing user.
#. TRANS: %s is the nickname of the user for which the profile could not be found.
-#: lib/command.php:130
+#: lib/command.php:128
#, php-format
msgid "Could not find a user with nickname %s."
msgstr "无法找到昵称为 %s 的用户。"
#. TRANS: Message given getting a non-existing user.
#. TRANS: %s is the nickname of the user that could not be found.
-#: lib/command.php:150
+#: lib/command.php:148
#, php-format
msgid "Could not find a local user with nickname %s."
msgstr "无法在本地找到昵称为%s的用户。"
#. TRANS: Error text shown when an unimplemented command is given.
-#: lib/command.php:185
+#: lib/command.php:183
msgid "Sorry, this command is not yet implemented."
msgstr "对不起,这个命令还没有实现。"
#. TRANS: Command exception text shown when a user tries to nudge themselves.
-#: lib/command.php:231
+#: lib/command.php:229
msgid "It does not make a lot of sense to nudge yourself!"
msgstr "呼叫自己不太符合逻辑吧。"
#. TRANS: Message given having nudged another user.
#. TRANS: %s is the nickname of the user that was nudged.
-#: lib/command.php:240
+#: lib/command.php:238
#, php-format
msgid "Nudge sent to %s."
msgstr "呼叫已发给 %s。"
@@ -5523,7 +5773,7 @@ msgstr "呼叫已发给 %s。"
#. TRANS: %1$s is the number of other user the user is subscribed to.
#. TRANS: %2$s is the number of users that are subscribed to the user.
#. TRANS: %3$s is the number of notices the user has sent.
-#: lib/command.php:270
+#: lib/command.php:268
#, php-format
msgid ""
"Subscriptions: %1$s\n"
@@ -5535,52 +5785,53 @@ msgstr ""
"消息数: %3$s"
#. TRANS: Text shown when a notice has been marked as favourite successfully.
-#: lib/command.php:314
+#: lib/command.php:312
msgid "Notice marked as fave."
msgstr "消息被标记为收藏。"
#. TRANS: Message given having added a user to a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:360
+#: lib/command.php:357
#, php-format
msgid "%1$s joined group %2$s."
msgstr "%1$s加入了%2$s小组。"
#. TRANS: Message given having removed a user from a group.
#. TRANS: %1$s is the nickname of the user, %2$s is the nickname of the group.
-#: lib/command.php:408
+#: lib/command.php:405
#, php-format
msgid "%1$s left group %2$s."
msgstr "%1$s离开了%2$s小组。"
#. TRANS: Whois output. %s is the full name of the queried user.
-#: lib/command.php:434
+#: lib/command.php:430
#, php-format
msgid "Fullname: %s"
msgstr "全名:%s"
#. TRANS: Whois output. %s is the location of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:438 lib/mail.php:268
+#: lib/command.php:434 lib/mail.php:268
#, php-format
msgid "Location: %s"
msgstr "位置:%s"
#. TRANS: Whois output. %s is the homepage of the queried user.
#. TRANS: Profile info line in new-subscriber notification e-mail
-#: lib/command.php:442 lib/mail.php:271
+#: lib/command.php:438 lib/mail.php:271
#, php-format
msgid "Homepage: %s"
msgstr "主页:%s"
#. TRANS: Whois output. %s is the bio information of the queried user.
-#: lib/command.php:446
+#: lib/command.php:442
#, php-format
msgid "About: %s"
msgstr "关于:%s"
#. TRANS: Command exception text shown when trying to send a direct message to a remote user (a user not registered at the current server).
-#: lib/command.php:474
+#. TRANS: %s is a remote profile.
+#: lib/command.php:471
#, php-format
msgid ""
"%s is a remote profile; you can only send direct messages to users on the "
@@ -5589,164 +5840,165 @@ msgstr "%s是一个远程的用户;你只能给同一个服务器上的用户
#. TRANS: Message given if content is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:491 lib/xmppmanager.php:403
+#: lib/command.php:488 lib/xmppmanager.php:403
#, php-format
msgid "Message too long - maximum is %1$d characters, you sent %2$d."
msgstr "消息包含%2$d个字符,超出长度限制 - 不能超过%1$d个字符。"
#. TRANS: Error text shown sending a direct message fails with an unknown reason.
-#: lib/command.php:517
+#: lib/command.php:514
msgid "Error sending direct message."
msgstr "发送消息出错。"
#. TRANS: Message given having repeated a notice from another user.
#. TRANS: %s is the name of the user for which the notice was repeated.
-#: lib/command.php:554
+#: lib/command.php:551
#, php-format
msgid "Notice from %s repeated."
msgstr "来自 %s 的消息已转发。"
#. TRANS: Error text shown when repeating a notice fails with an unknown reason.
-#: lib/command.php:557
+#: lib/command.php:554
msgid "Error repeating notice."
msgstr "转发消息时出错。"
#. TRANS: Message given if content of a notice for a reply is too long.
#. TRANS: %1$d is the maximum number of characters, %2$d is the number of submitted characters.
-#: lib/command.php:592
+#: lib/command.php:589
#, php-format
msgid "Notice too long - maximum is %1$d characters, you sent %2$d."
msgstr "消息过长 - 最长%1$d个字符,你发送的是%2$d。"
#. TRANS: Text shown having sent a reply to a notice successfully.
#. TRANS: %s is the nickname of the user of the notice the reply was sent to.
-#: lib/command.php:603
+#: lib/command.php:600
#, php-format
msgid "Reply to %s sent."
msgstr "给 %s 的回复已发送。"
#. TRANS: Error text shown when a reply to a notice fails with an unknown reason.
-#: lib/command.php:606
+#: lib/command.php:603
msgid "Error saving notice."
msgstr "保存消息时出错。"
#. TRANS: Error text shown when no username was provided when issuing a subscribe command.
-#: lib/command.php:655
+#: lib/command.php:650
msgid "Specify the name of the user to subscribe to."
msgstr "指定要关注的用户名。"
#. TRANS: Command exception text shown when trying to subscribe to an OMB profile using the subscribe command.
-#: lib/command.php:664
+#: lib/command.php:659
msgid "Can't subscribe to OMB profiles by command."
msgstr "无法通过命令行关注 OMB 用户。"
#. TRANS: Text shown after having subscribed to another user successfully.
#. TRANS: %s is the name of the user the subscription was requested for.
-#: lib/command.php:672
+#: lib/command.php:667
#, php-format
msgid "Subscribed to %s."
msgstr "已关注%s。"
#. TRANS: Error text shown when no username was provided when issuing an unsubscribe command.
#. TRANS: Error text shown when no username was provided when issuing the command.
-#: lib/command.php:694 lib/command.php:804
+#: lib/command.php:688 lib/command.php:799
msgid "Specify the name of the user to unsubscribe from."
msgstr "指定要取消关注的用户名。"
#. TRANS: Text shown after having unsubscribed from another user successfully.
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:705
+#: lib/command.php:699
#, php-format
msgid "Unsubscribed from %s."
msgstr "取消关注%s。"
#. TRANS: Error text shown when issuing the command "off" with a setting which has not yet been implemented.
#. TRANS: Error text shown when issuing the command "on" with a setting which has not yet been implemented.
-#: lib/command.php:724 lib/command.php:750
+#: lib/command.php:719 lib/command.php:745
msgid "Command not yet implemented."
msgstr "命令尚未实现。"
#. TRANS: Text shown when issuing the command "off" successfully.
-#: lib/command.php:728
+#: lib/command.php:723
msgid "Notification off."
msgstr "通知已关闭。"
#. TRANS: Error text shown when the command "off" fails for an unknown reason.
-#: lib/command.php:731
+#: lib/command.php:726
msgid "Can't turn off notification."
msgstr "无法关闭通知。"
#. TRANS: Text shown when issuing the command "on" successfully.
-#: lib/command.php:754
+#: lib/command.php:749
msgid "Notification on."
msgstr "通知已开启。"
#. TRANS: Error text shown when the command "on" fails for an unknown reason.
-#: lib/command.php:757
+#: lib/command.php:752
msgid "Can't turn on notification."
msgstr "无法开启通知。"
#. TRANS: Error text shown when issuing the login command while login is disabled.
-#: lib/command.php:771
+#: lib/command.php:766
msgid "Login command is disabled."
msgstr "登录命令被禁用。"
#. TRANS: Text shown after issuing the login command successfully.
#. TRANS: %s is a logon link..
-#: lib/command.php:784
+#: lib/command.php:779
#, php-format
msgid "This link is useable only once and is valid for only 2 minutes: %s."
msgstr "这个链接只能使用一次并且仅在2分钟内有效:%s。"
#. TRANS: Text shown after issuing the lose command successfully (stop another user from following the current user).
#. TRANS: %s is the name of the user the unsubscription was requested for.
-#: lib/command.php:813
+#: lib/command.php:808
#, php-format
msgid "Unsubscribed %s."
msgstr "已取消关注%s。"
#. TRANS: Text shown after requesting other users a user is subscribed to without having any subscriptions.
-#: lib/command.php:831
+#: lib/command.php:826
msgid "You are not subscribed to anyone."
msgstr "你没有关注任何人。"
#. TRANS: Text shown after requesting other users a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribed users.
-#: lib/command.php:836
+#: lib/command.php:831
msgid "You are subscribed to this person:"
msgid_plural "You are subscribed to these people:"
msgstr[0] "你已关注了这个用户:"
#. TRANS: Text shown after requesting other users that are subscribed to a user
#. TRANS: (followers) without having any subscribers.
-#: lib/command.php:858
+#: lib/command.php:853
msgid "No one is subscribed to you."
msgstr "没有人关注你。"
#. TRANS: Text shown after requesting other users that are subscribed to a user (followers).
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribing users.
-#: lib/command.php:863
+#: lib/command.php:858
msgid "This person is subscribed to you:"
msgid_plural "These people are subscribed to you:"
msgstr[0] "这个用户正在关注你:"
#. TRANS: Text shown after requesting groups a user is subscribed to without having
#. TRANS: any group subscriptions.
-#: lib/command.php:885
+#: lib/command.php:880
msgid "You are not a member of any groups."
msgstr "你还未成为任何一个小组的成员。"
#. TRANS: Text shown after requesting groups a user is subscribed to.
-#. TRANS: This message support plural forms. This message is followed by a
+#. TRANS: This message supports plural forms. This message is followed by a
#. TRANS: hard coded space and a comma separated list of subscribed groups.
-#: lib/command.php:890
+#: lib/command.php:885
msgid "You are a member of this group:"
msgid_plural "You are a member of these groups:"
msgstr[0] "你是该小组成员:"
-#: lib/command.php:905
+#. TRANS: Help text for commands. Do not translate the command names themselves; they are fixed strings.
+#: lib/command.php:900
msgid ""
"Commands:\n"
"on - turn on notifications\n"
@@ -5804,8 +6056,8 @@ msgstr ""
"fav #<消息id> - 将该id的消息加为'收藏'\n"
"repeat #<消息id> - 转发该id的消息\n"
"repeat <昵称> - 转发该用户的最后一条消息\n"
-"reply #<notice_id> - 对该id消息回复\n"
-"reply <昵称> - 对该用户的最后一条小心回复\n"
+"reply #<消息id> - 对该id消息回复\n"
+"reply <昵称> - 对该用户的最后一条消息回复\n"
"join <小组> - 加入小组\n"
"login - 获取网页登录的地址\n"
"drop <小组> - 离开小组\n"
@@ -5826,39 +6078,61 @@ msgstr ""
"tracks - 尚未实现。\n"
"tracking - 尚未实现。\n"
-#: lib/common.php:135
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:136
msgid "No configuration file found. "
msgstr "没有找到配置文件。 "
-#: lib/common.php:136
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: Is followed by a list of directories (separated by HTML breaks).
+#: lib/common.php:139
msgid "I looked for configuration files in the following places: "
msgstr "我在以下位置查找了配置文件:"
-#: lib/common.php:138
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#: lib/common.php:142
msgid "You may wish to run the installer to fix this."
msgstr "或许你想运行安装程序来解决这个问题。"
-#: lib/common.php:139
+#. TRANS: Error message displayed when no configuration file was found for a StatusNet installation.
+#. TRANS: The text is link text that leads to the installer page.
+#: lib/common.php:146
msgid "Go to the installer."
msgstr "去安装程序。"
-#: lib/connectsettingsaction.php:110
+#. TRANS: Menu item for Instant Messaging settings.
+#: lib/connectsettingsaction.php:106
+#, fuzzy
+msgctxt "MENU"
msgid "IM"
msgstr "即时通讯IM"
-#: lib/connectsettingsaction.php:111
+#. TRANS: Tooltip for Instant Messaging menu item.
+#: lib/connectsettingsaction.php:108
msgid "Updates by instant messenger (IM)"
msgstr "使用即时通讯工具(IM)更新"
-#: lib/connectsettingsaction.php:116
+#. TRANS: Menu item for Short Message Service settings.
+#: lib/connectsettingsaction.php:113
+#, fuzzy
+msgctxt "MENU"
+msgid "SMS"
+msgstr "SMS"
+
+#. TRANS: Tooltip for Short Message Service menu item.
+#: lib/connectsettingsaction.php:115
msgid "Updates by SMS"
msgstr "使用 SMS 更新"
+#. TRANS: Menu item for OAth connection settings.
#: lib/connectsettingsaction.php:120
+#, fuzzy
+msgctxt "MENU"
msgid "Connections"
msgstr "关联"
-#: lib/connectsettingsaction.php:121
+#. TRANS: Tooltip for connected applications (Connections through OAth) menu item.
+#: lib/connectsettingsaction.php:122
msgid "Authorized connected applications"
msgstr "被授权已连接的应用"
@@ -5879,18 +6153,14 @@ msgstr "你可以上传你的个人页面背景。文件最大 2MB。"
msgid "Design defaults restored."
msgstr "默认外观已恢复。"
-#: lib/disfavorform.php:114 lib/disfavorform.php:140
+#: lib/disfavorform.php:114 lib/disfavorform.php:144
msgid "Disfavor this notice"
msgstr "取消收藏这个消息"
-#: lib/favorform.php:114 lib/favorform.php:140
+#: lib/favorform.php:114 lib/favorform.php:143
msgid "Favor this notice"
msgstr "收藏"
-#: lib/favorform.php:140
-msgid "Favor"
-msgstr "收藏"
-
#: lib/feed.php:85
msgid "RSS 1.0"
msgstr "RSS 1.0"
@@ -5907,9 +6177,9 @@ msgstr "Atom"
msgid "FOAF"
msgstr "FOAF"
-#: lib/feedlist.php:64
-msgid "Export data"
-msgstr "RSS 订阅"
+#: lib/feedlist.php:66
+msgid "Feeds"
+msgstr "Feeds"
#: lib/galleryaction.php:121
msgid "Filter tags"
@@ -5963,37 +6233,77 @@ msgstr "小组的地理位置,例如“国家、省份、城市”"
msgid "Extra nicknames for the group, comma- or space- separated, max %d"
msgstr "该小组额外的昵称,用逗号或者空格分隔开,最长%d"
-#: lib/groupnav.php:85
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:86
+msgctxt "MENU"
msgid "Group"
msgstr "小组"
-#: lib/groupnav.php:101
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:89
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group"
+msgstr "%s小组"
+
+#. TRANS: Menu item in the group navigation page.
+#: lib/groupnav.php:95
+msgctxt "MENU"
+msgid "Members"
+msgstr "组员"
+
+#. TRANS: Tooltip for menu item in the group navigation page.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:98
+#, php-format
+msgctxt "TOOLTIP"
+msgid "%s group members"
+msgstr "%s 小组成员"
+
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:108
+msgctxt "MENU"
msgid "Blocked"
-msgstr "屏蔽用户"
+msgstr "屏蔽的用户"
-#: lib/groupnav.php:102
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:111
#, php-format
+msgctxt "TOOLTIP"
msgid "%s blocked users"
-msgstr "%s屏蔽的用户"
+msgstr "%s 屏蔽的用户"
-#: lib/groupnav.php:108
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:120
#, php-format
+msgctxt "TOOLTIP"
msgid "Edit %s group properties"
-msgstr "编辑 %s群选项"
+msgstr "编辑 %s 小组设置"
-#: lib/groupnav.php:113
+#. TRANS: Menu item in the group navigation page. Only shown for group administrators.
+#: lib/groupnav.php:126
+msgctxt "MENU"
msgid "Logo"
msgstr "Logo"
-#: lib/groupnav.php:114
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:129
#, php-format
+msgctxt "TOOLTIP"
msgid "Add or edit %s logo"
-msgstr "添加或编辑 %s 图标"
+msgstr "添加或编辑 %s logo"
-#: lib/groupnav.php:120
+#. TRANS: Tooltip for menu item in the group navigation page. Only shown for group administrators.
+#. TRANS: %s is the nickname of the group.
+#: lib/groupnav.php:138
#, php-format
+msgctxt "TOOLTIP"
msgid "Add or edit %s design"
-msgstr "添加或编辑%s外观"
+msgstr "添加或编辑 %s 外观"
#: lib/groupsbymemberssection.php:71
msgid "Groups with most members"
@@ -6026,7 +6336,8 @@ msgstr "文件太大。文件大小限制在%s以下。"
msgid "Partial upload."
msgstr "部分上传。"
-#: lib/imagefile.php:101 lib/mediafile.php:170
+#. TRANS: Client exception thrown when a file upload operation has failed with an unknown reason.
+#: lib/imagefile.php:101 lib/mediafile.php:179
msgid "System error uploading file."
msgstr "上传文件时出错。"
@@ -6060,10 +6371,6 @@ msgstr "[%s]"
msgid "Unknown inbox source %d."
msgstr "未知的收件箱来源%d。"
-#: lib/joinform.php:114
-msgid "Join"
-msgstr "加入"
-
#: lib/leaveform.php:114
msgid "Leave"
msgstr "离开"
@@ -6400,9 +6707,9 @@ msgstr ""
"你没有任何私信。你可以试着发送私信给其他用户鼓励他们用私信和你交流。其他用户"
"发给你你私信只有你看得到。"
-#: lib/mailbox.php:228 lib/noticelist.php:506
+#: lib/mailbox.php:228 lib/noticelist.php:516
msgid "from"
-msgstr "来自"
+msgstr "通过"
#: lib/mailhandler.php:37
msgid "Could not parse message."
@@ -6425,57 +6732,76 @@ msgstr "抱歉,现在不允许电子邮件发布。"
msgid "Unsupported message type: %s"
msgstr "不支持的信息格式:%s"
-#: lib/mediafile.php:98 lib/mediafile.php:123
+#. TRANS: Client exception thrown when a database error was thrown during a file upload operation.
+#: lib/mediafile.php:99 lib/mediafile.php:125
msgid "There was a database error while saving your file. Please try again."
msgstr "保存你的文件时数据库出现了一个错误。请重试。"
-#: lib/mediafile.php:142
+#. TRANS: Client exception thrown when an uploaded file is larger than set in php.ini.
+#: lib/mediafile.php:145
msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
msgstr "上传文件大小超过了 php.ini 中 upload_max_filesize 的设置限制。"
-#: lib/mediafile.php:147
+#. TRANS: Client exception.
+#: lib/mediafile.php:151
msgid ""
"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
"the HTML form."
msgstr "上传文件大小超过了 HTML 表单中 MAX_FILE_SIZE 的设置限制。"
-#: lib/mediafile.php:152
+#. TRANS: Client exception.
+#: lib/mediafile.php:157
msgid "The uploaded file was only partially uploaded."
msgstr "上传的文件只有部分被上传。"
-#: lib/mediafile.php:159
+#. TRANS: Client exception thrown when a temporary folder is not present to store a file upload.
+#: lib/mediafile.php:165
msgid "Missing a temporary folder."
msgstr "缺少一个临时文件夹。"
-#: lib/mediafile.php:162
+#. TRANS: Client exception thrown when writing to disk is not possible during a file upload operation.
+#: lib/mediafile.php:169
msgid "Failed to write file to disk."
msgstr "写入磁盘失败。"
-#: lib/mediafile.php:165
+#. TRANS: Client exception thrown when a file upload operation has been stopped by an extension.
+#: lib/mediafile.php:173
msgid "File upload stopped by extension."
msgstr "文件上传被扩展停止了。"
-#: lib/mediafile.php:179 lib/mediafile.php:217
+#. TRANS: Client exception thrown when a file upload operation would cause a user to exceed a set quota.
+#: lib/mediafile.php:189 lib/mediafile.php:232
msgid "File exceeds user's quota."
msgstr "文件超过了用户的配额。"
-#: lib/mediafile.php:197 lib/mediafile.php:234
+#. TRANS: Client exception thrown when a file upload operation fails because the file could
+#. TRANS: not be moved from the temporary folder to the permanent file location.
+#: lib/mediafile.php:209 lib/mediafile.php:251
msgid "File could not be moved to destination directory."
msgstr "文件不能被移动到目标目录。"
-#: lib/mediafile.php:202 lib/mediafile.php:238
+#. TRANS: Client exception thrown when a file upload operation has been stopped because the MIME
+#. TRANS: type of the uploaded file could not be determined.
+#: lib/mediafile.php:216 lib/mediafile.php:257
msgid "Could not determine file's MIME type."
msgstr "无法判断文件的 MIME 类型。"
-#: lib/mediafile.php:318
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %1$s is the file type that was denied, %2$s is the application part of
+#. TRANS: the MIME type that was denied.
+#: lib/mediafile.php:340
#, php-format
-msgid " Try using another %s format."
-msgstr "试一下其他的%s格式。"
+msgid ""
+"\"%1$s\" is not a supported file type on this server. Try using another %2$s "
+"format."
+msgstr "此服务器不支持 “%1$s” 的文件格式,试下使用其他的 %2$s 格式。"
-#: lib/mediafile.php:323
+#. TRANS: Client exception thrown trying to upload a forbidden MIME type.
+#. TRANS: %s is the file type that was denied.
+#: lib/mediafile.php:345
#, php-format
-msgid "%s is not a supported file type on this server."
-msgstr "这个服务器不支持%s的文件格式。"
+msgid "\"%s\" is not a supported file type on this server."
+msgstr "这个服务器不支持 %s 的文件格式。"
#: lib/messageform.php:120
msgid "Send a direct notice"
@@ -6496,7 +6822,7 @@ msgstr "发布"
#: lib/noticeform.php:160
msgid "Send a notice"
-msgstr "发送一个消息"
+msgstr "发送一个通知"
#: lib/noticeform.php:174
#, php-format
@@ -6526,55 +6852,55 @@ msgid ""
msgstr "抱歉,获取你的地理位置时间过长,请稍候重试"
#. TRANS: Used in coordinates as abbreviation of north
-#: lib/noticelist.php:436
+#: lib/noticelist.php:446
msgid "N"
msgstr "N"
#. TRANS: Used in coordinates as abbreviation of south
-#: lib/noticelist.php:438
+#: lib/noticelist.php:448
msgid "S"
msgstr "S"
#. TRANS: Used in coordinates as abbreviation of east
-#: lib/noticelist.php:440
+#: lib/noticelist.php:450
msgid "E"
msgstr "E"
#. TRANS: Used in coordinates as abbreviation of west
-#: lib/noticelist.php:442
+#: lib/noticelist.php:452
msgid "W"
msgstr "W"
-#: lib/noticelist.php:444
+#: lib/noticelist.php:454
#, php-format
msgid "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
msgstr "%1$u°%2$u'%3$u\"%4$s %5$u°%6$u'%7$u\"%8$s"
-#: lib/noticelist.php:453
+#: lib/noticelist.php:463
msgid "at"
msgstr "位于"
-#: lib/noticelist.php:502
+#: lib/noticelist.php:512
msgid "web"
msgstr "网页"
-#: lib/noticelist.php:568
+#: lib/noticelist.php:578
msgid "in context"
msgstr "查看对话"
-#: lib/noticelist.php:603
+#: lib/noticelist.php:613
msgid "Repeated by"
msgstr "转发来自"
-#: lib/noticelist.php:630
+#: lib/noticelist.php:640
msgid "Reply to this notice"
msgstr "回复"
-#: lib/noticelist.php:631
+#: lib/noticelist.php:641
msgid "Reply"
msgstr "回复"
-#: lib/noticelist.php:675
+#: lib/noticelist.php:685
msgid "Notice repeated"
msgstr "消息已转发"
@@ -6591,26 +6917,23 @@ msgid "Send a nudge to this user"
msgstr "呼叫这个用户"
#: lib/oauthstore.php:283
-msgid "Error inserting new profile"
-msgstr "添加个人信息出错"
+msgid "Error inserting new profile."
+msgstr "添加新个人信息出错。"
#: lib/oauthstore.php:291
-msgid "Error inserting avatar"
-msgstr "添加头像出错"
-
-#: lib/oauthstore.php:306
-msgid "Error updating remote profile"
-msgstr "更新远程的个人信息时出错"
+msgid "Error inserting avatar."
+msgstr "添加头像出错。"
#: lib/oauthstore.php:311
-msgid "Error inserting remote profile"
-msgstr "添加远程的个人信息出错"
+msgid "Error inserting remote profile."
+msgstr "添加远程个人信息时出错。"
-#: lib/oauthstore.php:345
-msgid "Duplicate notice"
-msgstr "转发消息"
+#. TRANS: Exception thrown when a notice is denied because it has been sent before.
+#: lib/oauthstore.php:346
+msgid "Duplicate notice."
+msgstr "复制消息。"
-#: lib/oauthstore.php:490
+#: lib/oauthstore.php:491
msgid "Couldn't insert new subscription."
msgstr "无法添加新的关注。"
@@ -6647,7 +6970,8 @@ msgstr "你发送的私信"
msgid "Tags in %s's notices"
msgstr "%s的消息中的标签"
-#: lib/plugin.php:115
+#. TRANS: Displayed as version information for a plugin if no version information was found.
+#: lib/plugin.php:121
msgid "Unknown"
msgstr "未知的"
@@ -6729,7 +7053,7 @@ msgstr "转发"
msgid "Revoke the \"%s\" role from this user"
msgstr "取消这个用户的\"%s\"权限"
-#: lib/router.php:709
+#: lib/router.php:711
msgid "No single user defined for single-user mode."
msgstr "没有单独的用户被定义为单用户模式。"
@@ -6741,19 +7065,24 @@ msgstr "沙盒"
msgid "Sandbox this user"
msgstr "将这个用户放入沙盒。"
-#: lib/searchaction.php:120
+#. TRANS: Fieldset legend for the search form.
+#: lib/searchaction.php:121
msgid "Search site"
msgstr "搜索帮助"
-#: lib/searchaction.php:126
+#. TRANS: Used as a field label for the field where one or more keywords
+#. TRANS: for searching can be entered.
+#: lib/searchaction.php:129
msgid "Keyword(s)"
msgstr "关键词"
-#: lib/searchaction.php:127
+#: lib/searchaction.php:130
+msgctxt "BUTTON"
msgid "Search"
msgstr "搜索"
-#: lib/searchaction.php:162
+#. TRANS: Definition list item with instructions on how to get (better) search results.
+#: lib/searchaction.php:170
msgid "Search help"
msgstr "搜索帮助"
@@ -6949,56 +7278,60 @@ msgid "Moderator"
msgstr "审核员"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1102
+#: lib/util.php:1126
msgid "a few seconds ago"
msgstr "几秒前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1105
+#: lib/util.php:1129
msgid "about a minute ago"
msgstr "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1109
+#: lib/util.php:1133
#, php-format
-msgid "about %d minutes ago"
-msgstr "约%d分钟前"
+msgid "about one minute ago"
+msgid_plural "about %d minutes ago"
+msgstr[0] "约1分钟前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1112
+#: lib/util.php:1136
msgid "about an hour ago"
msgstr "约1小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1116
+#: lib/util.php:1140
#, php-format
-msgid "about %d hours ago"
-msgstr "约%d小时前"
+msgid "about one hour ago"
+msgid_plural "about %d hours ago"
+msgstr[0] "约一小时前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1119
+#: lib/util.php:1143
msgid "about a day ago"
msgstr "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1123
+#: lib/util.php:1147
#, php-format
-msgid "about %d days ago"
-msgstr "约%d天前"
+msgid "about one day ago"
+msgid_plural "about %d days ago"
+msgstr[0] "约1天前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1126
+#: lib/util.php:1150
msgid "about a month ago"
msgstr "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1130
+#: lib/util.php:1154
#, php-format
-msgid "about %d months ago"
-msgstr "约%d个月前"
+msgid "about one month ago"
+msgid_plural "about %d months ago"
+msgstr[0] "约1个月前"
#. TRANS: Used in notices to indicate when the notice was made compared to now.
-#: lib/util.php:1133
+#: lib/util.php:1157
msgid "about a year ago"
msgstr "约1年前"
@@ -7011,3 +7344,17 @@ msgstr "%s不是有效的颜色!"
#, php-format
msgid "%s is not a valid color! Use 3 or 6 hex chars."
msgstr "%s不是有效的颜色!应使用3或6个十六进制字符。"
+
+#: scripts/restoreuser.php:82
+#, php-format
+msgid "Backup file for user %s (%s)"
+msgstr "用户 %s (%s) 的备份文件"
+
+#: scripts/restoreuser.php:88
+msgid "No user specified; using backup user."
+msgstr "没有用户被指定;使用备份用户。"
+
+#: scripts/restoreuser.php:94
+#, php-format
+msgid "%d entries in backup."
+msgstr "备份中有 %d 个条目。"