diff options
author | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
---|---|---|
committer | Zach Copley <zach@status.net> | 2009-11-10 15:25:43 -0800 |
commit | db64b612961c37477d0729e9ff4f882fb5df7b8d (patch) | |
tree | 9ae5a31b58a289fc838c29c34230edd3962c231f /locale/zh_CN/LC_MESSAGES | |
parent | ee3fc8ba03ddd8451cac60547af72ea2cef7dc6a (diff) | |
parent | 91332cdadc20e721c22fcf22ca1773cedbde95c5 (diff) |
Merge branch '0.9.x' into finish-account-api
* 0.9.x:
Added a events for the settings menu items
Bringing Sphinx search support up to code: broken out to a plugin, now supports multiple sites on a single server.
Changed to Evan's event style and added an AuthPlugin superclass
add geo output to statuses in json, xml, atom, rss in API
Localisation updates from translatewiki.net (2009-11-10)
Localisation updates from translatewiki.net
Update pot
add lat and long parameters to api/statuses/update
change credential check to work more like other events
fixup output of object attributes in db error code
Performance fix for subscription/subscriber lists based on feedback from ops.
Adjusting indexes to make favorites query more efficient, based on feedback from ops.
Revert untested code; spews PHP notice warnings on every page view: "just sent a http 200 for the check-fancy from install.php"
Added hook for the Group navigation items
Updated block @title text (shouldn't say from group)
Updated group block markup
Revert "Remove more contractions"
Diffstat (limited to 'locale/zh_CN/LC_MESSAGES')
-rw-r--r-- | locale/zh_CN/LC_MESSAGES/statusnet.mo | bin | 64437 -> 64571 bytes | |||
-rw-r--r-- | locale/zh_CN/LC_MESSAGES/statusnet.po | 147 |
2 files changed, 79 insertions, 68 deletions
diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.mo b/locale/zh_CN/LC_MESSAGES/statusnet.mo Binary files differindex 94772c6ca..f3b08115d 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.mo +++ b/locale/zh_CN/LC_MESSAGES/statusnet.mo diff --git a/locale/zh_CN/LC_MESSAGES/statusnet.po b/locale/zh_CN/LC_MESSAGES/statusnet.po index 06465826f..1a5c6d5ba 100644 --- a/locale/zh_CN/LC_MESSAGES/statusnet.po +++ b/locale/zh_CN/LC_MESSAGES/statusnet.po @@ -10,12 +10,12 @@ msgid "" msgstr "" "Project-Id-Version: StatusNet\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-11-08 22:51+0000\n" -"PO-Revision-Date: 2009-11-08 22:59:05+0000\n" +"POT-Creation-Date: 2009-11-10 20:53+0000\n" +"PO-Revision-Date: 2009-11-10 20:59:58+0000\n" "Language-Team: Simplified Chinese\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: MediaWiki 1.16alpha(r58791); Translate extension (2009-08-03)\n" +"X-Generator: MediaWiki 1.16alpha(r58872); Translate extension (2009-08-03)\n" "X-Translation-Project: translatewiki.net at http://translatewiki.net\n" "X-Language-Code: zh-hans\n" "X-Message-Group: out-statusnet\n" @@ -488,7 +488,7 @@ msgid "Invalid size." msgstr "大小不正确。" #: actions/avatarsettings.php:67 actions/showgroup.php:221 -#: lib/accountsettingsaction.php:111 +#: lib/accountsettingsaction.php:113 msgid "Avatar" msgstr "头像" @@ -537,7 +537,7 @@ msgstr "剪裁" #: actions/groupunblock.php:66 actions/imsettings.php:206 #: actions/invite.php:56 actions/login.php:131 actions/makeadmin.php:66 #: actions/newmessage.php:135 actions/newnotice.php:103 actions/nudge.php:80 -#: actions/othersettings.php:145 actions/passwordsettings.php:137 +#: actions/othersettings.php:145 actions/passwordsettings.php:151 #: actions/profilesettings.php:187 actions/recoverpassword.php:337 #: actions/register.php:165 actions/remotesubscribe.php:77 #: actions/smssettings.php:228 actions/subedit.php:38 actions/subscribe.php:46 @@ -641,7 +641,7 @@ msgstr "没有收件人。" msgid "No profile with that ID." msgstr "没有找到此ID的信息。" -#: actions/block.php:111 actions/block.php:134 +#: actions/block.php:111 actions/block.php:134 actions/groupblock.php:160 #, fuzzy msgid "Block user" msgstr "阻止用户" @@ -654,24 +654,25 @@ msgid "" msgstr "" #: actions/block.php:149 actions/deletenotice.php:145 -#: actions/groupblock.php:176 +#: actions/groupblock.php:178 msgid "No" msgstr "否" #: actions/block.php:149 #, fuzzy -msgid "Do not block this user from this group" -msgstr "该组成员列表。" +msgid "Do not block this user" +msgstr "取消阻止次用户" #: actions/block.php:150 actions/deletenotice.php:146 -#: actions/groupblock.php:177 +#: actions/groupblock.php:179 msgid "Yes" msgstr "是" -#: actions/block.php:150 +#: actions/block.php:150 actions/groupmembers.php:346 lib/blockform.php:123 +#: lib/blockform.php:153 #, fuzzy -msgid "Block this user from this group" -msgstr "该组成员列表。" +msgid "Block this user" +msgstr "阻止该用户" #: actions/block.php:165 msgid "You have already blocked this user." @@ -1169,7 +1170,7 @@ msgstr "您未告知此个人信息" msgid "Block user from group" msgstr "阻止用户" -#: actions/groupblock.php:155 +#: actions/groupblock.php:162 #, php-format msgid "" "Are you sure you want to block user \"%s\" from the group \"%s\"? They will " @@ -1177,7 +1178,17 @@ msgid "" "group in the future." msgstr "" -#: actions/groupblock.php:193 +#: actions/groupblock.php:178 +#, fuzzy +msgid "Do not block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:179 +#, fuzzy +msgid "Block this user from this group" +msgstr "该组成员列表。" + +#: actions/groupblock.php:196 msgid "Database error blocking user from group." msgstr "" @@ -1243,7 +1254,7 @@ msgstr "logo已更新。" msgid "Failed updating logo." msgstr "更新logo失败。" -#: actions/groupmembers.php:93 lib/groupnav.php:91 +#: actions/groupmembers.php:93 lib/groupnav.php:92 #, php-format msgid "%s group members" msgstr "%s 组成员" @@ -1257,7 +1268,7 @@ msgstr "%s 组成员, 第 %d 页" msgid "A list of the users in this group." msgstr "该组成员列表。" -#: actions/groupmembers.php:175 lib/groupnav.php:106 +#: actions/groupmembers.php:175 lib/groupnav.php:107 msgid "Admin" msgstr "admin管理员" @@ -1265,11 +1276,6 @@ msgstr "admin管理员" msgid "Block" msgstr "阻止" -#: actions/groupmembers.php:346 lib/blockform.php:123 lib/blockform.php:153 -#, fuzzy -msgid "Block this user" -msgstr "阻止该用户" - #: actions/groupmembers.php:441 #, fuzzy msgid "Make user an admin of the group" @@ -1671,7 +1677,7 @@ msgid "Nickname" msgstr "昵称" #: actions/login.php:249 actions/register.php:428 -#: lib/accountsettingsaction.php:114 +#: lib/accountsettingsaction.php:118 msgid "Password" msgstr "密码" @@ -1912,62 +1918,67 @@ msgstr "这是您的发件箱,包含您发送的私人消息。" msgid "Change password" msgstr "修改密码" -#: actions/passwordsettings.php:69 +#: actions/passwordsettings.php:70 +#, fuzzy +msgid "You are not allowed to change your password" +msgstr "修改密码" + +#: actions/passwordsettings.php:82 #, fuzzy msgid "Change your password." msgstr "修改密码" -#: actions/passwordsettings.php:95 actions/recoverpassword.php:231 +#: actions/passwordsettings.php:109 actions/recoverpassword.php:231 #, fuzzy msgid "Password change" msgstr "密码已保存。" -#: actions/passwordsettings.php:103 +#: actions/passwordsettings.php:117 msgid "Old password" msgstr "旧密码" -#: actions/passwordsettings.php:107 actions/recoverpassword.php:235 +#: actions/passwordsettings.php:121 actions/recoverpassword.php:235 msgid "New password" msgstr "新密码" -#: actions/passwordsettings.php:108 +#: actions/passwordsettings.php:122 msgid "6 or more characters" msgstr "6 个或更多字符" -#: actions/passwordsettings.php:111 actions/recoverpassword.php:239 +#: actions/passwordsettings.php:125 actions/recoverpassword.php:239 #: actions/register.php:432 actions/smssettings.php:134 msgid "Confirm" msgstr "确认" -#: actions/passwordsettings.php:112 +#: actions/passwordsettings.php:126 msgid "same as password above" msgstr "相同的密码" -#: actions/passwordsettings.php:116 +#: actions/passwordsettings.php:130 msgid "Change" msgstr "修改" -#: actions/passwordsettings.php:153 actions/register.php:230 +#: actions/passwordsettings.php:167 actions/register.php:230 msgid "Password must be 6 or more characters." msgstr "密码必须包含 6 个或更多字符。" -#: actions/passwordsettings.php:156 actions/register.php:233 +#: actions/passwordsettings.php:170 actions/register.php:233 msgid "Passwords don't match." msgstr "密码不匹配。" -#: actions/passwordsettings.php:164 +#: actions/passwordsettings.php:178 msgid "Incorrect old password" msgstr "旧密码不正确" -#: actions/passwordsettings.php:180 +#: actions/passwordsettings.php:194 msgid "Error saving user; invalid." msgstr "保存用户时出错;不正确。" -#: actions/passwordsettings.php:185 actions/recoverpassword.php:368 +#: actions/passwordsettings.php:199 actions/recoverpassword.php:368 msgid "Can't save new password." msgstr "无法保存新密码。" -#: actions/passwordsettings.php:191 actions/recoverpassword.php:211 +#: actions/passwordsettings.php:205 actions/recoverpassword.php:211 msgid "Password saved." msgstr "密码已保存。" @@ -2405,7 +2416,7 @@ msgid "Same as password above. Required." msgstr "相同的密码。此项必填。" #: actions/register.php:437 actions/register.php:441 -#: lib/accountsettingsaction.php:117 +#: lib/accountsettingsaction.php:122 msgid "Email" msgstr "电子邮件" @@ -2631,7 +2642,7 @@ msgstr "" msgid "This is a way to share what you like." msgstr "" -#: actions/showgroup.php:82 lib/groupnav.php:85 +#: actions/showgroup.php:82 lib/groupnav.php:86 #, php-format msgid "%s group" msgstr "%s 组" @@ -2685,7 +2696,7 @@ msgstr "%s 的通告聚合" msgid "FOAF for %s group" msgstr "%s 的发件箱" -#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:90 +#: actions/showgroup.php:381 actions/showgroup.php:438 lib/groupnav.php:91 #, fuzzy msgid "Members" msgstr "注册于" @@ -3339,40 +3350,40 @@ msgstr "添加回复时数据库出错:%s" msgid "Welcome to %1$s, @%2$s!" msgstr "发送给 %1$s 的 %2$s 消息" -#: lib/accountsettingsaction.php:108 lib/personalgroupnav.php:109 +#: lib/accountsettingsaction.php:109 lib/personalgroupnav.php:109 msgid "Profile" msgstr "个人信息" -#: lib/accountsettingsaction.php:109 +#: lib/accountsettingsaction.php:110 msgid "Change your profile settings" msgstr "修改您的个人信息" -#: lib/accountsettingsaction.php:112 +#: lib/accountsettingsaction.php:114 msgid "Upload an avatar" msgstr "上载一个头像。" -#: lib/accountsettingsaction.php:115 +#: lib/accountsettingsaction.php:119 msgid "Change your password" msgstr "修改密码" -#: lib/accountsettingsaction.php:118 +#: lib/accountsettingsaction.php:123 msgid "Change email handling" msgstr "修改电子邮件" -#: lib/accountsettingsaction.php:120 lib/groupnav.php:118 +#: lib/accountsettingsaction.php:125 lib/groupnav.php:119 msgid "Design" msgstr "" -#: lib/accountsettingsaction.php:121 +#: lib/accountsettingsaction.php:126 #, fuzzy msgid "Design your profile" msgstr "用户没有个人信息。" -#: lib/accountsettingsaction.php:123 +#: lib/accountsettingsaction.php:128 msgid "Other" msgstr "其他" -#: lib/accountsettingsaction.php:124 +#: lib/accountsettingsaction.php:129 msgid "Other options" msgstr "其他选项" @@ -3979,36 +3990,36 @@ msgstr "你的位置,格式类似\"城市,省份,国家\"" msgid "Extra nicknames for the group, comma- or space- separated, max %d" msgstr "" -#: lib/groupnav.php:84 lib/searchgroupnav.php:84 +#: lib/groupnav.php:85 lib/searchgroupnav.php:84 msgid "Group" msgstr "组" -#: lib/groupnav.php:100 +#: lib/groupnav.php:101 #, fuzzy msgid "Blocked" msgstr "阻止" -#: lib/groupnav.php:101 +#: lib/groupnav.php:102 #, fuzzy, php-format msgid "%s blocked users" msgstr "阻止用户" -#: lib/groupnav.php:107 +#: lib/groupnav.php:108 #, php-format msgid "Edit %s group properties" msgstr "编辑 %s群选项" -#: lib/groupnav.php:112 +#: lib/groupnav.php:113 #, fuzzy msgid "Logo" msgstr "Logo图标" -#: lib/groupnav.php:113 +#: lib/groupnav.php:114 #, php-format msgid "Add or edit %s logo" msgstr "添加或编辑 %s 图标" -#: lib/groupnav.php:119 +#: lib/groupnav.php:120 #, fuzzy, php-format msgid "Add or edit %s design" msgstr "添加或编辑 %s 图标" @@ -4214,7 +4225,7 @@ msgid "" "\n" "%3$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%4$s\n" @@ -4238,7 +4249,7 @@ msgid "" "\n" "%4$s\n" "\n" -"Do not reply to this email. It will not get to them.\n" +"Don't reply to this email; it won't get to them.\n" "\n" "With kind regards,\n" "%5$s\n" @@ -4654,47 +4665,47 @@ msgstr "无法向此用户发送消息。" msgid "Message" msgstr "新消息" -#: lib/util.php:844 +#: lib/util.php:818 msgid "a few seconds ago" msgstr "几秒前" -#: lib/util.php:846 +#: lib/util.php:820 msgid "about a minute ago" msgstr "一分钟前" -#: lib/util.php:848 +#: lib/util.php:822 #, php-format msgid "about %d minutes ago" msgstr "%d 分钟前" -#: lib/util.php:850 +#: lib/util.php:824 msgid "about an hour ago" msgstr "一小时前" -#: lib/util.php:852 +#: lib/util.php:826 #, php-format msgid "about %d hours ago" msgstr "%d 小时前" -#: lib/util.php:854 +#: lib/util.php:828 msgid "about a day ago" msgstr "一天前" -#: lib/util.php:856 +#: lib/util.php:830 #, php-format msgid "about %d days ago" msgstr "%d 天前" -#: lib/util.php:858 +#: lib/util.php:832 msgid "about a month ago" msgstr "一个月前" -#: lib/util.php:860 +#: lib/util.php:834 #, php-format msgid "about %d months ago" msgstr "%d 个月前" -#: lib/util.php:862 +#: lib/util.php:836 msgid "about a year ago" msgstr "一年前" |