diff --git a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/en/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: rhodecode 0.1\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -39,6 +39,10 @@ msgstr "" msgid "binary file" msgstr "" +#: rhodecode/controllers/compare.py:69 +msgid "There are no changesets yet" +msgstr "" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "" @@ -143,17 +147,17 @@ msgstr "" msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -169,12 +173,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -188,63 +192,58 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -253,14 +252,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -274,59 +273,59 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "ONELEVEL" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:51 +msgid "ONELEVEL" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:52 msgid "SUBTREE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:55 -msgid "NEVER" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "ALLOW" +msgid "NEVER" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "TRY" +msgid "ALLOW" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "DEMAND" +msgid "TRY" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:63 -msgid "No encryption" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" +msgid "No encryption" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "" @@ -347,7 +346,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -395,76 +394,76 @@ msgstr "" msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "" @@ -516,7 +515,7 @@ msgstr "" msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" @@ -525,95 +524,95 @@ msgstr "" msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 msgid "Removed email from user" msgstr "" @@ -704,84 +703,95 @@ msgstr "" msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" -msgstr "" - -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:612 +msgid "[commented] on pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:614 +msgid "[closed] pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "" @@ -854,75 +864,75 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 msgid "Repository no access" msgstr "" +#: rhodecode/model/db.py:1064 +msgid "Repository read access" +msgstr "" + +#: rhodecode/model/db.py:1065 +msgid "Repository write access" +msgstr "" + +#: rhodecode/model/db.py:1066 +msgid "Repository admin access" +msgstr "" + +#: rhodecode/model/db.py:1068 +msgid "Repositories Group no access" +msgstr "" + +#: rhodecode/model/db.py:1069 +msgid "Repositories Group read access" +msgstr "" + +#: rhodecode/model/db.py:1070 +msgid "Repositories Group write access" +msgstr "" + +#: rhodecode/model/db.py:1071 +msgid "Repositories Group admin access" +msgstr "" + #: rhodecode/model/db.py:1073 -msgid "Repository read access" +msgid "RhodeCode Administrator" msgstr "" #: rhodecode/model/db.py:1074 -msgid "Repository write access" +msgid "Repository creation disabled" msgstr "" #: rhodecode/model/db.py:1075 -msgid "Repository admin access" +msgid "Repository creation enabled" +msgstr "" + +#: rhodecode/model/db.py:1076 +msgid "Register disabled" msgstr "" #: rhodecode/model/db.py:1077 -msgid "Repositories Group no access" -msgstr "" - -#: rhodecode/model/db.py:1078 -msgid "Repositories Group read access" -msgstr "" - -#: rhodecode/model/db.py:1079 -msgid "Repositories Group write access" +msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/model/db.py:1080 -msgid "Repositories Group admin access" -msgstr "" - -#: rhodecode/model/db.py:1082 -msgid "RhodeCode Administrator" -msgstr "" - -#: rhodecode/model/db.py:1083 -msgid "Repository creation disabled" -msgstr "" - -#: rhodecode/model/db.py:1084 -msgid "Repository creation enabled" -msgstr "" - -#: rhodecode/model/db.py:1085 -msgid "Register disabled" -msgstr "" - -#: rhodecode/model/db.py:1086 -msgid "Register new user with RhodeCode with manual activation" -msgstr "" - -#: rhodecode/model/db.py:1089 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -944,36 +954,36 @@ msgstr "" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 msgid "sent message" msgstr "" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" msgstr "" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 msgid "latest tip" msgstr "" @@ -982,14 +992,15 @@ msgid "new user registration" msgstr "" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1127,7 +1138,9 @@ msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1135,13 +1148,15 @@ msgstr "" msgid "quick filter..." msgstr "" -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "" @@ -1160,13 +1175,12 @@ msgstr "" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "" @@ -1180,13 +1194,12 @@ msgstr "" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1203,15 +1216,12 @@ msgid "Name" msgstr "" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" @@ -1219,7 +1229,7 @@ msgstr "" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" @@ -1251,8 +1261,9 @@ msgstr "" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1262,8 +1273,9 @@ msgstr "" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1272,13 +1284,13 @@ msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 msgid "Last Change" msgstr "" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1287,8 +1299,9 @@ msgid "No records found." msgstr "" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1297,8 +1310,9 @@ msgid "Data error." msgstr "" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1408,7 +1422,7 @@ msgstr "" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "" @@ -1453,10 +1467,9 @@ msgid "Admin journal" msgstr "" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1563,7 +1576,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "" @@ -1591,7 +1604,7 @@ msgstr "" msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "" @@ -1613,7 +1626,7 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "" @@ -1660,7 +1673,6 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "" @@ -1702,26 +1714,28 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 msgid "Landing revision" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1741,7 +1755,9 @@ msgstr "" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1780,17 +1796,17 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "" @@ -1873,6 +1889,7 @@ msgid "Remove this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "" @@ -1909,7 +1926,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "" @@ -1920,7 +1937,7 @@ msgid "member" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -1958,25 +1975,6 @@ msgstr "" msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "" @@ -2007,6 +2005,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "" @@ -2031,12 +2030,20 @@ msgid "Number of toplevel repositories" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" msgstr "" @@ -2091,115 +2098,133 @@ msgstr "" msgid "destroy old data" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "require ssl for vcs operations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:213 -msgid "System Info and Packages" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:216 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:219 msgid "show" msgstr "" @@ -2209,7 +2234,6 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "" @@ -2266,26 +2290,34 @@ msgstr "" msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +msgid "Nothing here yet" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:210 -msgid "Email addresses" +#: rhodecode/templates/admin/users/user_edit.html:174 +msgid "Edit Permission" msgstr "" #: rhodecode/templates/admin/users/user_edit.html:223 +msgid "Email addresses" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:236 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 msgid "Add" msgstr "" @@ -2298,21 +2330,43 @@ msgstr "" msgid "My Account" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 msgid "My repos" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 -msgid "My permissions" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +msgid "My pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +msgid "Add repo" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2322,17 +2376,23 @@ msgstr "" msgid "Revision" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" @@ -2341,42 +2401,41 @@ msgstr "" msgid "Users administration" msgstr "" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +msgid "firstname" +msgstr "" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" -#: rhodecode/templates/admin/users/users.html:56 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "" @@ -2407,7 +2466,6 @@ msgid "Choosen group members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "" @@ -2416,7 +2474,6 @@ msgid "Available members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "" @@ -2522,9 +2579,9 @@ msgstr "" #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "" @@ -2532,9 +2589,9 @@ msgstr "" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "" @@ -2547,9 +2604,9 @@ msgstr "" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "" @@ -2566,7 +2623,7 @@ msgid "settings" msgstr "" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" @@ -2584,10 +2641,6 @@ msgstr "" msgid "repositories groups" msgstr "" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "" @@ -2668,6 +2721,10 @@ msgstr "" msgid "Compare" msgstr "" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "" @@ -2699,11 +2756,13 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" @@ -2712,7 +2771,7 @@ msgid "Show" msgstr "" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "" @@ -2850,18 +2909,18 @@ msgid "Commenting on line {1}." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 msgid "Comment" msgstr "" @@ -2878,18 +2937,22 @@ msgstr "" msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "change status" msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" @@ -2902,7 +2965,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2922,40 +2985,45 @@ msgstr "" msgid "Outgoing changesets" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "" @@ -2980,7 +3048,7 @@ msgid "%s Files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "" @@ -3222,7 +3290,7 @@ msgstr "" msgid "forked" msgstr "" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "" @@ -3253,6 +3321,10 @@ msgstr "" msgid "Watched" msgstr "" +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "" @@ -3295,62 +3367,71 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:95 -msgid "Available reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +msgid "owner" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:97 msgid "Create new pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "description" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +msgid "Closed %s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 msgid "Incoming changesets" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +msgid "all pull requests" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, python-format msgid "Search \"%s\" in repository: %s" @@ -3384,10 +3465,15 @@ msgstr "" msgid "File contents" msgstr "" +#: rhodecode/templates/search/search.html:64 +msgid "Commit messages" +msgstr "" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3464,6 +3550,10 @@ msgstr "" msgid "remote clone" msgstr "" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "" @@ -3526,40 +3616,49 @@ msgstr "" msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:643 -msgid "commits" -msgstr "" - -#: rhodecode/templates/summary/summary.html:644 -msgid "files added" -msgstr "" - -#: rhodecode/templates/summary/summary.html:645 -msgid "files changed" -msgstr "" - #: rhodecode/templates/summary/summary.html:646 -msgid "files removed" +msgid "commits" +msgstr "" + +#: rhodecode/templates/summary/summary.html:647 +msgid "files added" +msgstr "" + +#: rhodecode/templates/summary/summary.html:648 +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:649 -msgid "commit" -msgstr "" - -#: rhodecode/templates/summary/summary.html:650 -msgid "file added" -msgstr "" - -#: rhodecode/templates/summary/summary.html:651 -msgid "file changed" +msgid "files removed" msgstr "" #: rhodecode/templates/summary/summary.html:652 +msgid "commit" +msgstr "" + +#: rhodecode/templates/summary/summary.html:653 +msgid "file added" +msgstr "" + +#: rhodecode/templates/summary/summary.html:654 +msgid "file changed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "" diff --git a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/fr/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.1.5\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2012-06-05 20:07+0100\n" "Last-Translator: Vincent Duvert \n" "Language-Team: fr \n" @@ -39,6 +39,11 @@ msgstr "afficher %s lignes de contexte" msgid "binary file" msgstr "fichier binaire" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "Il n’y a aucun changement pour le moment" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "Accueil" @@ -147,17 +152,17 @@ msgstr "Type d’archive inconnu" msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "Tags" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -179,12 +184,12 @@ msgstr "" "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts." -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "dépôt %s forké en tant que %s" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." @@ -199,15 +204,15 @@ msgstr "Journal public" msgid "journal" msgstr "Journal" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "Vous vous êtes inscrits avec succès à RhodeCode" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "Un lien de rénitialisation de votre mot de passe vous a été envoyé." -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -215,54 +220,49 @@ msgstr "" "Votre mot de passe a été réinitialisé. Votre nouveau mot de passe vous a " "été envoyé par e-mail." -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 #, fuzzy msgid "Bookmarks" msgstr "Signets" -#: rhodecode/controllers/pullrequests.py:136 -#, fuzzy, python-format -msgid "%s (owner)" -msgstr "Followers de %s" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 #, fuzzy msgid "Successfully opened new pull request" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 #, fuzzy msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant la création du dépôt %s." -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " "code Whoosh." -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "Une erreur est survenue durant l’opération de recherche." #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès." #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, 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:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -274,14 +274,14 @@ msgstr "" "l’application pour rescanner les dépôts." #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" @@ -295,59 +295,59 @@ msgstr "Aucune donnée actuellement disponible." msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "Base" -#: rhodecode/controllers/admin/ldap_settings.py:50 +#: rhodecode/controllers/admin/ldap_settings.py:51 msgid "ONELEVEL" msgstr "Un niveau" -#: rhodecode/controllers/admin/ldap_settings.py:51 +#: rhodecode/controllers/admin/ldap_settings.py:52 msgid "SUBTREE" msgstr "Sous-arbre" -#: rhodecode/controllers/admin/ldap_settings.py:55 +#: rhodecode/controllers/admin/ldap_settings.py:56 msgid "NEVER" msgstr "NEVER" -#: rhodecode/controllers/admin/ldap_settings.py:56 +#: rhodecode/controllers/admin/ldap_settings.py:57 msgid "ALLOW" msgstr "Autoriser" -#: rhodecode/controllers/admin/ldap_settings.py:57 +#: rhodecode/controllers/admin/ldap_settings.py:58 msgid "TRY" msgstr "TRY" -#: rhodecode/controllers/admin/ldap_settings.py:58 +#: rhodecode/controllers/admin/ldap_settings.py:59 msgid "DEMAND" msgstr "DEMAND" -#: rhodecode/controllers/admin/ldap_settings.py:59 +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "HARD" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "Pas de chiffrement" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "Connection LDAPS" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "Connection LDAPS" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "START_TLS à la connexion" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "Mise à jour réussie des réglages LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Impossible d’activer LDAP. La bibliothèque « python-ldap » est manquante." -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "Une erreur est survenue durant la mise à jour des réglages du LDAP." @@ -368,7 +368,7 @@ msgstr "Écrire" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -416,80 +416,80 @@ msgstr "Permissions par défaut mises à jour avec succès" msgid "error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, 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:274 +#: rhodecode/controllers/admin/repos.py:317 #, 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:303 +#: rhodecode/controllers/admin/repos.py:346 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:322 +#: rhodecode/controllers/admin/repos.py:365 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:339 +#: rhodecode/controllers/admin/repos.py:382 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:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 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:379 +#: rhodecode/controllers/admin/repos.py:422 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:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 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:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, 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:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." @@ -545,7 +545,7 @@ msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs du" " groupe de dépôts." -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)" @@ -554,98 +554,98 @@ msgstr "Après re-scan : %s ajouté(s), %s enlevé(s)" msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée." -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "Une erreur est survenue durant la mise à jour des options." -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "Réglages de Mercurial mis à jour" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook." -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "La tâche d’e-mail a été créée." -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, 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:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "utilisateur %s créé" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, 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:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: 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:219 +#: rhodecode/controllers/admin/users.py:262 #: 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.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 #, fuzzy msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 #, fuzzy msgid "Removed email from user" msgstr "Le groupe de dépôts %s a été supprimé." @@ -739,85 +739,97 @@ msgstr "révisions" msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 msgid "[created] users group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 msgid "[updated] users group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:605 +#: rhodecode/lib/helpers.py:612 #, fuzzy -msgid "[commented] on pull request" +msgid "[commented] on pull request for" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:614 +#, fuzzy +msgid "[closed] pull request for" +msgstr "[a commenté] une révision du dépôt" + +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "Aucun fichier" @@ -890,88 +902,88 @@ msgstr "à la ligne %s" msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 #, fuzzy msgid "Repository no access" msgstr "Dépôts" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1064 #, fuzzy msgid "Repository read access" msgstr "Ce dépôt existe déjà" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1065 #, fuzzy msgid "Repository write access" msgstr "Dépôts" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1066 #, fuzzy msgid "Repository admin access" msgstr "Dépôts" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1068 #, fuzzy msgid "Repositories Group no access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1078 +#: rhodecode/model/db.py:1069 #, fuzzy msgid "Repositories Group read access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1079 +#: rhodecode/model/db.py:1070 #, fuzzy msgid "Repositories Group write access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1071 #, fuzzy msgid "Repositories Group admin access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1082 +#: rhodecode/model/db.py:1073 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administration des utilisateurs" -#: rhodecode/model/db.py:1083 +#: rhodecode/model/db.py:1074 #, fuzzy msgid "Repository creation disabled" msgstr "Création de dépôt" -#: rhodecode/model/db.py:1084 +#: rhodecode/model/db.py:1075 #, fuzzy msgid "Repository creation enabled" msgstr "Création de dépôt" -#: rhodecode/model/db.py:1085 +#: rhodecode/model/db.py:1076 #, fuzzy msgid "Register disabled" msgstr "Désactivé" -#: rhodecode/model/db.py:1086 +#: rhodecode/model/db.py:1077 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1089 +#: rhodecode/model/db.py:1080 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 #, fuzzy msgid "Approved" msgstr "Supprimés" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -993,37 +1005,37 @@ msgstr "Veuillez entrer un mot de passe" msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "a posté un commentaire sur le commit" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 msgid "sent message" msgstr "a envoyé un message" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "vous a mentioné" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" msgstr "s’est enregistré sur RhodeCode" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 #, fuzzy msgid "commented on pull request" msgstr "a posté un commentaire sur le commit" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 #, fuzzy msgid "latest tip" msgstr "Dernière connexion" @@ -1033,18 +1045,19 @@ msgid "new user registration" msgstr "Nouveau compte utilisateur enregistré" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application." -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application." -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1056,7 +1069,7 @@ msgstr "" #: rhodecode/model/validators.py:52 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" -msgstr "Ce nom d’utilisateur existe déjà" +msgstr "Ce nom \"%(username)s\" d’utilisateur existe déjà" #: rhodecode/model/validators.py:54 #, python-format @@ -1144,12 +1157,12 @@ msgstr "Un dépôt portant ce nom existe déjà." #: rhodecode/model/validators.py:286 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "Ce dépôt existe déjà dans le groupe « %s »." +msgstr "Ce dépôt existe déjà dans le groupe « \"%(group)s\" »." #: rhodecode/model/validators.py:288 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" -msgstr "Un dépôt portant ce nom existe déjà." +msgstr "Un dépôt portant \"%(repo)s\" ce nom existe déjà." #: rhodecode/model/validators.py:386 msgid "invalid clone url" @@ -1197,7 +1210,9 @@ msgstr "Tableau de bord" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1205,13 +1220,15 @@ msgstr "Tableau de bord" msgid "quick filter..." msgstr "Filtre rapide…" -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "Dépôts" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "AJOUTER UN DÉPÔT" @@ -1230,13 +1247,12 @@ msgstr "Nom de groupe" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "Description" @@ -1250,13 +1266,12 @@ msgstr "Groupe de dépôts" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1273,15 +1288,12 @@ msgid "Name" msgstr "Nom" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "Dernière modification" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Sommet" @@ -1289,7 +1301,7 @@ msgstr "Sommet" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Propriétaire" @@ -1321,8 +1333,9 @@ msgstr "Nom du groupe" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1332,8 +1345,9 @@ msgstr "Tri ascendant" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1342,13 +1356,13 @@ msgid "Click to sort descending" msgstr "Tri descendant" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 msgid "Last Change" msgstr "Dernière modification" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1357,8 +1371,9 @@ msgid "No records found." msgstr "Aucun élément n’a été trouvé." #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1367,8 +1382,9 @@ msgid "Data error." msgstr "Erreur d’intégrité des données." #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1478,7 +1494,7 @@ msgstr "Votre compte utilisateur devra être activé par un administrateur." #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "Dépôt privé" @@ -1523,10 +1539,9 @@ msgid "Admin journal" msgstr "Historique d’administration" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1633,7 +1648,7 @@ msgstr "Attribut pour l’e-mail" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "Enregistrer" @@ -1661,7 +1676,7 @@ msgstr "" msgid "Mark all read" msgstr "Tout marquer comme lu" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "Aucune notification pour le moment." @@ -1683,7 +1698,7 @@ msgstr "Gestion des permissions" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "Permissions" @@ -1733,7 +1748,6 @@ msgstr "Ajouter un dépôt" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "Dépôts" @@ -1776,6 +1790,7 @@ msgstr "Type de dépôt à créer." #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 #, fuzzy msgid "Landing revision" msgstr "révision suivante" @@ -1783,13 +1798,14 @@ msgstr "révision suivante" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " @@ -1798,7 +1814,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1820,7 +1836,9 @@ msgstr "Éditer le dépôt" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1859,17 +1877,17 @@ msgstr "Changer le propriétaire de ce dépôt." #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "Réinitialiser" @@ -1954,6 +1972,7 @@ msgid "Remove this repository" msgstr "Supprimer ce dépôt" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" @@ -1996,7 +2015,7 @@ msgstr "Écriture" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "Administration" @@ -2007,7 +2026,7 @@ msgid "member" msgstr "Membre" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -2045,25 +2064,6 @@ msgstr "Erreur lors de la suppression du groupe d’utilisateurs." msgid "Repositories administration" msgstr "Administration des dépôts" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "Contact" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "Supprimer" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: 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 ?" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "Groupes" @@ -2094,6 +2094,7 @@ msgstr "Parent du groupe" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "Enregistrer" @@ -2118,12 +2119,20 @@ msgid "Number of toplevel repositories" msgstr "Nombre de sous-dépôts" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "Action" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "Supprimer" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" msgstr "Voulez-vous vraiment supprimer le groupe « %s » ?" @@ -2180,88 +2189,102 @@ msgstr "" msgid "destroy old data" msgstr "Supprimer les données obsolètes" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "Re-scanner les dépôts" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Indexation Whoosh" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "Option d’indexation" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "Purger et reconstruire l’index" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "Mettre à jour l’index" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "Réglages d’application globaux" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "Nom de l’application" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "Texte du royaume" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "Code GA" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "Enregister les options" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Options de Mercurial" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "Réglages" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "SSL requis pour les pushs" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "Hooks" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "Mettre à jour les dépôts après un push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "Avancé" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "Emplacement des dépôts" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " @@ -2271,27 +2294,33 @@ msgstr "" "vraiment le faire, redémarrer l’application une fois le changement " "effectué. Cliquez sur ce texte pour déverrouiller." -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "Déverrouiller" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "E-mail de test" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 msgid "Email to" msgstr "Envoyer l’e-mail à" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 msgid "Send" msgstr "Envoyer" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "Information système et paquets" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "show" msgstr "Montrer" @@ -2301,7 +2330,6 @@ msgstr "Ajouter un utilisateur" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "Utilisateurs" @@ -2358,28 +2386,38 @@ msgstr "Confirmation du nouveau mot de p msgid "Create repositories" msgstr "Création de dépôts" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "Aucune notification pour le moment." + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 msgid "Permission" msgstr "Permission" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "Permissions du dépôt" + +#: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy msgid "Email addresses" msgstr "Adresse e-mail" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 #, fuzzy msgid "New email address" msgstr "Adresse e-mail" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 #, fuzzy msgid "Add" msgstr "Ajouter" @@ -2393,21 +2431,45 @@ msgstr "Mon compte" msgid "My Account" msgstr "Mon compte" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "Mes permissions" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 msgid "My repos" msgstr "Mes dépôts" -#: 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:37 -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "AJOUTER" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "a posté un commentaire sur le commit" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +#, fuzzy +msgid "Add repo" +msgstr "ajouter un nouveau" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2417,17 +2479,23 @@ msgstr "AJOUTER" msgid "Revision" msgstr "Révision" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "privé" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "Aucun dépôt pour le moment" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "En créer un maintenant" @@ -2436,42 +2504,42 @@ msgstr "En créer un maintenant" msgid "Users administration" msgstr "Administration des utilisateurs" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "Utilisateurs" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "NOUVEL UTILISATEUR" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "Nom d’utilisateur" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" msgstr "Prénom" -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "Nom de famille" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "Dernière connexion" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "Actif" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "LDAP" -#: rhodecode/templates/admin/users/users.html:56 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "Ajouter un groupe d’utilisateur" @@ -2502,7 +2570,6 @@ msgid "Choosen group members" msgstr "Membres du groupe" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "Tout enlever" @@ -2511,7 +2578,6 @@ msgid "Available members" msgstr "Membres disponibles" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "Tout ajouter" @@ -2617,9 +2683,9 @@ msgstr "Chargement…" #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "Résumé" @@ -2627,9 +2693,9 @@ msgstr "Résumé" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "Historique" @@ -2642,9 +2708,9 @@ msgstr "Aller" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "Fichiers" @@ -2661,7 +2727,7 @@ msgid "settings" msgstr "Réglages" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "Fork" @@ -2679,10 +2745,6 @@ msgstr "Rechercher" msgid "repositories groups" msgstr "Groupes de dépôts" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "Utilisateurs" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "Groupes d’utilisateurs" @@ -2765,6 +2827,10 @@ msgstr "Branches" msgid "Compare" msgstr "vue de comparaison" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "Prénom" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "Date" @@ -2797,11 +2863,13 @@ msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare fork" msgstr "vue de comparaison" @@ -2811,7 +2879,7 @@ msgid "Show" msgstr "Afficher" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "montrer plus" @@ -2950,7 +3018,7 @@ msgid "Commenting on line {1}." msgstr "Commentaire sur la ligne {1}." #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" @@ -2958,14 +3026,14 @@ msgstr "" "commande %s." #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 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:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 msgid "Comment" msgstr "Commentaire" @@ -2982,19 +3050,23 @@ msgstr "Vous devez être connecté pour poster des commentaires." msgid "Login now" msgstr "Se connecter maintenant" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "Laisser un commentaire" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 #, fuzzy msgid "change status" msgstr "Changesets" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" @@ -3007,7 +3079,7 @@ msgstr "Comparaison" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "Fichiers affectés" @@ -3029,40 +3101,45 @@ msgstr "Dépôt vide" msgid "Outgoing changesets" msgstr "Dépôt vide" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "Fork" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Dépôt Git" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "Dépôt public" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "Fork de" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "Dépôt vide" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "Ceci est une notification de RhodeCode." @@ -3087,7 +3164,7 @@ msgid "%s Files" msgstr "Fichiers de %s" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "Fichiers" @@ -3330,7 +3407,7 @@ msgstr "forks" msgid "forked" msgstr "forké" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks." @@ -3364,6 +3441,10 @@ msgstr "" msgid "Watched" msgstr "Surveillé" +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "AJOUTER" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "utilisateur suivant" @@ -3409,69 +3490,79 @@ msgid "Detailed compare view" msgstr "vue de comparaison" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "Propriétaire" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:95 -#, fuzzy -msgid "Available reviewers" -msgstr "Membres disponibles" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:97 #, fuzzy msgid "Create new pull request" msgstr "Créer un nouveau fichier" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "Écriture" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 #, fuzzy msgid "description" msgstr "Description" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" +msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 #, fuzzy msgid "Created on" msgstr "En créer un maintenant" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 #, fuzzy msgid "Compare view" msgstr "vue de comparaison" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 #, fuzzy msgid "Incoming changesets" msgstr "Dépôt vide" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "Créer un nouveau fichier" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format msgid "Search \"%s\" in repository: %s" @@ -3506,10 +3597,16 @@ msgstr "Rechercher dans" msgid "File contents" msgstr "Le contenu des fichiers" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "Message de commit" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "Les noms de fichiers" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3586,6 +3683,10 @@ msgstr "publique" msgid "remote clone" msgstr "Clone distant" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "Contact" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "URL de clone" @@ -3648,40 +3749,49 @@ msgstr "Résumé des changements" msgid "Quick start" msgstr "Démarrage rapide" -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "fichiers ajoutés" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "fichiers modifiés" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "fichiers supprimés" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "fichier ajouté" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "fichié modifié" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "fichier supprimé" diff --git a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/ja/LC_MESSAGES/rhodecode.po @@ -12,7 +12,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2012-07-14 03:16+0900\n" "Last-Translator: FULL NAME \n" "Language-Team: ja \n" @@ -44,6 +44,11 @@ msgstr "" msgid "binary file" msgstr "バイナリファイル" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "まだ変更がありません" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "ホームページ" @@ -148,17 +153,17 @@ msgstr "未知のアーカイブ種別です" msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -178,12 +183,12 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" @@ -197,63 +202,58 @@ msgstr "公開ジャーナル" msgid "journal" msgstr "ジャーナル" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "rhodecodeへの登録を受け付けました" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "パスワードリセットのリンクを送信しました" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "ブックマーク" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "%s (所有者)" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "検索するためのインデックスがありません。whooshでインデックスを作成して下さい" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "検索を実行する際にエラーがおきました" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -264,14 +264,14 @@ msgstr "" "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" @@ -285,59 +285,59 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" -#: rhodecode/controllers/admin/ldap_settings.py:50 +#: rhodecode/controllers/admin/ldap_settings.py:51 msgid "ONELEVEL" msgstr "ONELEVEL" -#: rhodecode/controllers/admin/ldap_settings.py:51 +#: rhodecode/controllers/admin/ldap_settings.py:52 msgid "SUBTREE" msgstr "SUBTREE" -#: rhodecode/controllers/admin/ldap_settings.py:55 +#: rhodecode/controllers/admin/ldap_settings.py:56 msgid "NEVER" msgstr "NEVER" -#: rhodecode/controllers/admin/ldap_settings.py:56 +#: rhodecode/controllers/admin/ldap_settings.py:57 msgid "ALLOW" msgstr "ALLOW" -#: rhodecode/controllers/admin/ldap_settings.py:57 +#: rhodecode/controllers/admin/ldap_settings.py:58 msgid "TRY" msgstr "TRY" -#: rhodecode/controllers/admin/ldap_settings.py:58 +#: rhodecode/controllers/admin/ldap_settings.py:59 msgid "DEMAND" msgstr "DEMAND" -#: rhodecode/controllers/admin/ldap_settings.py:59 +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "HARD" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "暗号化なし" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "LDAPS接続" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "LDAPS接続" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "LDAP接続でSTART_TLSを使用" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "LDAP設定を更新しました" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "LDAPを有効にできませんでした。\"python-ldap\"ライブラリがありません。" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "LDAP設定の更新中にエラーが発生しました" @@ -358,7 +358,7 @@ msgstr "書込" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -406,76 +406,76 @@ msgstr "デフォルトの権限を更新しました" msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" @@ -527,7 +527,7 @@ msgstr "グループユーザーを削除中にエラーが発生しました" msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s" @@ -536,95 +536,95 @@ msgstr "リポジトリを再度スキャンしました。 追加: %s 削除: %s" msgid "Whoosh reindex task scheduled" msgstr "Whooshの再インデックスタスクを予定に入れました" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "アプリケーション設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "Mercurialの設定を更新しました" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "フックの作成時にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "ユーザー %s を作成しました" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメール %s を追加しました" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 msgid "Removed email from user" msgstr "ユーザーからメールを削除しました" @@ -715,84 +715,97 @@ msgstr "リビジョン" msgid "fork name " msgstr "フォーク名 " -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "プルリクエスト #%s" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" +#: rhodecode/lib/helpers.py:612 +#, fuzzy +msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:614 +#, fuzzy +msgid "[closed] pull request for" +msgstr "プルリクエストに[コメント]" + +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "" @@ -859,75 +872,75 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 msgid "Repository no access" msgstr "" +#: rhodecode/model/db.py:1064 +msgid "Repository read access" +msgstr "" + +#: rhodecode/model/db.py:1065 +msgid "Repository write access" +msgstr "" + +#: rhodecode/model/db.py:1066 +msgid "Repository admin access" +msgstr "" + +#: rhodecode/model/db.py:1068 +msgid "Repositories Group no access" +msgstr "" + +#: rhodecode/model/db.py:1069 +msgid "Repositories Group read access" +msgstr "" + +#: rhodecode/model/db.py:1070 +msgid "Repositories Group write access" +msgstr "" + +#: rhodecode/model/db.py:1071 +msgid "Repositories Group admin access" +msgstr "" + #: rhodecode/model/db.py:1073 -msgid "Repository read access" +msgid "RhodeCode Administrator" msgstr "" #: rhodecode/model/db.py:1074 -msgid "Repository write access" +msgid "Repository creation disabled" msgstr "" #: rhodecode/model/db.py:1075 -msgid "Repository admin access" +msgid "Repository creation enabled" +msgstr "" + +#: rhodecode/model/db.py:1076 +msgid "Register disabled" msgstr "" #: rhodecode/model/db.py:1077 -msgid "Repositories Group no access" -msgstr "" - -#: rhodecode/model/db.py:1078 -msgid "Repositories Group read access" -msgstr "" - -#: rhodecode/model/db.py:1079 -msgid "Repositories Group write access" +msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/model/db.py:1080 -msgid "Repositories Group admin access" -msgstr "" - -#: rhodecode/model/db.py:1082 -msgid "RhodeCode Administrator" -msgstr "" - -#: rhodecode/model/db.py:1083 -msgid "Repository creation disabled" -msgstr "" - -#: rhodecode/model/db.py:1084 -msgid "Repository creation enabled" -msgstr "" - -#: rhodecode/model/db.py:1085 -msgid "Register disabled" -msgstr "" - -#: rhodecode/model/db.py:1086 -msgid "Register new user with RhodeCode with manual activation" -msgstr "" - -#: rhodecode/model/db.py:1089 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 msgid "Approved" msgstr "承認" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "却下" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "レビュー中" @@ -949,36 +962,36 @@ msgstr "パスワードを入力してください" msgid "Enter %(min)i characters or more" msgstr "%(min)i 文字以上必要です" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "コミットに対するコメント" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 msgid "sent message" msgstr "" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" msgstr "" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 msgid "latest tip" msgstr "最新のtip" @@ -987,14 +1000,15 @@ msgid "new user registration" msgstr "新規ユーザー登録" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1134,7 +1148,9 @@ msgstr "ダッシュボード" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1142,13 +1158,15 @@ msgstr "ダッシュボード" msgid "quick filter..." msgstr "クイックフィルタ..." -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "リポジトリ" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "リポジトリの追加" @@ -1167,13 +1185,12 @@ msgstr "グループ名" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "説明" @@ -1187,13 +1204,12 @@ msgstr "リポジトリグループ" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1210,15 +1226,12 @@ msgid "Name" msgstr "名前" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "最後の変更時刻" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Tip" @@ -1226,7 +1239,7 @@ msgstr "Tip" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" @@ -1258,8 +1271,9 @@ msgstr "グループ名" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1269,8 +1283,9 @@ msgstr "昇順で並び換え" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1279,13 +1294,13 @@ msgid "Click to sort descending" msgstr "降順で並び替え" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 msgid "Last Change" msgstr "最後の変更点" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1294,8 +1309,9 @@ msgid "No records found." msgstr "レコードが見つかりません" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1304,8 +1320,9 @@ msgid "Data error." msgstr "データエラー" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1415,7 +1432,7 @@ msgstr "アカウントは管理者のアクティベーションを待つ必要があります" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "非公開リポジトリ" @@ -1460,10 +1477,9 @@ msgid "Admin journal" msgstr "管理者ジャーナル" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1570,7 +1586,7 @@ msgstr "メールアドレス属性" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "保存" @@ -1597,7 +1613,7 @@ msgstr "プルリクエスト" msgid "Mark all read" msgstr "すべて既読にする" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "通知はまだありません" @@ -1619,7 +1635,7 @@ msgstr "権限管理" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "権限設定" @@ -1666,7 +1682,6 @@ msgstr "リポジトリの追加" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "リポジトリ" @@ -1708,26 +1723,28 @@ msgstr "作成するリポジトリのタイプを指定します" #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 msgid "Landing revision" msgstr "ランディングリビジョン" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "ファイルページ、ダウンロード、検索、READMEのデフォルトのリビジョンを指定します" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "短く要点を絞ってください。長い説明にはREADMEファイルを利用してください。" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1747,7 +1764,9 @@ msgstr "リポジトリを編集" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1786,17 +1805,17 @@ msgstr "リポジトリの所有者を変更" #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "リセット" @@ -1879,6 +1898,7 @@ msgid "Remove this repository" msgstr "このリポジトリを削除" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" @@ -1917,7 +1937,7 @@ msgstr "書込" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "管理" @@ -1928,7 +1948,7 @@ msgid "member" msgstr "メンバー" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -1966,25 +1986,6 @@ msgstr "ユーザーグループの削除に失敗しました" msgid "Repositories administration" msgstr "リポジトリ管理" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "コンタクト" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "削除" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "このリポジトリを削除しますか？ : %s" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "グループ" @@ -2015,6 +2016,7 @@ msgstr "親グループ" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "保存" @@ -2039,12 +2041,20 @@ msgid "Number of toplevel repositories" msgstr "トップレベルリポジトリの数" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "アクション" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "削除" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" msgstr "グループ %s を削除してもよろしいですか" @@ -2099,115 +2109,135 @@ msgstr "" msgid "destroy old data" msgstr "古いデータを削除する" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "リポジトリを再チェック" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Whooshインデックス" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "インデックス作成時の設定" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "一度削除してから再度インデックスを作成" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "再インデックス" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "アプリケーション全体の設定" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "アプリケーション名" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "Realmテキスト" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "GAコード" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "設定を保存" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Mercurialの設定" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "プッシュにSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "これはアプリケーションの重要な設定です。本当に変更が必要でしょうか。もし、変更した場合、変更を反映さ競るためにアプリケーションを再起動する必要があります。変更可能にするにはこのラベルをクリックして下さい" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "変更可能にする" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "show" msgstr "表示" @@ -2217,7 +2247,6 @@ msgstr "ユーザーを追加" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "ユーザー" @@ -2274,26 +2303,36 @@ msgstr "新しいパスワード 再入力" msgid "Create repositories" msgstr "リポジトリを作成する" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "通知はまだありません" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 msgid "Permission" msgstr "権限" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "リポジトリの権限" + +#: rhodecode/templates/admin/users/user_edit.html:223 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 msgid "New email address" msgstr "新しいメールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 msgid "Add" msgstr "追加" @@ -2306,21 +2345,45 @@ msgstr "アカウント" msgid "My Account" msgstr "アカウント" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "権限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 msgid "My repos" msgstr "リポジトリ" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 -msgid "My permissions" -msgstr "権限" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "追加" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "すべてのプルリクエスト" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +#, fuzzy +msgid "Add repo" +msgstr "新規追加" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, fuzzy, python-format +msgid "Pull request #%s opened on %s" +msgstr "プルリクエスト #%s" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2330,17 +2393,23 @@ msgstr "追加" msgid "Revision" msgstr "リビジョン" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "非公開" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "このリポジトリを削除しますか？ : %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "まだリポジトリがありません" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "今すぐ作成する" @@ -2349,42 +2418,42 @@ msgstr "今すぐ作成する" msgid "Users administration" msgstr "ユーザー管理" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "ユーザー" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "新しいユーザーを追加" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "ユーザー名" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" msgstr "名前" -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "名字" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "最終ログイン日" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "アクティブ" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "LDAP" -#: rhodecode/templates/admin/users/users.html:56 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "このユーザーを本当に削除してよろしいですか？: %s" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "ユーザーグループを追加" @@ -2415,7 +2484,6 @@ msgid "Choosen group members" msgstr "グループメンバーを選ぶ" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "全ての要素を削除" @@ -2424,7 +2492,6 @@ msgid "Available members" msgstr "有効なメンバー" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "全ての要素を追加" @@ -2530,9 +2597,9 @@ msgstr "読み込み中..." #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "要約" @@ -2540,9 +2607,9 @@ msgstr "要約" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "履歴" @@ -2555,9 +2622,9 @@ msgstr "ブランチの切り替え" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "ファイル" @@ -2574,7 +2641,7 @@ msgid "settings" msgstr "設定" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "フォーク" @@ -2592,10 +2659,6 @@ msgstr "検索" msgid "repositories groups" msgstr "リポジトリグループ" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "ユーザー" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "ユーザーグループ" @@ -2676,6 +2739,10 @@ msgstr "ブランチの比較" msgid "Compare" msgstr "比較" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "名前" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日付" @@ -2706,11 +2773,13 @@ msgid_plural "showing %d out of %d revis msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "%s とフォークを比較" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "フォークを比較" @@ -2719,7 +2788,7 @@ msgid "Show" msgstr "表示" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "もっと表示" @@ -2855,18 +2924,18 @@ msgid "Commenting on line {1}." msgstr "{1} 行目にコメント" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "コメントには %s 構文 ( %s サポートつき ) が利用出来ます" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "テキスト内で @username を使うと、この RhodeCode のユーザーに通知を送信します" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 msgid "Comment" msgstr "コメント" @@ -2883,18 +2952,22 @@ msgstr "コメントするにはログインが必要です" msgid "Login now" msgstr "今すぐログインする" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "コメントを残す" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "change status" msgstr "ステータスを変更する" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" @@ -2907,7 +2980,7 @@ msgstr "比較ビュー" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2927,40 +3000,45 @@ msgstr "チェンジセットはありません" msgid "Outgoing changesets" msgstr "送信可能なチェンジセット" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "フォーク" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Mercurialリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Gitリポジトリ" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "公開リポジトリ" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "フォーク元: " -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "まだチェンジセットがありません" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "このユーザーを本当に削除してよろしいですか？: %s" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "RhodeCodeからの通知があります" @@ -2985,7 +3063,7 @@ msgid "%s Files" msgstr "%s ファイル" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "ファイル" @@ -3225,7 +3303,7 @@ msgstr "フォーク" msgid "forked" msgstr "フォークしました" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "まだフォークがありません" @@ -3256,6 +3334,10 @@ msgstr "ATOMフィード" msgid "Watched" msgstr "ウォッチ" +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "追加" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "フォローしているユーザー" @@ -3298,62 +3380,74 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" -msgstr "選択されたレビュアー" - -#: rhodecode/templates/pullrequests/pullrequest.html:95 -msgid "Available reviewers" -msgstr "有効なレビュアー" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "所有者" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#, fuzzy +msgid "Add reviewer to this pull request." +msgstr "新しいプルリクエスト" + +#: rhodecode/templates/pullrequests/pullrequest.html:97 msgid "Create new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "タイトル" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "description" msgstr "説明" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "プルリクエストを送る" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" -msgstr "プルリクエスト #%s" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +msgid "Closed %s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "プルリクエストステータス" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 msgid "Created on" msgstr "作成日" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Compare view" msgstr "比較ビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 msgid "Incoming changesets" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "すべてのプルリクエスト" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "すべてのプルリクエスト" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, python-format msgid "Search \"%s\" in repository: %s" @@ -3387,10 +3481,16 @@ msgstr "検索対象" msgid "File contents" msgstr "ファイル内容" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "コミットメッセージ" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "ファイル名" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3467,6 +3567,10 @@ msgstr "公開" msgid "remote clone" msgstr "" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "コンタクト" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "クローンURL" @@ -3529,40 +3633,49 @@ msgstr "ログ" msgid "Quick start" msgstr "クイックスタート" -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "削除されたファイル" diff --git a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/pt_BR/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann \n" "Language-Team: pt_BR \n" @@ -39,6 +39,11 @@ msgstr "contexto de %s linhas" msgid "binary file" msgstr "arquivo binário" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "Ainda não há alteações" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "Página inicial" @@ -148,17 +153,17 @@ msgstr "Arquivo de tipo desconhecido" msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -180,12 +185,12 @@ msgstr "" "renomeado a partir do sistema de arquivos. Por favor execute a aplicação " "outra vez para varrer novamente por repositórios" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" @@ -200,15 +205,15 @@ msgstr "Diário público" msgid "journal" msgstr "diário" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "Você se registrou com sucesso no rhodecode" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -216,51 +221,46 @@ msgstr "" "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "Marcadores" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 #, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "Não há índice onde pesquisa. Por favor execute o indexador whoosh" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "Ocorreu um erro durante essa operação de busca" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "ocorreu um erro ao atualizar o repositório %s" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -272,14 +272,14 @@ msgstr "" "outra vez para varrer novamente por repositórios" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" @@ -293,59 +293,59 @@ msgstr "Ainda não há dados carregados" msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "BASE" -#: rhodecode/controllers/admin/ldap_settings.py:50 +#: rhodecode/controllers/admin/ldap_settings.py:51 msgid "ONELEVEL" msgstr "UMNÍVEL" -#: rhodecode/controllers/admin/ldap_settings.py:51 +#: rhodecode/controllers/admin/ldap_settings.py:52 msgid "SUBTREE" msgstr "SUBÁRVORE" -#: rhodecode/controllers/admin/ldap_settings.py:55 +#: rhodecode/controllers/admin/ldap_settings.py:56 msgid "NEVER" msgstr "NUNCA" -#: rhodecode/controllers/admin/ldap_settings.py:56 +#: rhodecode/controllers/admin/ldap_settings.py:57 msgid "ALLOW" msgstr "PERMITIR" -#: rhodecode/controllers/admin/ldap_settings.py:57 +#: rhodecode/controllers/admin/ldap_settings.py:58 msgid "TRY" msgstr "TENTAR" -#: rhodecode/controllers/admin/ldap_settings.py:58 +#: rhodecode/controllers/admin/ldap_settings.py:59 msgid "DEMAND" msgstr "EXIGIR" -#: rhodecode/controllers/admin/ldap_settings.py:59 +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "DIFÍCIL" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "Sem criptografia" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "Conexão LDAPS" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "Conexão LDAPS" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "START_TLS na conexão LDAP" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "Configurações de LDAP atualizadas com sucesso" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "Não foi possível ativar LDAP. A biblioteca \"python-ldap\" está faltando." -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "ocorreu um erro ao atualizar as configurações de LDAP" @@ -366,7 +366,7 @@ msgstr "Gravar" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -414,76 +414,76 @@ msgstr "Permissões padrões atualizadas com sucesso" msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, 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:274 +#: rhodecode/controllers/admin/repos.py:317 #, 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:303 +#: rhodecode/controllers/admin/repos.py:346 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:322 +#: rhodecode/controllers/admin/repos.py:365 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:339 +#: rhodecode/controllers/admin/repos.py:382 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:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "Atualizada a visibilidade do repositório no diário público" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 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:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 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:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, 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:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" @@ -535,7 +535,7 @@ msgstr "Ocorreu um erro ao excluir o usuário de grupo" msgid "An error occurred during deletion of group users groups" msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s" @@ -544,96 +544,96 @@ msgstr "Repositórios varridos com sucesso adicionados: %s, removidos: %s" msgid "Whoosh reindex task scheduled" msgstr "Tarefa de reindexação do whoosh agendada" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "Atualizadas as configurações do mercurial" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "Tarefa de e-mail criada" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 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:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, 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:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "usuário %s criado" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, 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:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: 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:219 +#: rhodecode/controllers/admin/users.py:262 #: 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.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 #, fuzzy msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 #, fuzzy msgid "Removed email from user" msgstr "removido grupo de repositórios %s" @@ -727,92 +727,104 @@ msgstr "revisões" msgid "fork name " msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 #, fuzzy msgid "[created] users group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 #, fuzzy msgid "[updated] users group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:605 +#: rhodecode/lib/helpers.py:612 #, fuzzy -msgid "[commented] on pull request" +msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:614 +#, fuzzy +msgid "[closed] pull request for" +msgstr "repositório [criado]" + +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "Nenhum Arquivo" @@ -885,88 +897,88 @@ msgstr "na linha %s" msgid "[Mention]" msgstr "[Menção]" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 #, fuzzy msgid "Repository no access" msgstr "repositórios" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1064 #, fuzzy msgid "Repository read access" msgstr "Esse repositório já existe" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1065 #, fuzzy msgid "Repository write access" msgstr "repositórios" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1066 #, fuzzy msgid "Repository admin access" msgstr "repositórios" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1068 #, fuzzy msgid "Repositories Group no access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1078 +#: rhodecode/model/db.py:1069 #, fuzzy msgid "Repositories Group read access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1079 +#: rhodecode/model/db.py:1070 #, fuzzy msgid "Repositories Group write access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1071 #, fuzzy msgid "Repositories Group admin access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1082 +#: rhodecode/model/db.py:1073 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administração de usuários" -#: rhodecode/model/db.py:1083 +#: rhodecode/model/db.py:1074 #, fuzzy msgid "Repository creation disabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1084 +#: rhodecode/model/db.py:1075 #, fuzzy msgid "Repository creation enabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1085 +#: rhodecode/model/db.py:1076 #, fuzzy msgid "Register disabled" msgstr "desabilitado" -#: rhodecode/model/db.py:1086 +#: rhodecode/model/db.py:1077 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1089 +#: rhodecode/model/db.py:1080 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 #, fuzzy msgid "Approved" msgstr "removidos" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -988,37 +1000,37 @@ msgstr "Por favor entre com uma senha" msgid "Enter %(min)i characters or more" msgstr "Entre com %(min)i caracteres ou mais" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "comentado no commit" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 msgid "sent message" msgstr "mensagem enviada" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "mencionou você" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" msgstr "registrado no RhodeCode" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 #, fuzzy msgid "commented on pull request" msgstr "comentado no commit" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 #, fuzzy msgid "latest tip" msgstr "último login" @@ -1028,18 +1040,19 @@ msgid "new user registration" msgstr "registro de novo usuário" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 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/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "" "Você não pode remover esse usuário, pois ele é crucial para toda a " "aplicação" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1189,7 +1202,9 @@ msgstr "Painel de Controle" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1197,13 +1212,15 @@ msgstr "Painel de Controle" msgid "quick filter..." msgstr "filtro rápido..." -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "repositórios" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "ADICIONAR REPOSITÓRIO" @@ -1222,13 +1239,12 @@ msgstr "Nome do grupo" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "Descrição" @@ -1242,13 +1258,12 @@ msgstr "Grupo de repositórios" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1265,15 +1280,12 @@ msgid "Name" msgstr "Nome" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "Última alteração" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Ponta" @@ -1281,7 +1293,7 @@ msgstr "Ponta" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Dono" @@ -1313,8 +1325,9 @@ msgstr "Nome do Grupo" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1324,8 +1337,9 @@ msgstr "Clique para ordenar em ordem cre #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1334,13 +1348,13 @@ msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 msgid "Last Change" msgstr "Última Alteração" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1349,8 +1363,9 @@ msgid "No records found." msgstr "Nenhum registro encontrado." #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1359,8 +1374,9 @@ msgid "Data error." msgstr "Erro de dados." #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1472,7 +1488,7 @@ msgstr "Sua conta precisa esperar ativação por um administrador" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "Repositório privado" @@ -1517,10 +1533,9 @@ msgid "Admin journal" msgstr "Diário do administrador" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1627,7 +1642,7 @@ msgstr "Atributo de E-mail" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "Salvar" @@ -1655,7 +1670,7 @@ msgstr "" msgid "Mark all read" msgstr "Marcar tudo como lido" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "Ainda não há notificações aqui" @@ -1677,7 +1692,7 @@ msgstr "Administração de permissões" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "Permissões" @@ -1727,7 +1742,6 @@ msgstr "Adicionar repositório" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "Repositórios" @@ -1770,6 +1784,7 @@ msgstr "Tipo de repositório a criar." #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 #, fuzzy msgid "Landing revision" msgstr "próxima revisão" @@ -1777,13 +1792,14 @@ msgstr "próxima revisão" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Seja sucinto e objetivo. Use um arquivo README para descrições mais " @@ -1792,7 +1808,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1814,7 +1830,9 @@ msgstr "Editar repositório" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1853,17 +1871,17 @@ msgstr "Mudar o dono desse repositório." #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "Limpar" @@ -1948,6 +1966,7 @@ msgid "Remove this repository" msgstr "Remover deste repositório" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" @@ -1990,7 +2009,7 @@ msgstr "escrever" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "administrador" @@ -2001,7 +2020,7 @@ msgid "member" msgstr "membro" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -2040,25 +2059,6 @@ msgstr "Falha ao remover grupo de usuários" msgid "Repositories administration" msgstr "Administração de repositórios" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "Contato" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "excluir" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: 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" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "Grupos" @@ -2089,6 +2089,7 @@ msgstr "Progenitor do grupo" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "salvar" @@ -2113,12 +2114,20 @@ msgid "Number of toplevel repositories" msgstr "Número de repositórios de nível superior" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "ação" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "excluir" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" msgstr "Confirme para excluir esse grupo: %s" @@ -2176,88 +2185,102 @@ msgstr "" msgid "destroy old data" msgstr "destruir dados antigos" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "Varrer repositórios" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Indexação do Whoosh" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "opção de construção de índice" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "construir do início" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "Reindexar" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "Configurações globais da aplicação" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "Nome da aplicação" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "Texto de esfera" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "Código GA" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "Salvar configurações" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Configurações do Mercurial" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "configurações" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "exigir ssl para realizar push" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "confirguações avançadas" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "Localização dos repositórios" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " @@ -2267,27 +2290,33 @@ msgstr "" "certeza de que quer mudar isto, você precisa reiniciar a aplicação para " "que essa configuração tenha efeito. Clique este rótulo para destravar." -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "destravar" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "Testar E-mail" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 msgid "Email to" msgstr "E-mail para" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 msgid "Send" msgstr "Enviar" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "Informações de Sistema e Pacotes" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "show" msgstr "mostrar" @@ -2297,7 +2326,6 @@ msgstr "Adicionar usuário" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "Usuários" @@ -2354,28 +2382,38 @@ msgstr "Confirmação de nova senha" msgid "Create repositories" msgstr "Criar repositórios" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "Ainda não há notificações aqui" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 msgid "Permission" msgstr "Permissão" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "Permissão de repositório" + +#: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy msgid "Email addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 #, fuzzy msgid "New email address" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 #, fuzzy msgid "Add" msgstr "adicionar" @@ -2389,21 +2427,45 @@ msgstr "Minha conta" msgid "My Account" msgstr "Minha Conta" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "Minhas permissões" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 msgid "My repos" msgstr "Meus repositórios" -#: 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:37 -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "ADICIONAR" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "comentado no commit" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +#, fuzzy +msgid "Add repo" +msgstr "adicionar novo" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2413,17 +2475,23 @@ msgstr "ADICIONAR" msgid "Revision" msgstr "Revisão" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "privado" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "Confirma excluir esse repositório: %s" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "Ainda não há repositórios" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "criar um agora" @@ -2432,42 +2500,42 @@ msgstr "criar um agora" msgid "Users administration" msgstr "Administração de usuários" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "usuários" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "ADICIONAR NOVO USUÁRIO" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "nome de usuário" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "nome" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" +msgstr "Primeiro Nome" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "sobrenome" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "último login" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "ativo" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "ldap" -#: rhodecode/templates/admin/users/users.html:56 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "Confirma excluir este usuário: %s" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "Adicionar grupo de usuários" @@ -2498,7 +2566,6 @@ msgid "Choosen group members" msgstr "Membros escolhidos do grupo" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "Remover todos os elementos" @@ -2507,7 +2574,6 @@ msgid "Available members" msgstr "Membros disponíveis" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "Adicionar todos os elementos" @@ -2613,9 +2679,9 @@ msgstr "carregando..." #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "Sumário" @@ -2623,9 +2689,9 @@ msgstr "Sumário" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "Registro de alterações" @@ -2638,9 +2704,9 @@ msgstr "Trocar para" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "Arquivos" @@ -2657,7 +2723,7 @@ msgid "settings" msgstr "configurações" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "bifurcação" @@ -2675,10 +2741,6 @@ msgstr "pesquisar" msgid "repositories groups" msgstr "grupos de repositórios" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "usuários" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "grupos de usuários" @@ -2761,6 +2823,10 @@ msgstr "ramos" msgid "Compare" msgstr "comparar exibir" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "nome" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "data" @@ -2793,11 +2859,13 @@ msgstr[0] "mostrando %d de %d revisão" msgstr[1] "mostrando %d de %d revisões" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 #, fuzzy msgid "Compare fork" msgstr "comparar exibir" @@ -2807,7 +2875,7 @@ msgid "Show" msgstr "Mostrar" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "mostrar mais" @@ -2946,20 +3014,20 @@ msgid "Commenting on line {1}." msgstr "Comentando a linha {1}." #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, 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:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 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:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 msgid "Comment" msgstr "Comentário" @@ -2976,19 +3044,23 @@ msgstr "Você precisa estar logado para comentar." msgid "Login now" msgstr "Entrar agora" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "Deixar um comentário" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 #, fuzzy msgid "change status" msgstr "Conjuntos de mudanças" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format msgid "%s Changesets" @@ -3001,7 +3073,7 @@ msgstr "Exibir Comparação" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "Arquivos afetados" @@ -3023,40 +3095,45 @@ msgstr "Nenhum conjunto de alterações ainda." msgid "Outgoing changesets" msgstr "Nenhum conjunto de alterações ainda." -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "Bifurcação" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Repositório Mercurial" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Repositório Git" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "repositório público" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "Bifurcação de" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "Nenhum conjunto de alterações ainda." +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "Confirma excluir este usuário: %s" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "Esta é uma notificação do RhodeCode." @@ -3081,7 +3158,7 @@ msgid "%s Files" msgstr "arquivos" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "arquivos" @@ -3325,7 +3402,7 @@ msgstr "bifurcações" msgid "forked" msgstr "bifurcado" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "Ainda não há bifurcações" @@ -3359,6 +3436,10 @@ msgstr "" msgid "Watched" msgstr "Seguindo" +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "ADICIONAR" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "seguindo usuário" @@ -3404,69 +3485,79 @@ msgid "Detailed compare view" msgstr "comparar exibir" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "Dono" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:95 -#, fuzzy -msgid "Available reviewers" -msgstr "Membros disponíveis" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:97 #, fuzzy msgid "Create new pull request" msgstr "Criar novo arquivo" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "escrever" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 #, fuzzy msgid "description" msgstr "Descrição" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" +msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 #, fuzzy msgid "Created on" msgstr "criar um agora" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 #, fuzzy msgid "Incoming changesets" msgstr "Nenhum conjunto de alterações ainda." #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "Criar novo arquivo" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format msgid "Search \"%s\" in repository: %s" @@ -3501,10 +3592,16 @@ msgstr "Pesquisando em" msgid "File contents" msgstr "Conteúdo dos arquivos" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "mensagem de commit" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "Nomes dos arquivos" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3581,6 +3678,10 @@ msgstr "público" msgid "remote clone" msgstr "clone remoto" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "Contato" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "URL de clonagem" @@ -3644,40 +3745,49 @@ msgstr "Log resumido" msgid "Quick start" msgstr "Início rápido" -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "arquivo adicionado" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "arquivo alterado" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "arquivo removido" diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.4.0b\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,6 +39,10 @@ msgstr "" msgid "binary file" msgstr "" +#: rhodecode/controllers/compare.py:69 +msgid "There are no changesets yet" +msgstr "" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "" @@ -143,17 +147,17 @@ msgstr "" msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " @@ -167,12 +171,12 @@ msgid "" "file system please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -186,71 +190,66 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:300 #, 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:155 rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -264,59 +263,59 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "ONELEVEL" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:51 +msgid "ONELEVEL" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:52 msgid "SUBTREE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:55 -msgid "NEVER" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "ALLOW" +msgid "NEVER" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "TRY" +msgid "ALLOW" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "DEMAND" +msgid "TRY" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:63 -msgid "No encryption" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" +msgid "No encryption" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "" @@ -337,7 +336,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -383,76 +382,76 @@ msgstr "" msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "" @@ -504,7 +503,7 @@ msgstr "" msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" @@ -513,95 +512,95 @@ msgstr "" msgid "Whoosh reindex task scheduled" msgstr "" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 msgid "Removed email from user" msgstr "" @@ -692,84 +691,95 @@ msgstr "" msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" -msgstr "" - -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:612 +msgid "[commented] on pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:614 +msgid "[closed] pull request for" +msgstr "" + +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "" @@ -842,75 +852,75 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 msgid "Repository no access" msgstr "" +#: rhodecode/model/db.py:1064 +msgid "Repository read access" +msgstr "" + +#: rhodecode/model/db.py:1065 +msgid "Repository write access" +msgstr "" + +#: rhodecode/model/db.py:1066 +msgid "Repository admin access" +msgstr "" + +#: rhodecode/model/db.py:1068 +msgid "Repositories Group no access" +msgstr "" + +#: rhodecode/model/db.py:1069 +msgid "Repositories Group read access" +msgstr "" + +#: rhodecode/model/db.py:1070 +msgid "Repositories Group write access" +msgstr "" + +#: rhodecode/model/db.py:1071 +msgid "Repositories Group admin access" +msgstr "" + #: rhodecode/model/db.py:1073 -msgid "Repository read access" +msgid "RhodeCode Administrator" msgstr "" #: rhodecode/model/db.py:1074 -msgid "Repository write access" +msgid "Repository creation disabled" msgstr "" #: rhodecode/model/db.py:1075 -msgid "Repository admin access" +msgid "Repository creation enabled" +msgstr "" + +#: rhodecode/model/db.py:1076 +msgid "Register disabled" msgstr "" #: rhodecode/model/db.py:1077 -msgid "Repositories Group no access" -msgstr "" - -#: rhodecode/model/db.py:1078 -msgid "Repositories Group read access" -msgstr "" - -#: rhodecode/model/db.py:1079 -msgid "Repositories Group write access" +msgid "Register new user with RhodeCode with manual activation" msgstr "" #: rhodecode/model/db.py:1080 -msgid "Repositories Group admin access" -msgstr "" - -#: rhodecode/model/db.py:1082 -msgid "RhodeCode Administrator" -msgstr "" - -#: rhodecode/model/db.py:1083 -msgid "Repository creation disabled" -msgstr "" - -#: rhodecode/model/db.py:1084 -msgid "Repository creation enabled" -msgstr "" - -#: rhodecode/model/db.py:1085 -msgid "Register disabled" -msgstr "" - -#: rhodecode/model/db.py:1086 -msgid "Register new user with RhodeCode with manual activation" -msgstr "" - -#: rhodecode/model/db.py:1089 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -932,36 +942,36 @@ msgstr "" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 msgid "sent message" msgstr "" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 msgid "registered in RhodeCode" msgstr "" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 msgid "latest tip" msgstr "" @@ -970,14 +980,15 @@ msgid "new user registration" msgstr "" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " @@ -1115,7 +1126,9 @@ msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1123,12 +1136,14 @@ msgstr "" msgid "quick filter..." msgstr "" -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "" #: rhodecode/templates/index_base.html:13 rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "" @@ -1145,13 +1160,12 @@ msgstr "" #: rhodecode/templates/index_base.html:132 rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "" @@ -1164,13 +1178,12 @@ msgstr "" #: rhodecode/templates/index_base.html:66 rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1186,21 +1199,18 @@ msgid "Name" msgstr "" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" #: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" @@ -1229,8 +1239,9 @@ msgid "Group Name" msgstr "" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1239,8 +1250,9 @@ msgid "Click to sort ascending" msgstr "" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1249,13 +1261,13 @@ msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 msgid "Last Change" msgstr "" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1264,8 +1276,9 @@ msgid "No records found." msgstr "" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1274,8 +1287,9 @@ msgid "Data error." msgstr "" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1385,7 +1399,7 @@ msgstr "" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "" @@ -1429,10 +1443,9 @@ msgid "Admin journal" msgstr "" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1538,7 +1551,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "" @@ -1564,7 +1577,7 @@ msgstr "" msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "" @@ -1586,7 +1599,7 @@ msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "" @@ -1633,7 +1646,6 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "" @@ -1675,26 +1687,28 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 msgid "Landing revision" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1714,7 +1728,9 @@ msgstr "" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1753,17 +1769,17 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "" @@ -1845,6 +1861,7 @@ msgid "Remove this repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "" @@ -1881,7 +1898,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "" @@ -1892,7 +1909,7 @@ msgid "member" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -1930,25 +1947,6 @@ msgstr "" msgid "Repositories administration" msgstr "" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "" @@ -1979,6 +1977,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "" @@ -2003,12 +2002,20 @@ msgid "Number of toplevel repositories" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, python-format msgid "Confirm to delete this group: %s" msgstr "" @@ -2063,115 +2070,133 @@ msgstr "" msgid "destroy old data" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete if " +"`destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" -msgstr "" - -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "require ssl for vcs operations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it will " +"return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to change" " this, you must restart application in order to make this setting take " "effect. Click this label to unlock." msgstr "" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a restart, " +"and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:213 -msgid "System Info and Packages" -msgstr "" - #: rhodecode/templates/admin/settings/settings.html:216 +msgid "System Info and Packages" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:219 msgid "show" msgstr "" @@ -2181,7 +2206,6 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "" @@ -2238,26 +2262,34 @@ msgstr "" msgid "Create repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +msgid "Nothing here yet" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:210 -msgid "Email addresses" +#: rhodecode/templates/admin/users/user_edit.html:174 +msgid "Edit Permission" msgstr "" #: rhodecode/templates/admin/users/user_edit.html:223 +msgid "Email addresses" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:236 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 msgid "Add" msgstr "" @@ -2270,21 +2302,43 @@ msgstr "" msgid "My Account" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +msgid "My permissions" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 msgid "My repos" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 -msgid "My permissions" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -msgid "ADD" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +msgid "My pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 +msgid "Add repo" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2293,17 +2347,23 @@ msgstr "" msgid "Revision" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, python-format +msgid "Confirm to delete this repository: %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" @@ -2312,42 +2372,41 @@ msgstr "" msgid "Users administration" msgstr "" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +msgid "firstname" +msgstr "" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" -#: rhodecode/templates/admin/users/users.html:56 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "" @@ -2378,7 +2437,6 @@ msgid "Choosen group members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "" @@ -2387,7 +2445,6 @@ msgid "Available members" msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "" @@ -2486,18 +2543,18 @@ msgstr "" #: rhodecode/templates/base/base.html:158 rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "" #: rhodecode/templates/base/base.html:166 rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "" @@ -2508,9 +2565,9 @@ msgstr "" #: rhodecode/templates/base/base.html:186 rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "" @@ -2525,7 +2582,7 @@ msgid "settings" msgstr "" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" @@ -2543,10 +2600,6 @@ msgstr "" msgid "repositories groups" msgstr "" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "" @@ -2622,6 +2675,10 @@ msgstr "" msgid "Compare" msgstr "" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "" @@ -2653,11 +2710,13 @@ msgstr[0] "" msgstr[1] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" @@ -2666,7 +2725,7 @@ msgid "Show" msgstr "" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "" @@ -2804,18 +2863,18 @@ msgid "Commenting on line {1}." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 msgid "Comment" msgstr "" @@ -2832,18 +2891,22 @@ msgstr "" msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "change status" msgstr "" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, python-format msgid "%s Changesets" @@ -2856,7 +2919,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2876,40 +2939,45 @@ msgstr "" msgid "Outgoing changesets" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, python-format +msgid "Confirm to delete this user: %s" +msgstr "" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "" @@ -2934,7 +3002,7 @@ msgid "%s Files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "" @@ -3175,7 +3243,7 @@ msgstr "" msgid "forked" msgstr "" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "" @@ -3206,6 +3274,10 @@ msgstr "" msgid "Watched" msgstr "" +#: rhodecode/templates/journal/journal.html:46 +msgid "ADD" +msgstr "" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "" @@ -3248,62 +3320,71 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:95 -msgid "Available reviewers" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +msgid "owner" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest.html:97 msgid "Create new pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 msgid "Title" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 msgid "description" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +msgid "Closed %s" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 msgid "Incoming changesets" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +msgid "all pull requests" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, python-format msgid "Search \"%s\" in repository: %s" @@ -3337,10 +3418,15 @@ msgstr "" msgid "File contents" msgstr "" +#: rhodecode/templates/search/search.html:64 +msgid "Commit messages" +msgstr "" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3417,6 +3503,10 @@ msgstr "" msgid "remote clone" msgstr "" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "" @@ -3479,40 +3569,49 @@ msgstr "" msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:643 -msgid "commits" -msgstr "" - -#: rhodecode/templates/summary/summary.html:644 -msgid "files added" -msgstr "" - -#: rhodecode/templates/summary/summary.html:645 -msgid "files changed" -msgstr "" - #: rhodecode/templates/summary/summary.html:646 -msgid "files removed" +msgid "commits" +msgstr "" + +#: rhodecode/templates/summary/summary.html:647 +msgid "files added" +msgstr "" + +#: rhodecode/templates/summary/summary.html:648 +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:649 -msgid "commit" -msgstr "" - -#: rhodecode/templates/summary/summary.html:650 -msgid "file added" -msgstr "" - -#: rhodecode/templates/summary/summary.html:651 -msgid "file changed" +msgid "files removed" msgstr "" #: rhodecode/templates/summary/summary.html:652 +msgid "commit" +msgstr "" + +#: rhodecode/templates/summary/summary.html:653 +msgid "file added" +msgstr "" + +#: rhodecode/templates/summary/summary.html:654 +msgid "file changed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "" diff --git a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_CN/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2012-04-05 17:37+0800\n" "Last-Translator: mikespook \n" "Language-Team: mikespook\n" @@ -40,6 +40,11 @@ msgstr "文件内容" msgid "binary file" msgstr "二进制文件" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "没有任何变更" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "主页" @@ -147,17 +152,17 @@ msgstr "未知包类型" msgid "Changesets" msgstr "变更集" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,12 +178,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "版本库 %s 被分支到 %s" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -193,65 +198,60 @@ msgstr "公共日志" msgid "journal" msgstr "日志" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "成功注册到 rhodecode" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "密码重置链接已经发送" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 #, fuzzy msgid "Successfully opened new pull request" msgstr "用户删除成功" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 #, fuzzy msgid "Error occurred during sending pull request" msgstr "提交时发生错误" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "没有索引用于搜索。请运行 whoosh 索引器" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "在搜索操作中发生异常" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "版本库 %s 成功更新" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -260,14 +260,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库 %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -281,59 +281,59 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "ONELEVEL" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:51 -msgid "SUBTREE" +msgid "ONELEVEL" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:55 -msgid "NEVER" +#: rhodecode/controllers/admin/ldap_settings.py:52 +msgid "SUBTREE" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "ALLOW" +msgid "NEVER" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "TRY" +msgid "ALLOW" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "DEMAND" +msgid "TRY" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "未加密" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "LDAP 设置已经成功更新" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "无法启用 LDAP。库“python-ldap”缺失。" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "" @@ -354,7 +354,7 @@ msgstr "写" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -402,76 +402,76 @@ msgstr "成功更新默认权限" msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "新版本库 %s 基于 %s 建立。" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "建立版本库 %s" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "新版本库 %s 基于 %s 建立。" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 #, fuzzy msgid "An error occurred during this operation" msgstr "在搜索操作中发生异常" @@ -525,7 +525,7 @@ msgstr "在搜索操作中发生异常" msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" @@ -534,96 +534,96 @@ msgstr "" msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引任务调度" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "更新应用设置" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "更新 mercurial 设置" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "新增钩子" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "创建用户 %s" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "用户更新成功" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "用户删除成功" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 #, fuzzy msgid "An error occurred during email saving" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 #, fuzzy msgid "Removed email from user" msgstr "移除版本库组 %s" @@ -717,89 +717,101 @@ msgstr "修订" msgid "fork name " msgstr "分支名称" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本库 %s" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 #, fuzzy msgid "[created] user" msgstr "创建用户 %s" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 #, fuzzy msgid "[updated] user" msgstr "更新用户组 %s" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 #, fuzzy msgid "[created] users group" msgstr "建立用户组 %s" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 #, fuzzy msgid "[updated] users group" msgstr "更新用户组 %s" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" +#: rhodecode/lib/helpers.py:612 +#, fuzzy +msgid "[commented] on pull request for" +msgstr "创建用户 %s" + +#: rhodecode/lib/helpers.py:614 +msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "没有文件" @@ -867,88 +879,88 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 #, fuzzy msgid "Repository no access" msgstr "个版本库" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1064 #, fuzzy msgid "Repository read access" msgstr "这个版本库已经存在" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1065 #, fuzzy msgid "Repository write access" msgstr "个版本库" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1066 #, fuzzy msgid "Repository admin access" msgstr "个版本库" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1068 #, fuzzy msgid "Repositories Group no access" msgstr "版本库组" -#: rhodecode/model/db.py:1078 +#: rhodecode/model/db.py:1069 #, fuzzy msgid "Repositories Group read access" msgstr "版本库组" -#: rhodecode/model/db.py:1079 +#: rhodecode/model/db.py:1070 #, fuzzy msgid "Repositories Group write access" msgstr "版本库组" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1071 #, fuzzy msgid "Repositories Group admin access" msgstr "版本库组" -#: rhodecode/model/db.py:1082 +#: rhodecode/model/db.py:1073 #, fuzzy msgid "RhodeCode Administrator" msgstr "用户管理员" -#: rhodecode/model/db.py:1083 +#: rhodecode/model/db.py:1074 #, fuzzy msgid "Repository creation disabled" msgstr "建立版本库" -#: rhodecode/model/db.py:1084 +#: rhodecode/model/db.py:1075 #, fuzzy msgid "Repository creation enabled" msgstr "建立版本库" -#: rhodecode/model/db.py:1085 +#: rhodecode/model/db.py:1076 #, fuzzy msgid "Register disabled" msgstr "禁用" -#: rhodecode/model/db.py:1086 +#: rhodecode/model/db.py:1077 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1089 +#: rhodecode/model/db.py:1080 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -970,38 +982,38 @@ msgstr "请输入密码" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 #, fuzzy msgid "sent message" msgstr "提交信息" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 #, fuzzy msgid "registered in RhodeCode" msgstr "成功注册到 rhodecode" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 #, fuzzy msgid "latest tip" msgstr "最后登录" @@ -1012,14 +1024,15 @@ msgid "new user registration" msgstr "[RhodeCode] 新用户注册" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1160,7 +1173,9 @@ msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1168,13 +1183,15 @@ msgstr "" msgid "quick filter..." msgstr "快速过滤..." -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "个版本库" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "新增版本库" @@ -1193,13 +1210,12 @@ msgstr "组名" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "描述" @@ -1213,13 +1229,12 @@ msgstr "版本库组" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1236,15 +1251,12 @@ msgid "Name" msgstr "名称" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "最后修改" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" @@ -1252,7 +1264,7 @@ msgstr "" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" @@ -1285,8 +1297,9 @@ msgstr "组名" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1296,8 +1309,9 @@ msgstr "" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1306,14 +1320,14 @@ msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 #, fuzzy msgid "Last Change" msgstr "最后修改" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1322,8 +1336,9 @@ msgid "No records found." msgstr "" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1332,8 +1347,9 @@ msgid "Data error." msgstr "" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1445,7 +1461,7 @@ msgstr "管理员审核后，你注册的帐号将被启用" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "私有版本库" @@ -1491,10 +1507,9 @@ msgid "Admin journal" msgstr "管理员日志" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1601,7 +1616,7 @@ msgstr "电子邮件属性" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "保存" @@ -1629,7 +1644,7 @@ msgstr "" msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 #, fuzzy msgid "No notifications here yet" msgstr "尚无操作" @@ -1654,7 +1669,7 @@ msgstr "权限管理" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "权限" @@ -1701,7 +1716,6 @@ msgstr "添加版本库" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "版本库" @@ -1744,6 +1758,7 @@ msgstr "建立版本库" #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 #, fuzzy msgid "Landing revision" msgstr "下一个修订" @@ -1751,20 +1766,21 @@ msgstr "下一个修订" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1784,7 +1800,9 @@ msgstr "编辑版本库" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1824,17 +1842,17 @@ msgstr "%s 库的修改" #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "重置" @@ -1917,6 +1935,7 @@ msgid "Remove this repository" msgstr "删除版本库" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "确认删除版本库" @@ -1953,7 +1972,7 @@ msgstr "写" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "管理员" @@ -1964,7 +1983,7 @@ msgid "member" msgstr "成员" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -2003,25 +2022,6 @@ msgstr "删除用户组失败" msgid "Repositories administration" msgstr "版本库管理员" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "联系方式" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "删除" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, fuzzy, python-format -msgid "Confirm to delete this repository: %s" -msgstr "确认删除版本库" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "组" @@ -2052,6 +2052,7 @@ msgstr "上级组" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "保存" @@ -2077,12 +2078,20 @@ msgid "Number of toplevel repositories" msgstr "版本库数量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "操作" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "删除" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, fuzzy, python-format msgid "Confirm to delete this group: %s" msgstr "确认删除该组" @@ -2137,117 +2146,137 @@ msgstr "如果版本库已经从文件系统删除，但数据库仍然有遗留信息，请勾选该项进行清理" msgid "destroy old data" msgstr "清理旧数据" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "重新扫描版本库" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Whoosh 索引" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "构建索引选项" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "重新建立" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "重新索引" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "全局设置" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "应用名称" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "保存设置" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Mercurial 设置" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "设置" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "使用 SSL 推送" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "记录用户推送命令" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "记录用户拉取命令" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "高级设置" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "版本库路径" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "这是一个关键设置。如果确认修改该项设置，请重启服务以便设置生效。" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "解锁" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 #, fuzzy msgid "Email to" msgstr "电子邮件" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 #, fuzzy msgid "show" msgstr "显示" @@ -2258,7 +2287,6 @@ msgstr "添加用户" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "用户" @@ -2316,29 +2344,39 @@ msgstr "" msgid "Create repositories" msgstr "创建版本库" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "尚无操作" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 #, fuzzy msgid "Permission" msgstr "权限" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "版本库权限" + +#: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy msgid "Email addresses" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除该用户" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 #, fuzzy msgid "New email address" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 #, fuzzy msgid "Add" msgstr "新增" @@ -2352,24 +2390,47 @@ msgstr "我的账户" msgid "My Account" msgstr "我的账户" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +#, fuzzy +msgid "My permissions" +msgstr "权限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 #, fuzzy msgid "My repos" msgstr "空版本库" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "创建用户 %s" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 #, fuzzy -msgid "My permissions" -msgstr "权限" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -#, fuzzy -msgid "ADD" +msgid "Add repo" msgstr "新增" -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2379,17 +2440,23 @@ msgstr "新增" msgid "Revision" msgstr "修订" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "私有" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, fuzzy, python-format +msgid "Confirm to delete this repository: %s" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "没有任何版本库" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" @@ -2398,42 +2465,42 @@ msgstr "" msgid "Users administration" msgstr "用户管理员" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "用户" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "添加用户" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "用户名" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名称" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" +msgstr "名" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "姓" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "最后登录" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "启用" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" -#: rhodecode/templates/admin/users/users.html:56 -#, fuzzy, python-format -msgid "Confirm to delete this user: %s" -msgstr "确认删除该用户" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "添加用户组" @@ -2464,7 +2531,6 @@ msgid "Choosen group members" msgstr "选择组成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "移除全部项目" @@ -2473,7 +2539,6 @@ msgid "Available members" msgstr "启用成员" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "添加全部项目" @@ -2581,9 +2646,9 @@ msgstr "" #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "概况" @@ -2591,9 +2656,9 @@ msgstr "概况" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "修改记录" @@ -2606,9 +2671,9 @@ msgstr "切换到" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "档案" @@ -2625,7 +2690,7 @@ msgid "settings" msgstr "设置" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" @@ -2643,10 +2708,6 @@ msgstr "搜索" msgid "repositories groups" msgstr "版本库组" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "用户" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "用户组" @@ -2731,6 +2792,10 @@ msgstr "分支" msgid "Compare" msgstr "比较显示" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "名称" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日期" @@ -2762,11 +2827,13 @@ msgid_plural "showing %d out of %d revis msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" @@ -2775,7 +2842,7 @@ msgid "Show" msgstr "显示" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "" @@ -2912,18 +2979,18 @@ msgid "Commenting on line {1}." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 #, fuzzy msgid "Comment" msgstr "提交" @@ -2942,19 +3009,23 @@ msgstr "必须登录才能访问该页面" msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 #, fuzzy msgid "change status" msgstr "变更集" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format msgid "%s Changesets" @@ -2967,7 +3038,7 @@ msgstr "比较显示" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2990,40 +3061,45 @@ msgstr "尚无修订" msgid "Outgoing changesets" msgstr "尚无修订" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "分支" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Mercurial 版本库" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Git 版本库" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "公共版本库" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "尚无修订" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, fuzzy, python-format +msgid "Confirm to delete this user: %s" +msgstr "确认删除该用户" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "" @@ -3048,7 +3124,7 @@ msgid "%s Files" msgstr "文件" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "文件" @@ -3303,7 +3379,7 @@ msgstr "分支" msgid "forked" msgstr "已有分支" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "尚未有任何分支" @@ -3338,6 +3414,11 @@ msgstr "" msgid "Watched" msgstr "缓存" +#: rhodecode/templates/journal/journal.html:46 +#, fuzzy +msgid "ADD" +msgstr "新增" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "跟随中用户" @@ -3383,69 +3464,79 @@ msgid "Detailed compare view" msgstr "比较显示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "所有者" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:95 -#, fuzzy -msgid "Available reviewers" -msgstr "启用成员" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:97 #, fuzzy msgid "Create new pull request" msgstr "创建用户 %s" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "写" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 #, fuzzy msgid "description" msgstr "描述" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" +msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 #, fuzzy msgid "Created on" msgstr "创建用户 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 #, fuzzy msgid "Incoming changesets" msgstr "尚无修订" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "创建用户 %s" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format msgid "Search \"%s\" in repository: %s" @@ -3480,10 +3571,16 @@ msgstr "搜索范围" msgid "File contents" msgstr "文件内容" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "提交信息" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "文件名" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3563,6 +3660,10 @@ msgstr "公共" msgid "remote clone" msgstr "远程 clone" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "联系方式" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "clone 地址" @@ -3628,40 +3729,49 @@ msgstr "简短日志" msgid "Quick start" msgstr "快速过滤..." -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "下载 %s 作为 %s" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "提交" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "文件已删除" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "提交" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "文件已删除" diff --git a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/zh_TW/LC_MESSAGES/rhodecode.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode 1.2.0\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2012-07-08 15:39+0200\n" +"POT-Creation-Date: 2012-07-26 23:35+0200\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen \n" "Language-Team: zh_TW \n" @@ -40,6 +40,11 @@ msgstr "文件內容" msgid "binary file" msgstr "二進位檔" +#: rhodecode/controllers/compare.py:69 +#, fuzzy +msgid "There are no changesets yet" +msgstr "尚未有任何變更" + #: rhodecode/controllers/error.py:69 msgid "Home page" msgstr "首頁" @@ -147,17 +152,17 @@ msgstr "未知的存檔類型" msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:66 -#: rhodecode/controllers/summary.py:230 rhodecode/model/scm.py:497 +#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:231 rhodecode/model/scm.py:508 +#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:88 +#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,12 +178,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:166 +#: rhodecode/controllers/forks.py:164 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:180 +#: rhodecode/controllers/forks.py:178 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -193,64 +198,59 @@ msgstr "公開日誌" msgid "journal" msgstr "日誌" -#: rhodecode/controllers/login.py:116 +#: rhodecode/controllers/login.py:130 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:137 +#: rhodecode/controllers/login.py:151 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:157 +#: rhodecode/controllers/login.py:171 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:68 rhodecode/model/scm.py:503 +#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 msgid "Bookmarks" msgstr "" -#: rhodecode/controllers/pullrequests.py:136 -#, python-format -msgid "%s (owner)" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:161 +#: rhodecode/controllers/pullrequests.py:160 #, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:164 +#: rhodecode/controllers/pullrequests.py:163 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/search.py:114 +#: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" -#: rhodecode/controllers/search.py:119 +#: rhodecode/controllers/search.py:136 msgid "There is no index to search in. Please run whoosh indexer" msgstr "沒有任何索引可以搜尋。請執行 whoosh 建立索引" -#: rhodecode/controllers/search.py:123 +#: rhodecode/controllers/search.py:140 msgid "An error occurred during this search operation" msgstr "" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:221 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:239 +#: rhodecode/controllers/admin/repos.py:282 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:257 +#: rhodecode/controllers/admin/repos.py:300 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -259,14 +259,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:269 +#: rhodecode/controllers/admin/repos.py:312 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:279 -#: rhodecode/controllers/admin/repos.py:285 +#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:328 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -280,59 +280,59 @@ msgstr "" msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" -#: rhodecode/controllers/admin/ldap_settings.py:49 +#: rhodecode/controllers/admin/ldap_settings.py:50 msgid "BASE" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:50 -msgid "ONELEVEL" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:51 -msgid "SUBTREE" +msgid "ONELEVEL" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:55 -msgid "NEVER" +#: rhodecode/controllers/admin/ldap_settings.py:52 +msgid "SUBTREE" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:56 -msgid "ALLOW" +msgid "NEVER" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:57 -msgid "TRY" +msgid "ALLOW" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:58 -msgid "DEMAND" +msgid "TRY" msgstr "" #: rhodecode/controllers/admin/ldap_settings.py:59 +msgid "DEMAND" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:60 msgid "HARD" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:63 +#: rhodecode/controllers/admin/ldap_settings.py:64 msgid "No encryption" msgstr "無加密" -#: rhodecode/controllers/admin/ldap_settings.py:64 -msgid "LDAPS connection" -msgstr "" - #: rhodecode/controllers/admin/ldap_settings.py:65 +msgid "LDAPS connection" +msgstr "" + +#: rhodecode/controllers/admin/ldap_settings.py:66 msgid "START_TLS on LDAP connection" msgstr "" -#: rhodecode/controllers/admin/ldap_settings.py:125 +#: rhodecode/controllers/admin/ldap_settings.py:126 msgid "Ldap settings updated successfully" msgstr "LDAP設定更新完成" -#: rhodecode/controllers/admin/ldap_settings.py:129 +#: rhodecode/controllers/admin/ldap_settings.py:130 msgid "Unable to activate ldap. The \"python-ldap\" library is missing." msgstr "無法啟用LDAP。找不到python-ldap函式庫" -#: rhodecode/controllers/admin/ldap_settings.py:146 +#: rhodecode/controllers/admin/ldap_settings.py:147 msgid "error occurred during update of ldap settings" msgstr "" @@ -353,7 +353,7 @@ msgstr "寫" #: rhodecode/templates/admin/permissions/permissions.html:9 #: rhodecode/templates/admin/repos/repo_add.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:9 -#: rhodecode/templates/admin/repos/repos.html:10 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:8 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 @@ -401,76 +401,76 @@ msgstr "預設權限更新完成" msgid "error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/repos.py:121 +#: rhodecode/controllers/admin/repos.py:123 msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:151 +#: rhodecode/controllers/admin/repos.py:191 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:155 +#: rhodecode/controllers/admin/repos.py:195 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:186 +#: rhodecode/controllers/admin/repos.py:226 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:303 +#: rhodecode/controllers/admin/repos.py:346 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:322 +#: rhodecode/controllers/admin/repos.py:365 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:339 +#: rhodecode/controllers/admin/repos.py:382 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:355 +#: rhodecode/controllers/admin/repos.py:398 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:375 +#: rhodecode/controllers/admin/repos.py:418 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:379 +#: rhodecode/controllers/admin/repos.py:422 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:384 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:397 +#: rhodecode/controllers/admin/repos.py:440 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:399 +#: rhodecode/controllers/admin/repos.py:442 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:415 +#: rhodecode/controllers/admin/repos.py:458 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:417 +#: rhodecode/controllers/admin/repos.py:460 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:421 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during this operation" msgstr "" @@ -522,7 +522,7 @@ msgstr "" msgid "An error occurred during deletion of group users groups" msgstr "" -#: rhodecode/controllers/admin/settings.py:120 +#: rhodecode/controllers/admin/settings.py:121 #, python-format msgid "Repositories successfully rescanned added: %s,removed: %s" msgstr "" @@ -531,95 +531,95 @@ msgstr "" msgid "Whoosh reindex task scheduled" msgstr "Whoosh 重新索引工作排程" -#: rhodecode/controllers/admin/settings.py:154 +#: rhodecode/controllers/admin/settings.py:160 msgid "Updated application settings" msgstr "更新應用設定" -#: rhodecode/controllers/admin/settings.py:159 -#: rhodecode/controllers/admin/settings.py:227 +#: rhodecode/controllers/admin/settings.py:164 +#: rhodecode/controllers/admin/settings.py:230 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:222 +#: rhodecode/controllers/admin/settings.py:226 msgid "Updated mercurial settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:247 +#: rhodecode/controllers/admin/settings.py:240 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:259 +#: rhodecode/controllers/admin/settings.py:252 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:263 +#: rhodecode/controllers/admin/settings.py:256 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:282 +#: rhodecode/controllers/admin/settings.py:275 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:337 +#: rhodecode/controllers/admin/settings.py:330 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:367 +#: rhodecode/controllers/admin/settings.py:361 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:387 -#: rhodecode/controllers/admin/users.py:143 +#: rhodecode/controllers/admin/settings.py:376 +#: rhodecode/controllers/admin/users.py:186 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:84 +#: rhodecode/controllers/admin/users.py:127 #, python-format msgid "created user %s" msgstr "建立使用者 %s" -#: rhodecode/controllers/admin/users.py:96 +#: rhodecode/controllers/admin/users.py:139 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:125 +#: rhodecode/controllers/admin/users.py:168 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:159 +#: rhodecode/controllers/admin/users.py:202 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:164 +#: rhodecode/controllers/admin/users.py:207 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:178 +#: rhodecode/controllers/admin/users.py:221 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:210 +#: rhodecode/controllers/admin/users.py:253 #: rhodecode/controllers/admin/users_groups.py:219 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:219 +#: rhodecode/controllers/admin/users.py:262 #: rhodecode/controllers/admin/users_groups.py:229 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:235 +#: rhodecode/controllers/admin/users.py:278 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:241 +#: rhodecode/controllers/admin/users.py:284 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:251 +#: rhodecode/controllers/admin/users.py:294 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" @@ -712,89 +712,101 @@ msgstr "修訂" msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:577 +#: rhodecode/lib/helpers.py:578 +#: rhodecode/templates/pullrequests/pullrequest_show.html:4 +#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#, python-format +msgid "Pull request #%s" +msgstr "" + +#: rhodecode/lib/helpers.py:584 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:579 rhodecode/lib/helpers.py:589 +#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:581 +#: rhodecode/lib/helpers.py:588 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:583 rhodecode/lib/helpers.py:591 +#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:585 rhodecode/lib/helpers.py:593 +#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:587 +#: rhodecode/lib/helpers.py:594 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:595 +#: rhodecode/lib/helpers.py:602 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:597 +#: rhodecode/lib/helpers.py:604 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:599 +#: rhodecode/lib/helpers.py:606 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:601 +#: rhodecode/lib/helpers.py:608 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:603 +#: rhodecode/lib/helpers.py:610 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:605 -msgid "[commented] on pull request" +#: rhodecode/lib/helpers.py:612 +#, fuzzy +msgid "[commented] on pull request for" +msgstr "建立使用者 %s" + +#: rhodecode/lib/helpers.py:614 +msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:607 +#: rhodecode/lib/helpers.py:616 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:609 +#: rhodecode/lib/helpers.py:618 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:611 +#: rhodecode/lib/helpers.py:620 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:613 +#: rhodecode/lib/helpers.py:622 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:615 +#: rhodecode/lib/helpers.py:624 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:617 +#: rhodecode/lib/helpers.py:626 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:781 +#: rhodecode/lib/helpers.py:790 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:785 +#: rhodecode/lib/helpers.py:794 msgid "No Files" msgstr "沒有檔案" @@ -862,88 +874,88 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1072 +#: rhodecode/model/db.py:1063 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1064 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1065 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1066 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1068 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1078 +#: rhodecode/model/db.py:1069 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1079 +#: rhodecode/model/db.py:1070 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1071 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1082 +#: rhodecode/model/db.py:1073 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/model/db.py:1083 +#: rhodecode/model/db.py:1074 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1084 +#: rhodecode/model/db.py:1075 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1085 +#: rhodecode/model/db.py:1076 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1086 +#: rhodecode/model/db.py:1077 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1089 +#: rhodecode/model/db.py:1080 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1489 +#: rhodecode/model/db.py:1481 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1490 +#: rhodecode/model/db.py:1482 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1491 +#: rhodecode/model/db.py:1483 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1492 +#: rhodecode/model/db.py:1484 msgid "Under Review" msgstr "" @@ -965,38 +977,38 @@ msgstr "請輸入密碼" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:203 +#: rhodecode/model/notification.py:220 msgid "commented on commit" msgstr "" -#: rhodecode/model/notification.py:204 +#: rhodecode/model/notification.py:221 #, fuzzy msgid "sent message" msgstr "遞交資訊" -#: rhodecode/model/notification.py:205 +#: rhodecode/model/notification.py:222 msgid "mentioned you" msgstr "" -#: rhodecode/model/notification.py:206 +#: rhodecode/model/notification.py:223 #, fuzzy msgid "registered in RhodeCode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/model/notification.py:207 +#: rhodecode/model/notification.py:224 msgid "opened new pull request" msgstr "" -#: rhodecode/model/notification.py:208 +#: rhodecode/model/notification.py:225 msgid "commented on pull request" msgstr "" -#: rhodecode/model/pull_request.py:82 +#: rhodecode/model/pull_request.py:84 #, python-format msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:489 +#: rhodecode/model/scm.py:526 #, fuzzy msgid "latest tip" msgstr "最後登入" @@ -1007,14 +1019,15 @@ msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" #: rhodecode/model/user.py:265 rhodecode/model/user.py:287 +#: rhodecode/model/user.py:309 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:311 +#: rhodecode/model/user.py:333 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:317 +#: rhodecode/model/user.py:339 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1155,7 +1168,9 @@ msgstr "儀表板" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/repo_switcher_list.html:4 +#: rhodecode/templates/admin/repos/repos.html:9 #: rhodecode/templates/admin/users/user_edit_my_account.html:31 +#: rhodecode/templates/admin/users/users.html:9 #: rhodecode/templates/bookmarks/bookmarks.html:10 #: rhodecode/templates/branches/branches.html:9 #: rhodecode/templates/journal/journal.html:40 @@ -1163,13 +1178,15 @@ msgstr "儀表板" msgid "quick filter..." msgstr "快速過濾..." -#: rhodecode/templates/index_base.html:6 rhodecode/templates/base/base.html:219 +#: rhodecode/templates/index_base.html:6 +#: rhodecode/templates/admin/repos/repos.html:9 +#: rhodecode/templates/base/base.html:219 msgid "repositories" msgstr "個版本庫" #: rhodecode/templates/index_base.html:13 #: rhodecode/templates/index_base.html:15 -#: rhodecode/templates/admin/repos/repos.html:22 +#: rhodecode/templates/admin/repos/repos.html:21 msgid "ADD REPOSITORY" msgstr "新增版本庫" @@ -1188,13 +1205,12 @@ msgstr "群組名稱" #: rhodecode/templates/index_base.html:158 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 -#: rhodecode/templates/admin/repos/repos.html:37 -#: rhodecode/templates/admin/repos/repos.html:84 +#: rhodecode/templates/admin/repos/repos.html:72 #: rhodecode/templates/admin/repos_groups/repos_groups_add.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:41 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:34 #: rhodecode/templates/forks/fork.html:59 -#: rhodecode/templates/settings/repo_settings.html:57 +#: rhodecode/templates/settings/repo_settings.html:66 #: rhodecode/templates/summary/summary.html:105 msgid "Description" msgstr "描述" @@ -1208,13 +1224,12 @@ msgstr "版本庫群組" #: rhodecode/templates/index_base.html:156 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: 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.html:170 -#: 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/admin/repos/repos.html:70 +#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit_my_account.html:59 +#: rhodecode/templates/admin/users/user_edit_my_account.html:154 +#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 #: rhodecode/templates/branches/branches.html:51 @@ -1231,15 +1246,12 @@ msgid "Name" msgstr "名稱" #: rhodecode/templates/index_base.html:68 -#: rhodecode/templates/admin/repos/repos.html:38 msgid "Last change" msgstr "最後修改" #: 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:167 +#: rhodecode/templates/admin/users/user_edit_my_account.html:156 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "" @@ -1247,7 +1259,7 @@ msgstr "" #: rhodecode/templates/index_base.html:70 #: rhodecode/templates/index_base.html:163 #: rhodecode/templates/admin/repos/repo_edit.html:112 -#: rhodecode/templates/admin/repos/repos.html:89 +#: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "擁有者" @@ -1280,8 +1292,9 @@ msgstr "群組名稱" #: 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:186 +#: rhodecode/templates/admin/repos/repos.html:94 +#: rhodecode/templates/admin/users/user_edit_my_account.html:176 +#: rhodecode/templates/admin/users/users.html:105 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1291,8 +1304,9 @@ msgstr "" #: 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:187 +#: rhodecode/templates/admin/repos/repos.html:95 +#: rhodecode/templates/admin/users/user_edit_my_account.html:177 +#: rhodecode/templates/admin/users/users.html:106 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1301,14 +1315,14 @@ msgid "Click to sort descending" msgstr "" #: rhodecode/templates/index_base.html:159 -#: rhodecode/templates/admin/repos/repos.html:85 #, fuzzy msgid "Last Change" msgstr "最後修改" #: rhodecode/templates/index_base.html:190 -#: rhodecode/templates/admin/repos/repos.html:114 -#: rhodecode/templates/admin/users/user_edit_my_account.html:188 +#: rhodecode/templates/admin/repos/repos.html:96 +#: rhodecode/templates/admin/users/user_edit_my_account.html:178 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1317,8 +1331,9 @@ msgid "No records found." msgstr "" #: rhodecode/templates/index_base.html:191 -#: rhodecode/templates/admin/repos/repos.html:115 -#: rhodecode/templates/admin/users/user_edit_my_account.html:189 +#: rhodecode/templates/admin/repos/repos.html:97 +#: rhodecode/templates/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1327,8 +1342,9 @@ msgid "Data error." msgstr "" #: rhodecode/templates/index_base.html:192 -#: rhodecode/templates/admin/repos/repos.html:116 -#: rhodecode/templates/admin/users/user_edit_my_account.html:190 +#: rhodecode/templates/admin/repos/repos.html:98 +#: rhodecode/templates/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1440,7 +1456,7 @@ msgstr "您的帳號註冊後將等待管理員啟用" #: rhodecode/templates/repo_switcher_list.html:11 #: rhodecode/templates/admin/repos/repo_add_base.html:65 #: rhodecode/templates/admin/repos/repo_edit.html:85 -#: rhodecode/templates/settings/repo_settings.html:67 +#: rhodecode/templates/settings/repo_settings.html:76 msgid "Private repository" msgstr "私有的版本庫" @@ -1486,10 +1502,9 @@ msgid "Admin journal" msgstr "管理員日誌" #: 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:51 -#: rhodecode/templates/admin/users/user_edit_my_account.html:52 +#: rhodecode/templates/admin/repos/repos.html:74 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:8 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:9 #: rhodecode/templates/journal/journal.html:61 #: rhodecode/templates/journal/journal.html:62 msgid "Action" @@ -1596,7 +1611,7 @@ msgstr "電子郵件屬性" #: rhodecode/templates/admin/users/user_edit.html:154 #: 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 +#: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "儲存" @@ -1624,7 +1639,7 @@ msgstr "" msgid "Mark all read" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_data.html:34 +#: rhodecode/templates/admin/notifications/notifications_data.html:39 msgid "No notifications here yet" msgstr "" @@ -1648,7 +1663,7 @@ msgstr "權限管理員" #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:58 #: rhodecode/templates/admin/users/user_edit.html:139 #: rhodecode/templates/admin/users_groups/users_group_edit.html:100 -#: rhodecode/templates/settings/repo_settings.html:77 +#: rhodecode/templates/settings/repo_settings.html:86 msgid "Permissions" msgstr "權限" @@ -1695,7 +1710,6 @@ msgstr "新增版本庫" #: rhodecode/templates/admin/repos/repo_add.html:11 #: rhodecode/templates/admin/repos/repo_edit.html:11 -#: rhodecode/templates/admin/repos/repos.html:10 #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:10 msgid "Repositories" msgstr "版本庫" @@ -1738,6 +1752,7 @@ msgstr "版本庫建立" #: rhodecode/templates/admin/repos/repo_add_base.html:47 #: rhodecode/templates/admin/repos/repo_edit.html:66 #: rhodecode/templates/forks/fork.html:41 +#: rhodecode/templates/settings/repo_settings.html:57 #, fuzzy msgid "Landing revision" msgstr "下一個修訂" @@ -1745,20 +1760,21 @@ msgstr "下一個修訂" #: rhodecode/templates/admin/repos/repo_add_base.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:70 #: rhodecode/templates/forks/fork.html:45 +#: rhodecode/templates/settings/repo_settings.html:61 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:60 #: rhodecode/templates/admin/repos/repo_edit.html:79 #: rhodecode/templates/forks/fork.html:63 -#: rhodecode/templates/settings/repo_settings.html:61 +#: rhodecode/templates/settings/repo_settings.html:70 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:69 #: rhodecode/templates/admin/repos/repo_edit.html:89 #: rhodecode/templates/forks/fork.html:72 -#: rhodecode/templates/settings/repo_settings.html:71 +#: rhodecode/templates/settings/repo_settings.html:80 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -1778,7 +1794,9 @@ msgstr "編輯版本庫" #: 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:71 +#: rhodecode/templates/admin/users/user_edit.html:204 +#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/admin/users_groups/users_group_edit.html:13 #: rhodecode/templates/files/files_source.html:44 #: rhodecode/templates/journal/journal.html:81 @@ -1818,17 +1836,17 @@ msgstr "修改於版本庫 %s" #: rhodecode/templates/admin/repos/repo_edit.html:133 #: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 -#: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:177 +#: rhodecode/templates/admin/settings/settings.html:113 +#: rhodecode/templates/admin/settings/settings.html:180 #: rhodecode/templates/admin/users/user_edit.html:130 #: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:245 +#: rhodecode/templates/admin/users/user_edit.html:258 #: 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 -#: rhodecode/templates/pullrequests/pullrequest.html:135 -#: rhodecode/templates/settings/repo_settings.html:85 +#: rhodecode/templates/pullrequests/pullrequest.html:124 +#: rhodecode/templates/settings/repo_settings.html:94 msgid "Reset" msgstr "重設" @@ -1911,6 +1929,7 @@ msgid "Remove this repository" msgstr "移除版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" @@ -1947,7 +1966,7 @@ msgstr "寫" #: rhodecode/templates/admin/repos/repo_edit_perms.html:6 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:6 -#: rhodecode/templates/admin/users/users.html:38 +#: rhodecode/templates/admin/users/users.html:83 #: rhodecode/templates/base/base.html:215 msgid "admin" msgstr "管理員" @@ -1958,7 +1977,7 @@ msgid "member" msgstr "成員" #: rhodecode/templates/admin/repos/repo_edit_perms.html:16 -#: rhodecode/templates/data_table/_dt_elements.html:61 +#: rhodecode/templates/data_table/_dt_elements.html:67 #: rhodecode/templates/journal/journal.html:132 #: rhodecode/templates/summary/summary.html:76 msgid "private repository" @@ -1997,25 +2016,6 @@ msgstr "移除使用者群組失敗" msgid "Repositories administration" msgstr "版本庫管理員" -#: rhodecode/templates/admin/repos/repos.html:40 -#: rhodecode/templates/summary/summary.html:112 -msgid "Contact" -msgstr "聯絡方式" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 -#: rhodecode/templates/admin/users/user_edit.html:222 -#: rhodecode/templates/admin/users/users.html:55 -#: rhodecode/templates/admin/users_groups/users_groups.html:44 -msgid "delete" -msgstr "刪除" - -#: rhodecode/templates/admin/repos/repos.html:68 -#: rhodecode/templates/admin/users/user_edit_my_account.html:74 -#, fuzzy, python-format -msgid "Confirm to delete this repository: %s" -msgstr "確認移除這個版本庫" - #: rhodecode/templates/admin/repos_groups/repos_groups.html:8 msgid "Groups" msgstr "群組" @@ -2046,6 +2046,7 @@ msgstr "父群組" #: rhodecode/templates/admin/users/user_add.html:94 #: rhodecode/templates/admin/users_groups/users_group_add.html:49 #: rhodecode/templates/admin/users_groups/users_group_edit.html:90 +#: rhodecode/templates/pullrequests/pullrequest_show.html:93 msgid "save" msgstr "儲存" @@ -2071,12 +2072,20 @@ msgid "Number of toplevel repositories" msgstr "版本庫數量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:40 +#: rhodecode/templates/admin/users/users.html:85 #: rhodecode/templates/admin/users_groups/users_groups.html:35 msgid "action" msgstr "動作" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 +#: rhodecode/templates/admin/users/user_edit.html:235 +#: rhodecode/templates/admin/users_groups/users_groups.html:44 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#: rhodecode/templates/data_table/_dt_elements.html:103 +msgid "delete" +msgstr "刪除" + +#: rhodecode/templates/admin/repos_groups/repos_groups_show.html:54 #, fuzzy, python-format msgid "Confirm to delete this group: %s" msgstr "確認刪除這個群組" @@ -2131,117 +2140,137 @@ msgstr "如果版本庫已從檔案系統中刪除，但是資料還留在資料庫，請勾選這個項目清理資料庫中舊的資料" msgid "destroy old data" msgstr "移除舊資料" -#: rhodecode/templates/admin/settings/settings.html:45 +#: rhodecode/templates/admin/settings/settings.html:41 +msgid "" +"Rescan repositories location for new repositories. Also deletes obsolete " +"if `destroy` flag is checked " +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:46 msgid "Rescan repositories" msgstr "重新掃描版本庫" -#: rhodecode/templates/admin/settings/settings.html:51 +#: rhodecode/templates/admin/settings/settings.html:52 msgid "Whoosh indexing" msgstr "Whoosh 索引" -#: rhodecode/templates/admin/settings/settings.html:59 +#: rhodecode/templates/admin/settings/settings.html:60 msgid "index build option" msgstr "索引選項" -#: rhodecode/templates/admin/settings/settings.html:64 +#: rhodecode/templates/admin/settings/settings.html:65 msgid "build from scratch" msgstr "重頭建立索引" -#: rhodecode/templates/admin/settings/settings.html:70 +#: rhodecode/templates/admin/settings/settings.html:71 msgid "Reindex" msgstr "重新索引" -#: rhodecode/templates/admin/settings/settings.html:76 +#: rhodecode/templates/admin/settings/settings.html:77 msgid "Global application settings" msgstr "全域設定" -#: rhodecode/templates/admin/settings/settings.html:85 +#: rhodecode/templates/admin/settings/settings.html:86 msgid "Application name" msgstr "應用名稱" -#: rhodecode/templates/admin/settings/settings.html:94 +#: rhodecode/templates/admin/settings/settings.html:95 msgid "Realm text" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:103 +#: rhodecode/templates/admin/settings/settings.html:104 msgid "GA code" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:111 -#: rhodecode/templates/admin/settings/settings.html:176 +#: rhodecode/templates/admin/settings/settings.html:112 +#: rhodecode/templates/admin/settings/settings.html:179 msgid "Save settings" msgstr "儲存設定" -#: rhodecode/templates/admin/settings/settings.html:118 -msgid "Mercurial settings" -msgstr "Mercurial 設定" - -#: rhodecode/templates/admin/settings/settings.html:127 +#: rhodecode/templates/admin/settings/settings.html:119 +#, fuzzy +msgid "VCS settings" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:128 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:132 -msgid "require ssl for pushing" +#: rhodecode/templates/admin/settings/settings.html:133 +#, fuzzy +msgid "require ssl for vcs operations" msgstr "推送時要求使用SSL" -#: rhodecode/templates/admin/settings/settings.html:139 +#: rhodecode/templates/admin/settings/settings.html:135 +msgid "" +"RhodeCode will require SSL for pushing or pulling. If SSL is missing it " +"will return HTTP Error 406: Not Acceptable" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:141 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:144 +#: rhodecode/templates/admin/settings/settings.html:146 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:148 +#: rhodecode/templates/admin/settings/settings.html:150 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:152 +#: rhodecode/templates/admin/settings/settings.html:154 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:156 +#: rhodecode/templates/admin/settings/settings.html:158 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:160 +#: rhodecode/templates/admin/settings/settings.html:162 msgid "advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:165 +#: rhodecode/templates/admin/settings/settings.html:167 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:170 +#: rhodecode/templates/admin/settings/settings.html:172 msgid "" "This a crucial application setting. If you are really sure you need to " "change this, you must restart application in order to make this setting " "take effect. Click this label to unlock." msgstr "這是一個關鍵的設定，如果您確定要修改這個設定，請重新啟動應用程式以套用設定" -#: rhodecode/templates/admin/settings/settings.html:171 +#: rhodecode/templates/admin/settings/settings.html:173 msgid "unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:191 +#: rhodecode/templates/admin/settings/settings.html:174 +msgid "" +"Location where repositories are stored. After changing this value a " +"restart, and rescan is required" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:194 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:199 +#: rhodecode/templates/admin/settings/settings.html:202 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:207 +#: rhodecode/templates/admin/settings/settings.html:210 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:213 +#: rhodecode/templates/admin/settings/settings.html:216 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:219 #, fuzzy msgid "show" msgstr "顯示" @@ -2252,7 +2281,6 @@ msgstr "新增使用者" #: rhodecode/templates/admin/users/user_add.html:10 #: rhodecode/templates/admin/users/user_edit.html:11 -#: rhodecode/templates/admin/users/users.html:9 msgid "Users" msgstr "使用者" @@ -2310,29 +2338,39 @@ msgstr "" msgid "Create repositories" msgstr "建立版本庫" -#: rhodecode/templates/admin/users/user_edit.html:171 -#: rhodecode/templates/admin/users/user_edit_my_account.html:100 -#: rhodecode/templates/admin/users/user_edit_my_account.html:201 +#: rhodecode/templates/admin/users/user_edit.html:166 +#, fuzzy +msgid "Nothing here yet" +msgstr "尚未有任何變更" + +#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit_my_account.html:60 +#: rhodecode/templates/admin/users/user_edit_my_account.html:191 #, fuzzy msgid "Permission" msgstr "權限" -#: rhodecode/templates/admin/users/user_edit.html:210 +#: rhodecode/templates/admin/users/user_edit.html:174 +#, fuzzy +msgid "Edit Permission" +msgstr "版本庫權限" + +#: rhodecode/templates/admin/users/user_edit.html:223 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:236 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:237 +#: rhodecode/templates/admin/users/user_edit.html:250 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:244 +#: rhodecode/templates/admin/users/user_edit.html:257 #, fuzzy msgid "Add" msgstr "新增" @@ -2346,24 +2384,47 @@ msgstr "我的帳號" msgid "My Account" msgstr "我的帳號" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:35 +#, fuzzy +msgid "My permissions" +msgstr "權限" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:38 #: rhodecode/templates/journal/journal.html:41 #, fuzzy msgid "My repos" msgstr "空的版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account.html:32 +#: rhodecode/templates/admin/users/user_edit_my_account.html:41 +#, fuzzy +msgid "My pull requests" +msgstr "建立使用者 %s" + +#: rhodecode/templates/admin/users/user_edit_my_account.html:45 #, fuzzy -msgid "My permissions" -msgstr "權限" - -#: rhodecode/templates/admin/users/user_edit_my_account.html:37 -#: rhodecode/templates/journal/journal.html:46 -#, fuzzy -msgid "ADD" +msgid "Add repo" msgstr "新增" -#: rhodecode/templates/admin/users/user_edit_my_account.html:50 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:2 +msgid "Opened by me" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#, python-format +msgid "Pull request #%s opened on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +msgid "I participate in" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 +#, python-format +msgid "Pull request #%s opened by %s on %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:7 #: rhodecode/templates/bookmarks/bookmarks.html:40 #: rhodecode/templates/bookmarks/bookmarks_data.html:9 #: rhodecode/templates/branches/branches.html:55 @@ -2373,17 +2434,23 @@ msgstr "新增" msgid "Revision" msgstr "修訂" -#: rhodecode/templates/admin/users/user_edit_my_account.html:71 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:28 #: rhodecode/templates/journal/journal.html:81 msgid "private" msgstr "私有" -#: rhodecode/templates/admin/users/user_edit_my_account.html:81 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:7 +#, fuzzy, python-format +msgid "Confirm to delete this repository: %s" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:38 #: rhodecode/templates/journal/journal.html:94 msgid "No repositories yet" msgstr "沒有任何版本庫" -#: rhodecode/templates/admin/users/user_edit_my_account.html:83 +#: rhodecode/templates/admin/users/user_edit_my_account_repos.html:40 #: rhodecode/templates/journal/journal.html:96 msgid "create one now" msgstr "" @@ -2392,42 +2459,42 @@ msgstr "" msgid "Users administration" msgstr "使用者管理員" +#: rhodecode/templates/admin/users/users.html:9 +#: rhodecode/templates/base/base.html:221 +msgid "users" +msgstr "使用者" + #: rhodecode/templates/admin/users/users.html:23 msgid "ADD NEW USER" msgstr "新增使用者" -#: rhodecode/templates/admin/users/users.html:33 +#: rhodecode/templates/admin/users/users.html:76 msgid "username" msgstr "使用者名稱" -#: rhodecode/templates/admin/users/users.html:34 -#: rhodecode/templates/branches/branches_data.html:6 -msgid "name" -msgstr "名字" - -#: rhodecode/templates/admin/users/users.html:35 +#: rhodecode/templates/admin/users/users.html:79 +#, fuzzy +msgid "firstname" +msgstr "名" + +#: rhodecode/templates/admin/users/users.html:80 msgid "lastname" msgstr "姓" -#: rhodecode/templates/admin/users/users.html:36 +#: rhodecode/templates/admin/users/users.html:81 msgid "last login" msgstr "最後登入" -#: rhodecode/templates/admin/users/users.html:37 +#: rhodecode/templates/admin/users/users.html:82 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "啟用" -#: rhodecode/templates/admin/users/users.html:39 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/base/base.html:224 msgid "ldap" msgstr "" -#: rhodecode/templates/admin/users/users.html:56 -#, fuzzy, python-format -msgid "Confirm to delete this user: %s" -msgstr "確認刪除這個使用者" - #: rhodecode/templates/admin/users_groups/users_group_add.html:5 msgid "Add users group" msgstr "新增使用者群組" @@ -2458,7 +2525,6 @@ msgid "Choosen group members" msgstr "選擇群組成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:61 -#: rhodecode/templates/pullrequests/pullrequest.html:81 msgid "Remove all elements" msgstr "移除所有元素" @@ -2467,7 +2533,6 @@ msgid "Available members" msgstr "啟用的成員" #: rhodecode/templates/admin/users_groups/users_group_edit.html:79 -#: rhodecode/templates/pullrequests/pullrequest.html:99 msgid "Add all elements" msgstr "新增索有元素" @@ -2575,9 +2640,9 @@ msgstr "載入中..." #: rhodecode/templates/base/base.html:158 #: rhodecode/templates/base/base.html:160 #: rhodecode/templates/base/base.html:162 -#: rhodecode/templates/data_table/_dt_elements.html:9 -#: rhodecode/templates/data_table/_dt_elements.html:11 -#: rhodecode/templates/data_table/_dt_elements.html:13 +#: rhodecode/templates/data_table/_dt_elements.html:15 +#: rhodecode/templates/data_table/_dt_elements.html:17 +#: rhodecode/templates/data_table/_dt_elements.html:19 msgid "Summary" msgstr "概況" @@ -2585,9 +2650,9 @@ msgstr "概況" #: rhodecode/templates/base/base.html:168 #: rhodecode/templates/base/base.html:170 #: rhodecode/templates/changelog/changelog.html:15 -#: rhodecode/templates/data_table/_dt_elements.html:17 -#: rhodecode/templates/data_table/_dt_elements.html:19 -#: rhodecode/templates/data_table/_dt_elements.html:21 +#: rhodecode/templates/data_table/_dt_elements.html:23 +#: rhodecode/templates/data_table/_dt_elements.html:25 +#: rhodecode/templates/data_table/_dt_elements.html:27 msgid "Changelog" msgstr "修改紀錄" @@ -2600,9 +2665,9 @@ msgstr "切換至" #: rhodecode/templates/base/base.html:186 #: rhodecode/templates/base/base.html:188 #: rhodecode/templates/base/base.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:25 -#: rhodecode/templates/data_table/_dt_elements.html:27 -#: rhodecode/templates/data_table/_dt_elements.html:29 +#: rhodecode/templates/data_table/_dt_elements.html:31 +#: rhodecode/templates/data_table/_dt_elements.html:33 +#: rhodecode/templates/data_table/_dt_elements.html:35 #: rhodecode/templates/files/files.html:40 msgid "Files" msgstr "檔案" @@ -2619,7 +2684,7 @@ msgid "settings" msgstr "設定" #: rhodecode/templates/base/base.html:209 -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/forks/fork.html:13 msgid "fork" msgstr "" @@ -2637,10 +2702,6 @@ msgstr "搜尋" msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:221 -msgid "users" -msgstr "使用者" - #: rhodecode/templates/base/base.html:222 msgid "users groups" msgstr "使用者群組" @@ -2725,6 +2786,10 @@ msgstr "分支" msgid "Compare" msgstr "比較顯示" +#: rhodecode/templates/branches/branches_data.html:6 +msgid "name" +msgstr "名字" + #: rhodecode/templates/branches/branches_data.html:7 msgid "date" msgstr "日期" @@ -2756,11 +2821,13 @@ msgid_plural "showing %d out of %d revis msgstr[0] "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:19 #, python-format msgid "compare fork with %s" msgstr "" #: rhodecode/templates/changelog/changelog.html:37 +#: rhodecode/templates/forks/forks_data.html:21 msgid "Compare fork" msgstr "" @@ -2769,7 +2836,7 @@ msgid "Show" msgstr "顯示" #: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:357 +#: rhodecode/templates/summary/summary.html:360 msgid "show more" msgstr "顯示更多" @@ -2906,18 +2973,18 @@ msgid "Commenting on line {1}." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:46 -#: rhodecode/templates/changeset/changeset_file_comment.html:115 +#: rhodecode/templates/changeset/changeset_file_comment.html:121 #, python-format msgid "Comments parsed using %s syntax with %s support." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:48 -#: rhodecode/templates/changeset/changeset_file_comment.html:117 +#: rhodecode/templates/changeset/changeset_file_comment.html:123 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.html:59 -#: rhodecode/templates/changeset/changeset_file_comment.html:132 +#: rhodecode/templates/changeset/changeset_file_comment.html:138 #, fuzzy msgid "Comment" msgstr "遞交" @@ -2936,19 +3003,23 @@ msgstr "您必須登入後才能瀏覽這個頁面" msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:112 +#: rhodecode/templates/changeset/changeset_file_comment.html:118 msgid "Leave a comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 msgid "Check this to change current status of code-review for this changeset" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.html:118 +#: rhodecode/templates/changeset/changeset_file_comment.html:124 #, fuzzy msgid "change status" msgstr "變更" +#: rhodecode/templates/changeset/changeset_file_comment.html:140 +msgid "Comment and close" +msgstr "" + #: rhodecode/templates/changeset/changeset_range.html:5 #, fuzzy, python-format msgid "%s Changesets" @@ -2961,7 +3032,7 @@ msgstr "比較顯示" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:71 +#: rhodecode/templates/pullrequests/pullrequest_show.html:50 msgid "Files affected" msgstr "" @@ -2984,40 +3055,45 @@ msgstr "尚未有任何變更" msgid "Outgoing changesets" msgstr "尚未有任何變更" -#: rhodecode/templates/data_table/_dt_elements.html:33 -#: rhodecode/templates/data_table/_dt_elements.html:35 -#: rhodecode/templates/data_table/_dt_elements.html:37 +#: rhodecode/templates/data_table/_dt_elements.html:39 +#: rhodecode/templates/data_table/_dt_elements.html:41 +#: rhodecode/templates/data_table/_dt_elements.html:43 msgid "Fork" msgstr "分支" -#: rhodecode/templates/data_table/_dt_elements.html:54 +#: rhodecode/templates/data_table/_dt_elements.html:60 #: rhodecode/templates/journal/journal.html:126 #: rhodecode/templates/summary/summary.html:68 msgid "Mercurial repository" msgstr "Mercurial 版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:56 +#: rhodecode/templates/data_table/_dt_elements.html:62 #: rhodecode/templates/journal/journal.html:128 #: rhodecode/templates/summary/summary.html:71 msgid "Git repository" msgstr "Git 版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:63 +#: rhodecode/templates/data_table/_dt_elements.html:69 #: rhodecode/templates/journal/journal.html:134 #: rhodecode/templates/summary/summary.html:78 msgid "public repository" msgstr "公開版本庫" -#: rhodecode/templates/data_table/_dt_elements.html:74 +#: rhodecode/templates/data_table/_dt_elements.html:80 #: rhodecode/templates/summary/summary.html:87 #: rhodecode/templates/summary/summary.html:88 msgid "Fork of" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.html:86 +#: rhodecode/templates/data_table/_dt_elements.html:92 msgid "No changesets yet" msgstr "尚未有任何變更" +#: rhodecode/templates/data_table/_dt_elements.html:104 +#, fuzzy, python-format +msgid "Confirm to delete this user: %s" +msgstr "確認刪除這個使用者" + #: rhodecode/templates/email_templates/main.html:8 msgid "This is an notification from RhodeCode." msgstr "" @@ -3042,7 +3118,7 @@ msgid "%s Files" msgstr "檔案" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:333 +#: rhodecode/templates/summary/summary.html:336 msgid "files" msgstr "檔案" @@ -3297,7 +3373,7 @@ msgstr "分支" msgid "forked" msgstr "已建立分支" -#: rhodecode/templates/forks/forks_data.html:34 +#: rhodecode/templates/forks/forks_data.html:38 msgid "There are no forks yet" msgstr "尚未有任何 fork" @@ -3331,6 +3407,11 @@ msgstr "" msgid "Watched" msgstr "快取" +#: rhodecode/templates/journal/journal.html:46 +#, fuzzy +msgid "ADD" +msgstr "新增" + #: rhodecode/templates/journal/journal.html:114 msgid "following user" msgstr "追蹤使用者" @@ -3376,69 +3457,79 @@ msgid "Detailed compare view" msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:40 +#: rhodecode/templates/pullrequests/pullrequest_show.html:63 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:78 -msgid "Chosen reviewers" +#: rhodecode/templates/pullrequests/pullrequest.html:79 +#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#, fuzzy +msgid "owner" +msgstr "擁有者" + +#: rhodecode/templates/pullrequests/pullrequest.html:91 +#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +msgid "Add reviewer to this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.html:95 -#, fuzzy -msgid "Available reviewers" -msgstr "啟用的成員" - -#: rhodecode/templates/pullrequests/pullrequest.html:108 +#: rhodecode/templates/pullrequests/pullrequest.html:97 #, fuzzy msgid "Create new pull request" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest.html:117 -#: rhodecode/templates/pullrequests/pullrequest_show.html:23 +#: rhodecode/templates/pullrequests/pullrequest.html:106 +#: rhodecode/templates/pullrequests/pullrequest_show.html:25 +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:33 #, fuzzy msgid "Title" msgstr "寫" -#: rhodecode/templates/pullrequests/pullrequest.html:126 +#: rhodecode/templates/pullrequests/pullrequest.html:115 #, fuzzy msgid "description" msgstr "描述" -#: rhodecode/templates/pullrequests/pullrequest.html:134 +#: rhodecode/templates/pullrequests/pullrequest.html:123 msgid "Send pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:4 -#: rhodecode/templates/pullrequests/pullrequest_show.html:12 +#: rhodecode/templates/pullrequests/pullrequest_show.html:23 #, python-format -msgid "Pull request #%s" +msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:26 +#: rhodecode/templates/pullrequests/pullrequest_show.html:28 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:33 +#: rhodecode/templates/pullrequests/pullrequest_show.html:35 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:42 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:67 +#: rhodecode/templates/pullrequests/pullrequest_show.html:46 #, fuzzy msgid "Incoming changesets" msgstr "尚未有任何變更" #: rhodecode/templates/pullrequests/pullrequest_show_all.html:4 +#, fuzzy +msgid "all pull requests" +msgstr "建立使用者 %s" + #: rhodecode/templates/pullrequests/pullrequest_show_all.html:12 msgid "All pull requests" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show_all.html:27 +msgid "Closed" +msgstr "" + #: rhodecode/templates/search/search.html:6 #, fuzzy, python-format msgid "Search \"%s\" in repository: %s" @@ -3473,10 +3564,16 @@ msgstr "搜尋範圍" msgid "File contents" msgstr "文件內容" +#: rhodecode/templates/search/search.html:64 +#, fuzzy +msgid "Commit messages" +msgstr "遞交資訊" + #: rhodecode/templates/search/search.html:65 msgid "File names" msgstr "檔案名稱" +#: rhodecode/templates/search/search_commit.html:34 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3556,6 +3653,10 @@ msgstr "公開" msgid "remote clone" msgstr "遠端複製" +#: rhodecode/templates/summary/summary.html:112 +msgid "Contact" +msgstr "聯絡方式" + #: rhodecode/templates/summary/summary.html:126 msgid "Clone url" msgstr "複製連結" @@ -3622,40 +3723,49 @@ msgstr "簡短紀錄" msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:286 +#: rhodecode/templates/summary/summary.html:229 +#, python-format +msgid "Readme file at revision '%s'" +msgstr "" + +#: rhodecode/templates/summary/summary.html:232 +msgid "Permalink to this readme" +msgstr "" + +#: rhodecode/templates/summary/summary.html:289 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:643 +#: rhodecode/templates/summary/summary.html:646 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:644 +#: rhodecode/templates/summary/summary.html:647 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:645 +#: rhodecode/templates/summary/summary.html:648 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:649 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:652 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:650 +#: rhodecode/templates/summary/summary.html:653 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:651 +#: rhodecode/templates/summary/summary.html:654 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:655 msgid "file removed" msgstr "移除檔案"