Mercurial > kallithea
diff rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @ 2376:679363531571 beta
Updated Journal messages + i18n
author | Marcin Kuzminski <marcin@python-works.com> |
---|---|
date | Sun, 03 Jun 2012 01:07:36 +0200 |
parents | feaf1fa547dd |
children | 7dd87a2f7831 |
line wrap: on
line diff
--- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po Sun Jun 03 01:07:36 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-05-27 17:41+0200\n" +"POT-Creation-Date: 2012-06-03 01:06+0200\n" "PO-Revision-Date: 2012-04-05 17:37+0800\n" "Last-Translator: mikespook <mikespook@gmail.com>\n" "Language-Team: mikespook\n" @@ -17,26 +17,26 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:96 +#: rhodecode/controllers/changelog.py:95 #, fuzzy msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:79 +#: rhodecode/controllers/changeset.py:80 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:86 rhodecode/controllers/changeset.py:93 +#: rhodecode/controllers/changeset.py:87 rhodecode/controllers/changeset.py:94 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:153 +#: rhodecode/controllers/changeset.py:154 #, fuzzy, python-format msgid "%s line context" msgstr "文件内容" -#: rhodecode/controllers/changeset.py:320 -#: rhodecode/controllers/changeset.py:335 rhodecode/lib/diffs.py:62 +#: rhodecode/controllers/changeset.py:324 +#: rhodecode/controllers/changeset.py:339 rhodecode/lib/diffs.py:62 msgid "binary file" msgstr "二进制文件" @@ -184,7 +184,7 @@ msgid "%s public journal %s feed" msgstr "公共日志 %s %s 订阅" -#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:224 +#: rhodecode/controllers/journal.py:190 rhodecode/controllers/journal.py:223 #: rhodecode/templates/admin/repos/repo_edit.html:177 #: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 @@ -219,19 +219,19 @@ msgstr "在搜索操作中发生异常" #: rhodecode/controllers/settings.py:103 -#: rhodecode/controllers/admin/repos.py:211 +#: rhodecode/controllers/admin/repos.py:213 #, python-format msgid "Repository %s updated successfully" msgstr "版本库 %s 成功更新" #: rhodecode/controllers/settings.py:121 -#: rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/admin/repos.py:231 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:139 -#: rhodecode/controllers/admin/repos.py:247 +#: rhodecode/controllers/admin/repos.py:249 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -240,14 +240,14 @@ msgstr "" #: rhodecode/controllers/settings.py:151 -#: rhodecode/controllers/admin/repos.py:259 +#: rhodecode/controllers/admin/repos.py:261 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库 %s" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 -#: rhodecode/controllers/admin/repos.py:275 +#: rhodecode/controllers/admin/repos.py:271 +#: rhodecode/controllers/admin/repos.py:277 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -396,62 +396,62 @@ msgid "created repository %s" msgstr "建立版本库 %s" -#: rhodecode/controllers/admin/repos.py:177 +#: rhodecode/controllers/admin/repos.py:179 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:293 +#: rhodecode/controllers/admin/repos.py:295 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:329 +#: rhodecode/controllers/admin/repos.py:331 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:345 +#: rhodecode/controllers/admin/repos.py:347 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:371 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:374 rhodecode/model/forms.py:54 +#: rhodecode/controllers/admin/repos.py:376 rhodecode/model/forms.py:54 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:387 -msgid "Pulled from remote location" -msgstr "" - #: rhodecode/controllers/admin/repos.py:389 -msgid "An error occurred during pull from remote location" +msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:405 -msgid "Nothing" +#: rhodecode/controllers/admin/repos.py:391 +msgid "An error occurred during pull from remote location" msgstr "" #: rhodecode/controllers/admin/repos.py:407 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:409 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "新版本库 %s 基于 %s 建立。" -#: rhodecode/controllers/admin/repos.py:411 +#: rhodecode/controllers/admin/repos.py:413 #, fuzzy msgid "An error occurred during this operation" msgstr "在搜索操作中发生异常" @@ -547,77 +547,77 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:365 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:384 -#: rhodecode/controllers/admin/users.py:132 +#: rhodecode/controllers/admin/settings.py:387 +#: rhodecode/controllers/admin/users.py:138 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:79 +#: rhodecode/controllers/admin/users.py:83 #, python-format msgid "created user %s" msgstr "创建用户 %s" -#: rhodecode/controllers/admin/users.py:92 +#: rhodecode/controllers/admin/users.py:95 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:118 +#: rhodecode/controllers/admin/users.py:124 msgid "User updated successfully" msgstr "用户更新成功" -#: rhodecode/controllers/admin/users.py:149 +#: rhodecode/controllers/admin/users.py:155 msgid "successfully deleted user" msgstr "用户删除成功" -#: rhodecode/controllers/admin/users.py:154 +#: rhodecode/controllers/admin/users.py:160 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:175 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: rhodecode/controllers/admin/users.py:199 -#: rhodecode/controllers/admin/users_groups.py:215 +#: rhodecode/controllers/admin/users.py:205 +#: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:208 -#: rhodecode/controllers/admin/users_groups.py:225 +#: rhodecode/controllers/admin/users.py:214 +#: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:79 +#: rhodecode/controllers/admin/users_groups.py:84 #, python-format msgid "created users group %s" msgstr "建立用户组 %s" -#: rhodecode/controllers/admin/users_groups.py:92 +#: rhodecode/controllers/admin/users_groups.py:95 #, python-format msgid "error occurred during creation of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:128 +#: rhodecode/controllers/admin/users_groups.py:135 #, python-format msgid "updated users group %s" msgstr "更新用户组 %s" -#: rhodecode/controllers/admin/users_groups.py:148 +#: rhodecode/controllers/admin/users_groups.py:152 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:165 +#: rhodecode/controllers/admin/users_groups.py:169 msgid "successfully deleted users group" msgstr "删除用户组成功" -#: rhodecode/controllers/admin/users_groups.py:170 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "An error occurred during deletion of users group" msgstr "" @@ -677,61 +677,89 @@ msgid "fork name " msgstr "分支名称" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:550 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:542 +#: rhodecode/lib/helpers.py:554 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本库 %s" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 +#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:560 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:549 +#: rhodecode/lib/helpers.py:568 +#, fuzzy, python-format +#| msgid "created user %s" +msgid "[created] user" +msgstr "创建用户 %s" + +#: rhodecode/lib/helpers.py:570 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] user" +msgstr "更新用户组 %s" + +#: rhodecode/lib/helpers.py:572 +#, fuzzy, python-format +#| msgid "created users group %s" +msgid "[created] users group" +msgstr "建立用户组 %s" + +#: rhodecode/lib/helpers.py:574 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] users group" +msgstr "更新用户组 %s" + +#: rhodecode/lib/helpers.py:576 +msgid "[commented] on revision in repository" +msgstr "" + +#: rhodecode/lib/helpers.py:578 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:550 -msgid "[committed via RhodeCode] into" +#: rhodecode/lib/helpers.py:580 +msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:551 -msgid "[pulled from remote] into" +#: rhodecode/lib/helpers.py:582 +msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:552 +#: rhodecode/lib/helpers.py:584 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:553 +#: rhodecode/lib/helpers.py:586 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:588 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:752 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:736 +#: rhodecode/lib/helpers.py:756 msgid "No Files" msgstr "没有文件" @@ -979,7 +1007,7 @@ msgstr "" #: rhodecode/templates/index_base.html:6 -#: rhodecode/templates/admin/users/user_edit_my_account.html:115 +#: rhodecode/templates/admin/users/user_edit_my_account.html:31 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:31 @@ -1034,10 +1062,10 @@ #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:36 #: rhodecode/templates/admin/repos/repos.html:82 -#: rhodecode/templates/admin/users/user_edit_my_account.html:133 -#: rhodecode/templates/admin/users/user_edit_my_account.html:183 -#: rhodecode/templates/admin/users/user_edit_my_account.html:249 -#: rhodecode/templates/admin/users/user_edit_my_account.html:284 +#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/admin/users/user_edit_my_account.html:99 +#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/admin/users/user_edit_my_account.html:200 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:36 @@ -1062,7 +1090,7 @@ #: rhodecode/templates/index_base.html:161 #: rhodecode/templates/admin/repos/repos.html:39 #: rhodecode/templates/admin/repos/repos.html:87 -#: rhodecode/templates/admin/users/user_edit_my_account.html:251 +#: rhodecode/templates/admin/users/user_edit_my_account.html:167 #: rhodecode/templates/journal/journal.html:179 msgid "Tip" msgstr "" @@ -1106,7 +1134,7 @@ #: rhodecode/templates/index_base.html:148 #: rhodecode/templates/index_base.html:188 #: rhodecode/templates/admin/repos/repos.html:112 -#: rhodecode/templates/admin/users/user_edit_my_account.html:270 +#: rhodecode/templates/admin/users/user_edit_my_account.html:186 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:60 #: rhodecode/templates/journal/journal.html:202 @@ -1117,7 +1145,7 @@ #: rhodecode/templates/index_base.html:149 #: rhodecode/templates/index_base.html:189 #: rhodecode/templates/admin/repos/repos.html:113 -#: rhodecode/templates/admin/users/user_edit_my_account.html:271 +#: rhodecode/templates/admin/users/user_edit_my_account.html:187 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:61 #: rhodecode/templates/journal/journal.html:203 @@ -1133,7 +1161,7 @@ #: rhodecode/templates/index_base.html:190 #: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:272 +#: rhodecode/templates/admin/users/user_edit_my_account.html:188 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:62 #: rhodecode/templates/journal/journal.html:204 @@ -1143,7 +1171,7 @@ #: rhodecode/templates/index_base.html:191 #: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:273 +#: rhodecode/templates/admin/users/user_edit_my_account.html:189 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:63 #: rhodecode/templates/journal/journal.html:205 @@ -1153,7 +1181,7 @@ #: rhodecode/templates/index_base.html:192 #: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:274 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:64 #: rhodecode/templates/journal/journal.html:206 @@ -1174,7 +1202,7 @@ #: rhodecode/templates/admin/admin_log.html:5 #: rhodecode/templates/admin/users/user_add.html:32 #: rhodecode/templates/admin/users/user_edit.html:50 -#: rhodecode/templates/admin/users/user_edit_my_account.html:49 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 #: rhodecode/templates/summary/summary.html:113 msgid "Username" @@ -1235,21 +1263,21 @@ #: rhodecode/templates/register.html:47 #: rhodecode/templates/admin/users/user_add.html:59 #: rhodecode/templates/admin/users/user_edit.html:86 -#: rhodecode/templates/admin/users/user_edit_my_account.html:76 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:53 msgid "First Name" msgstr "名" #: rhodecode/templates/register.html:56 #: rhodecode/templates/admin/users/user_add.html:68 #: rhodecode/templates/admin/users/user_edit.html:95 -#: rhodecode/templates/admin/users/user_edit_my_account.html:85 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:62 msgid "Last Name" msgstr "姓" #: rhodecode/templates/register.html:65 #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 -#: rhodecode/templates/admin/users/user_edit_my_account.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 #: rhodecode/templates/summary/summary.html:115 msgid "Email" msgstr "电子邮件" @@ -1313,8 +1341,8 @@ #: rhodecode/templates/admin/admin_log.html:6 #: rhodecode/templates/admin/repos/repos.html:41 #: rhodecode/templates/admin/repos/repos.html:90 -#: rhodecode/templates/admin/users/user_edit_my_account.html:135 -#: rhodecode/templates/admin/users/user_edit_my_account.html:136 +#: rhodecode/templates/admin/users/user_edit_my_account.html:51 +#: rhodecode/templates/admin/users/user_edit_my_account.html:52 #: rhodecode/templates/journal/journal.html:52 #: rhodecode/templates/journal/journal.html:53 msgid "Action" @@ -1337,7 +1365,7 @@ msgid "From IP" msgstr "来源 IP" -#: rhodecode/templates/admin/admin_log.html:52 +#: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" msgstr "尚无操作" @@ -1418,7 +1446,7 @@ #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 #: rhodecode/templates/admin/users/user_edit.html:154 -#: rhodecode/templates/admin/users/user_edit_my_account.html:102 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 #: rhodecode/templates/admin/users_groups/users_group_edit.html:115 #: rhodecode/templates/settings/repo_settings.html:84 msgid "Save" @@ -1574,7 +1602,7 @@ #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:71 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:32 #: rhodecode/templates/journal/journal.html:72 @@ -1733,38 +1761,27 @@ msgstr "私有版本库" #: rhodecode/templates/admin/repos/repo_edit_perms.html:33 -#: rhodecode/templates/admin/repos/repo_edit_perms.html:53 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:58 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:23 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:42 msgid "revoke" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:75 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 msgid "Add another member" msgstr "添加成员" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:89 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 msgid "Failed to remove user" msgstr "删除用户失败" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:104 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 msgid "Failed to remove users group" msgstr "删除用户组失败" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 -msgid "Group" -msgstr "组" - -#: rhodecode/templates/admin/repos/repo_edit_perms.html:124 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:113 -#: rhodecode/templates/admin/users_groups/users_groups.html:33 -msgid "members" -msgstr "成员" - #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "版本库管理员" @@ -1782,7 +1799,7 @@ msgstr "删除" #: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:158 +#: rhodecode/templates/admin/users/user_edit_my_account.html:74 #, fuzzy, python-format msgid "Confirm to delete this repository: %s" msgstr "确认删除版本库" @@ -1833,7 +1850,7 @@ #: rhodecode/templates/admin/settings/settings.html:177 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit_my_account.html:103 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 #: rhodecode/templates/admin/users_groups/users_group_edit.html:116 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 @@ -2062,17 +2079,17 @@ msgstr "编辑用户" #: rhodecode/templates/admin/users/user_edit.html:34 -#: rhodecode/templates/admin/users/user_edit_my_account.html:33 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:10 msgid "Change your avatar at" msgstr "修改你的头像" #: rhodecode/templates/admin/users/user_edit.html:35 -#: rhodecode/templates/admin/users/user_edit_my_account.html:34 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:11 msgid "Using" msgstr "使用中" #: rhodecode/templates/admin/users/user_edit.html:43 -#: rhodecode/templates/admin/users/user_edit_my_account.html:43 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:20 msgid "API key" msgstr "" @@ -2081,12 +2098,12 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:58 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:35 msgid "New password" msgstr "新密码" #: rhodecode/templates/admin/users/user_edit.html:77 -#: rhodecode/templates/admin/users/user_edit_my_account.html:67 +#: rhodecode/templates/admin/users/user_edit_my_account_form.html:44 msgid "New password confirmation" msgstr "" @@ -2104,24 +2121,24 @@ msgid "My Account" msgstr "我的账户" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 #: rhodecode/templates/journal/journal.html:32 #, fuzzy msgid "My repos" msgstr "空版本库" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 #, fuzzy msgid "My permissions" msgstr "权限" -#: rhodecode/templates/admin/users/user_edit_my_account.html:121 +#: rhodecode/templates/admin/users/user_edit_my_account.html:37 #: rhodecode/templates/journal/journal.html:37 #, fuzzy msgid "ADD" msgstr "新增" -#: rhodecode/templates/admin/users/user_edit_my_account.html:134 +#: rhodecode/templates/admin/users/user_edit_my_account.html:50 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:40 @@ -2131,23 +2148,23 @@ msgid "Revision" msgstr "修订" -#: rhodecode/templates/admin/users/user_edit_my_account.html:155 +#: rhodecode/templates/admin/users/user_edit_my_account.html:71 #: rhodecode/templates/journal/journal.html:72 msgid "private" msgstr "私有" -#: rhodecode/templates/admin/users/user_edit_my_account.html:165 +#: rhodecode/templates/admin/users/user_edit_my_account.html:81 #: rhodecode/templates/journal/journal.html:85 msgid "No repositories yet" msgstr "没有任何版本库" -#: rhodecode/templates/admin/users/user_edit_my_account.html:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:83 #: rhodecode/templates/journal/journal.html:87 msgid "create one now" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:184 -#: rhodecode/templates/admin/users/user_edit_my_account.html:285 +#: rhodecode/templates/admin/users/user_edit_my_account.html:100 +#: rhodecode/templates/admin/users/user_edit_my_account.html:201 #, fuzzy msgid "Permission" msgstr "权限" @@ -2250,6 +2267,11 @@ msgid "group name" msgstr "组名" +#: rhodecode/templates/admin/users_groups/users_groups.html:33 +#: rhodecode/templates/base/root.html:46 +msgid "members" +msgstr "成员" + #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, fuzzy, python-format msgid "Confirm to delete this users group: %s" @@ -2410,22 +2432,26 @@ msgid "Search" msgstr "搜索" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:42 #, fuzzy msgid "add another comment" msgstr "添加成员" -#: rhodecode/templates/base/root.html:54 +#: rhodecode/templates/base/root.html:43 #: rhodecode/templates/journal/journal.html:111 #: rhodecode/templates/summary/summary.html:52 msgid "Stop following this repository" msgstr "停止跟随该版本库" -#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "开始跟随该版本库" +#: rhodecode/templates/base/root.html:45 +msgid "Group" +msgstr "组" + #: rhodecode/templates/bookmarks/bookmarks.html:5 msgid "Bookmarks" msgstr "" @@ -2554,14 +2580,14 @@ msgstr "下载 diff" #: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#: rhodecode/templates/changeset/changeset_file_comment.html:71 #, fuzzy, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "提交" #: rhodecode/templates/changeset/changeset.html:42 -#: rhodecode/templates/changeset/changeset_file_comment.html:69 +#: rhodecode/templates/changeset/changeset_file_comment.html:71 #, python-format msgid "(%d inline)" msgid_plural "(%d inline)" @@ -2585,37 +2611,37 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:39 -#: rhodecode/templates/changeset/changeset_file_comment.html:100 +#: rhodecode/templates/changeset/changeset_file_comment.html:102 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:41 -#: rhodecode/templates/changeset/changeset_file_comment.html:102 +#: rhodecode/templates/changeset/changeset_file_comment.html:104 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:47 -#: rhodecode/templates/changeset/changeset_file_comment.html:107 +#: rhodecode/templates/changeset/changeset_file_comment.html:49 +#: rhodecode/templates/changeset/changeset_file_comment.html:110 #, fuzzy msgid "Comment" msgstr "提交" -#: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:59 +#: rhodecode/templates/changeset/changeset_file_comment.html:50 +#: rhodecode/templates/changeset/changeset_file_comment.html:61 msgid "Hide" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 #, fuzzy msgid "You need to be logged in to comment." msgstr "必须登录才能访问该页面" -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:99 msgid "Leave a comment" msgstr "" @@ -3119,3 +3145,9 @@ msgid "file removed" msgstr "文件已删除" +#~ msgid "[committed via RhodeCode] into" +#~ msgstr "" + +#~ msgid "[pulled from remote] into" +#~ msgstr "" +