Mercurial > kallithea
changeset 2376:679363531571 beta
Updated Journal messages + i18n
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Sun, 03 Jun 2012 01:07:36 +0200 |
| parents | bc2d8c03c050 |
| children | 32a98559aa12 |
| files | rhodecode/i18n/en/LC_MESSAGES/rhodecode.po rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po rhodecode/i18n/rhodecode.pot rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po rhodecode/lib/helpers.py rhodecode/templates/admin/admin_log.html |
| diffstat | 8 files changed, 1040 insertions(+), 881 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po Sun Jun 03 01:07:36 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rhodecode 0.1\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: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL@li.org>\n" @@ -17,25 +17,25 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:96 +#: rhodecode/controllers/changelog.py:95 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 #, 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 "" @@ -181,7 +181,7 @@ msgid "%s public journal %s feed" msgstr "" -#: 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 @@ -216,19 +216,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 "" #: 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 " @@ -237,14 +237,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 "" #: 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 "" @@ -393,62 +393,62 @@ msgid "created repository %s" msgstr "" -#: 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 "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:391 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:405 -msgid "Nothing" -msgstr "" - #: rhodecode/controllers/admin/repos.py:407 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:409 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:411 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during this operation" msgstr "" @@ -542,77 +542,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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -670,60 +670,80 @@ 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 -msgid "[created] repository as fork" -msgstr "" - -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 -msgid "[forked] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 -msgid "[updated] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:545 -msgid "[delete] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:549 -msgid "[pushed] into" -msgstr "" - -#: rhodecode/lib/helpers.py:550 -msgid "[committed via RhodeCode] into" -msgstr "" - -#: rhodecode/lib/helpers.py:551 -msgid "[pulled from remote] into" -msgstr "" - -#: rhodecode/lib/helpers.py:552 -msgid "[pulled] from" -msgstr "" - -#: rhodecode/lib/helpers.py:553 -msgid "[started following] repository" -msgstr "" - #: rhodecode/lib/helpers.py:554 +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 +msgid "[updated] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:560 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:568 +msgid "[created] user" +msgstr "" + +#: rhodecode/lib/helpers.py:570 +msgid "[updated] user" +msgstr "" + +#: rhodecode/lib/helpers.py:572 +msgid "[created] users group" +msgstr "" + +#: rhodecode/lib/helpers.py:574 +msgid "[updated] users group" +msgstr "" + +#: 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:580 +msgid "[committed via RhodeCode] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:582 +msgid "[pulled from remote] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:584 +msgid "[pulled] from" +msgstr "" + +#: rhodecode/lib/helpers.py:586 +msgid "[started following] repository" +msgstr "" + +#: 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 "" @@ -971,7 +991,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 @@ -1026,10 +1046,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 @@ -1054,7 +1074,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 "" @@ -1097,7 +1117,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 @@ -1108,7 +1128,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 @@ -1123,7 +1143,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 @@ -1133,7 +1153,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 @@ -1143,7 +1163,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 @@ -1163,7 +1183,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" @@ -1223,21 +1243,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 "" @@ -1300,8 +1320,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" @@ -1324,7 +1344,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:52 +#: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" msgstr "" @@ -1405,7 +1425,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" @@ -1557,7 +1577,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 @@ -1715,38 +1735,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 "" @@ -1764,7 +1773,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 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -1815,7 +1824,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 @@ -2039,17 +2048,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 "" @@ -2058,12 +2067,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 "" @@ -2081,21 +2090,21 @@ 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 msgid "My repos" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 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 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 @@ -2105,23 +2114,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 msgid "Permission" msgstr "" @@ -2222,6 +2231,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 #, python-format msgid "Confirm to delete this users group: %s" @@ -2381,21 +2395,25 @@ msgid "Search" msgstr "" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:42 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 "" @@ -2524,7 +2542,7 @@ msgstr "" #: 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 comment" msgid_plural "%d comments" @@ -2532,7 +2550,7 @@ msgstr[1] "" #: 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)" @@ -2557,35 +2575,35 @@ 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 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 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 "" @@ -3070,9 +3088,9 @@ msgid "file removed" msgstr "" -#~ msgid "" -#~ "Changeset was to big and was cut" -#~ " off, use diff menu to display " -#~ "this diff" +#~ msgid "[committed via RhodeCode] into" #~ msgstr "" +#~ msgid "[pulled from remote] into" +#~ msgstr "" +
--- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po Sun Jun 03 01:07:36 2012 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.1.5\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-05-20 11:36+0100\n" "Last-Translator: Vincent Duvert <vincent@duvert.net>\n" "Language-Team: fr <LL@li.org>\n" @@ -17,25 +17,25 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:96 +#: rhodecode/controllers/changelog.py:95 msgid "All Branches" msgstr "Toutes les branches" -#: rhodecode/controllers/changeset.py:79 +#: rhodecode/controllers/changeset.py:80 msgid "show white space" msgstr "afficher les espaces et tabulations" -#: 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 "ignorer les espaces et tabulations" -#: rhodecode/controllers/changeset.py:153 +#: rhodecode/controllers/changeset.py:154 #, python-format msgid "%s line context" msgstr "afficher %s lignes de contexte" -#: 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 "fichier binaire" @@ -191,7 +191,7 @@ msgid "%s public journal %s feed" msgstr "%s — Flux %s du journal public" -#: 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 @@ -230,19 +230,19 @@ msgstr "Une erreur est survenue durant l’opération de recherche." #: 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 "Dépôt %s mis à jour avec succè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 "Une erreur est survenue lors de la mise à jour du dépôt %s." #: 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 " @@ -254,14 +254,14 @@ "l’application pour rescanner les dépôts." #: rhodecode/controllers/settings.py:151 -#: rhodecode/controllers/admin/repos.py:259 +#: rhodecode/controllers/admin/repos.py:261 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" #: 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 "Erreur pendant la suppression de %s" @@ -410,66 +410,66 @@ msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:177 +#: rhodecode/controllers/admin/repos.py:179 #, python-format msgid "error occurred during creation of repository %s" msgstr "Une erreur est survenue durant la création du dépôt %s." -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Impossible de supprimer le dépôt %s : Des forks y sont attachés." -#: rhodecode/controllers/admin/repos.py:293 +#: rhodecode/controllers/admin/repos.py:295 msgid "An error occurred during deletion of repository user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur du dépôt." -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 msgid "An error occurred during deletion of repository users groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs de" " ce dépôt." -#: rhodecode/controllers/admin/repos.py:329 +#: rhodecode/controllers/admin/repos.py:331 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt." -#: rhodecode/controllers/admin/repos.py:345 +#: rhodecode/controllers/admin/repos.py:347 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour." -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:371 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt." -#: 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 "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:387 -msgid "Pulled from remote location" -msgstr "Les changements distants ont été récupérés." - #: rhodecode/controllers/admin/repos.py:389 +msgid "Pulled from remote location" +msgstr "Les changements distants ont été récupérés." + +#: rhodecode/controllers/admin/repos.py:391 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante." -#: rhodecode/controllers/admin/repos.py:405 +#: rhodecode/controllers/admin/repos.py:407 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:407 +#: rhodecode/controllers/admin/repos.py:409 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: rhodecode/controllers/admin/repos.py:411 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." @@ -569,77 +569,77 @@ "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: rhodecode/controllers/admin/settings.py:365 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: 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 "Une erreur est survenue durant la mise à jour de l’utilisateur %s." -#: rhodecode/controllers/admin/users.py:79 +#: rhodecode/controllers/admin/users.py:83 #, python-format msgid "created user %s" msgstr "utilisateur %s créé" -#: rhodecode/controllers/admin/users.py:92 +#: rhodecode/controllers/admin/users.py:95 #, python-format msgid "error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l’utilisateur %s." -#: rhodecode/controllers/admin/users.py:118 +#: rhodecode/controllers/admin/users.py:124 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: rhodecode/controllers/admin/users.py:149 +#: rhodecode/controllers/admin/users.py:155 msgid "successfully deleted user" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/admin/users.py:154 +#: rhodecode/controllers/admin/users.py:160 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:175 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: 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 "La permission de création de dépôts a été accordée à l’utilisateur." -#: 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 "La permission de création de dépôts a été révoquée à l’utilisateur." -#: rhodecode/controllers/admin/users_groups.py:79 +#: rhodecode/controllers/admin/users_groups.py:84 #, python-format msgid "created users group %s" msgstr "Le groupe d’utilisateurs %s a été créé." -#: 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 "Une erreur est survenue durant la création du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:128 +#: rhodecode/controllers/admin/users_groups.py:135 #, python-format msgid "updated users group %s" msgstr "Le groupe d’utilisateurs %s a été mis à jour." -#: 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 "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:165 +#: rhodecode/controllers/admin/users_groups.py:169 msgid "successfully deleted users group" msgstr "Le groupe d’utilisateurs a été supprimé avec succès." -#: rhodecode/controllers/admin/users_groups.py:170 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "An error occurred during deletion of users group" msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs." @@ -700,60 +700,94 @@ msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:550 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:542 +#: rhodecode/lib/helpers.py:554 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 +#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:560 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:549 +#: rhodecode/lib/helpers.py:568 +#, fuzzy, python-format +#| msgid "created user %s" +msgid "[created] user" +msgstr "utilisateur %s créé" + +#: rhodecode/lib/helpers.py:570 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] user" +msgstr "Le groupe d’utilisateurs %s a été mis à jour." + +#: rhodecode/lib/helpers.py:572 +#, fuzzy, python-format +#| msgid "created users group %s" +msgid "[created] users group" +msgstr "Le groupe d’utilisateurs %s a été créé." + +#: rhodecode/lib/helpers.py:574 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] users group" +msgstr "Le groupe d’utilisateurs %s a été mis à jour." + +#: rhodecode/lib/helpers.py:576 +#, fuzzy +#| msgid "[created] repository" +msgid "[commented] on revision in repository" +msgstr "[a créé] le dépôt" + +#: rhodecode/lib/helpers.py:578 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:550 -msgid "[committed via RhodeCode] into" +#: rhodecode/lib/helpers.py:580 +#, fuzzy +#| msgid "[committed via RhodeCode] into" +msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans" -#: rhodecode/lib/helpers.py:551 -msgid "[pulled from remote] into" +#: rhodecode/lib/helpers.py:582 +#, fuzzy +#| msgid "[pulled from remote] into" +msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans" -#: rhodecode/lib/helpers.py:552 +#: rhodecode/lib/helpers.py:584 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:553 +#: rhodecode/lib/helpers.py:586 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:588 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:752 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:736 +#: rhodecode/lib/helpers.py:756 msgid "No Files" msgstr "Aucun fichier" @@ -1017,7 +1051,7 @@ msgstr "Tableau de bord" #: 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 @@ -1072,10 +1106,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 @@ -1100,7 +1134,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 "Sommet" @@ -1143,7 +1177,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 @@ -1154,7 +1188,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 @@ -1169,7 +1203,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 @@ -1179,7 +1213,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 @@ -1189,7 +1223,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 @@ -1209,7 +1243,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" @@ -1269,21 +1303,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 "Prénom" #: 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 "Nom" #: 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 "E-mail" @@ -1346,8 +1380,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" @@ -1370,7 +1404,7 @@ msgid "From IP" msgstr "Depuis l’adresse IP" -#: rhodecode/templates/admin/admin_log.html:52 +#: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment." @@ -1451,7 +1485,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" @@ -1610,7 +1644,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 @@ -1774,38 +1808,27 @@ msgstr "Dépôt privé" #: 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 "Révoquer" -#: 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 "Ajouter un utilisateur" -#: 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 "Échec de suppression de l’utilisateur" -#: 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 "Erreur lors de la suppression du groupe d’utilisateurs." -#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 -msgid "Group" -msgstr "Groupe" - -#: 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 "Membres" - #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "Administration des dépôts" @@ -1823,7 +1846,7 @@ msgstr "Supprimer" #: 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 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" @@ -1874,7 +1897,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 @@ -2103,17 +2126,17 @@ msgstr "Éditer l'utilisateur" #: 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 "Vous pouvez changer votre avatar sur" #: 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 "en utilisant l’adresse" #: 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 "Clé d’API" @@ -2122,12 +2145,12 @@ msgstr "DN LDAP" #: 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 "Nouveau mot de passe" #: 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 "Confirmation du nouveau mot de passe" @@ -2145,21 +2168,21 @@ msgid "My Account" msgstr "Mon compte" -#: 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 msgid "My repos" msgstr "Mes dépôts" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 msgid "My permissions" msgstr "Mes permissions" -#: 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 msgid "ADD" msgstr "AJOUTER" -#: 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 @@ -2169,23 +2192,23 @@ msgid "Revision" msgstr "Révision" -#: 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 "privé" -#: 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 "Aucun dépôt pour le moment" -#: 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 "En créer un maintenant" -#: 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 msgid "Permission" msgstr "Permission" @@ -2286,6 +2309,11 @@ msgid "group name" msgstr "Nom du groupe" +#: rhodecode/templates/admin/users_groups/users_groups.html:33 +#: rhodecode/templates/base/root.html:46 +msgid "members" +msgstr "Membres" + #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, python-format msgid "Confirm to delete this users group: %s" @@ -2445,21 +2473,25 @@ msgid "Search" msgstr "Rechercher" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:42 msgid "add another comment" msgstr "Nouveau commentaire" -#: 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 "Arrêter de suivre ce dépôt" -#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "Suivre ce dépôt" +#: rhodecode/templates/base/root.html:45 +msgid "Group" +msgstr "Groupe" + #: rhodecode/templates/bookmarks/bookmarks.html:5 msgid "Bookmarks" msgstr "Signets" @@ -2588,7 +2620,7 @@ msgstr "Télécharger le diff" #: 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 comment" msgid_plural "%d comments" @@ -2596,7 +2628,7 @@ msgstr[1] "%d commentaires" #: 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)" @@ -2621,7 +2653,7 @@ msgstr "Commentaire sur la ligne {1}." #: 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 "" @@ -2629,31 +2661,31 @@ "commande %s." #: 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 "" "Utilisez @nomutilisateur dans ce texte pour envoyer une notification à " "l’utilisateur RhodeCode en question." -#: 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 msgid "Comment" msgstr "Commentaire" -#: 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 "Masquer" -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "Login now" msgstr "Se connecter maintenant" -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:99 msgid "Leave a comment" msgstr "Laisser un commentaire"
--- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/pt_BR/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-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann <augusto.herrmann@gmail.com>\n" "Language-Team: pt_BR <LL@li.org>\n" @@ -17,25 +17,25 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:96 +#: rhodecode/controllers/changelog.py:95 msgid "All Branches" msgstr "Todos os Ramos" -#: rhodecode/controllers/changeset.py:79 +#: rhodecode/controllers/changeset.py:80 msgid "show white space" msgstr "mostrar espaços em branco" -#: 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 "ignorar espaços em branco" -#: rhodecode/controllers/changeset.py:153 +#: rhodecode/controllers/changeset.py:154 #, python-format msgid "%s line context" msgstr "contexto de %s linhas" -#: 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 "arquivo binário" @@ -191,7 +191,7 @@ msgid "%s public journal %s feed" msgstr "diário público de %s - feed %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 @@ -228,19 +228,19 @@ msgstr "Ocorreu um erro durante essa operação de busca" #: 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 "Repositório %s atualizado com sucesso" #: 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 "ocorreu um erro ao atualizar o repositório %s" #: 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 " @@ -252,14 +252,14 @@ "outra vez para varrer novamente por repositórios" #: rhodecode/controllers/settings.py:151 -#: rhodecode/controllers/admin/repos.py:259 +#: rhodecode/controllers/admin/repos.py:261 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %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 "Ocorreu um erro durante a exclusão de %s" @@ -408,62 +408,62 @@ msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:177 +#: rhodecode/controllers/admin/repos.py:179 #, python-format msgid "error occurred during creation of repository %s" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "Nao é possível excluir %s pois ele ainda contém bifurcações vinculadas" -#: rhodecode/controllers/admin/repos.py:293 +#: rhodecode/controllers/admin/repos.py:295 msgid "An error occurred during deletion of repository user" msgstr "Ocorreu um erro ao excluir usuário de repositório" -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 msgid "An error occurred during deletion of repository users groups" msgstr "Ocorreu um erro ao excluir grupo de usuário de repositório" -#: rhodecode/controllers/admin/repos.py:329 +#: rhodecode/controllers/admin/repos.py:331 msgid "An error occurred during deletion of repository stats" msgstr "Ocorreu um erro ao excluir estatísticas de repositório" -#: rhodecode/controllers/admin/repos.py:345 +#: rhodecode/controllers/admin/repos.py:347 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:371 msgid "An error occurred during setting this repository in public journal" msgstr "Ocorreu um erro ao ajustar esse repositório no diário público" -#: 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 "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:387 +#: rhodecode/controllers/admin/repos.py:389 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:389 +#: rhodecode/controllers/admin/repos.py:391 msgid "An error occurred during pull from remote location" msgstr "Ocorreu um erro ao realizar pull de localização remota" -#: rhodecode/controllers/admin/repos.py:405 +#: rhodecode/controllers/admin/repos.py:407 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:407 +#: rhodecode/controllers/admin/repos.py:409 #, python-format msgid "Marked repo %s as fork of %s" msgstr "Marcado repositório %s como bifurcação de %s" -#: rhodecode/controllers/admin/repos.py:411 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" @@ -557,77 +557,77 @@ msgid "You can't edit this user since it's crucial for entire application" msgstr "Você não pode editar esse usuário pois ele é crucial para toda a aplicação" -#: rhodecode/controllers/admin/settings.py:365 +#: rhodecode/controllers/admin/settings.py:367 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: 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 "ocorreu um erro ao atualizar o usuário %s" -#: rhodecode/controllers/admin/users.py:79 +#: rhodecode/controllers/admin/users.py:83 #, python-format msgid "created user %s" msgstr "usuário %s criado" -#: rhodecode/controllers/admin/users.py:92 +#: rhodecode/controllers/admin/users.py:95 #, python-format msgid "error occurred during creation of user %s" msgstr "ocorreu um erro ao criar o usuário %s" -#: rhodecode/controllers/admin/users.py:118 +#: rhodecode/controllers/admin/users.py:124 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:149 +#: rhodecode/controllers/admin/users.py:155 msgid "successfully deleted user" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:154 +#: rhodecode/controllers/admin/users.py:160 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:169 +#: rhodecode/controllers/admin/users.py:175 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: 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 "Concedida permissão de 'criar repositório' ao usuário" -#: 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 "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users_groups.py:79 +#: rhodecode/controllers/admin/users_groups.py:84 #, python-format msgid "created users group %s" msgstr "criado grupo de usuários %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 "ocorreu um erro ao criar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:128 +#: rhodecode/controllers/admin/users_groups.py:135 #, python-format msgid "updated users group %s" msgstr "grupo de usuários %s atualizado" -#: 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 "ocorreu um erro ao atualizar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:165 +#: rhodecode/controllers/admin/users_groups.py:169 msgid "successfully deleted users group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:170 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "An error occurred during deletion of users group" msgstr "Ocorreu um erro ao excluir o grupo de usuários" @@ -687,60 +687,94 @@ msgid "fork name " msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:550 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:541 rhodecode/lib/helpers.py:546 +#: rhodecode/lib/helpers.py:552 rhodecode/lib/helpers.py:562 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:542 +#: rhodecode/lib/helpers.py:554 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 +#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 +#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:545 +#: rhodecode/lib/helpers.py:560 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:549 +#: rhodecode/lib/helpers.py:568 +#, fuzzy, python-format +#| msgid "created user %s" +msgid "[created] user" +msgstr "usuário %s criado" + +#: rhodecode/lib/helpers.py:570 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] user" +msgstr "grupo de usuários %s atualizado" + +#: rhodecode/lib/helpers.py:572 +#, fuzzy, python-format +#| msgid "created users group %s" +msgid "[created] users group" +msgstr "criado grupo de usuários %s" + +#: rhodecode/lib/helpers.py:574 +#, fuzzy, python-format +#| msgid "updated users group %s" +msgid "[updated] users group" +msgstr "grupo de usuários %s atualizado" + +#: rhodecode/lib/helpers.py:576 +#, fuzzy +#| msgid "[created] repository" +msgid "[commented] on revision in repository" +msgstr "repositório [criado]" + +#: rhodecode/lib/helpers.py:578 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:550 -msgid "[committed via RhodeCode] into" +#: rhodecode/lib/helpers.py:580 +#, fuzzy +#| msgid "[committed via RhodeCode] into" +msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:551 -msgid "[pulled from remote] into" +#: rhodecode/lib/helpers.py:582 +#, fuzzy +#| msgid "[pulled from remote] into" +msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:552 +#: rhodecode/lib/helpers.py:584 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:553 +#: rhodecode/lib/helpers.py:586 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:554 +#: rhodecode/lib/helpers.py:588 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:732 +#: rhodecode/lib/helpers.py:752 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:736 +#: rhodecode/lib/helpers.py:756 msgid "No Files" msgstr "Nenhum Arquivo" @@ -1001,7 +1035,7 @@ msgstr "Painel de Controle" #: 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 @@ -1056,10 +1090,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 @@ -1084,7 +1118,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 "Ponta" @@ -1127,7 +1161,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 @@ -1138,7 +1172,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 @@ -1153,7 +1187,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 @@ -1163,7 +1197,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 @@ -1173,7 +1207,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 @@ -1193,7 +1227,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" @@ -1255,21 +1289,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 "Primeiro Nome" #: 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 "Último Nome" #: 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 "E-mail" @@ -1332,8 +1366,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" @@ -1356,7 +1390,7 @@ msgid "From IP" msgstr "A partir do IP" -#: rhodecode/templates/admin/admin_log.html:52 +#: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" msgstr "Ainda não há ações" @@ -1437,7 +1471,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" @@ -1596,7 +1630,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 @@ -1760,38 +1794,27 @@ msgstr "repositório privado" #: 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 "revogar" -#: 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 "Adicionar outro membro" -#: 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 "Falha ao reomver usuário" -#: 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 "Falha ao remover grupo de usuários" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:123 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:112 -msgid "Group" -msgstr "Grupo" - -#: 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 "membros" - #: rhodecode/templates/admin/repos/repos.html:5 msgid "Repositories administration" msgstr "Administração de repositórios" @@ -1809,7 +1832,7 @@ msgstr "excluir" #: 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 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Confirma excluir esse repositório: %s" @@ -1860,7 +1883,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 @@ -2090,17 +2113,17 @@ msgstr "Editar usuário" #: 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 "Altere o seu avatar em" #: 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 "Usando" #: 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 "Chave de API" @@ -2109,12 +2132,12 @@ msgstr "DN LDAP" #: 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 "Nova senha" #: 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 "Confirmação de nova senha" @@ -2132,21 +2155,21 @@ msgid "My Account" msgstr "Minha Conta" -#: 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 msgid "My repos" msgstr "Meus repositórios" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 msgid "My permissions" msgstr "Minhas permissões" -#: 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 msgid "ADD" msgstr "ADICIONAR" -#: 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 @@ -2156,23 +2179,23 @@ msgid "Revision" msgstr "Revisão" -#: 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 "privado" -#: 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 "Ainda não há repositórios" -#: 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 "criar um agora" -#: 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 msgid "Permission" msgstr "Permissão" @@ -2273,6 +2296,11 @@ msgid "group name" msgstr "nome do grupo" +#: rhodecode/templates/admin/users_groups/users_groups.html:33 +#: rhodecode/templates/base/root.html:46 +msgid "members" +msgstr "membros" + #: rhodecode/templates/admin/users_groups/users_groups.html:45 #, python-format msgid "Confirm to delete this users group: %s" @@ -2432,21 +2460,25 @@ msgid "Search" msgstr "Pesquisar" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:42 msgid "add another comment" msgstr "adicionar outro comentário" -#: 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 "Parar de seguir este repositório" -#: rhodecode/templates/base/root.html:55 +#: rhodecode/templates/base/root.html:44 #: rhodecode/templates/summary/summary.html:56 msgid "Start following this repository" msgstr "Passar a seguir este repositório" +#: rhodecode/templates/base/root.html:45 +msgid "Group" +msgstr "Grupo" + #: rhodecode/templates/bookmarks/bookmarks.html:5 msgid "Bookmarks" msgstr "Marcadores" @@ -2575,7 +2607,7 @@ msgstr "descarregar diff" #: 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 comment" msgid_plural "%d comments" @@ -2583,7 +2615,7 @@ msgstr[1] "%d comentários" #: 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)" @@ -2608,37 +2640,37 @@ msgstr "Comentando a linha {1}." #: 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 "Comentários interpretados usando a sintaxe %s com suporte a %s." #: 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 "" "Use @nomedeusuário dentro desse texto para enviar notificação a este " "usuário do RhodeCode" -#: 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 msgid "Comment" msgstr "Comentário" -#: 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 "Ocultar" -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "You need to be logged in to comment." msgstr "Você precisa estar logado para comentar." -#: rhodecode/templates/changeset/changeset_file_comment.html:55 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 msgid "Login now" msgstr "Entrar agora" -#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/changeset/changeset_file_comment.html:99 msgid "Leave a comment" msgstr "Deixar um comentário"
--- a/rhodecode/i18n/rhodecode.pot Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/rhodecode.pot Sun Jun 03 01:07:36 2012 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: RhodeCode 1.4.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: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,24 +17,24 @@ "Content-Transfer-Encoding: 8bit\n" "Generated-By: Babel 0.9.6\n" -#: rhodecode/controllers/changelog.py:96 +#: rhodecode/controllers/changelog.py:95 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 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:320 rhodecode/controllers/changeset.py:335 +#: rhodecode/controllers/changeset.py:324 rhodecode/controllers/changeset.py:339 #: rhodecode/lib/diffs.py:62 msgid "binary file" msgstr "" @@ -179,7 +179,7 @@ msgid "%s public journal %s feed" msgstr "" -#: 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 #: rhodecode/templates/base/base.html:311 @@ -210,30 +210,30 @@ msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:103 rhodecode/controllers/admin/repos.py:211 +#: rhodecode/controllers/settings.py:103 rhodecode/controllers/admin/repos.py:213 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:121 rhodecode/controllers/admin/repos.py:229 +#: rhodecode/controllers/settings.py:121 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/settings.py:139 rhodecode/controllers/admin/repos.py:249 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/settings.py:151 rhodecode/controllers/admin/repos.py:259 +#: rhodecode/controllers/settings.py:151 rhodecode/controllers/admin/repos.py:261 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:269 -#: rhodecode/controllers/admin/repos.py:275 +#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:271 +#: rhodecode/controllers/admin/repos.py:277 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -380,62 +380,62 @@ msgid "created repository %s" msgstr "" -#: 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 "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:391 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:405 -msgid "Nothing" -msgstr "" - #: rhodecode/controllers/admin/repos.py:407 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:409 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:411 +#: rhodecode/controllers/admin/repos.py:413 msgid "An error occurred during this operation" msgstr "" @@ -529,77 +529,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 "" -#: 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 "" -#: 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 "" -#: 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 "" @@ -657,60 +657,80 @@ 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 -msgid "[created] repository as fork" -msgstr "" - -#: rhodecode/lib/helpers.py:543 rhodecode/lib/helpers.py:547 -msgid "[forked] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:544 rhodecode/lib/helpers.py:548 -msgid "[updated] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:545 -msgid "[delete] repository" -msgstr "" - -#: rhodecode/lib/helpers.py:549 -msgid "[pushed] into" -msgstr "" - -#: rhodecode/lib/helpers.py:550 -msgid "[committed via RhodeCode] into" -msgstr "" - -#: rhodecode/lib/helpers.py:551 -msgid "[pulled from remote] into" -msgstr "" - -#: rhodecode/lib/helpers.py:552 -msgid "[pulled] from" -msgstr "" - -#: rhodecode/lib/helpers.py:553 -msgid "[started following] repository" -msgstr "" - #: rhodecode/lib/helpers.py:554 +msgid "[created] repository as fork" +msgstr "" + +#: rhodecode/lib/helpers.py:556 rhodecode/lib/helpers.py:564 +msgid "[forked] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:558 rhodecode/lib/helpers.py:566 +msgid "[updated] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:560 +msgid "[delete] repository" +msgstr "" + +#: rhodecode/lib/helpers.py:568 +msgid "[created] user" +msgstr "" + +#: rhodecode/lib/helpers.py:570 +msgid "[updated] user" +msgstr "" + +#: rhodecode/lib/helpers.py:572 +msgid "[created] users group" +msgstr "" + +#: rhodecode/lib/helpers.py:574 +msgid "[updated] users group" +msgstr "" + +#: 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:580 +msgid "[committed via RhodeCode] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:582 +msgid "[pulled from remote] into repository" +msgstr "" + +#: rhodecode/lib/helpers.py:584 +msgid "[pulled] from" +msgstr "" + +#: rhodecode/lib/helpers.py:586 +msgid "[started following] repository" +msgstr "" + +#: 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 "" @@ -958,7 +978,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 @@ -1009,10 +1029,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 @@ -1035,7 +1055,7 @@ #: rhodecode/templates/index_base.html:69 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 "" @@ -1074,7 +1094,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 @@ -1084,7 +1104,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 @@ -1099,7 +1119,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 @@ -1109,7 +1129,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 @@ -1119,7 +1139,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 @@ -1139,7 +1159,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" @@ -1199,21 +1219,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 "" @@ -1275,8 +1295,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" @@ -1298,7 +1318,7 @@ msgid "From IP" msgstr "" -#: rhodecode/templates/admin/admin_log.html:52 +#: rhodecode/templates/admin/admin_log.html:53 msgid "No actions yet" msgstr "" @@ -1379,7 +1399,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" @@ -1531,7 +1551,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 @@ -1689,38 +1709,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 "" @@ -1738,7 +1747,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 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -1789,7 +1798,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 @@ -2013,17 +2022,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 "" @@ -2032,12 +2041,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 "" @@ -2055,21 +2064,21 @@ 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 msgid "My repos" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:116 +#: rhodecode/templates/admin/users/user_edit_my_account.html:32 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 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 @@ -2078,23 +2087,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 msgid "Permission" msgstr "" @@ -2195,6 +2204,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 #, python-format msgid "Confirm to delete this users group: %s" @@ -2338,21 +2352,25 @@ msgid "Search" msgstr "" -#: rhodecode/templates/base/root.html:53 +#: rhodecode/templates/base/root.html:42 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 "" @@ -2480,7 +2498,7 @@ msgstr "" #: 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 comment" msgid_plural "%d comments" @@ -2488,7 +2506,7 @@ msgstr[1] "" #: 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)" @@ -2513,35 +2531,35 @@ 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 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 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 ""
--- 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 "" +
--- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/i18n/zh_TW/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-05-09 22:23+0800\n" "Last-Translator: Nansen <nansenat16@gmail.com>\n" "Language-Team: zh_TW <LL@li.org>\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 feed" -#: 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 msgid "An error occurred during this operation" msgstr "" @@ -545,77 +545,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 "" @@ -674,61 +674,89 @@ msgid "fork name " msgstr "fork 名稱" -#: 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 "沒有檔案" @@ -976,7 +1004,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 @@ -1031,10 +1059,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 @@ -1059,7 +1087,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 "" @@ -1103,7 +1131,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 @@ -1114,7 +1142,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 @@ -1130,7 +1158,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 @@ -1140,7 +1168,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 @@ -1150,7 +1178,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 @@ -1171,7 +1199,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" @@ -1232,21 +1260,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 "電子郵件" @@ -1310,8 +1338,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" @@ -1334,7 +1362,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 "" @@ -1415,7 +1443,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" @@ -1570,7 +1598,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 @@ -1729,38 +1757,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 "版本庫管理員" @@ -1778,7 +1795,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 "確認移除這個版本庫" @@ -1829,7 +1846,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 @@ -2058,17 +2075,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 "" @@ -2077,12 +2094,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 "" @@ -2100,24 +2117,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 @@ -2127,23 +2144,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 "權限" @@ -2246,6 +2263,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" @@ -2406,22 +2428,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 "" @@ -2550,14 +2576,14 @@ msgstr "下載差異" #: 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)" @@ -2581,37 +2607,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 "" @@ -3116,9 +3142,9 @@ msgid "file removed" msgstr "移除檔案" -#~ msgid "" -#~ "Changeset was to big and was cut" -#~ " off, use diff menu to display " -#~ "this diff" +#~ msgid "[committed via RhodeCode] into" #~ msgstr "" +#~ msgid "[pulled from remote] into" +#~ msgstr "" +
--- a/rhodecode/lib/helpers.py Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/lib/helpers.py Sun Jun 03 01:07:36 2012 +0200 @@ -547,46 +547,46 @@ # action : translated str, callback(extractor), icon action_map = { - 'user_deleted_repo': (_('[deleted] repository'), None, - 'database_delete.png'), - 'user_created_repo': (_('[created] repository'), None, - 'database_add.png'), - 'user_created_fork': (_('[created] repository as fork'), None, - 'arrow_divide.png'), - 'user_forked_repo': (_('[forked] repository'), get_fork_name, - 'arrow_divide.png'), - 'user_updated_repo': (_('[updated] repository'), None, - 'database_edit.png'), - 'admin_deleted_repo': (_('[delete] repository'), None, - 'database_delete.png'), - 'admin_created_repo': (_('[created] repository'), None, - 'database_add.png'), - 'admin_forked_repo': (_('[forked] repository'), None, - 'arrow_divide.png'), - 'admin_updated_repo': (_('[updated] repository'), None, - 'database_edit.png'), - 'admin_created_user': (_('[created] user'), get_user_name, - 'user_add.png'), - 'admin_updated_user': (_('[updated] user'), get_user_name, - 'user_edit.png'), - 'admin_created_users_group': (_('[created] users group'), get_users_group, - 'group_add.png'), - 'admin_updated_users_group': (_('[updated] users group'), get_users_group, - 'group_edit.png'), - 'user_commented_revision': (_('[commented] on revision'), get_cs_links, - 'comment_add.png'), - 'push': (_('[pushed] into'), get_cs_links, - 'script_add.png'), - 'push_local': (_('[committed via RhodeCode] into'), get_cs_links, - 'script_edit.png'), - 'push_remote': (_('[pulled from remote] into'), get_cs_links, - 'connect.png'), - 'pull': (_('[pulled] from'), None, - 'down_16.png'), - 'started_following_repo': (_('[started following] repository'), None, - 'heart_add.png'), - 'stopped_following_repo': (_('[stopped following] repository'), None, - 'heart_delete.png'), + 'user_deleted_repo': (_('[deleted] repository'), + None, 'database_delete.png'), + 'user_created_repo': (_('[created] repository'), + None, 'database_add.png'), + 'user_created_fork': (_('[created] repository as fork'), + None, 'arrow_divide.png'), + 'user_forked_repo': (_('[forked] repository'), + get_fork_name, 'arrow_divide.png'), + 'user_updated_repo': (_('[updated] repository'), + None, 'database_edit.png'), + 'admin_deleted_repo': (_('[delete] repository'), + None, 'database_delete.png'), + 'admin_created_repo': (_('[created] repository'), + None, 'database_add.png'), + 'admin_forked_repo': (_('[forked] repository'), + None, 'arrow_divide.png'), + 'admin_updated_repo': (_('[updated] repository'), + None, 'database_edit.png'), + 'admin_created_user': (_('[created] user'), + get_user_name, 'user_add.png'), + 'admin_updated_user': (_('[updated] user'), + get_user_name, 'user_edit.png'), + 'admin_created_users_group': (_('[created] users group'), + get_users_group, 'group_add.png'), + 'admin_updated_users_group': (_('[updated] users group'), + get_users_group, 'group_edit.png'), + 'user_commented_revision': (_('[commented] on revision in repository'), + get_cs_links, 'comment_add.png'), + 'push': (_('[pushed] into'), + get_cs_links, 'script_add.png'), + 'push_local': (_('[committed via RhodeCode] into repository'), + get_cs_links, 'script_edit.png'), + 'push_remote': (_('[pulled from remote] into repository'), + get_cs_links, 'connect.png'), + 'pull': (_('[pulled] from'), + None, 'down_16.png'), + 'started_following_repo': (_('[started following] repository'), + None, 'heart_add.png'), + 'stopped_following_repo': (_('[stopped following] repository'), + None, 'heart_delete.png'), } action_str = action_map.get(action, action)
--- a/rhodecode/templates/admin/admin_log.html Sun Jun 03 00:40:14 2012 +0200 +++ b/rhodecode/templates/admin/admin_log.html Sun Jun 03 01:07:36 2012 +0200 @@ -14,10 +14,11 @@ <td>${h.link_to(l.user.username,h.url('edit_user', id=l.user.user_id))}</td> <td>${h.action_parser(l)[0]()} <div class="journal_action_params"> - ${h.literal(h.action_parser(l)[1]())}</div> + ${h.literal(h.action_parser(l)[1]())} + </div> </td> <td> - %if l.repository: + %if l.repository is not None: ${h.link_to(l.repository.repo_name,h.url('summary_home',repo_name=l.repository.repo_name))} %else: ${l.repository_name}