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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2011-02-25 19:13+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: en \n" @@ -21,24 +21,30 @@ msgstr "" msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 msgid "There are no changesets yet" msgstr "" @@ -84,8 +90,7 @@ msgid "commited on" msgstr "" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +msgid "click here to add new file" msgstr "" #: rhodecode/controllers/files.py:85 @@ -93,71 +98,76 @@ msgstr "" msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -165,7 +175,7 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,12 +183,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -188,36 +198,48 @@ msgid "public journal" msgstr "" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 +msgid "error during creation of pull request" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:181 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 msgid "Error occurred during sending pull request" msgstr "" +#: rhodecode/controllers/pullrequests.py:217 +msgid "Successfully deleted pull request" +msgstr "" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "" @@ -231,19 +253,19 @@ msgid "An error occurred during this sea msgstr "" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -252,14 +274,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -269,7 +291,7 @@ msgid "No data loaded yet" msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "" @@ -360,9 +382,9 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "" @@ -379,18 +401,20 @@ msgid "allowed with automatic account ac msgstr "" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "" @@ -398,120 +422,124 @@ msgstr "" msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:346 +#: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:418 -msgid "Updated repository visibility in public journal" -msgstr "" - #: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:440 -msgid "Pulled from remote location" +msgid "An error occurred during unlocking" msgstr "" #: rhodecode/controllers/admin/repos.py:442 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:458 -msgid "Nothing" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:460 -#, python-format -msgid "Marked repo %s as fork of %s" +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:446 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +msgid "Token mismatch" msgstr "" #: rhodecode/controllers/admin/repos.py:464 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:466 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:482 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:484 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" @@ -529,90 +557,109 @@ msgid "Updated application settings" msgstr "" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:200 +msgid "Updated visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:205 +msgid "error occurred during updating visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:271 +msgid "Updated VCS settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:202 -msgid "successfully deleted user" -msgstr "" - #: rhodecode/controllers/admin/users.py:207 +msgid "successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +msgid "Granted 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:282 +msgid "Revoked 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +msgid "An error occurred during permissions saving" +msgstr "" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 msgid "Removed email from user" msgstr "" @@ -631,167 +678,183 @@ msgstr "" msgid "updated users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:169 -msgid "successfully deleted users group" -msgstr "" - #: rhodecode/controllers/admin/users_groups.py:174 +msgid "successfully deleted users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +msgid "Granted 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:238 +msgid "Revoked 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:244 +msgid "Granted 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:249 +msgid "Revoked 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "" @@ -864,75 +927,83 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +msgid "Repository forking disabled" +msgstr "" + +#: rhodecode/model/db.py:1154 +msgid "Repository forking enabled" +msgstr "" + +#: rhodecode/model/db.py:1155 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -983,155 +1054,164 @@ msgstr "" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:323 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:339 +#: rhodecode/model/user.py:329 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:54 -#, python-format -msgid "Username \"%(username)s\" is forbidden" -msgstr "" - -#: rhodecode/model/validators.py:56 -msgid "" -"Username may only contain alphanumeric characters underscores, periods or" -" dashes and must begin with alphanumeric character" -msgstr "" - #: rhodecode/model/validators.py:84 #, python-format +msgid "Username \"%(username)s\" is forbidden" +msgstr "" + +#: rhodecode/model/validators.py:86 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or" +" dashes and must begin with alphanumeric character" +msgstr "" + +#: rhodecode/model/validators.py:114 +#, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 msgid "Invalid users group name" msgstr "" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:432 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +msgstr "" + +#: rhodecode/model/validators.py:457 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "" @@ -1150,7 +1230,7 @@ msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "" @@ -1170,9 +1250,9 @@ msgid "Group name" msgstr "" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1190,15 +1270,15 @@ msgstr "" msgid "Repositories group" msgstr "" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1209,61 +1289,61 @@ msgstr "" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: 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/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 msgid "Group Name" msgstr "" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1271,11 +1351,11 @@ msgstr "" msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1283,14 +1363,14 @@ msgstr "" msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1298,10 +1378,10 @@ msgstr "" msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1309,10 +1389,10 @@ msgstr "" msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1334,7 +1414,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "" @@ -1407,7 +1487,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "" @@ -1569,13 +1649,13 @@ msgid "E-mail Attribute" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "" @@ -1595,8 +1675,8 @@ msgid "Comments" msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1622,7 +1702,7 @@ msgid "Permissions administration" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1662,7 +1742,11 @@ msgid "Repository creation" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +msgid "Repository forking" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "" @@ -1677,6 +1761,10 @@ msgstr "" msgid "Repositories" msgstr "" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1755,8 +1843,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1790,19 +1878,29 @@ msgstr "" msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +msgid "Enable locking" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:133 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1810,90 +1908,126 @@ msgstr "" msgid "Reset" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:153 -msgid "Fetched to rev" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:154 -msgid "Stats gathered" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:162 +msgid "Fetched to rev" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:163 +msgid "Stats gathered" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:177 -msgid "Cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:181 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:181 -msgid "Confirm to invalidate repository cache" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Confirm to invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Locking" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Confirm to unlock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "Confirm to lock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Repository is not locked" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1901,14 +2035,6 @@ msgid "" "please do it manually" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -1926,8 +2052,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "" @@ -1956,18 +2082,18 @@ msgstr "" msgid "revoke" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "" @@ -2005,7 +2131,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "" @@ -2017,6 +2143,12 @@ msgstr "" msgid "edit repos group" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "" @@ -2030,13 +2162,13 @@ msgid "Number of toplevel repositories" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2141,90 +2273,133 @@ msgid "GA code" msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "" #: rhodecode/templates/admin/settings/settings.html:119 -msgid "VCS settings" +msgid "Visualisation settings" msgstr "" #: rhodecode/templates/admin/settings/settings.html:128 -msgid "Web" +msgid "Icons" msgstr "" #: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +msgid "Show private repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:144 +msgid "Meta-Tagging" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:185 +msgid "Web" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:190 msgid "require ssl for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 msgid "show" msgstr "" @@ -2287,37 +2462,57 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +msgid "Inherit default permissions" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +msgid "Fork repositories" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 msgid "Add" msgstr "" @@ -2351,16 +2546,20 @@ msgstr "" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +msgid "Confirm to delete this pull request" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2402,7 +2601,7 @@ msgid "Users administration" msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "" @@ -2410,29 +2609,29 @@ msgstr "" msgid "ADD NEW USER" msgstr "" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "" -#: rhodecode/templates/admin/users/users.html:79 -msgid "firstname" -msgstr "" - #: rhodecode/templates/admin/users/users.html:80 -msgid "lastname" +msgid "firstname" msgstr "" #: rhodecode/templates/admin/users/users.html:81 -msgid "last login" +msgid "lastname" msgstr "" #: rhodecode/templates/admin/users/users.html:82 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" +msgid "last login" msgstr "" #: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 +msgid "active" +msgstr "" + +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "" @@ -2477,7 +2676,7 @@ msgstr "" msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 msgid "Group members" msgstr "" @@ -2524,9 +2723,9 @@ msgid "Inbox" msgstr "" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2550,9 +2749,9 @@ msgid "Home" msgstr "" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2607,7 +2806,6 @@ msgstr "" #: 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 "" @@ -2618,7 +2816,7 @@ msgstr "" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "" @@ -2628,40 +2826,40 @@ msgstr "" msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:220 -msgid "repositories groups" -msgstr "" - #: rhodecode/templates/base/base.html:222 +msgid "repositories groups" +msgstr "" + +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -2766,46 +2964,46 @@ msgstr "" msgid "Compare fork" msgstr "" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2814,20 +3012,20 @@ msgstr "" msgid "branch" msgstr "" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "" @@ -2965,7 +3163,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" @@ -3043,12 +3241,13 @@ msgid "File diff" msgstr "" #: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:72 #, python-format -msgid "%s Files" +msgid "%s files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "" @@ -3367,17 +3566,17 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 msgid "owner" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3404,19 +3603,34 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +msgid "Status" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Incoming changesets" msgstr "" @@ -3473,7 +3687,7 @@ msgstr "" msgid "File names" msgstr "" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3550,115 +3764,115 @@ msgstr "" msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:126 -msgid "Clone url" -msgstr "" - -#: rhodecode/templates/summary/summary.html:129 -msgid "Show by Name" -msgstr "" - #: rhodecode/templates/summary/summary.html:130 +msgid "Clone url" +msgstr "" + +#: rhodecode/templates/summary/summary.html:133 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 msgid "Trending files" msgstr "" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "" -#: rhodecode/templates/summary/summary.html:154 -msgid "Download" -msgstr "" - #: rhodecode/templates/summary/summary.html:158 +msgid "Download" +msgstr "" + +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:648 -msgid "files changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:649 -msgid "files removed" -msgstr "" - #: rhodecode/templates/summary/summary.html:652 -msgid "commit" +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:653 +msgid "files removed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:656 +msgid "commit" +msgstr "" + +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2012-06-05 20:07+0100\n" "Last-Translator: Vincent Duvert \n" "Language-Team: fr \n" @@ -21,24 +21,30 @@ msgstr "" msgid "All Branches" msgstr "Toutes les branches" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "afficher les espaces et tabulations" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "ignorer les espaces et tabulations" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" msgstr "afficher %s lignes de contexte" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "fichier binaire" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 #, fuzzy msgid "There are no changesets yet" @@ -89,80 +95,85 @@ msgid "commited on" msgstr "a commité, le" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "ajouter un nouveau" +#, fuzzy +msgid "click here to add new file" +msgstr "Ajouter un fichier" #: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "Il n’y a pas encore de fichiers %s" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "%s édité via RhodeCode" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "Aucun changement" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" msgstr "%s ajouté par RhodeCode" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 msgid "No content" msgstr "Aucun contenu" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 msgid "No filename" msgstr "Aucun nom de fichier" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "Les téléchargements sont désactivés" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue." -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "Dépôt vide." -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "Changesets" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "Branches" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "Tags" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,7 +184,7 @@ msgstr "" "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts." -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -184,12 +195,12 @@ msgstr "" "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts." -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "dépôt %s forké en tant que %s" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s." @@ -200,19 +211,19 @@ msgid "public journal" msgstr "Journal public" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "Journal" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "Vous vous êtes inscrits avec succès à RhodeCode" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 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:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -220,21 +231,34 @@ 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:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 #, fuzzy msgid "Bookmarks" msgstr "Signets" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 +msgid "error during creation of pull request" +msgstr "erreur lors de la création de la demande traction" + +#: rhodecode/controllers/pullrequests.py:181 #, fuzzy msgid "Successfully opened new pull request" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 #, fuzzy msgid "Error occurred during sending pull request" msgstr "Une erreur est survenue durant la création du dépôt %s." +#: rhodecode/controllers/pullrequests.py:217 +#, fuzzy +msgid "Successfully deleted pull request" +msgstr "L’utilisateur a été supprimé avec succès." + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." @@ -250,19 +274,19 @@ msgid "An error occurred during this sea msgstr "Une erreur est survenue durant l’opération de recherche." #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, 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:282 +#: rhodecode/controllers/admin/repos.py:284 #, 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:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -274,14 +298,14 @@ msgstr "" "l’application pour rescanner les dépôts." #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "Dépôt %s supprimé" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" @@ -291,7 +315,7 @@ msgid "No data loaded yet" msgstr "Aucune donnée actuellement disponible." #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt." @@ -382,9 +406,9 @@ msgstr "Écrire" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "Administration" @@ -401,18 +425,20 @@ msgid "allowed with automatic account ac msgstr "Autorisé avec activation automatique du compte" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "Interdite" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "Autorisée" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "Permissions par défaut mises à jour avec succès" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "erreur pendant la mise à jour des permissions" @@ -420,126 +446,131 @@ msgstr "erreur pendant la mise à jour des permissions" msgid "--REMOVE FORK--" msgstr "[Pas un fork]" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "Le dépôt %s a été créé depuis %s." -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "Le dépôt %s a été créé." -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, 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:317 +#: rhodecode/controllers/admin/repos.py:319 #, 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:346 +#: rhodecode/controllers/admin/repos.py:348 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:365 +#: rhodecode/controllers/admin/repos.py:367 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:382 +#: rhodecode/controllers/admin/repos.py:385 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:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache." -#: rhodecode/controllers/admin/repos.py:418 +#: rhodecode/controllers/admin/repos.py:422 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "Une erreur est survenue durant cette opération." + +#: rhodecode/controllers/admin/repos.py:442 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:422 +#: rhodecode/controllers/admin/repos.py:446 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:427 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect." -#: rhodecode/controllers/admin/repos.py:440 +#: rhodecode/controllers/admin/repos.py:464 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés." -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:466 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:458 +#: rhodecode/controllers/admin/repos.py:482 msgid "Nothing" msgstr "[Aucun dépôt]" -#: rhodecode/controllers/admin/repos.py:460 +#: rhodecode/controllers/admin/repos.py:484 #, 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:464 +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "Le groupe de dépôts %s a été créé." -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "Le groupe de dépôts %s a été mis à jour." -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé." -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "Le groupe de dépôts %s a été supprimé." -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "Impossible de supprimer ce groupe : Il contient des sous-groupes." -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s." -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "" "Une erreur est survenue durant la suppression de l’utilisateur du groupe " "de dépôts." -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" "Une erreur est survenue durant la suppression du groupe d’utilisateurs du" @@ -559,93 +590,118 @@ msgid "Updated application settings" msgstr "Réglages mis à jour" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "Une erreur est survenue durant la mise à jour des options." -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" +#: rhodecode/controllers/admin/settings.py:200 +#, fuzzy +msgid "Updated visualisation settings" +msgstr "Réglages mis à jour" + +#: rhodecode/controllers/admin/settings.py:205 +#, fuzzy +msgid "error occurred during updating visualisation settings" +msgstr "Une erreur est survenue durant la mise à jour des options." + +#: rhodecode/controllers/admin/settings.py:271 +#, fuzzy +msgid "Updated VCS settings" msgstr "Réglages de Mercurial mis à jour" -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté." -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook." -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "La tâche d’e-mail a été créée." -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 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:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, 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:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "utilisateur %s créé" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, 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:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès." -#: rhodecode/controllers/admin/users.py:202 +#: rhodecode/controllers/admin/users.py:207 msgid "successfully deleted user" msgstr "L’utilisateur a été supprimé avec succès." -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur." -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "Vous ne pouvez pas éditer cet utilisateur" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 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:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 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:278 +#: rhodecode/controllers/admin/users.py:277 +#, fuzzy +msgid "Granted 'repository fork' permission to user" +msgstr "La permission de création de dépôts a été accordée à l’utilisateur." + +#: rhodecode/controllers/admin/users.py:282 +#, fuzzy +msgid "Revoked 'repository fork' 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:288 +#: rhodecode/controllers/admin/users_groups.py:255 +#, fuzzy +msgid "An error occurred during permissions saving" +msgstr "Une erreur est survenue durant cette opération." + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 #, fuzzy msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant cette opération." -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 #, fuzzy msgid "Removed email from user" msgstr "Le groupe de dépôts %s a été supprimé." @@ -665,171 +721,191 @@ msgstr "Une erreur est survenue durant la création du groupe d’utilisateurs %s." msgid "updated users group %s" msgstr "Le groupe d’utilisateurs %s a été mis à jour." -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe d’utilisateurs %s." -#: rhodecode/controllers/admin/users_groups.py:169 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" msgstr "Le groupe d’utilisateurs a été supprimé avec succès." -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "Une erreur est survenue lors de la suppression du groupe d’utilisateurs." -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +#, fuzzy +msgid "Granted 'repository create' permission to users group" +msgstr "La permission de création de dépôts a été accordée à l’utilisateur." + +#: rhodecode/controllers/admin/users_groups.py:238 +#, fuzzy +msgid "Revoked 'repository create' permission to users group" +msgstr "La permission de création de dépôts a été révoquée à l’utilisateur." + +#: rhodecode/controllers/admin/users_groups.py:244 +#, fuzzy +msgid "Granted 'repository fork' permission to users group" +msgstr "La permission de création de dépôts a été accordée à l’utilisateur." + +#: rhodecode/controllers/admin/users_groups.py:249 +#, fuzzy +msgid "Revoked 'repository fork' permission to users group" +msgstr "La permission de création de dépôts a été révoquée à l’utilisateur." + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action." -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "Vous devez être connecté pour visualiser cette page." -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « Diff » pour afficher les différences." -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "Aucun changement détecté." -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%d/%m/%Y à %H:%M:%S" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "Vrai" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "Faux" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "vue de comparaison" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "et" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "%s de plus" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "révisions" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "Nom du fork" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 msgid "[created] users group" msgstr "[a créé] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 msgid "[updated] users group" msgstr "[a mis à jour] le groupe d’utilisateurs" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 #, fuzzy msgid "[commented] on pull request for" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 #, fuzzy msgid "[closed] pull request for" msgstr "[a commenté] une révision du dépôt" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "[a pushé] dans" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "[a commité via RhodeCode] dans le dépôt" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr "et %s de plus" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "Aucun fichier" @@ -902,88 +978,98 @@ msgstr "à la ligne %s" msgid "[Mention]" msgstr "[Mention]" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 #, fuzzy msgid "Repository no access" msgstr "Dépôts" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 #, fuzzy msgid "Repository read access" msgstr "Ce dépôt existe déjà" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 #, fuzzy msgid "Repository write access" msgstr "Dépôts" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 #, fuzzy msgid "Repository admin access" msgstr "Dépôts" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 #, fuzzy msgid "Repositories Group no access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 #, fuzzy msgid "Repositories Group read access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 #, fuzzy msgid "Repositories Group write access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 #, fuzzy msgid "Repositories Group admin access" msgstr "Groupes de dépôts" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administration des utilisateurs" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 #, fuzzy msgid "Repository creation disabled" msgstr "Création de dépôt" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 #, fuzzy msgid "Repository creation enabled" msgstr "Création de dépôt" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +#, fuzzy +msgid "Repository forking disabled" +msgstr "Création de dépôt" + +#: rhodecode/model/db.py:1154 +#, fuzzy +msgid "Repository forking enabled" +msgstr "Création de dépôt" + +#: rhodecode/model/db.py:1155 #, fuzzy msgid "Register disabled" msgstr "Désactivé" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 #, fuzzy msgid "Approved" msgstr "Supprimés" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -1035,29 +1121,29 @@ msgstr "a posté un commentaire sur le commit" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 #, fuzzy msgid "latest tip" msgstr "Dernière connexion" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 msgid "new user registration" msgstr "Nouveau compte utilisateur enregistré" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 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:333 +#: rhodecode/model/user.py:323 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:339 +#: rhodecode/model/user.py:329 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1066,17 +1152,21 @@ msgstr "" "L’utilisateur « %s » possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires de ces dépôts. %s" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "Ce nom \"%(username)s\" d’utilisateur existe déjà" -#: rhodecode/model/validators.py:54 +#: rhodecode/model/validators.py:84 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:56 +#: rhodecode/model/validators.py:86 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1085,22 +1175,22 @@ msgstr "" "numériques ainsi que les caractères suivants : « _ . - ». Il doit " "commencer par un caractère alpha-numérique." -#: rhodecode/model/validators.py:84 -#, fuzzy, python-format +#: rhodecode/model/validators.py:114 +#, python-format msgid "Username %(username)s is not valid" -msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." - -#: rhodecode/model/validators.py:103 +msgstr "%(username)s Nom d'utilisateur n'est pas valide" + +#: rhodecode/model/validators.py:133 #, fuzzy msgid "Invalid users group name" msgstr "nom d’utilisateur invalide" -#: rhodecode/model/validators.py:104 -#, fuzzy, python-format +#: rhodecode/model/validators.py:134 +#, python-format msgid "Users group \"%(usersgroup)s\" already exists" -msgstr "Ce groupe d’utilisateurs existe déjà." - -#: rhodecode/model/validators.py:106 +msgstr "Ce groupe \"%(usersgroup)s\" d’utilisateurs existe déjà." + +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1109,94 +1199,95 @@ msgstr "" "numériques ainsi que les caractères suivants : « _ . - ». Il doit " "commencer par un caractère alpha-numérique." -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent." -#: rhodecode/model/validators.py:145 -#, fuzzy, python-format +#: rhodecode/model/validators.py:175 +#, python-format msgid "Group \"%(group_name)s\" already exists" -msgstr "Ce nom d’utilisateur existe déjà" - -#: rhodecode/model/validators.py:147 -#, fuzzy, python-format +msgstr "Ce nom d’utilisateur \"%(group_name)s\" existe déjà" + +#: rhodecode/model/validators.py:177 +#, python-format msgid "Repository with name \"%(group_name)s\" already exists" -msgstr "Un dépôt portant ce nom existe déjà." - -#: rhodecode/model/validators.py:205 +msgstr "Dépôt avec le nom de \"%(group_name)s\" existe déjà" + +#: rhodecode/model/validators.py:235 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects dans le mot de passe" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas." -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "mot de passe invalide" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "nom d’utilisateur invalide" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "Votre compte est désactivé" -#: rhodecode/model/validators.py:283 -#, fuzzy, python-format +#: rhodecode/model/validators.py:313 +#, python-format msgid "Repository name %(repo)s is disallowed" -msgstr "Ce nom de dépôt est interdit" - -#: rhodecode/model/validators.py:285 -#, fuzzy, python-format +msgstr "Ce nom de dépôt %(repo)s est interdit" + +#: rhodecode/model/validators.py:315 +#, python-format msgid "Repository named %(repo)s already exists" -msgstr "Un dépôt portant ce nom existe déjà." - -#: rhodecode/model/validators.py:286 -#, fuzzy, python-format +msgstr "Un dépôt portant %(repo)s ce nom existe déjà." + +#: rhodecode/model/validators.py:316 +#, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" -msgstr "Ce dépôt existe déjà dans le groupe « \"%(group)s\" »." - -#: rhodecode/model/validators.py:288 -#, fuzzy, python-format +msgstr "Ce dépôt \"%(repo)s\" existe déjà dans le groupe « \"%(group)s\" »." + +#: rhodecode/model/validators.py:318 +#, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "Un dépôt portant \"%(repo)s\" ce nom existe déjà." -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "URL de clonage invalide." -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" +#: rhodecode/model/validators.py:432 +#, fuzzy +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" "URL à cloner invalide. Veuillez fournir une URL valide commençant par " "http(s)." -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:457 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Le fork doit être du même type que l’original" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "Ce nom d’utilisateur ou de groupe n’est pas valide." -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "Cette adresse e-mail est déjà enregistrée" -#: rhodecode/model/validators.py:544 -#, fuzzy, python-format +#: rhodecode/model/validators.py:597 +#, python-format msgid "e-mail \"%(email)s\" does not exist." -msgstr "Cette adresse e-mail n’existe pas" - -#: rhodecode/model/validators.py:581 +msgstr "Cette adresse e-mail \"%(email)s\" n’existe pas" + +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1204,6 +1295,11 @@ msgstr "" "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur." +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "Tableau de bord" @@ -1222,7 +1318,7 @@ msgstr "Filtre rapide…" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "Dépôts" @@ -1242,9 +1338,9 @@ msgid "Group name" msgstr "Nom de groupe" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1262,15 +1358,15 @@ msgstr "Description" msgid "Repositories group" msgstr "Groupe de dépôts" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1281,61 +1377,61 @@ msgstr "Groupe de dépôts" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nom" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Sommet" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:163 -#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Propriétaire" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 msgid "Group Name" msgstr "Nom du groupe" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1343,11 +1439,11 @@ msgstr "Nom du groupe" msgid "Click to sort ascending" msgstr "Tri ascendant" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1355,14 +1451,14 @@ msgstr "Tri ascendant" msgid "Click to sort descending" msgstr "Tri descendant" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 msgid "Last Change" msgstr "Dernière modification" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1370,10 +1466,10 @@ msgstr "Dernière modification" msgid "No records found." msgstr "Aucun élément n’a été trouvé." -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1381,10 +1477,10 @@ msgstr "Aucun élément n’a été trouvé." msgid "Data error." msgstr "Erreur d’intégrité des données." -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1406,7 +1502,7 @@ msgstr "Connexion à" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "Nom d’utilisateur" @@ -1479,7 +1575,7 @@ msgstr "Nom" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "E-mail" @@ -1641,13 +1737,13 @@ msgid "E-mail Attribute" msgstr "Attribut pour l’e-mail" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "Enregistrer" @@ -1667,8 +1763,8 @@ msgid "Comments" msgstr "commits" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1694,7 +1790,7 @@ msgid "Permissions administration" msgstr "Gestion des permissions" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1737,7 +1833,12 @@ msgid "Repository creation" msgstr "Création de dépôt" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +#, fuzzy +msgid "Repository forking" +msgstr "Création de dépôt" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "Définir" @@ -1752,6 +1853,10 @@ msgstr "Ajouter un dépôt" msgid "Repositories" msgstr "Dépôts" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "ajouter un nouveau" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1836,8 +1941,8 @@ 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.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1871,19 +1976,30 @@ msgstr "Activer les téléchargements" msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#, fuzzy +msgid "Enable locking" +msgstr "Activer" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." 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/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1891,70 +2007,70 @@ msgstr "Changer le propriétaire de ce dépôt." msgid "Reset" msgstr "Réinitialiser" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "Administration" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "Statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "Réinitialiser les statistiques" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Fetched to rev" msgstr "Parcouru jusqu’à la révision" -#: rhodecode/templates/admin/repos/repo_edit.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:163 msgid "Stats gathered" msgstr "Statistiques obtenues" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "Dépôt distant" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "Récupérer les changements depuis le site distant" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "Voulez-vous vraiment récupérer les changements depuis le site distant ?" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:186 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Invalidate repository cache" msgstr "Invalider le cache du dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Confirm to invalidate repository cache" msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "Journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "Ajouter le dépôt au journal public" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -1962,21 +2078,63 @@ msgstr "" "Le descriptif des actions réalisées sur ce dépôt sera visible à tous " "depuis le journal public." -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +#, fuzzy +msgid "Locking" +msgstr "Déverrouiller" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +#, fuzzy +msgid "Confirm to unlock repository" +msgstr "Voulez-vous vraiment supprimer ce dépôt ?" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +#, fuzzy +msgid "Confirm to lock repository" +msgstr "Voulez-vous vraiment supprimer ce dépôt ?" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +#, fuzzy +msgid "Repository is not locked" +msgstr "Dépôts" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +#, fuzzy +msgid "Set as fork of" +msgstr "Indiquer comme fork" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +#, fuzzy +msgid "Manually set this repository as a fork of another from the list" +msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt." + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "Supprimer" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "Supprimer ce dépôt" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "Voulez-vous vraiment supprimer ce dépôt ?" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1988,16 +2146,6 @@ msgstr "" "Si vous voulez le supprimer complètement, effectuez la suppression " "manuellement." -#: rhodecode/templates/admin/repos/repo_edit.html:222 -#, fuzzy -msgid "Set as fork of" -msgstr "Indiquer comme fork" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -#, fuzzy -msgid "Manually set this repository as a fork of another from the list" -msgstr "Permet d’indiquer manuellement que ce dépôt est un fork d’un autre dépôt." - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2015,8 +2163,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "Administration" @@ -2045,18 +2193,18 @@ msgstr "[Par défaut]" msgid "revoke" msgstr "Révoquer" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "Ajouter un utilisateur" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "Échec de suppression de l’utilisateur" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "Erreur lors de la suppression du groupe d’utilisateurs." @@ -2094,7 +2242,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "Enregistrer" @@ -2106,6 +2254,12 @@ msgstr "Éditer le groupe de dépôt" msgid "edit repos group" msgstr "Édition du groupe de dépôt" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "Administration des groupes de dépôts" @@ -2119,13 +2273,13 @@ 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:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2232,59 +2386,107 @@ msgid "GA code" msgstr "Code GA" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "Enregister les options" #: rhodecode/templates/admin/settings/settings.html:119 #, fuzzy -msgid "VCS settings" -msgstr "Réglages" +msgid "Visualisation settings" +msgstr "Réglages d’application globaux" #: rhodecode/templates/admin/settings/settings.html:128 +#, fuzzy +msgid "Icons" +msgstr "Options" + +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +#, fuzzy +msgid "Show private repo icon on repositories" +msgstr "Dépôt privé" + +#: rhodecode/templates/admin/settings/settings.html:144 +#, fuzzy +msgid "Meta-Tagging" +msgstr "Réglages" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +#, fuzzy +msgid "VCS settings" +msgstr "Réglages" + +#: rhodecode/templates/admin/settings/settings.html:185 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:190 #, fuzzy msgid "require ssl for vcs operations" msgstr "SSL requis pour les pushs" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "Hooks" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 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:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "Avancé" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +#, fuzzy +msgid "Mercurial Extensions" +msgstr "Dépôt Mercurial" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "Emplacement des dépôts" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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 " @@ -2294,33 +2496,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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "Déverrouiller" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "E-mail de test" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 msgid "Email to" msgstr "Envoyer l’e-mail à" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 msgid "Send" msgstr "Envoyer" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "Information système et paquets" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 msgid "show" msgstr "Montrer" @@ -2383,41 +2585,63 @@ msgstr "Confirmation du nouveau mot de p #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +#, fuzzy +msgid "Inherit default permissions" +msgstr "Permissions par défaut" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Création de dépôts" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +#, fuzzy +msgid "Fork repositories" +msgstr "Dépôts" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, 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.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 msgid "Permission" msgstr "Permission" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 #, fuzzy msgid "Edit Permission" msgstr "Permissions du dépôt" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 #, fuzzy msgid "Email addresses" msgstr "Adresse e-mail" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, 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:250 +#: rhodecode/templates/admin/users/user_edit.html:270 #, fuzzy msgid "New email address" msgstr "Adresse e-mail" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 #, fuzzy msgid "Add" msgstr "Ajouter" @@ -2454,16 +2678,21 @@ msgstr "ajouter un nouveau" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, fuzzy +msgid "Confirm to delete this pull request" +msgstr "Voulez-vous vraiment supprimer ce dépôt ?" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2505,7 +2734,7 @@ msgid "Users administration" msgstr "Administration des utilisateurs" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "Utilisateurs" @@ -2513,30 +2742,30 @@ msgstr "Utilisateurs" msgid "ADD NEW USER" msgstr "NOUVEL UTILISATEUR" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "Nom d’utilisateur" -#: rhodecode/templates/admin/users/users.html:79 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy msgid "firstname" msgstr "Prénom" -#: rhodecode/templates/admin/users/users.html:80 +#: rhodecode/templates/admin/users/users.html:81 msgid "lastname" msgstr "Nom de famille" -#: rhodecode/templates/admin/users/users.html:81 +#: rhodecode/templates/admin/users/users.html:82 msgid "last login" msgstr "Dernière connexion" -#: rhodecode/templates/admin/users/users.html:82 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "Actif" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "LDAP" @@ -2581,7 +2810,7 @@ msgstr "Membres disponibles" msgid "Add all elements" msgstr "Tout ajouter" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 msgid "Group members" msgstr "Membres du groupe" @@ -2628,9 +2857,9 @@ msgid "Inbox" msgstr "Boîte de réception" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2654,9 +2883,9 @@ msgid "Home" msgstr "Accueil" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2711,7 +2940,6 @@ msgstr "Aller" #: 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" @@ -2722,7 +2950,7 @@ msgstr "Options" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "Réglages" @@ -2732,40 +2960,40 @@ msgstr "Réglages" msgid "fork" msgstr "Fork" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "Rechercher" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:222 msgid "repositories groups" msgstr "Groupes de dépôts" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "Groupes d’utilisateurs" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "Permissions" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "Followers" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "Forks" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "Rechercher" @@ -2874,20 +3102,20 @@ msgstr "" msgid "Compare fork" msgstr "vue de comparaison" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "Afficher" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "montrer plus" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 @@ -2895,26 +3123,26 @@ msgstr "Nombre de fichiers modifiés, cliquez pour plus de détails" msgid "Changeset status" msgstr "Changesets" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "Parent" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "Aucun parent" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "Fusion" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2923,20 +3151,20 @@ msgstr "Fusion" msgid "branch" msgstr "Branche" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "Signet" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "Tag" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "Afficher les changements sélections de __S à __E" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" @@ -3079,7 +3307,7 @@ msgstr "Comparaison" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "Fichiers affectés" @@ -3159,12 +3387,13 @@ msgid "File diff" msgstr "Diff de fichier" #: rhodecode/templates/files/files.html:4 -#, python-format -msgid "%s Files" +#: rhodecode/templates/files/files.html:72 +#, fuzzy, python-format +msgid "%s files" msgstr "Fichiers de %s" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "Fichiers" @@ -3313,11 +3542,11 @@ msgid "show at revision" msgstr "révision suivante" #: rhodecode/templates/files/files_source.html:14 -#, fuzzy, python-format +#, python-format msgid "%s author" msgid_plural "%s authors" -msgstr[0] "Auteur" -msgstr[1] "" +msgstr[0] "%s Auteur" +msgstr[1] "%s Auteurs" #: rhodecode/templates/files/files_source.html:36 msgid "show source" @@ -3490,18 +3719,18 @@ msgid "Detailed compare view" msgstr "vue de comparaison" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy msgid "owner" msgstr "Propriétaire" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3531,21 +3760,37 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +#, fuzzy +msgid "Status" +msgstr "Changesets" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Created on" msgstr "En créer un maintenant" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 #, fuzzy msgid "Compare view" msgstr "vue de comparaison" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Incoming changesets" msgstr "Dépôt vide" @@ -3564,20 +3809,20 @@ msgid "Closed" msgstr "" #: rhodecode/templates/search/search.html:6 -#, fuzzy, python-format +#, python-format msgid "Search \"%s\" in repository: %s" -msgstr "dans le dépôt :" +msgstr "dans \"%s\" le dépôt: %s" #: rhodecode/templates/search/search.html:8 -#, fuzzy, python-format +#, python-format msgid "Search \"%s\" in all repositories" -msgstr "dans tous les dépôts" +msgstr "Recherche \"%s\" dans tous les référentiels" #: rhodecode/templates/search/search.html:12 #: rhodecode/templates/search/search.html:32 -#, fuzzy, python-format +#, python-format msgid "Search in repository: %s" -msgstr "dans le dépôt :" +msgstr "dans le dépôt : %s" #: rhodecode/templates/search/search.html:14 #: rhodecode/templates/search/search.html:34 @@ -3606,7 +3851,7 @@ msgstr "Message de commit" msgid "File names" msgstr "Les noms de fichiers" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3683,115 +3928,115 @@ msgstr "publique" msgid "remote clone" msgstr "Clone distant" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "Contact" -#: rhodecode/templates/summary/summary.html:126 +#: rhodecode/templates/summary/summary.html:130 msgid "Clone url" msgstr "URL de clone" -#: rhodecode/templates/summary/summary.html:129 +#: rhodecode/templates/summary/summary.html:133 msgid "Show by Name" msgstr "Afficher par nom" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "Afficher par ID" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 msgid "Trending files" msgstr "Populaires" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "Activer" -#: rhodecode/templates/summary/summary.html:154 +#: rhodecode/templates/summary/summary.html:158 msgid "Download" msgstr "Téléchargements" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés." -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt." -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "avec les sous-dépôts" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "Activité de commit par jour et par auteur" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "Statistiques obtenues :" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "Résumé des changements" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 msgid "Quick start" msgstr "Démarrage rapide" -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "Télécharger %s comme archive %s" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "fichiers ajoutés" -#: rhodecode/templates/summary/summary.html:648 +#: rhodecode/templates/summary/summary.html:652 msgid "files changed" msgstr "fichiers modifiés" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:653 msgid "files removed" msgstr "fichiers supprimés" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:656 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "fichier ajouté" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "fichié modifié" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2012-07-14 03:16+0900\n" "Last-Translator: FULL NAME \n" "Language-Team: ja \n" @@ -26,24 +26,30 @@ msgstr "" msgid "All Branches" msgstr "すべてのブランチ" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "空白を表示" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "空白を無視" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "バイナリファイル" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 #, fuzzy msgid "There are no changesets yet" @@ -90,80 +96,85 @@ msgid "commited on" msgstr "コミット" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "新規追加" +#, fuzzy +msgid "click here to add new file" +msgstr "新しいファイルを追加" #: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "まだファイルがありません %s" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "RhodeCode経由で %s を変更" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "変更点なし" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "%s へのコミットが成功しました" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "コミット中にエラーが発生しました" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" msgstr "RhodeCode経由で %s を追加" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 msgid "No content" msgstr "内容がありません" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 msgid "No filename" msgstr "ファイル名がありません" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "ダウンロードは無効化されています" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "%s は未知のリビジョンです" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "空のリポジトリ" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "未知のアーカイブ種別です" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "チェンジセット" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "ブランチ" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "タグ" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -173,7 +184,7 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -183,12 +194,12 @@ msgstr "" "%s " "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "リポジトリ %s を %s としてフォーク" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "リポジトリ %s のフォーク中にエラーが発生しました" @@ -198,36 +209,50 @@ msgid "public journal" msgstr "公開ジャーナル" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "ジャーナル" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "rhodecodeへの登録を受け付けました" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "パスワードリセットのリンクを送信しました" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "パスワードをリセットしました。新しいパスワードをあなたのメールアドレスに送りました" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "ブックマーク" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 +#, fuzzy +msgid "error during creation of pull request" +msgstr "ユーザー %s の作成中にエラーが発生しました" + +#: rhodecode/controllers/pullrequests.py:181 msgid "Successfully opened new pull request" msgstr "新しいプルリクエストを作成しました" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 msgid "Error occurred during sending pull request" msgstr "プルリクエストの作成中にエラーが発生しました" +#: rhodecode/controllers/pullrequests.py:217 +#, fuzzy +msgid "Successfully deleted pull request" +msgstr "新しいプルリクエストを作成しました" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "無効な検索クエリーです。\\\"で囲んで下さい" @@ -241,19 +266,19 @@ msgid "An error occurred during this sea msgstr "検索を実行する際にエラーがおきました" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "リポジトリ %s の更新に成功しました" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "リポジトリ %s の更新中にエラーが発生しました" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -264,14 +289,14 @@ msgstr "" "リポジトリはDB内に見つかりませんでした。おそらくファイルシステム上で作られたか名前が変更されたためです。リポジトリをもう一度チェックするためにアプリケーションを立ち上げ直してください。" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "リポジトリ %s を削除しました" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "リポジトリ %s の削除中にエラーが発生しました" @@ -281,7 +306,7 @@ msgid "No data loaded yet" msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "このリポジトリの統計は無効化されています" @@ -372,9 +397,9 @@ msgstr "書込" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "管理" @@ -391,18 +416,20 @@ msgid "allowed with automatic account ac msgstr "自動でアカウントを有効にする" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "無効" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "有効" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "デフォルトの権限を更新しました" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "権限の更新中にエラーが発生しました" @@ -410,120 +437,125 @@ msgstr "権限の更新中にエラーが発生しました" msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "リポジトリ %s を %s から作成" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "リポジトリ %s を作成しました" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" msgstr "リポジトリ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:346 +#: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" msgstr "リポジトリユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "An error occurred during deletion of repository users groups" msgstr "リポジトリユーザーグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during deletion of repository stats" msgstr "リポジトリステートの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "キャッシュの無効化時にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:418 -msgid "Updated repository visibility in public journal" -msgstr "" - #: rhodecode/controllers/admin/repos.py:422 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "メールの保存時にエラーが発生しました" + +#: rhodecode/controllers/admin/repos.py:442 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:446 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 msgid "Token mismatch" msgstr "トークンが合いません" -#: rhodecode/controllers/admin/repos.py:440 +#: rhodecode/controllers/admin/repos.py:464 msgid "Pulled from remote location" msgstr "リモートから取得" -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:466 msgid "An error occurred during pull from remote location" msgstr "リモートから取得中にエラーが発生しました" -#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:482 msgid "Nothing" msgstr "ありません" -#: rhodecode/controllers/admin/repos.py:460 +#: rhodecode/controllers/admin/repos.py:484 #, python-format msgid "Marked repo %s as fork of %s" msgstr "%s リポジトリを %s のフォークとして印をつける" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "操作中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "リポジトリグループ %s を作成しました" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "リポジトリグループ %s を作成中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "リポジトリグループ %s を更新しました" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "リポジトリグループ %s を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "このグループは %s リポジトリを含んでいるため削除出来ません" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "リポジトリグループ %s を削除しました" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "サブグループを含んでいるため、このグループを削除できません" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "リポジトリグループの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "グループユーザーを削除中にエラーが発生しました" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" @@ -541,90 +573,115 @@ msgid "Updated application settings" msgstr "アプリケーション設定を更新しました" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "アプリケーション設定を更新中にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" +#: rhodecode/controllers/admin/settings.py:200 +#, fuzzy +msgid "Updated visualisation settings" +msgstr "アプリケーション設定を更新しました" + +#: rhodecode/controllers/admin/settings.py:205 +#, fuzzy +msgid "error occurred during updating visualisation settings" +msgstr "アプリケーション設定を更新中にエラーが発生しました" + +#: rhodecode/controllers/admin/settings.py:271 +#, fuzzy +msgid "Updated VCS settings" msgstr "Mercurialの設定を更新しました" -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "新しいフックを追加しました" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "フックを更新しました" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "フックの作成時にエラーが発生しました" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "メールのタスクを作成しました" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 msgid "You can't edit this user since it's crucial for entire application" msgstr "このユーザーを編集出来ません。このユーザーはアプリケーションにとって必要不可欠です。" -#: rhodecode/controllers/admin/settings.py:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "アカウントを更新しました" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" msgstr "ユーザー %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "ユーザー %s を作成しました" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" msgstr "ユーザー %s の作成中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "ユーザーの更新に成功しました" -#: rhodecode/controllers/admin/users.py:202 +#: rhodecode/controllers/admin/users.py:207 msgid "successfully deleted user" msgstr "ユーザーの削除に成功しました" -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "ユーザーの削除中にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "このユーザーは編集できません" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +#, fuzzy +msgid "Granted 'repository fork' permission to user" +msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" + +#: rhodecode/controllers/admin/users.py:282 +#, fuzzy +msgid "Revoked 'repository fork' permission to user" +msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +#, fuzzy +msgid "An error occurred during permissions saving" +msgstr "メールの保存時にエラーが発生しました" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "ユーザーにメール %s を追加しました" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 msgid "An error occurred during email saving" msgstr "メールの保存時にエラーが発生しました" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 msgid "Removed email from user" msgstr "ユーザーからメールを削除しました" @@ -643,169 +700,189 @@ msgstr "ユーザーグループ %s の作成中にエラーが発生しました" msgid "updated users group %s" msgstr "ユーザーグループ %s を更新しました" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "ユーザーグループ %s の更新中にエラーが発生しました" -#: rhodecode/controllers/admin/users_groups.py:169 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" msgstr "ユーザーグループ" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "ユーザーグループの削除中にエラーが発生しました" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +#, fuzzy +msgid "Granted 'repository create' permission to users group" +msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" + +#: rhodecode/controllers/admin/users_groups.py:238 +#, fuzzy +msgid "Revoked 'repository create' permission to users group" +msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" + +#: rhodecode/controllers/admin/users_groups.py:244 +#, fuzzy +msgid "Granted 'repository fork' permission to users group" +msgstr "ユーザーに 'リポジトリ作成' 権限を与えました" + +#: rhodecode/controllers/admin/users_groups.py:249 +#, fuzzy +msgid "Revoked 'repository fork' permission to users group" +msgstr "ユーザーの 'リポジトリ作成' 権限を取り消しました" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "このアクションを実行するためには登録ユーザーである必要があります" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "このページを閲覧するためにはサインインが必要です" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "検出された変更はありません" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "%a, %d %b %Y %H:%M:%S" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "True" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "False" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 msgid "Changeset not found" msgstr "リビジョンが見つかりません" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "%s から %s までのすべてのチェンジセットを表示" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "比較の表示" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "リビジョン" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "フォーク名 " -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "リポジトリを[作成]" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 msgid "[created] repository as fork" msgstr "フォークしてリポジトリを[作成]" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "リポジトリを[フォーク]" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "リポジトリを[更新]" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "リポジトリを[削除]" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 msgid "[created] user" msgstr "ユーザーを[作成]" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 msgid "[updated] user" msgstr "ユーザーを[更新]" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 msgid "[created] users group" msgstr "ユーザーグループを[作成]" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 msgid "[updated] users group" msgstr "ユーザーグループを[更新]" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "リポジトリのリビジョンに[コメント]" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 #, fuzzy msgid "[commented] on pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 #, fuzzy msgid "[closed] pull request for" msgstr "プルリクエストに[コメント]" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "[プッシュ]" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "リポジトリに[RhodeCode経由でコミット]" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "リポジトリに[リモートからプル]" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "[プル]" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "リポジトリの[フォローを開始]" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "リポジトリの[フォローを停止]" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr " と %s 以上" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "" @@ -872,75 +949,83 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +msgid "Repository forking disabled" +msgstr "" + +#: rhodecode/model/db.py:1154 +msgid "Repository forking enabled" +msgstr "" + +#: rhodecode/model/db.py:1155 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "未レビュー" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 msgid "Approved" msgstr "承認" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "却下" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "レビュー中" @@ -991,61 +1076,65 @@ msgstr "" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 msgid "latest tip" msgstr "最新のtip" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 msgid "new user registration" msgstr "新規ユーザー登録" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:323 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:339 +#: rhodecode/model/user.py:329 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "ユーザー名 \"%(username)s\" はすでに使われています" -#: rhodecode/model/validators.py:54 +#: rhodecode/model/validators.py:84 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "ユーザー名 \"%(username)s\" は許可されていません" -#: rhodecode/model/validators.py:56 +#: rhodecode/model/validators.py:86 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "ユーザー名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:114 #, python-format msgid "Username %(username)s is not valid" msgstr "ユーザー名 %(username)s は不正です" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 msgid "Invalid users group name" msgstr "不正なユーザーグループ名です" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "ユーザーグループ \"%(usersgroup)s\" はすでに存在します" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1053,95 +1142,100 @@ msgstr "" "ユーザーグループ名はアルファベット、アンダースコア(_)、ピリオド(.)、ダッシュ(-)しか使えません。また、アルファベットから始まる必要があります" " " -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "このグループは親にできません" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "グループ \"%(group_name)s\" はすでに存在します" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "グループ名 \"%(group_name)s\" を持つリポジトリはすでに存在します" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "パスワードに利用出来ない文字列(non-ascii)です" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "パスワードが一致しません" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "不正なパスワードです" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "不正なユーザー名です" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "アカウントは無効です" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "リポジトリ名 %(repo)s は許可されていません" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "リポジトリ %(repo)s はすでに存在します" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "リポジトリ \"%(repo)s\" は グループ \"%(group)s\" にすでに存在します" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "リポジトリグループ名 \"%(repo)s\" はすでに存在します" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "無効なクローンURIです" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" +#: rhodecode/model/validators.py:432 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:457 msgid "Fork have to be the same type as parent" msgstr "フォークは親と同じタイプの必要があります" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "ユーザー名かユーザーグループが不正です" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "不正なパスです" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "このメールアドレスはすでに取得されています" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "メールアドレス \"%(email)s\" は存在しません" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "LDAPのこのCNに対するログイン属性は必須です。 - これは \"ユーザー名\" と同じです" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "ダッシュボード" @@ -1160,7 +1254,7 @@ msgstr "クイックフィルタ..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "リポジトリ" @@ -1180,9 +1274,9 @@ msgid "Group name" msgstr "グループ名" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1200,15 +1294,15 @@ msgstr "説明" msgid "Repositories group" msgstr "リポジトリグループ" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1219,61 +1313,61 @@ msgstr "リポジトリグループ" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名前" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "最後の変更時刻" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Tip" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:163 -#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "%s の RSS フィードを購読" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "%s の ATOM フィードを購読" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 msgid "Group Name" msgstr "グループ名" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1281,11 +1375,11 @@ msgstr "グループ名" msgid "Click to sort ascending" msgstr "昇順で並び換え" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1293,14 +1387,14 @@ msgstr "昇順で並び換え" msgid "Click to sort descending" msgstr "降順で並び替え" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 msgid "Last Change" msgstr "最後の変更点" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1308,10 +1402,10 @@ msgstr "最後の変更点" msgid "No records found." msgstr "レコードが見つかりません" -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1319,10 +1413,10 @@ msgstr "レコードが見つかりません" msgid "Data error." msgstr "データエラー" -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1344,7 +1438,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "ユーザー名" @@ -1417,7 +1511,7 @@ msgstr "名字" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "メールアドレス" @@ -1579,13 +1673,13 @@ msgid "E-mail Attribute" msgstr "メールアドレス属性" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "保存" @@ -1604,8 +1698,8 @@ msgid "Comments" msgstr "コメント" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "プルリクエスト" @@ -1631,7 +1725,7 @@ msgid "Permissions administration" msgstr "権限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1671,7 +1765,12 @@ msgid "Repository creation" msgstr "リポジトリ作成" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +#, fuzzy +msgid "Repository forking" +msgstr "リポジトリ作成" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "保存" @@ -1686,6 +1785,10 @@ msgstr "リポジトリの追加" msgid "Repositories" msgstr "リポジトリ" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "新規追加" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1764,8 +1867,8 @@ msgstr "リポジトリを編集" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1799,19 +1902,30 @@ msgstr "ダウンロードを有効にする" msgid "Enable download menu on summary page." msgstr "概要ページのダウンロードメニューを有効にします" -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#, fuzzy +msgid "Enable locking" +msgstr "有効にする" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "リポジトリの所有者を変更" -#: rhodecode/templates/admin/repos/repo_edit.html:133 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1819,90 +1933,130 @@ msgstr "リポジトリの所有者を変更" msgid "Reset" msgstr "リセット" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "管理" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "現在の統計情報をリセットする" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "現在の統計情報をリセットしてもよろしいですか" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Fetched to rev" msgstr "収集するリビジョン" -#: rhodecode/templates/admin/repos/repo_edit.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:163 msgid "Stats gathered" msgstr "収集した統計情報" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "リモート" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "リモートから変更を取り込む" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "リモートから変更を取り込んでもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:186 msgid "Cache" msgstr "キャッシュ" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Invalidate repository cache" msgstr "リポジトリのキャッシュを無効化" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Confirm to invalidate repository cache" msgstr "リポジトリのキャッシュを無効化してもよろしいですか？" -#: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "公開ジャーナル" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "公開ジャーナルから削除する" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "公開ジャーナルに追加する" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "公開ジャーナルでは、このリポジトリに対して行った操作のすべてが公開されます" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +#, fuzzy +msgid "Locking" +msgstr "変更可能にする" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +#, fuzzy +msgid "Confirm to unlock repository" +msgstr "このリポジトリを削除しますか？" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +#, fuzzy +msgid "Confirm to lock repository" +msgstr "このリポジトリを削除しますか？" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +#, fuzzy +msgid "Repository is not locked" +msgstr "リポジトリロケーション" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +msgid "Set as fork of" +msgstr "フォーク元の設定" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +msgid "Manually set this repository as a fork of another from the list" +msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "削除" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "このリポジトリを削除" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "このリポジトリを削除しますか？" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1912,14 +2066,6 @@ msgstr "" "このリポジトリはRhodeCodeとVCSシステムからアクセスされないような名前に、特別な方法で変更されます。\n" "もし、ファイルシステムから完全に削除したい場合、手動で行ってください" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Set as fork of" -msgstr "フォーク元の設定" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -msgid "Manually set this repository as a fork of another from the list" -msgstr "このリポジトリをリスト中の他のリポジトリのフォークとして、手動で設定します" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -1937,8 +2083,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "管理" @@ -1967,18 +2113,18 @@ msgstr "default" msgid "revoke" msgstr "取消" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "別のメンバーを追加" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "ユーザーの削除に失敗しました" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "ユーザーグループの削除に失敗しました" @@ -2016,7 +2162,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "保存" @@ -2028,6 +2174,12 @@ msgstr "リポジトリグループを編集" msgid "edit repos group" msgstr "リポジトリグループを編集" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "リポジトリグループ管理" @@ -2041,13 +2193,13 @@ msgid "Number of toplevel repositories" msgstr "トップレベルリポジトリの数" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2152,92 +2304,140 @@ msgid "GA code" msgstr "GAコード" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "設定を保存" #: rhodecode/templates/admin/settings/settings.html:119 #, fuzzy -msgid "VCS settings" -msgstr "設定" +msgid "Visualisation settings" +msgstr "アプリケーション全体の設定" #: rhodecode/templates/admin/settings/settings.html:128 +#, fuzzy +msgid "Icons" +msgstr "オプション" + +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +#, fuzzy +msgid "Show private repo icon on repositories" +msgstr "非公開リポジトリ" + +#: rhodecode/templates/admin/settings/settings.html:144 +#, fuzzy +msgid "Meta-Tagging" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +#, fuzzy +msgid "VCS settings" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:185 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:190 #, fuzzy msgid "require ssl for vcs operations" msgstr "プッシュにSSLを必須とする" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "フック" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "プッシュ後にリポジトリをを更新する (hg update)" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "プッシュ後にリポジトリのサイズを表示する" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "ユーザーのプッシュコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "ユーザーのプルコマンドを記録する" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "高度な設定" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +#, fuzzy +msgid "Mercurial Extensions" +msgstr "Mercurialリポジトリ" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "リポジトリロケーション" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "変更可能にする" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "テストメール" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 msgid "Email to" msgstr "送信先" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 msgid "Send" msgstr "送る" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "システム情報とパッケージ" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 msgid "show" msgstr "表示" @@ -2300,39 +2500,61 @@ msgstr "新しいパスワード 再入力" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +#, fuzzy +msgid "Inherit default permissions" +msgstr "デフォルトの権限" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "リポジトリを作成する" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +#, fuzzy +msgid "Fork repositories" +msgstr "リポジトリ" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, fuzzy msgid "Nothing here yet" msgstr "通知はまだありません" -#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 msgid "Permission" msgstr "権限" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 #, fuzzy msgid "Edit Permission" msgstr "リポジトリの権限" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 msgid "Email addresses" msgstr "メールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, python-format msgid "Confirm to delete this email: %s" msgstr "このメールを削除してよろしいですか: %s" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 msgid "New email address" msgstr "新しいメールアドレス" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 msgid "Add" msgstr "追加" @@ -2368,16 +2590,21 @@ msgstr "新規追加" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, fuzzy, python-format msgid "Pull request #%s opened on %s" msgstr "プルリクエスト #%s" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, fuzzy +msgid "Confirm to delete this pull request" +msgstr "このリポジトリを削除しますか？" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2419,7 +2646,7 @@ msgid "Users administration" msgstr "ユーザー管理" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "ユーザー" @@ -2427,30 +2654,30 @@ msgstr "ユーザー" msgid "ADD NEW USER" msgstr "新しいユーザーを追加" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "ユーザー名" -#: rhodecode/templates/admin/users/users.html:79 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy msgid "firstname" msgstr "名前" -#: rhodecode/templates/admin/users/users.html:80 +#: rhodecode/templates/admin/users/users.html:81 msgid "lastname" msgstr "名字" -#: rhodecode/templates/admin/users/users.html:81 +#: rhodecode/templates/admin/users/users.html:82 msgid "last login" msgstr "最終ログイン日" -#: rhodecode/templates/admin/users/users.html:82 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "アクティブ" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "LDAP" @@ -2495,7 +2722,7 @@ msgstr "有効なメンバー" msgid "Add all elements" msgstr "全ての要素を追加" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 msgid "Group members" msgstr "グループメンバー" @@ -2542,9 +2769,9 @@ msgid "Inbox" msgstr "受信箱" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2568,9 +2795,9 @@ msgid "Home" msgstr "ホーム" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2625,7 +2852,6 @@ msgstr "ブランチの切り替え" #: 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 "ファイル" @@ -2636,7 +2862,7 @@ msgstr "オプション" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "設定" @@ -2646,40 +2872,40 @@ msgstr "設定" msgid "fork" msgstr "フォーク" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "新しいプルリクエストを作成" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "検索" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:222 msgid "repositories groups" msgstr "リポジトリグループ" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "ユーザーグループ" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "権限" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "フォロワー" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "フォーク" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "検索" @@ -2783,46 +3009,46 @@ msgstr "%s とフォークを比較" msgid "Compare fork" msgstr "フォークを比較" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "表示" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "もっと表示" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "リビジョンステータス" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "親リビジョン" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "親リビジョンはありません" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "マージ" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2831,20 +3057,20 @@ msgstr "マージ" msgid "branch" msgstr "ブランチ" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "ブックマーク" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "タグ" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "まだ変更がありません" @@ -2980,7 +3206,7 @@ msgstr "比較ビュー" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" @@ -3058,12 +3284,13 @@ msgid "File diff" msgstr "ファイル差分" #: rhodecode/templates/files/files.html:4 -#, python-format -msgid "%s Files" +#: rhodecode/templates/files/files.html:72 +#, fuzzy, python-format +msgid "%s files" msgstr "%s ファイル" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "ファイル" @@ -3380,18 +3607,18 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "プルリクエストレビュアー" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy msgid "owner" msgstr "所有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 #, fuzzy msgid "Add reviewer to this pull request." msgstr "新しいプルリクエスト" @@ -3419,19 +3646,35 @@ msgstr "プルリクエストを送る" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +#, fuzzy +msgid "Status" +msgstr "ステータスを変更する" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "プルリクエストステータス" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +#, fuzzy +msgid "Still not reviewed by" +msgstr "未レビュー" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, fuzzy, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "レビュー中" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 msgid "Created on" msgstr "作成日" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 msgid "Compare view" msgstr "比較ビュー" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Incoming changesets" msgstr "" @@ -3490,7 +3733,7 @@ msgstr "コミットメッセージ" msgid "File names" msgstr "ファイル名" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3567,115 +3810,115 @@ msgstr "公開" msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "コンタクト" -#: rhodecode/templates/summary/summary.html:126 +#: rhodecode/templates/summary/summary.html:130 msgid "Clone url" msgstr "クローンURL" -#: rhodecode/templates/summary/summary.html:129 +#: rhodecode/templates/summary/summary.html:133 msgid "Show by Name" msgstr "名前で表示" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "IDで表示" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 msgid "Trending files" msgstr "トレンドファイル" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "有効にする" -#: rhodecode/templates/summary/summary.html:154 +#: rhodecode/templates/summary/summary.html:158 msgid "Download" msgstr "ダウンロード" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "まだダウンロードがありません" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "このリポジトリのダウンロードは無効化されています" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "ZIPとしてダウンロード" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "チェックするとダウンロードアーカイブにサブリポジトリが含まれます" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "サブリポジトリを含む" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "ログ" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 msgid "Quick start" msgstr "クイックスタート" -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "%s を %sとしてダウンロード" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:648 +#: rhodecode/templates/summary/summary.html:652 msgid "files changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:653 msgid "files removed" msgstr "削除されたファイル" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:656 msgid "commit" msgstr "コミット" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "追加されたファイル" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "変更されたファイル" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2012-05-22 16:47-0300\n" "Last-Translator: Augusto Herrmann \n" "Language-Team: pt_BR \n" @@ -21,24 +21,30 @@ msgstr "" msgid "All Branches" msgstr "Todos os Ramos" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "mostrar espaços em branco" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "ignorar espaços em branco" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" msgstr "contexto de %s linhas" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "arquivo binário" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 #, fuzzy msgid "There are no changesets yet" @@ -90,80 +96,85 @@ msgid "commited on" msgstr "commit" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "adicionar novo" +#, fuzzy +msgid "click here to add new file" +msgstr "adicionar novo arquivo" #: rhodecode/controllers/files.py:85 #, python-format msgid "There are no files yet %s" msgstr "Ainda não há arquivos %s" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "Editado %s via RhodeCode" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "Sem alterações" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "Commit realizado com sucesso para %s" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "Ocorreu um erro ao realizar commit" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" msgstr "Adicionado %s via RhodeCode" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 msgid "No content" msgstr "Nenhum conteúdo" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 msgid "No filename" msgstr "Nenhum nomes de arquivo" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "downloads desabilitados" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "Revisão desconhecida %s" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "Repositório vazio" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "Arquivo de tipo desconhecido" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "Conjuntos de mudanças" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "Ramos" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "Etiquetas" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -174,7 +185,7 @@ 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:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -185,12 +196,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:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "bifurcado repositório %s como %s" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "Ocorreu um erro ao bifurcar o repositório %s" @@ -201,19 +212,19 @@ msgid "public journal" msgstr "Diário público" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "diário" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "Você se registrou com sucesso no rhodecode" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "Seu link de reinicialização de senha foi enviado" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" @@ -221,20 +232,34 @@ msgstr "" "Sua reinicialização de senha foi bem sucedida, sua senha foi enviada ao " "seu e-mail" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "Marcadores" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 #, fuzzy +msgid "error during creation of pull request" +msgstr "ocorreu um erro ao criar o usuário %s" + +#: rhodecode/controllers/pullrequests.py:181 +#, fuzzy msgid "Successfully opened new pull request" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 #, fuzzy msgid "Error occurred during sending pull request" msgstr "ocorreu um erro ao criar o repositório %s" +#: rhodecode/controllers/pullrequests.py:217 +#, fuzzy +msgid "Successfully deleted pull request" +msgstr "usuário excluído com sucesso" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "Consulta de busca inválida. Tente usar aspas." @@ -248,19 +273,19 @@ msgid "An error occurred during this sea msgstr "Ocorreu um erro durante essa operação de busca" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "Repositório %s atualizado com sucesso" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/admin/repos.py:284 #, 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:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -272,14 +297,14 @@ msgstr "" "outra vez para varrer novamente por repositórios" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "excluído o repositório %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "Ocorreu um erro durante a exclusão de %s" @@ -289,7 +314,7 @@ msgid "No data loaded yet" msgstr "Ainda não há dados carregados" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "As estatísticas estão desabillitadas para este repositório" @@ -380,9 +405,9 @@ msgstr "Gravar" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "Administrador" @@ -399,18 +424,20 @@ msgid "allowed with automatic account ac msgstr "permitido com ativação automática de conta" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "Desabilitado" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "Habilitado" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "Permissões padrões atualizadas com sucesso" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "ocorreu um erro ao atualizar as permissões" @@ -418,120 +445,125 @@ msgstr "ocorreu um erro ao atualizar as permissões" msgid "--REMOVE FORK--" msgstr "--REMOVER BIFURCAÇÂO--" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "repositório %s criado a partir de %s" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "repositório %s criado" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, 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:317 +#: rhodecode/controllers/admin/repos.py:319 #, 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:346 +#: rhodecode/controllers/admin/repos.py:348 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:365 +#: rhodecode/controllers/admin/repos.py:367 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:382 +#: rhodecode/controllers/admin/repos.py:385 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:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "Ocorreu um erro ao invalidar o cache" -#: 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:422 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/admin/repos.py:442 +msgid "Updated repository visibility in public journal" +msgstr "Atualizada a visibilidade do repositório no diário público" + +#: rhodecode/controllers/admin/repos.py:446 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:427 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 msgid "Token mismatch" msgstr "Descompasso de Token" -#: rhodecode/controllers/admin/repos.py:440 +#: rhodecode/controllers/admin/repos.py:464 msgid "Pulled from remote location" msgstr "Realizado pull de localização remota" -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:466 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:458 +#: rhodecode/controllers/admin/repos.py:482 msgid "Nothing" msgstr "Nada" -#: rhodecode/controllers/admin/repos.py:460 +#: rhodecode/controllers/admin/repos.py:484 #, 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:464 +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "criado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "ccorreu um erro ao criar grupo de repositório %s" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "atualizado grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "ocorreu um erro ao atualizar grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "Esse grupo contém %s repositórios e não pode ser excluído" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "removido grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "Nao é possível excluir este grupo pois ele ainda contém subgrupos" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "ccorreu um erro ao excluir grupo de repositórios %s" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "Ocorreu um erro ao excluir o usuário de grupo" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "Ocorreu um erro ao excluir o grupo do grupo de usuários" @@ -549,91 +581,116 @@ msgid "Updated application settings" msgstr "Configurações da aplicação atualizadas" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "ocorreu um erro ao atualizar as configurações da aplicação" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" +#: rhodecode/controllers/admin/settings.py:200 +#, fuzzy +msgid "Updated visualisation settings" +msgstr "Configurações da aplicação atualizadas" + +#: rhodecode/controllers/admin/settings.py:205 +#, fuzzy +msgid "error occurred during updating visualisation settings" +msgstr "ocorreu um erro ao atualizar as configurações da aplicação" + +#: rhodecode/controllers/admin/settings.py:271 +#, fuzzy +msgid "Updated VCS settings" msgstr "Atualizadas as configurações do mercurial" -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "Adicionado novo gancho" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "Atualizados os ganchos" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "ocorreu um erro ao criar gancho" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "Tarefa de e-mail criada" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 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:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "Sua conta foi atualizada com sucesso" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, 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:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "usuário %s criado" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, 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:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "Usuário atualizado com sucesso" -#: rhodecode/controllers/admin/users.py:202 +#: rhodecode/controllers/admin/users.py:207 msgid "successfully deleted user" msgstr "usuário excluído com sucesso" -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "Ocorreu um erro ao excluir o usuário" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "Você não pode editar esse usuário" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "Concedida permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "Revogada permissão de 'criar repositório' ao usuário" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +#, fuzzy +msgid "Granted 'repository fork' permission to user" +msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#: rhodecode/controllers/admin/users.py:282 +#, fuzzy +msgid "Revoked 'repository fork' permission to user" +msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +#, fuzzy +msgid "An error occurred during permissions saving" +msgstr "Ocorreu um erro durante essa operação" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 #, fuzzy msgid "An error occurred during email saving" msgstr "Ocorreu um erro durante essa operação" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 #, fuzzy msgid "Removed email from user" msgstr "removido grupo de repositórios %s" @@ -653,178 +710,198 @@ msgstr "ocorreu um erro ao criar o grupo de usuários %s" msgid "updated users group %s" msgstr "grupo de usuários %s atualizado" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "ocorreu um erro ao atualizar o grupo de usuários %s" -#: rhodecode/controllers/admin/users_groups.py:169 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" msgstr "grupo de usuários excluído com sucesso" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "Ocorreu um erro ao excluir o grupo de usuários" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +#, fuzzy +msgid "Granted 'repository create' permission to users group" +msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#: rhodecode/controllers/admin/users_groups.py:238 +#, fuzzy +msgid "Revoked 'repository create' permission to users group" +msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#: rhodecode/controllers/admin/users_groups.py:244 +#, fuzzy +msgid "Granted 'repository fork' permission to users group" +msgstr "Concedida permissão de 'criar repositório' ao usuário" + +#: rhodecode/controllers/admin/users_groups.py:249 +#, fuzzy +msgid "Revoked 'repository fork' permission to users group" +msgstr "Revogada permissão de 'criar repositório' ao usuário" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "Você precisa ser um usuário registrado para realizar essa ação" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "Você precisa estar logado para ver essa página" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Conjunto de mudanças é grande demais e foi cortado, use o menu de " "diferenças para ver as diferenças" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "Nenhuma alteração detectada" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "Verdadeiro" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "Falso" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 msgid "Changeset not found" msgstr "Conjunto de alterações não encontrado" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Ver todos os conjuntos de mudanças combinados %s->%s" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "comparar exibir" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "e" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "%s mais" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "revisões" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "nome da bifurcação" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "repositório [excluído]" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 msgid "[created] repository as fork" msgstr "repositório [criado] como uma bifurcação" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "repositório [bifurcado]" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "repositório [atualizado]" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "[excluir] repositório" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 #, fuzzy msgid "[created] user" msgstr "usuário %s criado" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 #, fuzzy msgid "[updated] user" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 #, fuzzy msgid "[created] users group" msgstr "criado grupo de usuários %s" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 #, fuzzy msgid "[updated] users group" msgstr "grupo de usuários %s atualizado" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 #, fuzzy msgid "[commented] on revision in repository" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 #, fuzzy msgid "[commented] on pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 #, fuzzy msgid "[closed] pull request for" msgstr "repositório [criado]" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "[realizado push] para" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 #, fuzzy msgid "[committed via RhodeCode] into repository" msgstr "[realizado commit via RhodeCode] para" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 #, fuzzy msgid "[pulled from remote] into repository" msgstr "[realizado pull remoto] para" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "[realizado pull] a partir de" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "[passou a seguir] o repositório" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "[parou de seguir] o repositório" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr " e mais %s" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "Nenhum Arquivo" @@ -897,88 +974,98 @@ msgstr "na linha %s" msgid "[Mention]" msgstr "[Menção]" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 #, fuzzy msgid "Repository no access" msgstr "repositórios" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 #, fuzzy msgid "Repository read access" msgstr "Esse repositório já existe" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 #, fuzzy msgid "Repository write access" msgstr "repositórios" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 #, fuzzy msgid "Repository admin access" msgstr "repositórios" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 #, fuzzy msgid "Repositories Group no access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 #, fuzzy msgid "Repositories Group read access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 #, fuzzy msgid "Repositories Group write access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 #, fuzzy msgid "Repositories Group admin access" msgstr "grupos de repositórios" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 #, fuzzy msgid "RhodeCode Administrator" msgstr "Administração de usuários" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 #, fuzzy msgid "Repository creation disabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 #, fuzzy msgid "Repository creation enabled" msgstr "Criação de repositório" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +#, fuzzy +msgid "Repository forking disabled" +msgstr "Criação de repositório" + +#: rhodecode/model/db.py:1154 +#, fuzzy +msgid "Repository forking enabled" +msgstr "Criação de repositório" + +#: rhodecode/model/db.py:1155 #, fuzzy msgid "Register disabled" msgstr "desabilitado" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 #, fuzzy msgid "Approved" msgstr "removidos" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -1030,29 +1117,29 @@ msgstr "comentado no commit" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 #, fuzzy msgid "latest tip" msgstr "último login" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 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 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 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:333 +#: rhodecode/model/user.py:323 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:339 +#: rhodecode/model/user.py:329 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1061,17 +1148,21 @@ msgstr "" "usuário \"%s\" ainda é dono de %s repositórios e não pode ser removido. " "Troque os donos ou remova esses repositórios. %s" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:54 +#: rhodecode/model/validators.py:84 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:56 +#: rhodecode/model/validators.py:86 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" @@ -1079,22 +1170,22 @@ msgstr "" "Nome de usuário pode conter somente caracteres alfanuméricos, sublinha, " "pontos e hífens e deve iniciar com caractere alfanumérico" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:114 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 #, fuzzy msgid "Invalid users group name" msgstr "nome de usuário inválido" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "Esse grupo de usuários já existe" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1103,92 +1194,93 @@ msgstr "" "alfanuméricos, sublinha, pontos e hífens e deve iniciar com caractere " "alfanumérico" -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "Não é possível associar esse grupo como progenitor" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Esse nome de usuário já existe" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "Caracteres inválidos na senha" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "Senhas não conferem" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "senha inválida" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "nome de usuário inválido" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "Sua conta está desabilitada" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "Esse nome de repositório não é permitido" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Esse repositório já existe em um grupo \"%s\"" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "Já existe um repositório com esse nome" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "URL de clonagem inválida" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" +#: rhodecode/model/validators.py:432 +#, fuzzy +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "URL de clonagem inválida, forneça uma URL válida de clonagem http\\s" -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:457 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Bifurcação precisa ser do mesmo tipo que o original" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "Esse nome de usuário ou nome de grupo de usuários não é válido" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "Esse não é um caminho válido" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "Esse endereço de e-mail já está tomado" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "Esse endereço de e-mail não existe." -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1196,6 +1288,11 @@ msgstr "" "O atributo de login LDAP do CN deve ser especificado - isto é o nome do " "atributo que é equivalente ao 'nome de usuário'" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "Painel de Controle" @@ -1214,7 +1311,7 @@ msgstr "filtro rápido..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "repositórios" @@ -1234,9 +1331,9 @@ msgid "Group name" msgstr "Nome do grupo" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1254,15 +1351,15 @@ msgstr "Descrição" msgid "Repositories group" msgstr "Grupo de repositórios" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1273,61 +1370,61 @@ msgstr "Grupo de repositórios" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "Nome" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "Última alteração" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: rhodecode/templates/journal/journal.html:188 msgid "Tip" msgstr "Ponta" -#: rhodecode/templates/index_base.html:70 -#: rhodecode/templates/index_base.html:163 -#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "Dono" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "RSS" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "Atom" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "Assinar o feed rss de %s" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "Assinar o feed atom de %s" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 msgid "Group Name" msgstr "Nome do Grupo" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1335,11 +1432,11 @@ msgstr "Nome do Grupo" msgid "Click to sort ascending" msgstr "Clique para ordenar em ordem crescente" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1347,14 +1444,14 @@ msgstr "Clique para ordenar em ordem cre msgid "Click to sort descending" msgstr "Clique para ordenar em ordem descrescente" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 msgid "Last Change" msgstr "Última Alteração" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1362,10 +1459,10 @@ msgstr "Última Alteração" msgid "No records found." msgstr "Nenhum registro encontrado." -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1373,10 +1470,10 @@ msgstr "Nenhum registro encontrado." msgid "Data error." msgstr "Erro de dados." -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1398,7 +1495,7 @@ msgstr "Entrar em" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "Nome de usuário" @@ -1473,7 +1570,7 @@ msgstr "Último Nome" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "E-mail" @@ -1635,13 +1732,13 @@ msgid "E-mail Attribute" msgstr "Atributo de E-mail" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "Salvar" @@ -1661,8 +1758,8 @@ msgid "Comments" msgstr "commits" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1688,7 +1785,7 @@ msgid "Permissions administration" msgstr "Administração de permissões" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1731,7 +1828,12 @@ msgid "Repository creation" msgstr "Criação de repositório" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +#, fuzzy +msgid "Repository forking" +msgstr "Criação de repositório" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "ajustar" @@ -1746,6 +1848,10 @@ msgstr "Adicionar repositório" msgid "Repositories" msgstr "Repositórios" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "adicionar novo" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1830,8 +1936,8 @@ 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.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1865,19 +1971,30 @@ msgstr "Habilitar downloads" msgid "Enable download menu on summary page." msgstr "Habilitar menu de descarregar na página de sumário." -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#, fuzzy +msgid "Enable locking" +msgstr "habilitar" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." 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/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1885,70 +2002,70 @@ msgstr "Mudar o dono desse repositório." msgid "Reset" msgstr "Limpar" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "Administração" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "Estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "Reinicializar estatísticas atuais" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "Confirma remover atuais estatísticas" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Fetched to rev" msgstr "Trazida à rev" -#: rhodecode/templates/admin/repos/repo_edit.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:163 msgid "Stats gathered" msgstr "Estatísticas coletadas" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "Remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "Realizar pull de alterações a partir de localização remota" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "Confirma realizar pull de alterações a partir de lado remoto" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:186 msgid "Cache" msgstr "Cache" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Invalidate repository cache" msgstr "Invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Confirm to invalidate repository cache" msgstr "Confirma invalidar cache do repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "Diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "Remover do diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "Adicionar ao diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" @@ -1956,21 +2073,63 @@ msgstr "" "Todas as ações feitas nesse repositório serão acessíveis a todos no " "diário público" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +#, fuzzy +msgid "Locking" +msgstr "destravar" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +#, fuzzy +msgid "Confirm to unlock repository" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +#, fuzzy +msgid "Confirm to lock repository" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +#, fuzzy +msgid "Repository is not locked" +msgstr "repositórios" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +#, fuzzy +msgid "Set as fork of" +msgstr "Marcar como bifurcação" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +#, fuzzy +msgid "Manually set this repository as a fork of another from the list" +msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "Excluir" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "Remover deste repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "Confirma excluir este repositório" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1982,16 +2141,6 @@ msgstr "" " Se você precisa exclui-lo completamente do " "sistema de arquivos, por favor faça-o manualmente" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -#, fuzzy -msgid "Set as fork of" -msgstr "Marcar como bifurcação" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -#, fuzzy -msgid "Manually set this repository as a fork of another from the list" -msgstr "Marcar manualmente este repositório como sendo uma bifurcação de outro" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -2009,8 +2158,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "administrador" @@ -2040,18 +2189,18 @@ msgstr "excluir" msgid "revoke" msgstr "revogar" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "Adicionar outro membro" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "Falha ao reomver usuário" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "Falha ao remover grupo de usuários" @@ -2089,7 +2238,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "salvar" @@ -2101,6 +2250,12 @@ msgstr "Editar grupo de repositórios" msgid "edit repos group" msgstr "editar grupo de repositórios" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "Administração de grupos de repositórios" @@ -2114,13 +2269,13 @@ 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:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2228,59 +2383,107 @@ msgid "GA code" msgstr "Código GA" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "Salvar configurações" #: rhodecode/templates/admin/settings/settings.html:119 #, fuzzy -msgid "VCS settings" -msgstr "configurações" +msgid "Visualisation settings" +msgstr "Configurações globais da aplicação" #: rhodecode/templates/admin/settings/settings.html:128 +#, fuzzy +msgid "Icons" +msgstr "Opções" + +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +#, fuzzy +msgid "Show private repo icon on repositories" +msgstr "repositório privado" + +#: rhodecode/templates/admin/settings/settings.html:144 +#, fuzzy +msgid "Meta-Tagging" +msgstr "configurações" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +#, fuzzy +msgid "VCS settings" +msgstr "configurações" + +#: rhodecode/templates/admin/settings/settings.html:185 msgid "Web" msgstr "Web" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:190 #, fuzzy msgid "require ssl for vcs operations" msgstr "exigir ssl para realizar push" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "Ganchos" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "Atualizar repositório após realizar push (hg update)" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "Mostrar tamanho do repositório após o push" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "Armazenar registro de comandos de push dos usuários" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "Armazenar registro de comandos de pull dos usuários" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "confirguações avançadas" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +#, fuzzy +msgid "Mercurial Extensions" +msgstr "Repositório Mercurial" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "Localização dos repositórios" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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 " @@ -2290,33 +2493,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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "destravar" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "Testar E-mail" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 msgid "Email to" msgstr "E-mail para" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 msgid "Send" msgstr "Enviar" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "Informações de Sistema e Pacotes" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 msgid "show" msgstr "mostrar" @@ -2379,41 +2582,63 @@ msgstr "Confirmação de nova senha" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +#, fuzzy +msgid "Inherit default permissions" +msgstr "Permissões padrão" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "Criar repositórios" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +#, fuzzy +msgid "Fork repositories" +msgstr "repositórios" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, 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.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 msgid "Permission" msgstr "Permissão" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 #, fuzzy msgid "Edit Permission" msgstr "Permissão de repositório" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 #, fuzzy msgid "Email addresses" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "Confirma excluir este usuário: %s" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 #, fuzzy msgid "New email address" msgstr "Endereço de e-mail" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 #, fuzzy msgid "Add" msgstr "adicionar" @@ -2450,16 +2675,21 @@ msgstr "adicionar novo" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, fuzzy +msgid "Confirm to delete this pull request" +msgstr "Confirma excluir este repositório" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2501,7 +2731,7 @@ msgid "Users administration" msgstr "Administração de usuários" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "usuários" @@ -2509,30 +2739,30 @@ msgstr "usuários" msgid "ADD NEW USER" msgstr "ADICIONAR NOVO USUÁRIO" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "nome de usuário" -#: rhodecode/templates/admin/users/users.html:79 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy msgid "firstname" msgstr "Primeiro Nome" -#: rhodecode/templates/admin/users/users.html:80 +#: rhodecode/templates/admin/users/users.html:81 msgid "lastname" msgstr "sobrenome" -#: rhodecode/templates/admin/users/users.html:81 +#: rhodecode/templates/admin/users/users.html:82 msgid "last login" msgstr "último login" -#: rhodecode/templates/admin/users/users.html:82 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "ativo" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "ldap" @@ -2577,7 +2807,7 @@ msgstr "Membros disponíveis" msgid "Add all elements" msgstr "Adicionar todos os elementos" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 msgid "Group members" msgstr "Membros do grupo" @@ -2624,9 +2854,9 @@ msgid "Inbox" msgstr "Caixa de Entrada" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2650,9 +2880,9 @@ msgid "Home" msgstr "Início" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2707,7 +2937,6 @@ msgstr "Trocar para" #: 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" @@ -2718,7 +2947,7 @@ msgstr "Opções" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "configurações" @@ -2728,40 +2957,40 @@ msgstr "configurações" msgid "fork" msgstr "bifurcação" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "pesquisar" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:222 msgid "repositories groups" msgstr "grupos de repositórios" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "grupos de usuários" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "permissões" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "Seguidores" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "Bifurcações" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "Pesquisar" @@ -2870,20 +3099,20 @@ msgstr "" msgid "Compare fork" msgstr "comparar exibir" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "Mostrar" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "mostrar mais" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 @@ -2891,26 +3120,26 @@ msgstr "Número de arquivos afetados, clique para mostrar mais detalhes" msgid "Changeset status" msgstr "Conjuntos de mudanças" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "Progenitor" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "Sem progenitores" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "mesclar" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2919,20 +3148,20 @@ msgstr "mesclar" msgid "branch" msgstr "ramo" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "marcador" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "etiqueta" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "Mostrar alterações selecionadas __S -> __E" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "Ainda não há alteações" @@ -3073,7 +3302,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:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "Arquivos afetados" @@ -3153,12 +3382,13 @@ msgid "File diff" msgstr "Diff do arquivo" #: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:72 #, fuzzy, python-format -msgid "%s Files" +msgid "%s files" msgstr "arquivos" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "arquivos" @@ -3485,18 +3715,18 @@ msgid "Detailed compare view" msgstr "comparar exibir" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy msgid "owner" msgstr "Dono" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3526,21 +3756,37 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +#, fuzzy +msgid "Status" +msgstr "Conjuntos de mudanças" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Created on" msgstr "criar um agora" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 #, fuzzy msgid "Compare view" msgstr "comparar exibir" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Incoming changesets" msgstr "Nenhum conjunto de alterações ainda." @@ -3601,7 +3847,7 @@ msgstr "mensagem de commit" msgid "File names" msgstr "Nomes dos arquivos" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3678,116 +3924,116 @@ msgstr "público" msgid "remote clone" msgstr "clone remoto" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "Contato" -#: rhodecode/templates/summary/summary.html:126 +#: rhodecode/templates/summary/summary.html:130 msgid "Clone url" msgstr "URL de clonagem" -#: rhodecode/templates/summary/summary.html:129 +#: rhodecode/templates/summary/summary.html:133 msgid "Show by Name" msgstr "Mostrar por Nome" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "Mostrar por ID" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 msgid "Trending files" msgstr "Tendências em arquivos" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "habilitar" -#: rhodecode/templates/summary/summary.html:154 +#: rhodecode/templates/summary/summary.html:158 msgid "Download" msgstr "Download" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "Ainda não há downloads" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "Downloads estão desabilitados para este repositório" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 #, fuzzy msgid "Download as zip" msgstr "descarregar como bruto" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "Marque isto para descarregar arquivo com subrepositórios" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "com subrepositórios" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "Atividade de commit por dia / autor" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "Estatísticas coletadas:" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "Log resumido" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 msgid "Quick start" msgstr "Início rápido" -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "Descarregar %s como %s" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "commits" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "arquivos adicionados" -#: rhodecode/templates/summary/summary.html:648 +#: rhodecode/templates/summary/summary.html:652 msgid "files changed" msgstr "arquivos alterados" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:653 msgid "files removed" msgstr "arquivos removidos" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:656 msgid "commit" msgstr "commit" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "arquivo adicionado" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "arquivo alterado" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,24 +21,30 @@ msgstr "" msgid "All Branches" msgstr "" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, python-format msgid "%s line context" msgstr "" -#: rhodecode/controllers/changeset.py:331 rhodecode/controllers/changeset.py:346 -#: rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 rhodecode/controllers/changeset.py:348 +#: rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is not " +"allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 msgid "There are no changesets yet" msgstr "" @@ -84,8 +90,7 @@ msgid "commited on" msgstr "" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" +msgid "click here to add new file" msgstr "" #: rhodecode/controllers/files.py:85 @@ -93,90 +98,95 @@ msgstr "" msgid "There are no files yet %s" msgstr "" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, python-format msgid "Added %s via RhodeCode" msgstr "" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 msgid "No content" msgstr "" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the " "file system please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -186,34 +196,46 @@ msgid "public journal" msgstr "" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "Your password reset was successful, new password has been sent to your email" msgstr "" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 +msgid "error during creation of pull request" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:181 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 msgid "Error occurred during sending pull request" msgstr "" +#: rhodecode/controllers/pullrequests.py:217 +msgid "Successfully deleted pull request" +msgstr "" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "" @@ -226,30 +248,30 @@ msgstr "" msgid "An error occurred during this search operation" msgstr "" -#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/settings.py:107 rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/settings.py:125 rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:300 +#: rhodecode/controllers/settings.py:143 rhodecode/controllers/admin/repos.py:302 #, 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:312 +#: rhodecode/controllers/settings.py:155 rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "" -#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/settings.py:159 rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -259,7 +281,7 @@ msgid "No data loaded yet" msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "" @@ -349,8 +371,8 @@ msgstr "" #: rhodecode/templates/admin/users_groups/users_group_add.html:8 #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 -#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:335 -#: rhodecode/templates/base/base.html:337 rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:197 rhodecode/templates/base/base.html:337 +#: rhodecode/templates/base/base.html:339 rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "" @@ -367,18 +389,20 @@ msgid "allowed with automatic account ac msgstr "" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "" @@ -386,120 +410,124 @@ msgstr "" msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:346 +#: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:418 -msgid "Updated repository visibility in public journal" -msgstr "" - #: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:440 -msgid "Pulled from remote location" +msgid "An error occurred during unlocking" msgstr "" #: rhodecode/controllers/admin/repos.py:442 -msgid "An error occurred during pull from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:458 -msgid "Nothing" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:460 -#, python-format -msgid "Marked repo %s as fork of %s" +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:446 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +msgid "Token mismatch" msgstr "" #: rhodecode/controllers/admin/repos.py:464 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:466 +msgid "An error occurred during pull from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:482 +msgid "Nothing" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:484 +#, python-format +msgid "Marked repo %s as fork of %s" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" @@ -517,90 +545,109 @@ msgid "Updated application settings" msgstr "" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:200 +msgid "Updated visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:205 +msgid "error occurred during updating visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:271 +msgid "Updated VCS settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:202 -msgid "successfully deleted user" -msgstr "" - #: rhodecode/controllers/admin/users.py:207 +msgid "successfully deleted user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +msgid "Granted 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:282 +msgid "Revoked 'repository fork' permission to user" +msgstr "" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +msgid "An error occurred during permissions saving" +msgstr "" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 msgid "Removed email from user" msgstr "" @@ -619,167 +666,183 @@ msgstr "" msgid "updated users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:169 -msgid "successfully deleted users group" -msgstr "" - #: rhodecode/controllers/admin/users_groups.py:174 +msgid "successfully deleted users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +msgid "Granted 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:238 +msgid "Revoked 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:244 +msgid "Granted 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:249 +msgid "Revoked 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 msgid "Changeset not found" msgstr "" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 msgid "[created] repository as fork" msgstr "" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 msgid "[created] user" msgstr "" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 msgid "[updated] user" msgstr "" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 msgid "[created] users group" msgstr "" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 msgid "[updated] users group" msgstr "" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 msgid "[commented] on pull request for" msgstr "" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "" @@ -852,75 +915,83 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 msgid "Repository no access" msgstr "" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 msgid "Repository read access" msgstr "" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 msgid "Repository write access" msgstr "" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 msgid "Repository admin access" msgstr "" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 msgid "Repositories Group no access" msgstr "" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 msgid "Repositories Group read access" msgstr "" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 msgid "Repositories Group write access" msgstr "" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 msgid "Repositories Group admin access" msgstr "" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 msgid "RhodeCode Administrator" msgstr "" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 msgid "Repository creation disabled" msgstr "" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 msgid "Repository creation enabled" msgstr "" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +msgid "Repository forking disabled" +msgstr "" + +#: rhodecode/model/db.py:1154 +msgid "Repository forking enabled" +msgstr "" + +#: rhodecode/model/db.py:1155 msgid "Register disabled" msgstr "" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 msgid "Approved" msgstr "" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -971,155 +1042,164 @@ msgstr "" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 msgid "new user registration" msgstr "" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:323 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:339 +#: rhodecode/model/user.py:329 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories. %s" msgstr "" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:54 -#, python-format -msgid "Username \"%(username)s\" is forbidden" -msgstr "" - -#: rhodecode/model/validators.py:56 -msgid "" -"Username may only contain alphanumeric characters underscores, periods or " -"dashes and must begin with alphanumeric character" -msgstr "" - #: rhodecode/model/validators.py:84 #, python-format +msgid "Username \"%(username)s\" is forbidden" +msgstr "" + +#: rhodecode/model/validators.py:86 +msgid "" +"Username may only contain alphanumeric characters underscores, periods or " +"dashes and must begin with alphanumeric character" +msgstr "" + +#: rhodecode/model/validators.py:114 +#, python-format msgid "Username %(username)s is not valid" msgstr "" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 msgid "Invalid users group name" msgstr "" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "" -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 msgid "Invalid characters (non-ascii) in password" msgstr "" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, python-format msgid "Repository name %(repo)s is disallowed" msgstr "" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, python-format msgid "Repository named %(repo)s already exists" msgstr "" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:432 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +msgstr "" + +#: rhodecode/model/validators.py:457 msgid "Fork have to be the same type as parent" msgstr "" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name of " "the attribute that is equivalent to \"username\"" msgstr "" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "" @@ -1138,7 +1218,7 @@ msgstr "" #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "" @@ -1156,8 +1236,8 @@ msgstr "" msgid "Group name" msgstr "" -#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:30 rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1175,14 +1255,14 @@ msgstr "" msgid "Repositories group" msgstr "" -#: rhodecode/templates/index_base.html:66 rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1193,55 +1273,55 @@ msgstr "" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "" -#: rhodecode/templates/index_base.html:69 rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: 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/index_base.html:74 rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:102 rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "" -#: rhodecode/templates/index_base.html:109 rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 msgid "Group Name" msgstr "" -#: rhodecode/templates/index_base.html:148 rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1249,10 +1329,10 @@ msgstr "" msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:149 rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1260,14 +1340,14 @@ msgstr "" msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1275,10 +1355,10 @@ msgstr "" msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1286,10 +1366,10 @@ msgstr "" msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1311,7 +1391,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "" @@ -1384,7 +1464,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "" @@ -1544,13 +1624,13 @@ msgid "E-mail Attribute" msgstr "" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "" @@ -1569,7 +1649,7 @@ msgid "Comments" msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:254 rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1595,7 +1675,7 @@ msgid "Permissions administration" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1635,7 +1715,11 @@ msgid "Repository creation" msgstr "" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +msgid "Repository forking" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "" @@ -1650,6 +1734,10 @@ msgstr "" msgid "Repositories" msgstr "" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1728,8 +1816,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1763,19 +1851,29 @@ msgstr "" msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +msgid "Enable locking" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:133 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1783,89 +1881,125 @@ msgstr "" msgid "Reset" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:153 -msgid "Fetched to rev" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:154 -msgid "Stats gathered" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:162 +msgid "Fetched to rev" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:163 +msgid "Stats gathered" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:177 -msgid "Cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:181 -msgid "Invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:181 -msgid "Confirm to invalidate repository cache" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 rhodecode/templates/base/base.html:318 -#: rhodecode/templates/base/base.html:320 +msgid "Cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:190 +msgid "Confirm to invalidate repository cache" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:195 +#: rhodecode/templates/base/base.html:318 rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in public " "journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +msgid "Locking" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Confirm to unlock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "Confirm to lock repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +msgid "Repository is not locked" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be unaccesible " "for RhodeCode and VCS systems.\n" @@ -1873,14 +2007,6 @@ msgid "" "do it manually" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -1898,8 +2024,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "" @@ -1928,18 +2054,18 @@ msgstr "" msgid "revoke" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "" @@ -1977,7 +2103,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "" @@ -1989,6 +2115,12 @@ msgstr "" msgid "edit repos group" msgstr "" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other " +"groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "" @@ -2002,13 +2134,13 @@ msgid "Number of toplevel repositories" msgstr "" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2113,90 +2245,133 @@ msgid "GA code" msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "" #: rhodecode/templates/admin/settings/settings.html:119 -msgid "VCS settings" +msgid "Visualisation settings" msgstr "" #: rhodecode/templates/admin/settings/settings.html:128 -msgid "Web" +msgid "Icons" msgstr "" #: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +msgid "Show private repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:144 +msgid "Meta-Tagging" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +msgid "VCS settings" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:185 +msgid "Web" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:190 msgid "require ssl for vcs operations" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +msgid "Mercurial Extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a restart, " "and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 msgid "Email to" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 msgid "Send" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 msgid "show" msgstr "" @@ -2259,37 +2434,57 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +msgid "Inherit default permissions" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +msgid "Fork repositories" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 msgid "Nothing here yet" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 msgid "Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 msgid "Email addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 msgid "Add" msgstr "" @@ -2323,16 +2518,20 @@ msgstr "" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +msgid "Confirm to delete this pull request" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2373,7 +2572,7 @@ msgid "Users administration" msgstr "" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "" @@ -2381,29 +2580,29 @@ msgstr "" msgid "ADD NEW USER" msgstr "" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "" -#: rhodecode/templates/admin/users/users.html:79 -msgid "firstname" -msgstr "" - #: rhodecode/templates/admin/users/users.html:80 -msgid "lastname" +msgid "firstname" msgstr "" #: rhodecode/templates/admin/users/users.html:81 -msgid "last login" +msgid "lastname" msgstr "" #: rhodecode/templates/admin/users/users.html:82 -#: rhodecode/templates/admin/users_groups/users_groups.html:34 -msgid "active" +msgid "last login" msgstr "" #: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users_groups/users_groups.html:34 +msgid "active" +msgstr "" + +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "" @@ -2448,7 +2647,7 @@ msgstr "" msgid "Add all elements" msgstr "" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 msgid "Group members" msgstr "" @@ -2494,8 +2693,8 @@ msgstr "" msgid "Inbox" msgstr "" -#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:298 -#: rhodecode/templates/base/base.html:300 rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:122 rhodecode/templates/base/base.html:300 +#: rhodecode/templates/base/base.html:302 rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2517,8 +2716,8 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:307 -#: rhodecode/templates/base/base.html:309 rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:123 rhodecode/templates/base/base.html:309 +#: rhodecode/templates/base/base.html:311 rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2568,7 +2767,6 @@ msgstr "" #: 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 "" @@ -2577,7 +2775,7 @@ msgid "Options" msgstr "" #: rhodecode/templates/base/base.html:204 rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "" @@ -2587,37 +2785,37 @@ msgstr "" msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "" -#: rhodecode/templates/base/base.html:220 -msgid "repositories groups" -msgstr "" - #: rhodecode/templates/base/base.html:222 +msgid "repositories groups" +msgstr "" + +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "" -#: rhodecode/templates/base/base.html:236 rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:238 rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "" -#: rhodecode/templates/base/base.html:244 rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:246 rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:325 rhodecode/templates/base/base.html:327 -#: rhodecode/templates/base/base.html:329 rhodecode/templates/search/search.html:52 +#: rhodecode/templates/base/base.html:327 rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 rhodecode/templates/search/search.html:52 msgid "Search" msgstr "" @@ -2720,46 +2918,46 @@ msgstr "" msgid "Compare fork" msgstr "" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 msgid "Changeset status" msgstr "" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2768,20 +2966,20 @@ msgstr "" msgid "branch" msgstr "" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "" @@ -2919,7 +3117,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" @@ -2996,13 +3194,13 @@ msgstr "" msgid "File diff" msgstr "" -#: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:4 rhodecode/templates/files/files.html:72 #, python-format -msgid "%s Files" +msgid "%s files" msgstr "" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "" @@ -3320,17 +3518,17 @@ msgid "Detailed compare view" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 msgid "owner" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3357,19 +3555,34 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +msgid "Status" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" +msgstr[1] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 msgid "Created on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 msgid "Compare view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 msgid "Incoming changesets" msgstr "" @@ -3426,7 +3639,7 @@ msgstr "" msgid "File names" msgstr "" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3503,115 +3716,115 @@ msgstr "" msgid "remote clone" msgstr "" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "" -#: rhodecode/templates/summary/summary.html:126 -msgid "Clone url" -msgstr "" - -#: rhodecode/templates/summary/summary.html:129 -msgid "Show by Name" -msgstr "" - #: rhodecode/templates/summary/summary.html:130 +msgid "Clone url" +msgstr "" + +#: rhodecode/templates/summary/summary.html:133 +msgid "Show by Name" +msgstr "" + +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 msgid "Trending files" msgstr "" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "" -#: rhodecode/templates/summary/summary.html:154 -msgid "Download" -msgstr "" - #: rhodecode/templates/summary/summary.html:158 +msgid "Download" +msgstr "" + +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 msgid "Download as zip" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 msgid "Quick start" msgstr "" -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "" -#: rhodecode/templates/summary/summary.html:648 -msgid "files changed" -msgstr "" - -#: rhodecode/templates/summary/summary.html:649 -msgid "files removed" -msgstr "" - #: rhodecode/templates/summary/summary.html:652 -msgid "commit" +msgid "files changed" msgstr "" #: rhodecode/templates/summary/summary.html:653 +msgid "files removed" +msgstr "" + +#: rhodecode/templates/summary/summary.html:656 +msgid "commit" +msgstr "" + +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2012-04-05 17:37+0800\n" "Last-Translator: mikespook \n" "Language-Team: mikespook\n" @@ -22,24 +22,30 @@ msgstr "" msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, fuzzy, python-format msgid "%s line context" msgstr "文件内容" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "二进制文件" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 #, fuzzy msgid "There are no changesets yet" @@ -87,82 +93,87 @@ msgid "commited on" msgstr "提交" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "新增" +#, fuzzy +msgid "click here to add new file" +msgstr "添加新用户" #: rhodecode/controllers/files.py:85 #, fuzzy, python-format msgid "There are no files yet %s" msgstr "尚无文件" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "通过 RhodeCode 修改了 %s" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "无变更" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "成功提交到 %s" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "提交时发生错误" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "通过 RhodeCode 修改了 %s" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 #, fuzzy msgid "No content" msgstr "文件内容" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 #, fuzzy msgid "No filename" msgstr "文件名" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "禁止下载" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "未知版本 %s" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "空版本库" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "未知包类型" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "变更集" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "标签" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -170,7 +181,7 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -178,12 +189,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "版本库 %s 被分支到 %s" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -194,38 +205,52 @@ msgid "public journal" msgstr "公共日志" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "日志" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "成功注册到 rhodecode" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "密码重置链接已经发送" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "密码已经成功重置，新密码已经发送到你的邮箱" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 #, fuzzy +msgid "error during creation of pull request" +msgstr "提交时发生错误" + +#: rhodecode/controllers/pullrequests.py:181 +#, fuzzy msgid "Successfully opened new pull request" msgstr "用户删除成功" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 #, fuzzy msgid "Error occurred during sending pull request" msgstr "提交时发生错误" +#: rhodecode/controllers/pullrequests.py:217 +#, fuzzy +msgid "Successfully deleted pull request" +msgstr "用户删除成功" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "错误的搜索。请尝试用引号包含它。" @@ -239,19 +264,19 @@ msgid "An error occurred during this sea msgstr "在搜索操作中发生异常" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "版本库 %s 成功更新" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -260,14 +285,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "已经删除版本库 %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -277,7 +302,7 @@ msgid "No data loaded yet" msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "该版本库统计功能已经禁用" @@ -368,9 +393,9 @@ msgstr "写" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "管理" @@ -387,18 +412,20 @@ msgid "allowed with automatic account ac msgstr "允许自动启用帐号" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "停用" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "启用" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "成功更新默认权限" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "" @@ -406,122 +433,127 @@ msgstr "" msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "新版本库 %s 基于 %s 建立。" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "建立版本库 %s" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:346 +#: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:418 -msgid "Updated repository visibility in public journal" -msgstr "" - #: rhodecode/controllers/admin/repos.py:422 +#, fuzzy +msgid "An error occurred during unlocking" +msgstr "在搜索操作中发生异常" + +#: rhodecode/controllers/admin/repos.py:442 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:446 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 msgid "Token mismatch" msgstr "" -#: rhodecode/controllers/admin/repos.py:440 +#: rhodecode/controllers/admin/repos.py:464 msgid "Pulled from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:442 +#: rhodecode/controllers/admin/repos.py:466 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:482 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:460 +#: rhodecode/controllers/admin/repos.py:484 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "新版本库 %s 基于 %s 建立。" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:488 #, fuzzy msgid "An error occurred during this operation" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "建立版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "更新版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "移除版本库组 %s" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 #, fuzzy msgid "An error occurred during deletion of group user" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" @@ -539,91 +571,116 @@ msgid "Updated application settings" msgstr "更新应用设置" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" +#: rhodecode/controllers/admin/settings.py:200 +#, fuzzy +msgid "Updated visualisation settings" +msgstr "更新应用设置" + +#: rhodecode/controllers/admin/settings.py:205 +#, fuzzy +msgid "error occurred during updating visualisation settings" +msgstr "提交时发生错误" + +#: rhodecode/controllers/admin/settings.py:271 +#, fuzzy +msgid "Updated VCS settings" msgstr "更新 mercurial 设置" -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "新增钩子" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "更新钩子" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "你的帐号已经更新完成" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "创建用户 %s" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "用户更新成功" -#: rhodecode/controllers/admin/users.py:202 +#: rhodecode/controllers/admin/users.py:207 msgid "successfully deleted user" msgstr "用户删除成功" -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "无法编辑该用户" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +#, fuzzy +msgid "Granted 'repository fork' permission to user" +msgstr "版本库权限" + +#: rhodecode/controllers/admin/users.py:282 +#, fuzzy +msgid "Revoked 'repository fork' permission to user" +msgstr "版本库权限" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +#, fuzzy +msgid "An error occurred during permissions saving" +msgstr "在搜索操作中发生异常" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 #, fuzzy msgid "An error occurred during email saving" msgstr "在搜索操作中发生异常" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 #, fuzzy msgid "Removed email from user" msgstr "移除版本库组 %s" @@ -643,175 +700,191 @@ msgstr "" msgid "updated users group %s" msgstr "更新用户组 %s" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:169 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" msgstr "删除用户组成功" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +msgid "Granted 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:238 +msgid "Revoked 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:244 +msgid "Granted 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:249 +msgid "Revoked 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "必须是注册用户才能进行此操作" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "必须登录才能访问该页面" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "变更集因过大而被截断，可查看原始变更集作为替代" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 #, fuzzy msgid "No changes detected" msgstr "尚无修订" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "修订" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "分支名称" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本库 %s" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 #, fuzzy msgid "[created] user" msgstr "创建用户 %s" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 #, fuzzy msgid "[updated] user" msgstr "更新用户组 %s" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 #, fuzzy msgid "[created] users group" msgstr "建立用户组 %s" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 #, fuzzy msgid "[updated] users group" msgstr "更新用户组 %s" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 #, fuzzy msgid "[commented] on pull request for" msgstr "创建用户 %s" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "没有文件" @@ -879,88 +952,98 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 #, fuzzy msgid "Repository no access" msgstr "个版本库" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 #, fuzzy msgid "Repository read access" msgstr "这个版本库已经存在" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 #, fuzzy msgid "Repository write access" msgstr "个版本库" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 #, fuzzy msgid "Repository admin access" msgstr "个版本库" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 #, fuzzy msgid "Repositories Group no access" msgstr "版本库组" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 #, fuzzy msgid "Repositories Group read access" msgstr "版本库组" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 #, fuzzy msgid "Repositories Group write access" msgstr "版本库组" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 #, fuzzy msgid "Repositories Group admin access" msgstr "版本库组" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 #, fuzzy msgid "RhodeCode Administrator" msgstr "用户管理员" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 #, fuzzy msgid "Repository creation disabled" msgstr "建立版本库" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 #, fuzzy msgid "Repository creation enabled" msgstr "建立版本库" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +#, fuzzy +msgid "Repository forking disabled" +msgstr "建立版本库" + +#: rhodecode/model/db.py:1154 +#, fuzzy +msgid "Repository forking enabled" +msgstr "建立版本库" + +#: rhodecode/model/db.py:1155 #, fuzzy msgid "Register disabled" msgstr "禁用" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -1013,160 +1096,169 @@ msgstr "" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 #, fuzzy msgid "latest tip" msgstr "最后登录" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新用户注册" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 msgid "You can't Edit this user since it's crucial for entire application" msgstr "由于是系统帐号，无法编辑该用户" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:323 msgid "You can't remove this user since it's crucial for entire application" msgstr "由于是系统帐号，无法删除该用户" -#: rhodecode/model/user.py:339 +#: rhodecode/model/user.py:329 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "由于该用户拥有版本库 %s 因而无法删除，请变更版本库所有者或删除版本库" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "该用户名已经存在" -#: rhodecode/model/validators.py:54 +#: rhodecode/model/validators.py:84 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:56 +#: rhodecode/model/validators.py:86 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "只能使用字母、数字、下划线、小数点或减号作为用户名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:114 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "用户或用户组名称无效" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 #, fuzzy msgid "Invalid users group name" msgstr "无效用户名" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "该用户组名称已经存在" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "只能使用字母、数字、下划线、小数点或减号作为用户组名，且必须由数字或字母开头" -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "该用户名已经存在" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "这个版本库已经存在" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "密码含有无效字符" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "密码不符" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "无效密码" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "无效用户名" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "该帐号已被禁用" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "该版本库名称被禁用" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "这个版本库已经存在" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "组中已经存在该版本库" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "这个版本库已经存在" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "无效的 clone 地址" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" +#: rhodecode/model/validators.py:432 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" msgstr "" -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:457 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "分支必须使用相同的版本库类型" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "用户或用户组名称无效" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "不是一个合法的路径" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "该邮件地址已被使用" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "该邮件地址不存在" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "" @@ -1185,7 +1277,7 @@ msgstr "快速过滤..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "个版本库" @@ -1205,9 +1297,9 @@ msgid "Group name" msgstr "组名" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1225,15 +1317,15 @@ msgstr "描述" msgid "Repositories group" msgstr "版本库组" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1244,62 +1336,62 @@ msgstr "版本库组" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名称" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "最后修改" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: 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/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "所有者" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "订阅 rss %s" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "订阅 atom %s" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 #, fuzzy msgid "Group Name" msgstr "组名" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1307,11 +1399,11 @@ msgstr "组名" msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1319,15 +1411,15 @@ msgstr "" msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 #, fuzzy msgid "Last Change" msgstr "最后修改" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1335,10 +1427,10 @@ msgstr "最后修改" msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1346,10 +1438,10 @@ msgstr "" msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1372,7 +1464,7 @@ msgstr "登录到" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "帐号" @@ -1446,7 +1538,7 @@ msgstr "姓" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "电子邮件" @@ -1609,13 +1701,13 @@ msgid "E-mail Attribute" msgstr "电子邮件属性" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "保存" @@ -1635,8 +1727,8 @@ msgid "Comments" msgstr "提交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1665,7 +1757,7 @@ msgid "Permissions administration" msgstr "权限管理" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1705,7 +1797,12 @@ msgid "Repository creation" msgstr "建立版本库" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +#, fuzzy +msgid "Repository forking" +msgstr "建立版本库" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "设置" @@ -1720,6 +1817,10 @@ msgstr "添加版本库" msgid "Repositories" msgstr "版本库" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "新增" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1800,8 +1901,8 @@ msgstr "编辑版本库" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1835,20 +1936,31 @@ msgstr "启用下载" msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#, fuzzy +msgid "Enable locking" +msgstr "启用" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 #, fuzzy msgid "Change owner of this repository." msgstr "%s 库的修改" -#: rhodecode/templates/admin/repos/repo_edit.html:133 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1856,90 +1968,130 @@ msgstr "%s 库的修改" msgid "Reset" msgstr "重置" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "管理" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "统计" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "重置统计" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "确认移除当前统计" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:163 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "远程" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:186 msgid "Cache" msgstr "缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Confirm to invalidate repository cache" msgstr "确认清除版本库缓存" -#: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "从公共日志删除" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "添加到公共日志" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +#, fuzzy +msgid "Locking" +msgstr "解锁" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +#, fuzzy +msgid "Confirm to unlock repository" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +#, fuzzy +msgid "Confirm to lock repository" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +#, fuzzy +msgid "Repository is not locked" +msgstr "个版本库" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "删除" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "确认删除版本库" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1947,14 +2099,6 @@ msgid "" "please do it manually" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -1972,8 +2116,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "管理员" @@ -2003,18 +2147,18 @@ msgstr "删除" msgid "revoke" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "添加成员" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "删除用户失败" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "删除用户组失败" @@ -2052,7 +2196,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "保存" @@ -2064,6 +2208,12 @@ msgstr "编辑版本库组" msgid "edit repos group" msgstr "编辑版本库组" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "版本库管理员" @@ -2078,13 +2228,13 @@ msgid "Number of toplevel repositories" msgstr "版本库数量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2189,94 +2339,142 @@ msgid "GA code" msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "保存设置" #: rhodecode/templates/admin/settings/settings.html:119 #, fuzzy -msgid "VCS settings" -msgstr "设置" +msgid "Visualisation settings" +msgstr "全局设置" #: rhodecode/templates/admin/settings/settings.html:128 +#, fuzzy +msgid "Icons" +msgstr "选项" + +#: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +#, fuzzy +msgid "Show private repo icon on repositories" +msgstr "私有版本库" + +#: rhodecode/templates/admin/settings/settings.html:144 +#, fuzzy +msgid "Meta-Tagging" +msgstr "设置" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +#, fuzzy +msgid "VCS settings" +msgstr "设置" + +#: rhodecode/templates/admin/settings/settings.html:185 msgid "Web" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:133 +#: rhodecode/templates/admin/settings/settings.html:190 #, fuzzy msgid "require ssl for vcs operations" msgstr "使用 SSL 推送" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "推送后更新版本库（hg update）" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "推送后显示版本库大小" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "记录用户推送命令" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "记录用户拉取命令" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "高级设置" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +#, fuzzy +msgid "Mercurial Extensions" +msgstr "Mercurial 版本库" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "版本库路径" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "解锁" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 #, fuzzy msgid "Email to" msgstr "电子邮件" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 #, fuzzy msgid "show" msgstr "显示" @@ -2341,42 +2539,64 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +#, fuzzy +msgid "Inherit default permissions" +msgstr "默认权限" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "创建版本库" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +#, fuzzy +msgid "Fork repositories" +msgstr "个版本库" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, fuzzy msgid "Nothing here yet" msgstr "尚无操作" -#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 #, fuzzy msgid "Permission" msgstr "权限" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 #, fuzzy msgid "Edit Permission" msgstr "版本库权限" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 #, fuzzy msgid "Email addresses" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "确认删除该用户" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 #, fuzzy msgid "New email address" msgstr "邮件地址" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 #, fuzzy msgid "Add" msgstr "新增" @@ -2415,16 +2635,21 @@ msgstr "新增" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, fuzzy +msgid "Confirm to delete this pull request" +msgstr "确认删除版本库" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2466,7 +2691,7 @@ msgid "Users administration" msgstr "用户管理员" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "用户" @@ -2474,30 +2699,30 @@ msgstr "用户" msgid "ADD NEW USER" msgstr "添加用户" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "用户名" -#: rhodecode/templates/admin/users/users.html:79 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy msgid "firstname" msgstr "名" -#: rhodecode/templates/admin/users/users.html:80 +#: rhodecode/templates/admin/users/users.html:81 msgid "lastname" msgstr "姓" -#: rhodecode/templates/admin/users/users.html:81 +#: rhodecode/templates/admin/users/users.html:82 msgid "last login" msgstr "最后登录" -#: rhodecode/templates/admin/users/users.html:82 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "启用" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "" @@ -2542,7 +2767,7 @@ msgstr "启用成员" msgid "Add all elements" msgstr "添加全部项目" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 #, fuzzy msgid "Group members" msgstr "选择组成员" @@ -2591,9 +2816,9 @@ msgid "Inbox" msgstr "" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2617,9 +2842,9 @@ msgid "Home" msgstr "首页" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2674,7 +2899,6 @@ msgstr "切换到" #: 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 "档案" @@ -2685,7 +2909,7 @@ msgstr "选项" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "设置" @@ -2695,40 +2919,40 @@ msgstr "设置" msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "搜索" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:222 msgid "repositories groups" msgstr "版本库组" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "用户组" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "权限" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "跟随者" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜索" @@ -2837,20 +3061,20 @@ msgstr "" msgid "Compare fork" msgstr "" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "显示" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 @@ -2858,26 +3082,26 @@ msgstr "" msgid "Changeset status" msgstr "变更集" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "合并" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2886,20 +3110,20 @@ msgstr "合并" msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "标签" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "没有任何变更" @@ -3038,7 +3262,7 @@ msgstr "比较显示" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" @@ -3119,12 +3343,13 @@ msgid "File diff" msgstr "文件 diff" #: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:72 #, fuzzy, python-format -msgid "%s Files" +msgid "%s files" msgstr "文件" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "文件" @@ -3464,18 +3689,18 @@ msgid "Detailed compare view" msgstr "比较显示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy msgid "owner" msgstr "所有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3505,21 +3730,36 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +#, fuzzy +msgid "Status" +msgstr "变更集" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Created on" msgstr "创建用户 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 #, fuzzy msgid "Compare view" msgstr "比较显示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Incoming changesets" msgstr "尚无修订" @@ -3580,7 +3820,7 @@ msgstr "提交信息" msgid "File names" msgstr "文件名" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3660,118 +3900,118 @@ msgstr "公共" msgid "remote clone" msgstr "远程 clone" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "联系方式" -#: rhodecode/templates/summary/summary.html:126 +#: rhodecode/templates/summary/summary.html:130 msgid "Clone url" msgstr "clone 地址" -#: rhodecode/templates/summary/summary.html:129 +#: rhodecode/templates/summary/summary.html:133 msgid "Show by Name" msgstr "" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 #, fuzzy msgid "Trending files" msgstr "编辑文件" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "启用" -#: rhodecode/templates/summary/summary.html:154 +#: rhodecode/templates/summary/summary.html:158 msgid "Download" msgstr "下载" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "尚无任何下载" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "这个版本库的下载已经禁用" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 #, fuzzy msgid "Download as zip" msgstr "下载原始文件" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "简短日志" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 #, fuzzy msgid "Quick start" msgstr "快速过滤..." -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "下载 %s 作为 %s" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "提交" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:648 +#: rhodecode/templates/summary/summary.html:652 msgid "files changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:653 msgid "files removed" msgstr "文件已删除" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:656 msgid "commit" msgstr "提交" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "文件已添加" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "文件已更改" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 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-26 23:35+0200\n" +"POT-Creation-Date: 2012-09-02 20:30+0200\n" "PO-Revision-Date: 2012-05-09 22:23+0800\n" "Last-Translator: Nansen \n" "Language-Team: zh_TW \n" @@ -22,24 +22,30 @@ msgstr "" msgid "All Branches" msgstr "分支" -#: rhodecode/controllers/changeset.py:81 +#: rhodecode/controllers/changeset.py:83 msgid "show white space" msgstr "" -#: rhodecode/controllers/changeset.py:88 rhodecode/controllers/changeset.py:95 +#: rhodecode/controllers/changeset.py:90 rhodecode/controllers/changeset.py:97 msgid "ignore white space" msgstr "" -#: rhodecode/controllers/changeset.py:155 +#: rhodecode/controllers/changeset.py:157 #, fuzzy, python-format msgid "%s line context" msgstr "文件內容" -#: rhodecode/controllers/changeset.py:331 -#: rhodecode/controllers/changeset.py:346 rhodecode/lib/diffs.py:69 +#: rhodecode/controllers/changeset.py:333 +#: rhodecode/controllers/changeset.py:348 rhodecode/lib/diffs.py:70 msgid "binary file" msgstr "二進位檔" +#: rhodecode/controllers/changeset.py:408 +msgid "" +"Changing status on a changeset associated witha closed pull request is " +"not allowed" +msgstr "" + #: rhodecode/controllers/compare.py:69 #, fuzzy msgid "There are no changesets yet" @@ -87,82 +93,87 @@ msgid "commited on" msgstr "遞交" #: rhodecode/controllers/files.py:84 -#: rhodecode/templates/admin/repos/repo_add.html:13 -msgid "add new" -msgstr "新增" +#, fuzzy +msgid "click here to add new file" +msgstr "新增使用者" #: rhodecode/controllers/files.py:85 #, fuzzy, python-format msgid "There are no files yet %s" msgstr "尚未有任何檔案" -#: rhodecode/controllers/files.py:254 +#: rhodecode/controllers/files.py:239 rhodecode/controllers/files.py:299 +#, python-format +msgid "This repository is has been locked by %s on %s" +msgstr "" + +#: rhodecode/controllers/files.py:266 #, python-format msgid "Edited %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:259 +#: rhodecode/controllers/files.py:271 msgid "No changes" msgstr "沒有修改" -#: rhodecode/controllers/files.py:270 rhodecode/controllers/files.py:324 +#: rhodecode/controllers/files.py:282 rhodecode/controllers/files.py:346 #, python-format msgid "Successfully committed to %s" msgstr "成功遞交至 %s" -#: rhodecode/controllers/files.py:275 rhodecode/controllers/files.py:330 +#: rhodecode/controllers/files.py:287 rhodecode/controllers/files.py:352 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:296 +#: rhodecode/controllers/files.py:318 #, fuzzy, python-format msgid "Added %s via RhodeCode" msgstr "使用 RhodeCode 編輯 %s" -#: rhodecode/controllers/files.py:310 +#: rhodecode/controllers/files.py:332 #, fuzzy msgid "No content" msgstr "文件內容" -#: rhodecode/controllers/files.py:314 +#: rhodecode/controllers/files.py:336 #, fuzzy msgid "No filename" msgstr "檔案名稱" -#: rhodecode/controllers/files.py:356 +#: rhodecode/controllers/files.py:378 msgid "downloads disabled" msgstr "下載已關閉" -#: rhodecode/controllers/files.py:367 +#: rhodecode/controllers/files.py:389 #, python-format msgid "Unknown revision %s" msgstr "未知修訂 %s" -#: rhodecode/controllers/files.py:369 +#: rhodecode/controllers/files.py:391 msgid "Empty repository" msgstr "空的版本庫" -#: rhodecode/controllers/files.py:371 +#: rhodecode/controllers/files.py:393 msgid "Unknown archive type" msgstr "未知的存檔類型" -#: rhodecode/controllers/files.py:472 +#: rhodecode/controllers/files.py:494 #: rhodecode/templates/changeset/changeset_range.html:13 #: rhodecode/templates/changeset/changeset_range.html:31 msgid "Changesets" msgstr "變更" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/pullrequests.py:70 -#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:534 +#: rhodecode/controllers/files.py:495 rhodecode/controllers/pullrequests.py:72 +#: rhodecode/controllers/summary.py:232 rhodecode/model/scm.py:543 msgid "Branches" msgstr "分支" -#: rhodecode/controllers/files.py:474 rhodecode/controllers/pullrequests.py:74 -#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:545 +#: rhodecode/controllers/files.py:496 rhodecode/controllers/pullrequests.py:76 +#: rhodecode/controllers/summary.py:233 rhodecode/model/scm.py:554 msgid "Tags" msgstr "標籤" -#: rhodecode/controllers/forks.py:72 rhodecode/controllers/admin/repos.py:90 +#: rhodecode/controllers/forks.py:73 rhodecode/controllers/admin/repos.py:90 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -170,7 +181,7 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:131 rhodecode/controllers/settings.py:72 +#: rhodecode/controllers/forks.py:133 rhodecode/controllers/settings.py:72 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -178,12 +189,12 @@ msgid "" "repositories" msgstr "" -#: rhodecode/controllers/forks.py:164 +#: rhodecode/controllers/forks.py:167 #, python-format msgid "forked %s repository as %s" msgstr "forked %s 版本庫為 %s" -#: rhodecode/controllers/forks.py:178 +#: rhodecode/controllers/forks.py:181 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -194,37 +205,51 @@ msgid "public journal" msgstr "公開日誌" #: rhodecode/controllers/journal.py:206 rhodecode/controllers/journal.py:243 -#: rhodecode/templates/base/base.html:218 +#: rhodecode/templates/base/base.html:220 msgid "journal" msgstr "日誌" -#: rhodecode/controllers/login.py:130 +#: rhodecode/controllers/login.py:143 msgid "You have successfully registered into rhodecode" msgstr "您已經成功註冊rhodecode" -#: rhodecode/controllers/login.py:151 +#: rhodecode/controllers/login.py:164 msgid "Your password reset link was sent" msgstr "您的密碼重設連結已寄出" -#: rhodecode/controllers/login.py:171 +#: rhodecode/controllers/login.py:184 msgid "" "Your password reset was successful, new password has been sent to your " "email" msgstr "您的密碼重設動作已完成，新的密碼已寄至您的信箱" -#: rhodecode/controllers/pullrequests.py:72 rhodecode/model/scm.py:540 +#: rhodecode/controllers/pullrequests.py:74 rhodecode/model/scm.py:549 msgid "Bookmarks" msgstr "" +#: rhodecode/controllers/pullrequests.py:158 +msgid "Pull request requires a title with min. 3 chars" +msgstr "" + #: rhodecode/controllers/pullrequests.py:160 #, fuzzy +msgid "error during creation of pull request" +msgstr "建立使用者 %s" + +#: rhodecode/controllers/pullrequests.py:181 +#, fuzzy msgid "Successfully opened new pull request" msgstr "成功刪除使用者" -#: rhodecode/controllers/pullrequests.py:163 +#: rhodecode/controllers/pullrequests.py:184 msgid "Error occurred during sending pull request" msgstr "" +#: rhodecode/controllers/pullrequests.py:217 +#, fuzzy +msgid "Successfully deleted pull request" +msgstr "成功刪除使用者" + #: rhodecode/controllers/search.py:131 msgid "Invalid search query. Try quoting it." msgstr "無效的查詢。請使用跳脫字元" @@ -238,19 +263,19 @@ msgid "An error occurred during this sea msgstr "" #: rhodecode/controllers/settings.py:107 -#: rhodecode/controllers/admin/repos.py:264 +#: rhodecode/controllers/admin/repos.py:266 #, python-format msgid "Repository %s updated successfully" msgstr "版本庫 %s 更新完成" #: rhodecode/controllers/settings.py:125 -#: rhodecode/controllers/admin/repos.py:282 +#: rhodecode/controllers/admin/repos.py:284 #, python-format msgid "error occurred during update of repository %s" msgstr "" #: rhodecode/controllers/settings.py:143 -#: rhodecode/controllers/admin/repos.py:300 +#: rhodecode/controllers/admin/repos.py:302 #, python-format msgid "" "%s repository is not mapped to db perhaps it was moved or renamed from " @@ -259,14 +284,14 @@ msgid "" msgstr "" #: rhodecode/controllers/settings.py:155 -#: rhodecode/controllers/admin/repos.py:312 +#: rhodecode/controllers/admin/repos.py:314 #, python-format msgid "deleted repository %s" msgstr "刪除版本庫 %s" #: rhodecode/controllers/settings.py:159 -#: rhodecode/controllers/admin/repos.py:322 -#: rhodecode/controllers/admin/repos.py:328 +#: rhodecode/controllers/admin/repos.py:324 +#: rhodecode/controllers/admin/repos.py:330 #, python-format msgid "An error occurred during deletion of %s" msgstr "" @@ -276,7 +301,7 @@ msgid "No data loaded yet" msgstr "" #: rhodecode/controllers/summary.py:142 -#: rhodecode/templates/summary/summary.html:144 +#: rhodecode/templates/summary/summary.html:148 msgid "Statistics are disabled for this repository" msgstr "這個版本庫的統計功能已停用" @@ -367,9 +392,9 @@ msgstr "寫" #: rhodecode/templates/admin/users_groups/users_group_edit.html:9 #: rhodecode/templates/admin/users_groups/users_groups.html:9 #: rhodecode/templates/base/base.html:197 -#: rhodecode/templates/base/base.html:335 #: rhodecode/templates/base/base.html:337 #: rhodecode/templates/base/base.html:339 +#: rhodecode/templates/base/base.html:341 msgid "Admin" msgstr "管理" @@ -386,18 +411,20 @@ msgid "allowed with automatic account ac msgstr "允許自動啟用帳號" #: rhodecode/controllers/admin/permissions.py:71 +#: rhodecode/controllers/admin/permissions.py:74 msgid "Disabled" msgstr "停用" #: rhodecode/controllers/admin/permissions.py:72 +#: rhodecode/controllers/admin/permissions.py:75 msgid "Enabled" msgstr "啟用" -#: rhodecode/controllers/admin/permissions.py:106 +#: rhodecode/controllers/admin/permissions.py:116 msgid "Default permissions updated successfully" msgstr "預設權限更新完成" -#: rhodecode/controllers/admin/permissions.py:123 +#: rhodecode/controllers/admin/permissions.py:130 msgid "error occurred during update of permissions" msgstr "" @@ -405,120 +432,124 @@ msgstr "" msgid "--REMOVE FORK--" msgstr "" -#: rhodecode/controllers/admin/repos.py:191 +#: rhodecode/controllers/admin/repos.py:192 #, python-format msgid "created repository %s from %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:195 +#: rhodecode/controllers/admin/repos.py:196 #, python-format msgid "created repository %s" msgstr "建立版本庫 %s" -#: rhodecode/controllers/admin/repos.py:226 +#: rhodecode/controllers/admin/repos.py:227 #, python-format msgid "error occurred during creation of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:317 +#: rhodecode/controllers/admin/repos.py:319 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:346 +#: rhodecode/controllers/admin/repos.py:348 msgid "An error occurred during deletion of repository user" msgstr "" -#: rhodecode/controllers/admin/repos.py:365 +#: rhodecode/controllers/admin/repos.py:367 msgid "An error occurred during deletion of repository users groups" msgstr "" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:385 msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/controllers/admin/repos.py:398 +#: rhodecode/controllers/admin/repos.py:402 msgid "An error occurred during cache invalidation" msgstr "" -#: rhodecode/controllers/admin/repos.py:418 -msgid "Updated repository visibility in public journal" -msgstr "" - #: rhodecode/controllers/admin/repos.py:422 -msgid "An error occurred during setting this repository in public journal" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:427 rhodecode/model/validators.py:269 -msgid "Token mismatch" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:440 -msgid "Pulled from remote location" +msgid "An error occurred during unlocking" msgstr "" #: rhodecode/controllers/admin/repos.py:442 +msgid "Updated repository visibility in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:446 +msgid "An error occurred during setting this repository in public journal" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:451 rhodecode/model/validators.py:299 +msgid "Token mismatch" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:464 +msgid "Pulled from remote location" +msgstr "" + +#: rhodecode/controllers/admin/repos.py:466 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:458 +#: rhodecode/controllers/admin/repos.py:482 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:460 +#: rhodecode/controllers/admin/repos.py:484 #, fuzzy, python-format msgid "Marked repo %s as fork of %s" msgstr "建立版本庫 %s 到 %s" -#: rhodecode/controllers/admin/repos.py:464 +#: rhodecode/controllers/admin/repos.py:488 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:119 +#: rhodecode/controllers/admin/repos_groups.py:116 #, python-format msgid "created repos group %s" msgstr "建立版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:132 +#: rhodecode/controllers/admin/repos_groups.py:129 #, python-format msgid "error occurred during creation of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:166 +#: rhodecode/controllers/admin/repos_groups.py:163 #, python-format msgid "updated repos group %s" msgstr "更新版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:179 +#: rhodecode/controllers/admin/repos_groups.py:176 #, python-format msgid "error occurred during update of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:197 +#: rhodecode/controllers/admin/repos_groups.py:194 #, python-format msgid "This group contains %s repositores and cannot be deleted" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:205 +#: rhodecode/controllers/admin/repos_groups.py:202 #, python-format msgid "removed repos group %s" msgstr "移除版本庫群組 %s" -#: rhodecode/controllers/admin/repos_groups.py:210 +#: rhodecode/controllers/admin/repos_groups.py:208 msgid "Cannot delete this group it still contains subgroups" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:215 -#: rhodecode/controllers/admin/repos_groups.py:220 +#: rhodecode/controllers/admin/repos_groups.py:213 +#: rhodecode/controllers/admin/repos_groups.py:218 #, python-format msgid "error occurred during deletion of repos group %s" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:240 +#: rhodecode/controllers/admin/repos_groups.py:238 msgid "An error occurred during deletion of group user" msgstr "" -#: rhodecode/controllers/admin/repos_groups.py:260 +#: rhodecode/controllers/admin/repos_groups.py:258 msgid "An error occurred during deletion of group users groups" msgstr "" @@ -536,90 +567,113 @@ msgid "Updated application settings" msgstr "更新應用設定" #: rhodecode/controllers/admin/settings.py:164 -#: rhodecode/controllers/admin/settings.py:230 +#: rhodecode/controllers/admin/settings.py:275 msgid "error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:226 -msgid "Updated mercurial settings" +#: rhodecode/controllers/admin/settings.py:200 +#, fuzzy +msgid "Updated visualisation settings" +msgstr "更新應用設定" + +#: rhodecode/controllers/admin/settings.py:205 +msgid "error occurred during updating visualisation settings" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:271 +#, fuzzy +msgid "Updated VCS settings" msgstr "更新 mercurial 設定" -#: rhodecode/controllers/admin/settings.py:240 +#: rhodecode/controllers/admin/settings.py:285 msgid "Added new hook" msgstr "新增hook" -#: rhodecode/controllers/admin/settings.py:252 +#: rhodecode/controllers/admin/settings.py:297 msgid "Updated hooks" msgstr "更新hook" -#: rhodecode/controllers/admin/settings.py:256 +#: rhodecode/controllers/admin/settings.py:301 msgid "error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:275 +#: rhodecode/controllers/admin/settings.py:320 msgid "Email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:375 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/settings.py:361 +#: rhodecode/controllers/admin/settings.py:406 msgid "Your account was updated successfully" msgstr "您的帳號已更新完成" -#: rhodecode/controllers/admin/settings.py:376 -#: rhodecode/controllers/admin/users.py:186 +#: rhodecode/controllers/admin/settings.py:421 +#: rhodecode/controllers/admin/users.py:191 #, python-format msgid "error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:127 +#: rhodecode/controllers/admin/users.py:130 #, python-format msgid "created user %s" msgstr "建立使用者 %s" -#: rhodecode/controllers/admin/users.py:139 +#: rhodecode/controllers/admin/users.py:142 #, python-format msgid "error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:168 +#: rhodecode/controllers/admin/users.py:171 msgid "User updated successfully" msgstr "使用者更新完成" -#: rhodecode/controllers/admin/users.py:202 +#: rhodecode/controllers/admin/users.py:207 msgid "successfully deleted user" msgstr "成功刪除使用者" -#: rhodecode/controllers/admin/users.py:207 +#: rhodecode/controllers/admin/users.py:212 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:221 +#: rhodecode/controllers/admin/users.py:226 msgid "You can't edit this user" msgstr "您無法編輯這位使用者" -#: rhodecode/controllers/admin/users.py:253 -#: rhodecode/controllers/admin/users_groups.py:219 +#: rhodecode/controllers/admin/users.py:266 msgid "Granted 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:262 -#: rhodecode/controllers/admin/users_groups.py:229 +#: rhodecode/controllers/admin/users.py:271 msgid "Revoked 'repository create' permission to user" msgstr "" -#: rhodecode/controllers/admin/users.py:278 +#: rhodecode/controllers/admin/users.py:277 +#, fuzzy +msgid "Granted 'repository fork' permission to user" +msgstr "版本庫權限" + +#: rhodecode/controllers/admin/users.py:282 +#, fuzzy +msgid "Revoked 'repository fork' permission to user" +msgstr "版本庫權限" + +#: rhodecode/controllers/admin/users.py:288 +#: rhodecode/controllers/admin/users_groups.py:255 +msgid "An error occurred during permissions saving" +msgstr "" + +#: rhodecode/controllers/admin/users.py:303 #, python-format msgid "Added email %s to user" msgstr "" -#: rhodecode/controllers/admin/users.py:284 +#: rhodecode/controllers/admin/users.py:309 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:319 #, fuzzy msgid "Removed email from user" msgstr "移除版本庫群組 %s" @@ -639,174 +693,190 @@ msgstr "" msgid "updated users group %s" msgstr "更新使用者群組 %s" -#: rhodecode/controllers/admin/users_groups.py:152 +#: rhodecode/controllers/admin/users_groups.py:157 #, python-format msgid "error occurred during update of users group %s" msgstr "" -#: rhodecode/controllers/admin/users_groups.py:169 +#: rhodecode/controllers/admin/users_groups.py:174 msgid "successfully deleted users group" msgstr "成功移除使用者群組" -#: rhodecode/controllers/admin/users_groups.py:174 +#: rhodecode/controllers/admin/users_groups.py:179 msgid "An error occurred during deletion of users group" msgstr "" -#: rhodecode/lib/auth.py:497 +#: rhodecode/controllers/admin/users_groups.py:233 +msgid "Granted 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:238 +msgid "Revoked 'repository create' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:244 +msgid "Granted 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/controllers/admin/users_groups.py:249 +msgid "Revoked 'repository fork' permission to users group" +msgstr "" + +#: rhodecode/lib/auth.py:499 msgid "You need to be a registered user to perform this action" msgstr "您必須是註冊使用者才能執行這個動作" -#: rhodecode/lib/auth.py:538 +#: rhodecode/lib/auth.py:540 msgid "You need to be a signed in to view this page" msgstr "您必須登入後才能瀏覽這個頁面" -#: rhodecode/lib/diffs.py:85 +#: rhodecode/lib/diffs.py:86 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" -#: rhodecode/lib/diffs.py:95 +#: rhodecode/lib/diffs.py:96 msgid "No changes detected" msgstr "尚未有任何變更" -#: rhodecode/lib/helpers.py:369 +#: rhodecode/lib/helpers.py:372 #, python-format msgid "%a, %d %b %Y %H:%M:%S" msgstr "" -#: rhodecode/lib/helpers.py:442 +#: rhodecode/lib/helpers.py:484 msgid "True" msgstr "真" -#: rhodecode/lib/helpers.py:446 +#: rhodecode/lib/helpers.py:488 msgid "False" msgstr "假" -#: rhodecode/lib/helpers.py:490 +#: rhodecode/lib/helpers.py:532 #, fuzzy msgid "Changeset not found" msgstr "修改" -#: rhodecode/lib/helpers.py:513 +#: rhodecode/lib/helpers.py:555 #, python-format msgid "Show all combined changesets %s->%s" msgstr "" -#: rhodecode/lib/helpers.py:519 +#: rhodecode/lib/helpers.py:561 msgid "compare view" msgstr "" -#: rhodecode/lib/helpers.py:539 +#: rhodecode/lib/helpers.py:581 msgid "and" msgstr "和" -#: rhodecode/lib/helpers.py:540 +#: rhodecode/lib/helpers.py:582 #, python-format msgid "%s more" msgstr "" -#: rhodecode/lib/helpers.py:541 rhodecode/templates/changelog/changelog.html:46 +#: rhodecode/lib/helpers.py:583 rhodecode/templates/changelog/changelog.html:48 msgid "revisions" msgstr "修訂" -#: rhodecode/lib/helpers.py:564 +#: rhodecode/lib/helpers.py:606 msgid "fork name " msgstr "fork 名稱" -#: rhodecode/lib/helpers.py:578 +#: rhodecode/lib/helpers.py:620 #: 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 +#: rhodecode/lib/helpers.py:626 msgid "[deleted] repository" msgstr "" -#: rhodecode/lib/helpers.py:586 rhodecode/lib/helpers.py:596 +#: rhodecode/lib/helpers.py:628 rhodecode/lib/helpers.py:638 msgid "[created] repository" msgstr "" -#: rhodecode/lib/helpers.py:588 +#: rhodecode/lib/helpers.py:630 #, fuzzy msgid "[created] repository as fork" msgstr "建立版本庫 %s" -#: rhodecode/lib/helpers.py:590 rhodecode/lib/helpers.py:598 +#: rhodecode/lib/helpers.py:632 rhodecode/lib/helpers.py:640 msgid "[forked] repository" msgstr "" -#: rhodecode/lib/helpers.py:592 rhodecode/lib/helpers.py:600 +#: rhodecode/lib/helpers.py:634 rhodecode/lib/helpers.py:642 msgid "[updated] repository" msgstr "" -#: rhodecode/lib/helpers.py:594 +#: rhodecode/lib/helpers.py:636 msgid "[delete] repository" msgstr "" -#: rhodecode/lib/helpers.py:602 +#: rhodecode/lib/helpers.py:644 #, fuzzy msgid "[created] user" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:604 +#: rhodecode/lib/helpers.py:646 #, fuzzy msgid "[updated] user" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:606 +#: rhodecode/lib/helpers.py:648 #, fuzzy msgid "[created] users group" msgstr "建立使用者群組 %s" -#: rhodecode/lib/helpers.py:608 +#: rhodecode/lib/helpers.py:650 #, fuzzy msgid "[updated] users group" msgstr "更新使用者群組 %s" -#: rhodecode/lib/helpers.py:610 +#: rhodecode/lib/helpers.py:652 msgid "[commented] on revision in repository" msgstr "" -#: rhodecode/lib/helpers.py:612 +#: rhodecode/lib/helpers.py:654 #, fuzzy msgid "[commented] on pull request for" msgstr "建立使用者 %s" -#: rhodecode/lib/helpers.py:614 +#: rhodecode/lib/helpers.py:656 msgid "[closed] pull request for" msgstr "" -#: rhodecode/lib/helpers.py:616 +#: rhodecode/lib/helpers.py:658 msgid "[pushed] into" msgstr "" -#: rhodecode/lib/helpers.py:618 +#: rhodecode/lib/helpers.py:660 msgid "[committed via RhodeCode] into repository" msgstr "" -#: rhodecode/lib/helpers.py:620 +#: rhodecode/lib/helpers.py:662 msgid "[pulled from remote] into repository" msgstr "" -#: rhodecode/lib/helpers.py:622 +#: rhodecode/lib/helpers.py:664 msgid "[pulled] from" msgstr "" -#: rhodecode/lib/helpers.py:624 +#: rhodecode/lib/helpers.py:666 msgid "[started following] repository" msgstr "" -#: rhodecode/lib/helpers.py:626 +#: rhodecode/lib/helpers.py:668 msgid "[stopped following] repository" msgstr "" -#: rhodecode/lib/helpers.py:790 +#: rhodecode/lib/helpers.py:840 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:794 +#: rhodecode/lib/helpers.py:844 msgid "No Files" msgstr "沒有檔案" @@ -874,88 +944,98 @@ msgstr "" msgid "[Mention]" msgstr "" -#: rhodecode/model/db.py:1063 +#: rhodecode/model/db.py:1140 #, fuzzy msgid "Repository no access" msgstr "個版本庫" -#: rhodecode/model/db.py:1064 +#: rhodecode/model/db.py:1141 #, fuzzy msgid "Repository read access" msgstr "這個版本庫已經存在" -#: rhodecode/model/db.py:1065 +#: rhodecode/model/db.py:1142 #, fuzzy msgid "Repository write access" msgstr "個版本庫" -#: rhodecode/model/db.py:1066 +#: rhodecode/model/db.py:1143 #, fuzzy msgid "Repository admin access" msgstr "個版本庫" -#: rhodecode/model/db.py:1068 +#: rhodecode/model/db.py:1145 #, fuzzy msgid "Repositories Group no access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1069 +#: rhodecode/model/db.py:1146 #, fuzzy msgid "Repositories Group read access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1070 +#: rhodecode/model/db.py:1147 #, fuzzy msgid "Repositories Group write access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1071 +#: rhodecode/model/db.py:1148 #, fuzzy msgid "Repositories Group admin access" msgstr "版本庫群組" -#: rhodecode/model/db.py:1073 +#: rhodecode/model/db.py:1150 #, fuzzy msgid "RhodeCode Administrator" msgstr "使用者管理員" -#: rhodecode/model/db.py:1074 +#: rhodecode/model/db.py:1151 #, fuzzy msgid "Repository creation disabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1075 +#: rhodecode/model/db.py:1152 #, fuzzy msgid "Repository creation enabled" msgstr "版本庫建立" -#: rhodecode/model/db.py:1076 +#: rhodecode/model/db.py:1153 +#, fuzzy +msgid "Repository forking disabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1154 +#, fuzzy +msgid "Repository forking enabled" +msgstr "版本庫建立" + +#: rhodecode/model/db.py:1155 #, fuzzy msgid "Register disabled" msgstr "停用" -#: rhodecode/model/db.py:1077 +#: rhodecode/model/db.py:1156 msgid "Register new user with RhodeCode with manual activation" msgstr "" -#: rhodecode/model/db.py:1080 +#: rhodecode/model/db.py:1159 msgid "Register new user with RhodeCode with auto activation" msgstr "" -#: rhodecode/model/db.py:1481 +#: rhodecode/model/db.py:1579 msgid "Not Reviewed" msgstr "" -#: rhodecode/model/db.py:1482 +#: rhodecode/model/db.py:1580 #, fuzzy msgid "Approved" msgstr "移除" -#: rhodecode/model/db.py:1483 +#: rhodecode/model/db.py:1581 msgid "Rejected" msgstr "" -#: rhodecode/model/db.py:1484 +#: rhodecode/model/db.py:1582 msgid "Under Review" msgstr "" @@ -1008,160 +1088,169 @@ msgstr "" msgid "%(user)s wants you to review pull request #%(pr_id)s" msgstr "" -#: rhodecode/model/scm.py:526 +#: rhodecode/model/scm.py:535 #, fuzzy msgid "latest tip" msgstr "最後登入" -#: rhodecode/model/user.py:240 +#: rhodecode/model/user.py:230 #, fuzzy msgid "new user registration" msgstr "[RhodeCode] 新使用者註冊" -#: rhodecode/model/user.py:265 rhodecode/model/user.py:287 -#: rhodecode/model/user.py:309 +#: rhodecode/model/user.py:255 rhodecode/model/user.py:277 +#: rhodecode/model/user.py:299 msgid "You can't Edit this user since it's crucial for entire application" msgstr "您無法編輯這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:333 +#: rhodecode/model/user.py:323 msgid "You can't remove this user since it's crucial for entire application" msgstr "您無法移除這個使用者，因為他是系統帳號" -#: rhodecode/model/user.py:339 +#: rhodecode/model/user.py:329 #, fuzzy, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch " "owners or remove those repositories. %s" msgstr "這個使用者擁有 %s 個版本庫所以無法移除，請先變更版本庫擁有者或者刪除版本庫" -#: rhodecode/model/validators.py:52 +#: rhodecode/model/validators.py:35 rhodecode/model/validators.py:36 +msgid "Value cannot be an empty list" +msgstr "" + +#: rhodecode/model/validators.py:82 #, fuzzy, python-format msgid "Username \"%(username)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:54 +#: rhodecode/model/validators.py:84 #, python-format msgid "Username \"%(username)s\" is forbidden" msgstr "" -#: rhodecode/model/validators.py:56 +#: rhodecode/model/validators.py:86 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with alphanumeric character" msgstr "使用者名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:84 +#: rhodecode/model/validators.py:114 #, fuzzy, python-format msgid "Username %(username)s is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:103 +#: rhodecode/model/validators.py:133 #, fuzzy msgid "Invalid users group name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:104 +#: rhodecode/model/validators.py:134 #, fuzzy, python-format msgid "Users group \"%(usersgroup)s\" already exists" msgstr "這個使用者群組已存在" -#: rhodecode/model/validators.py:106 +#: rhodecode/model/validators.py:136 msgid "" "users group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" msgstr "群組名稱只能使用字母數字、底線、小數點或破折號，且必須使用數字或字母開頭" -#: rhodecode/model/validators.py:144 +#: rhodecode/model/validators.py:174 msgid "Cannot assign this group as parent" msgstr "" -#: rhodecode/model/validators.py:145 +#: rhodecode/model/validators.py:175 #, fuzzy, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "使用者名稱已存在" -#: rhodecode/model/validators.py:147 +#: rhodecode/model/validators.py:177 #, fuzzy, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:205 +#: rhodecode/model/validators.py:235 #, fuzzy msgid "Invalid characters (non-ascii) in password" msgstr "無效的字元在密碼中" -#: rhodecode/model/validators.py:220 +#: rhodecode/model/validators.py:250 msgid "Passwords do not match" msgstr "密碼不相符" -#: rhodecode/model/validators.py:237 +#: rhodecode/model/validators.py:267 msgid "invalid password" msgstr "無效的密碼" -#: rhodecode/model/validators.py:238 +#: rhodecode/model/validators.py:268 msgid "invalid user name" msgstr "無效的使用者名稱" -#: rhodecode/model/validators.py:239 +#: rhodecode/model/validators.py:269 msgid "Your account is disabled" msgstr "您的帳號已被停用" -#: rhodecode/model/validators.py:283 +#: rhodecode/model/validators.py:313 #, fuzzy, python-format msgid "Repository name %(repo)s is disallowed" msgstr "不允許的版本庫名稱" -#: rhodecode/model/validators.py:285 +#: rhodecode/model/validators.py:315 #, fuzzy, python-format msgid "Repository named %(repo)s already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:286 +#: rhodecode/model/validators.py:316 #, fuzzy, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "這個版本庫已存在於群組 \"%s\"" -#: rhodecode/model/validators.py:288 +#: rhodecode/model/validators.py:318 #, fuzzy, python-format msgid "Repositories group with name \"%(repo)s\" already exists" msgstr "這個版本庫已經存在" -#: rhodecode/model/validators.py:386 +#: rhodecode/model/validators.py:431 msgid "invalid clone url" msgstr "無效的複製URL" -#: rhodecode/model/validators.py:387 -msgid "Invalid clone url, provide a valid clone http\\s url" -msgstr "" - -#: rhodecode/model/validators.py:418 +#: rhodecode/model/validators.py:432 +msgid "Invalid clone url, provide a valid clone http(s)/svn+http(s) url" +msgstr "" + +#: rhodecode/model/validators.py:457 #, fuzzy msgid "Fork have to be the same type as parent" msgstr "Fork 必須使用相同的版本庫類型" -#: rhodecode/model/validators.py:439 +#: rhodecode/model/validators.py:478 msgid "This username or users group name is not valid" msgstr "使用者名稱或群組名稱無效" -#: rhodecode/model/validators.py:509 +#: rhodecode/model/validators.py:562 msgid "This is not a valid path" msgstr "不是一個有效的路徑" -#: rhodecode/model/validators.py:524 +#: rhodecode/model/validators.py:577 msgid "This e-mail address is already taken" msgstr "這個郵件位址已經使用了" -#: rhodecode/model/validators.py:544 +#: rhodecode/model/validators.py:597 #, fuzzy, python-format msgid "e-mail \"%(email)s\" does not exist." msgstr "這個郵件位址不存在" -#: rhodecode/model/validators.py:581 +#: rhodecode/model/validators.py:634 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" msgstr "" +#: rhodecode/model/validators.py:653 +#, python-format +msgid "Revisions %(revs)s are already part of pull request or have set status" +msgstr "" + #: rhodecode/templates/index.html:3 msgid "Dashboard" msgstr "儀表板" @@ -1180,7 +1269,7 @@ msgstr "快速過濾..." #: rhodecode/templates/index_base.html:6 #: rhodecode/templates/admin/repos/repos.html:9 -#: rhodecode/templates/base/base.html:219 +#: rhodecode/templates/base/base.html:221 msgid "repositories" msgstr "個版本庫" @@ -1200,9 +1289,9 @@ msgid "Group name" msgstr "群組名稱" #: rhodecode/templates/index_base.html:30 -#: rhodecode/templates/index_base.html:67 -#: rhodecode/templates/index_base.html:132 -#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:142 +#: rhodecode/templates/index_base.html:168 #: rhodecode/templates/admin/repos/repo_add_base.html:56 #: rhodecode/templates/admin/repos/repo_edit.html:75 #: rhodecode/templates/admin/repos/repos.html:72 @@ -1220,15 +1309,15 @@ msgstr "描述" msgid "Repositories group" msgstr "版本庫群組" -#: rhodecode/templates/index_base.html:66 -#: rhodecode/templates/index_base.html:156 +#: rhodecode/templates/index_base.html:70 +#: rhodecode/templates/index_base.html:166 #: rhodecode/templates/admin/repos/repo_add_base.html:9 #: rhodecode/templates/admin/repos/repo_edit.html:32 #: rhodecode/templates/admin/repos/repos.html:70 -#: rhodecode/templates/admin/users/user_edit.html:172 +#: rhodecode/templates/admin/users/user_edit.html:192 #: 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.html:157 +#: rhodecode/templates/admin/users/user_edit_my_account.html:193 #: rhodecode/templates/admin/users/user_edit_my_account_repos.html:6 #: rhodecode/templates/bookmarks/bookmarks.html:36 #: rhodecode/templates/bookmarks/bookmarks_data.html:6 @@ -1239,62 +1328,62 @@ msgstr "版本庫群組" #: rhodecode/templates/journal/journal.html:186 #: rhodecode/templates/settings/repo_settings.html:31 #: rhodecode/templates/summary/summary.html:43 -#: rhodecode/templates/summary/summary.html:119 +#: rhodecode/templates/summary/summary.html:123 #: rhodecode/templates/tags/tags.html:36 #: rhodecode/templates/tags/tags_data.html:6 msgid "Name" msgstr "名稱" -#: rhodecode/templates/index_base.html:68 +#: rhodecode/templates/index_base.html:72 msgid "Last change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:69 -#: rhodecode/templates/index_base.html:161 -#: rhodecode/templates/admin/users/user_edit_my_account.html:156 +#: rhodecode/templates/index_base.html:73 +#: rhodecode/templates/index_base.html:171 +#: rhodecode/templates/admin/users/user_edit_my_account.html:159 #: 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/index_base.html:74 +#: rhodecode/templates/index_base.html:173 +#: rhodecode/templates/admin/repos/repo_edit.html:121 #: rhodecode/templates/admin/repos/repos.html:73 msgid "Owner" msgstr "擁有者" -#: rhodecode/templates/index_base.html:71 +#: rhodecode/templates/index_base.html:75 #: rhodecode/templates/summary/summary.html:48 #: rhodecode/templates/summary/summary.html:51 msgid "RSS" msgstr "" -#: rhodecode/templates/index_base.html:72 +#: rhodecode/templates/index_base.html:76 msgid "Atom" msgstr "" -#: rhodecode/templates/index_base.html:102 -#: rhodecode/templates/index_base.html:104 +#: rhodecode/templates/index_base.html:110 +#: rhodecode/templates/index_base.html:112 #, python-format msgid "Subscribe to %s rss feed" msgstr "訂閱 %s rss" -#: rhodecode/templates/index_base.html:109 -#: rhodecode/templates/index_base.html:111 +#: rhodecode/templates/index_base.html:117 +#: rhodecode/templates/index_base.html:119 #, python-format msgid "Subscribe to %s atom feed" msgstr "訂閱 %s atom" -#: rhodecode/templates/index_base.html:130 +#: rhodecode/templates/index_base.html:140 #, fuzzy msgid "Group Name" msgstr "群組名稱" -#: rhodecode/templates/index_base.html:148 -#: rhodecode/templates/index_base.html:188 +#: rhodecode/templates/index_base.html:158 +#: rhodecode/templates/index_base.html:198 #: 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/admin/users/user_edit_my_account.html:179 +#: rhodecode/templates/admin/users/users.html:107 #: rhodecode/templates/bookmarks/bookmarks.html:60 #: rhodecode/templates/branches/branches.html:77 #: rhodecode/templates/journal/journal.html:211 @@ -1302,11 +1391,11 @@ msgstr "群組名稱" msgid "Click to sort ascending" msgstr "" -#: rhodecode/templates/index_base.html:149 -#: rhodecode/templates/index_base.html:189 +#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:199 #: 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/admin/users/user_edit_my_account.html:180 +#: rhodecode/templates/admin/users/users.html:108 #: rhodecode/templates/bookmarks/bookmarks.html:61 #: rhodecode/templates/branches/branches.html:78 #: rhodecode/templates/journal/journal.html:212 @@ -1314,15 +1403,15 @@ msgstr "" msgid "Click to sort descending" msgstr "" -#: rhodecode/templates/index_base.html:159 +#: rhodecode/templates/index_base.html:169 #, fuzzy msgid "Last Change" msgstr "最後修改" -#: rhodecode/templates/index_base.html:190 +#: rhodecode/templates/index_base.html:200 #: 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/admin/users/user_edit_my_account.html:181 +#: rhodecode/templates/admin/users/users.html:109 #: rhodecode/templates/bookmarks/bookmarks.html:62 #: rhodecode/templates/branches/branches.html:79 #: rhodecode/templates/journal/journal.html:213 @@ -1330,10 +1419,10 @@ msgstr "最後修改" msgid "No records found." msgstr "" -#: rhodecode/templates/index_base.html:191 +#: rhodecode/templates/index_base.html:201 #: 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/admin/users/user_edit_my_account.html:182 +#: rhodecode/templates/admin/users/users.html:110 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:80 #: rhodecode/templates/journal/journal.html:214 @@ -1341,10 +1430,10 @@ msgstr "" msgid "Data error." msgstr "" -#: rhodecode/templates/index_base.html:192 +#: rhodecode/templates/index_base.html:202 #: 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/admin/users/user_edit_my_account.html:183 +#: rhodecode/templates/admin/users/users.html:111 #: rhodecode/templates/bookmarks/bookmarks.html:64 #: rhodecode/templates/branches/branches.html:81 #: rhodecode/templates/journal/journal.html:215 @@ -1367,7 +1456,7 @@ msgstr "登入" #: rhodecode/templates/admin/users/user_edit.html:50 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:26 #: rhodecode/templates/base/base.html:83 -#: rhodecode/templates/summary/summary.html:118 +#: rhodecode/templates/summary/summary.html:122 msgid "Username" msgstr "帳號" @@ -1441,7 +1530,7 @@ msgstr "姓" #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit.html:104 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:71 -#: rhodecode/templates/summary/summary.html:120 +#: rhodecode/templates/summary/summary.html:124 msgid "Email" msgstr "電子郵件" @@ -1604,13 +1693,13 @@ msgid "E-mail Attribute" msgstr "電子郵件屬性" #: rhodecode/templates/admin/ldap/ldap.html:89 -#: rhodecode/templates/admin/repos/repo_edit.html:132 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#: rhodecode/templates/admin/repos/repo_edit.html:141 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:74 #: rhodecode/templates/admin/settings/hooks.html:73 #: rhodecode/templates/admin/users/user_edit.html:129 -#: rhodecode/templates/admin/users/user_edit.html:154 +#: rhodecode/templates/admin/users/user_edit.html:174 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:79 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:115 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:135 #: rhodecode/templates/settings/repo_settings.html:93 msgid "Save" msgstr "儲存" @@ -1630,8 +1719,8 @@ msgid "Comments" msgstr "遞交" #: rhodecode/templates/admin/notifications/notifications.html:31 -#: rhodecode/templates/base/base.html:252 #: rhodecode/templates/base/base.html:254 +#: rhodecode/templates/base/base.html:256 msgid "Pull requests" msgstr "" @@ -1659,7 +1748,7 @@ msgid "Permissions administration" msgstr "權限管理員" #: rhodecode/templates/admin/permissions/permissions.html:11 -#: rhodecode/templates/admin/repos/repo_edit.html:125 +#: rhodecode/templates/admin/repos/repo_edit.html:134 #: 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 @@ -1699,7 +1788,12 @@ msgid "Repository creation" msgstr "版本庫建立" #: rhodecode/templates/admin/permissions/permissions.html:71 -#: rhodecode/templates/admin/repos/repo_edit.html:227 +#, fuzzy +msgid "Repository forking" +msgstr "版本庫建立" + +#: rhodecode/templates/admin/permissions/permissions.html:78 +#: rhodecode/templates/admin/repos/repo_edit.html:241 msgid "set" msgstr "設定" @@ -1714,6 +1808,10 @@ msgstr "新增版本庫" msgid "Repositories" msgstr "版本庫" +#: rhodecode/templates/admin/repos/repo_add.html:13 +msgid "add new" +msgstr "新增" + #: rhodecode/templates/admin/repos/repo_add_base.html:20 #: rhodecode/templates/summary/summary.html:95 #: rhodecode/templates/summary/summary.html:96 @@ -1794,8 +1892,8 @@ msgstr "編輯版本庫" #: rhodecode/templates/admin/repos/repo_edit.html:13 #: rhodecode/templates/admin/users/user_edit.html:13 -#: rhodecode/templates/admin/users/user_edit.html:204 -#: rhodecode/templates/admin/users/user_edit.html:206 +#: rhodecode/templates/admin/users/user_edit.html:224 +#: rhodecode/templates/admin/users/user_edit.html:226 #: 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 @@ -1829,20 +1927,31 @@ msgstr "啟用下載" msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:117 +#: rhodecode/templates/admin/repos/repo_edit.html:112 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:66 +#, fuzzy +msgid "Enable locking" +msgstr "啟用" + +#: rhodecode/templates/admin/repos/repo_edit.html:116 +msgid "Enable lock-by-pulling on repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:126 #, fuzzy msgid "Change owner of this repository." msgstr "修改於版本庫 %s" -#: rhodecode/templates/admin/repos/repo_edit.html:133 -#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:67 +#: rhodecode/templates/admin/repos/repo_edit.html:142 +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:75 #: rhodecode/templates/admin/settings/settings.html:113 -#: rhodecode/templates/admin/settings/settings.html:180 +#: rhodecode/templates/admin/settings/settings.html:168 +#: rhodecode/templates/admin/settings/settings.html:258 #: rhodecode/templates/admin/users/user_edit.html:130 -#: rhodecode/templates/admin/users/user_edit.html:155 -#: rhodecode/templates/admin/users/user_edit.html:258 +#: rhodecode/templates/admin/users/user_edit.html:175 +#: rhodecode/templates/admin/users/user_edit.html:278 #: rhodecode/templates/admin/users/user_edit_my_account_form.html:80 -#: rhodecode/templates/admin/users_groups/users_group_edit.html:116 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:136 #: rhodecode/templates/files/files_add.html:82 #: rhodecode/templates/files/files_edit.html:68 #: rhodecode/templates/pullrequests/pullrequest.html:124 @@ -1850,90 +1959,130 @@ msgstr "修改於版本庫 %s" msgid "Reset" msgstr "重設" -#: rhodecode/templates/admin/repos/repo_edit.html:143 +#: rhodecode/templates/admin/repos/repo_edit.html:152 msgid "Administration" msgstr "管理者" -#: rhodecode/templates/admin/repos/repo_edit.html:146 +#: rhodecode/templates/admin/repos/repo_edit.html:155 msgid "Statistics" msgstr "統計" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Reset current statistics" msgstr "重設目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:150 +#: rhodecode/templates/admin/repos/repo_edit.html:159 msgid "Confirm to remove current statistics" msgstr "確認移除目前的統計" -#: rhodecode/templates/admin/repos/repo_edit.html:153 +#: rhodecode/templates/admin/repos/repo_edit.html:162 msgid "Fetched to rev" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:154 +#: rhodecode/templates/admin/repos/repo_edit.html:163 msgid "Stats gathered" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:162 +#: rhodecode/templates/admin/repos/repo_edit.html:171 msgid "Remote" msgstr "遠端" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:166 +#: rhodecode/templates/admin/repos/repo_edit.html:175 msgid "Confirm to pull changes from remote side" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:177 +#: rhodecode/templates/admin/repos/repo_edit.html:186 msgid "Cache" msgstr "快取" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:181 +#: rhodecode/templates/admin/repos/repo_edit.html:190 msgid "Confirm to invalidate repository cache" msgstr "確認廢止版本庫快取" -#: rhodecode/templates/admin/repos/repo_edit.html:186 -#: rhodecode/templates/base/base.html:316 +#: rhodecode/templates/admin/repos/repo_edit.html:195 #: rhodecode/templates/base/base.html:318 #: rhodecode/templates/base/base.html:320 +#: rhodecode/templates/base/base.html:322 msgid "Public journal" msgstr "公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:192 +#: rhodecode/templates/admin/repos/repo_edit.html:201 msgid "Remove from public journal" msgstr "從公開日誌移除" -#: rhodecode/templates/admin/repos/repo_edit.html:194 +#: rhodecode/templates/admin/repos/repo_edit.html:203 msgid "Add to public journal" msgstr "新增至公開日誌" -#: rhodecode/templates/admin/repos/repo_edit.html:199 +#: rhodecode/templates/admin/repos/repo_edit.html:208 msgid "" "All actions made on this repository will be accessible to everyone in " "public journal" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:206 +#: rhodecode/templates/admin/repos/repo_edit.html:215 +#, fuzzy +msgid "Locking" +msgstr "解鎖" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +msgid "Unlock locked repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:220 +#, fuzzy +msgid "Confirm to unlock repository" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +msgid "lock repo" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:223 +#, fuzzy +msgid "Confirm to lock repository" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/admin/repos/repo_edit.html:224 +#, fuzzy +msgid "Repository is not locked" +msgstr "個版本庫" + +#: rhodecode/templates/admin/repos/repo_edit.html:229 +msgid "Force locking on repository. Works only when anonymous access is disabled" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:236 +msgid "Set as fork of" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:245 +msgid "Manually set this repository as a fork of another from the list" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.html:251 #: rhodecode/templates/changeset/changeset_file_comment.html:26 msgid "Delete" msgstr "移除" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 msgid "Remove this repository" msgstr "移除版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:210 +#: rhodecode/templates/admin/repos/repo_edit.html:255 #: rhodecode/templates/journal/journal.html:84 msgid "Confirm to delete this repository" msgstr "確認移除這個版本庫" -#: rhodecode/templates/admin/repos/repo_edit.html:214 +#: rhodecode/templates/admin/repos/repo_edit.html:259 msgid "" "This repository will be renamed in a special way in order to be " "unaccesible for RhodeCode and VCS systems.\n" @@ -1941,14 +2090,6 @@ msgid "" "please do it manually" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.html:222 -msgid "Set as fork of" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit.html:231 -msgid "Manually set this repository as a fork of another from the list" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_perms.html:3 #: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:3 msgid "none" @@ -1966,8 +2107,8 @@ 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:83 -#: rhodecode/templates/base/base.html:215 +#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/base/base.html:217 msgid "admin" msgstr "管理員" @@ -1997,18 +2138,18 @@ msgstr "刪除" msgid "revoke" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:80 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:64 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:83 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:67 msgid "Add another member" msgstr "新增另ㄧ位成員" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:94 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:78 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:97 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:81 msgid "Failed to remove user" msgstr "移除使用者失敗" -#: rhodecode/templates/admin/repos/repo_edit_perms.html:109 -#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:93 +#: rhodecode/templates/admin/repos/repo_edit_perms.html:112 +#: rhodecode/templates/admin/repos_groups/repos_group_edit_perms.html:96 msgid "Failed to remove users group" msgstr "移除使用者群組失敗" @@ -2046,7 +2187,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 +#: rhodecode/templates/pullrequests/pullrequest_show.html:113 msgid "save" msgstr "儲存" @@ -2058,6 +2199,12 @@ msgstr "編輯版本庫群組" msgid "edit repos group" msgstr "編輯版本庫群組" +#: rhodecode/templates/admin/repos_groups/repos_groups_edit.html:70 +msgid "" +"Enable lock-by-pulling on group. This option will be applied to all other" +" groups and repositories inside" +msgstr "" + #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:5 msgid "Repositories groups administration" msgstr "版本庫群組管理員" @@ -2072,13 +2219,13 @@ msgid "Number of toplevel repositories" msgstr "版本庫數量" #: rhodecode/templates/admin/repos_groups/repos_groups_show.html:36 -#: rhodecode/templates/admin/users/users.html:85 +#: rhodecode/templates/admin/users/users.html:87 #: 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/user_edit.html:255 #: 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 @@ -2183,94 +2330,142 @@ msgid "GA code" msgstr "" #: rhodecode/templates/admin/settings/settings.html:112 -#: rhodecode/templates/admin/settings/settings.html:179 +#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:257 msgid "Save settings" msgstr "儲存設定" #: rhodecode/templates/admin/settings/settings.html:119 #, fuzzy -msgid "VCS settings" -msgstr "設定" +msgid "Visualisation settings" +msgstr "全域設定" #: rhodecode/templates/admin/settings/settings.html:128 -msgid "Web" -msgstr "" +#, fuzzy +msgid "Icons" +msgstr "選項" #: rhodecode/templates/admin/settings/settings.html:133 +msgid "Show public repo icon on repositories" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:137 +#, fuzzy +msgid "Show private repo icon on repositories" +msgstr "私有版本庫" + +#: rhodecode/templates/admin/settings/settings.html:144 +#, fuzzy +msgid "Meta-Tagging" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:149 +msgid "Stylify recognised metatags:" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:176 +#, fuzzy +msgid "VCS settings" +msgstr "設定" + +#: rhodecode/templates/admin/settings/settings.html:185 +msgid "Web" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:190 #, fuzzy msgid "require ssl for vcs operations" msgstr "推送時要求使用SSL" -#: rhodecode/templates/admin/settings/settings.html:135 +#: rhodecode/templates/admin/settings/settings.html:192 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 +#: rhodecode/templates/admin/settings/settings.html:198 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:146 +#: rhodecode/templates/admin/settings/settings.html:203 msgid "Update repository after push (hg update)" msgstr "push後更新版本庫 (hg update)" -#: rhodecode/templates/admin/settings/settings.html:150 +#: rhodecode/templates/admin/settings/settings.html:207 msgid "Show repository size after push" msgstr "push 後顯示版本庫大小" -#: rhodecode/templates/admin/settings/settings.html:154 +#: rhodecode/templates/admin/settings/settings.html:211 msgid "Log user push commands" msgstr "紀錄使用者推送命令" -#: rhodecode/templates/admin/settings/settings.html:158 +#: rhodecode/templates/admin/settings/settings.html:215 msgid "Log user pull commands" msgstr "紀錄使用者抓取命令" -#: rhodecode/templates/admin/settings/settings.html:162 +#: rhodecode/templates/admin/settings/settings.html:219 msgid "advanced setup" msgstr "進階設定" -#: rhodecode/templates/admin/settings/settings.html:167 +#: rhodecode/templates/admin/settings/settings.html:224 +#, fuzzy +msgid "Mercurial Extensions" +msgstr "Mercurial 版本庫" + +#: rhodecode/templates/admin/settings/settings.html:229 +msgid "largefiles extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:233 +msgid "hgsubversion extensions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:235 +msgid "" +"Requires hgsubversion library installed. Allows clonning from svn remote " +"locations" +msgstr "" + +#: rhodecode/templates/admin/settings/settings.html:245 msgid "Repositories location" msgstr "版本庫路徑" -#: rhodecode/templates/admin/settings/settings.html:172 +#: rhodecode/templates/admin/settings/settings.html:250 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:173 +#: rhodecode/templates/admin/settings/settings.html:251 msgid "unlock" msgstr "解鎖" -#: rhodecode/templates/admin/settings/settings.html:174 +#: rhodecode/templates/admin/settings/settings.html:252 msgid "" "Location where repositories are stored. After changing this value a " "restart, and rescan is required" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:194 +#: rhodecode/templates/admin/settings/settings.html:272 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:202 +#: rhodecode/templates/admin/settings/settings.html:280 #, fuzzy msgid "Email to" msgstr "電子郵件" -#: rhodecode/templates/admin/settings/settings.html:210 +#: rhodecode/templates/admin/settings/settings.html:288 #, fuzzy msgid "Send" msgstr "秒" -#: rhodecode/templates/admin/settings/settings.html:216 +#: rhodecode/templates/admin/settings/settings.html:294 msgid "System Info and Packages" msgstr "" -#: rhodecode/templates/admin/settings/settings.html:219 +#: rhodecode/templates/admin/settings/settings.html:297 #, fuzzy msgid "show" msgstr "顯示" @@ -2335,42 +2530,64 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit.html:147 #: rhodecode/templates/admin/users_groups/users_group_edit.html:108 +#, fuzzy +msgid "Inherit default permissions" +msgstr "預設權限" + +#: rhodecode/templates/admin/users/user_edit.html:152 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:113 +#, python-format +msgid "" +"Select to inherit permissions from %s settings. With this selected below " +"options does not have any action" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit.html:158 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:119 msgid "Create repositories" msgstr "建立版本庫" #: rhodecode/templates/admin/users/user_edit.html:166 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:127 +#, fuzzy +msgid "Fork repositories" +msgstr "個版本庫" + +#: rhodecode/templates/admin/users/user_edit.html:186 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:22 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:39 #, fuzzy msgid "Nothing here yet" msgstr "尚未有任何變更" -#: rhodecode/templates/admin/users/user_edit.html:173 +#: rhodecode/templates/admin/users/user_edit.html:193 #: rhodecode/templates/admin/users/user_edit_my_account.html:60 -#: rhodecode/templates/admin/users/user_edit_my_account.html:191 +#: rhodecode/templates/admin/users/user_edit_my_account.html:194 #, fuzzy msgid "Permission" msgstr "權限" -#: rhodecode/templates/admin/users/user_edit.html:174 +#: rhodecode/templates/admin/users/user_edit.html:194 #, fuzzy msgid "Edit Permission" msgstr "版本庫權限" -#: rhodecode/templates/admin/users/user_edit.html:223 +#: rhodecode/templates/admin/users/user_edit.html:243 #, fuzzy msgid "Email addresses" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:236 +#: rhodecode/templates/admin/users/user_edit.html:256 #, fuzzy, python-format msgid "Confirm to delete this email: %s" msgstr "確認刪除這個使用者" -#: rhodecode/templates/admin/users/user_edit.html:250 +#: rhodecode/templates/admin/users/user_edit.html:270 #, fuzzy msgid "New email address" msgstr "郵件位址" -#: rhodecode/templates/admin/users/user_edit.html:257 +#: rhodecode/templates/admin/users/user_edit.html:277 #, fuzzy msgid "Add" msgstr "新增" @@ -2409,16 +2626,21 @@ msgstr "新增" msgid "Opened by me" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:7 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:10 #, python-format msgid "Pull request #%s opened on %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:13 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:15 +#, fuzzy +msgid "Confirm to delete this pull request" +msgstr "確認移除這個版本庫" + +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:26 msgid "I participate in" msgstr "" -#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:18 +#: rhodecode/templates/admin/users/user_edit_my_account_pullrequests.html:33 #: rhodecode/templates/pullrequests/pullrequest_show_all.html:30 #, python-format msgid "Pull request #%s opened by %s on %s" @@ -2460,7 +2682,7 @@ msgid "Users administration" msgstr "使用者管理員" #: rhodecode/templates/admin/users/users.html:9 -#: rhodecode/templates/base/base.html:221 +#: rhodecode/templates/base/base.html:223 msgid "users" msgstr "使用者" @@ -2468,30 +2690,30 @@ msgstr "使用者" msgid "ADD NEW USER" msgstr "新增使用者" -#: rhodecode/templates/admin/users/users.html:76 +#: rhodecode/templates/admin/users/users.html:77 msgid "username" msgstr "使用者名稱" -#: rhodecode/templates/admin/users/users.html:79 +#: rhodecode/templates/admin/users/users.html:80 #, fuzzy msgid "firstname" msgstr "名" -#: rhodecode/templates/admin/users/users.html:80 +#: rhodecode/templates/admin/users/users.html:81 msgid "lastname" msgstr "姓" -#: rhodecode/templates/admin/users/users.html:81 +#: rhodecode/templates/admin/users/users.html:82 msgid "last login" msgstr "最後登入" -#: rhodecode/templates/admin/users/users.html:82 +#: rhodecode/templates/admin/users/users.html:84 #: rhodecode/templates/admin/users_groups/users_groups.html:34 msgid "active" msgstr "啟用" -#: rhodecode/templates/admin/users/users.html:84 -#: rhodecode/templates/base/base.html:224 +#: rhodecode/templates/admin/users/users.html:86 +#: rhodecode/templates/base/base.html:226 msgid "ldap" msgstr "" @@ -2536,7 +2758,7 @@ msgstr "啟用的成員" msgid "Add all elements" msgstr "新增索有元素" -#: rhodecode/templates/admin/users_groups/users_group_edit.html:126 +#: rhodecode/templates/admin/users_groups/users_group_edit.html:146 #, fuzzy msgid "Group members" msgstr "選擇群組成員" @@ -2585,9 +2807,9 @@ msgid "Inbox" msgstr "" #: rhodecode/templates/base/base.html:122 -#: rhodecode/templates/base/base.html:298 #: rhodecode/templates/base/base.html:300 #: rhodecode/templates/base/base.html:302 +#: rhodecode/templates/base/base.html:304 #: rhodecode/templates/bookmarks/bookmarks.html:11 #: rhodecode/templates/branches/branches.html:10 #: rhodecode/templates/changelog/changelog.html:10 @@ -2611,9 +2833,9 @@ msgid "Home" msgstr "首頁" #: rhodecode/templates/base/base.html:123 -#: rhodecode/templates/base/base.html:307 #: rhodecode/templates/base/base.html:309 #: rhodecode/templates/base/base.html:311 +#: rhodecode/templates/base/base.html:313 #: rhodecode/templates/journal/journal.html:4 #: rhodecode/templates/journal/journal.html:21 #: rhodecode/templates/journal/public_journal.html:4 @@ -2668,7 +2890,6 @@ msgstr "切換至" #: 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 "檔案" @@ -2679,7 +2900,7 @@ msgstr "選項" #: rhodecode/templates/base/base.html:204 #: rhodecode/templates/base/base.html:206 -#: rhodecode/templates/base/base.html:225 +#: rhodecode/templates/base/base.html:227 msgid "settings" msgstr "設定" @@ -2689,40 +2910,40 @@ msgstr "設定" msgid "fork" msgstr "" -#: rhodecode/templates/base/base.html:210 -#: rhodecode/templates/changelog/changelog.html:39 +#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/changelog/changelog.html:40 msgid "Open new pull request" msgstr "" -#: rhodecode/templates/base/base.html:211 +#: rhodecode/templates/base/base.html:213 msgid "search" msgstr "搜尋" -#: rhodecode/templates/base/base.html:220 +#: rhodecode/templates/base/base.html:222 msgid "repositories groups" msgstr "版本庫群組" -#: rhodecode/templates/base/base.html:222 +#: rhodecode/templates/base/base.html:224 msgid "users groups" msgstr "使用者群組" -#: rhodecode/templates/base/base.html:223 +#: rhodecode/templates/base/base.html:225 msgid "permissions" msgstr "權限" -#: rhodecode/templates/base/base.html:236 #: rhodecode/templates/base/base.html:238 +#: rhodecode/templates/base/base.html:240 msgid "Followers" msgstr "追蹤者" -#: rhodecode/templates/base/base.html:244 #: rhodecode/templates/base/base.html:246 +#: rhodecode/templates/base/base.html:248 msgid "Forks" msgstr "" -#: rhodecode/templates/base/base.html:325 #: rhodecode/templates/base/base.html:327 #: rhodecode/templates/base/base.html:329 +#: rhodecode/templates/base/base.html:331 #: rhodecode/templates/search/search.html:52 msgid "Search" msgstr "搜尋" @@ -2831,20 +3052,20 @@ msgstr "" msgid "Compare fork" msgstr "" -#: rhodecode/templates/changelog/changelog.html:44 +#: rhodecode/templates/changelog/changelog.html:46 msgid "Show" msgstr "顯示" -#: rhodecode/templates/changelog/changelog.html:70 -#: rhodecode/templates/summary/summary.html:360 +#: rhodecode/templates/changelog/changelog.html:72 +#: rhodecode/templates/summary/summary.html:364 msgid "show more" msgstr "顯示更多" -#: rhodecode/templates/changelog/changelog.html:74 +#: rhodecode/templates/changelog/changelog.html:76 msgid "Affected number of files, click to show more details" msgstr "" -#: rhodecode/templates/changelog/changelog.html:87 +#: rhodecode/templates/changelog/changelog.html:89 #: rhodecode/templates/changeset/changeset.html:38 #: rhodecode/templates/changeset/changeset_file_comment.html:20 #: rhodecode/templates/changeset/changeset_range.html:46 @@ -2852,26 +3073,26 @@ msgstr "" msgid "Changeset status" msgstr "變更" -#: rhodecode/templates/changelog/changelog.html:90 +#: rhodecode/templates/changelog/changelog.html:92 msgid "Click to open associated pull request" msgstr "" -#: rhodecode/templates/changelog/changelog.html:100 +#: rhodecode/templates/changelog/changelog.html:102 #: rhodecode/templates/changeset/changeset.html:78 msgid "Parent" msgstr "" -#: rhodecode/templates/changelog/changelog.html:106 +#: rhodecode/templates/changelog/changelog.html:108 #: rhodecode/templates/changeset/changeset.html:84 msgid "No parents" msgstr "" -#: rhodecode/templates/changelog/changelog.html:111 +#: rhodecode/templates/changelog/changelog.html:113 #: rhodecode/templates/changeset/changeset.html:88 msgid "merge" msgstr "合併" -#: rhodecode/templates/changelog/changelog.html:114 +#: rhodecode/templates/changelog/changelog.html:116 #: rhodecode/templates/changeset/changeset.html:91 #: rhodecode/templates/files/files.html:29 #: rhodecode/templates/files/files_add.html:33 @@ -2880,20 +3101,20 @@ msgstr "合併" msgid "branch" msgstr "分支" -#: rhodecode/templates/changelog/changelog.html:120 +#: rhodecode/templates/changelog/changelog.html:122 msgid "bookmark" msgstr "" -#: rhodecode/templates/changelog/changelog.html:126 +#: rhodecode/templates/changelog/changelog.html:128 #: rhodecode/templates/changeset/changeset.html:96 msgid "tag" msgstr "標籤" -#: rhodecode/templates/changelog/changelog.html:162 +#: rhodecode/templates/changelog/changelog.html:164 msgid "Show selected changes __S -> __E" msgstr "" -#: rhodecode/templates/changelog/changelog.html:253 +#: rhodecode/templates/changelog/changelog.html:255 msgid "There are no changes yet" msgstr "尚未有任何變更" @@ -3032,7 +3253,7 @@ msgstr "比較顯示" #: rhodecode/templates/changeset/changeset_range.html:54 #: rhodecode/templates/compare/compare_diff.html:41 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 +#: rhodecode/templates/pullrequests/pullrequest_show.html:69 msgid "Files affected" msgstr "" @@ -3113,12 +3334,13 @@ msgid "File diff" msgstr "檔案差異" #: rhodecode/templates/files/files.html:4 +#: rhodecode/templates/files/files.html:72 #, fuzzy, python-format -msgid "%s Files" +msgid "%s files" msgstr "檔案" #: rhodecode/templates/files/files.html:12 -#: rhodecode/templates/summary/summary.html:336 +#: rhodecode/templates/summary/summary.html:340 msgid "files" msgstr "檔案" @@ -3457,18 +3679,18 @@ msgid "Detailed compare view" msgstr "比較顯示" #: rhodecode/templates/pullrequests/pullrequest.html:70 -#: rhodecode/templates/pullrequests/pullrequest_show.html:63 +#: rhodecode/templates/pullrequests/pullrequest_show.html:82 msgid "Pull request reviewers" msgstr "" #: rhodecode/templates/pullrequests/pullrequest.html:79 -#: rhodecode/templates/pullrequests/pullrequest_show.html:75 +#: rhodecode/templates/pullrequests/pullrequest_show.html:94 #, fuzzy msgid "owner" msgstr "擁有者" #: rhodecode/templates/pullrequests/pullrequest.html:91 -#: rhodecode/templates/pullrequests/pullrequest_show.html:89 +#: rhodecode/templates/pullrequests/pullrequest_show.html:109 msgid "Add reviewer to this pull request." msgstr "" @@ -3498,21 +3720,36 @@ msgstr "" msgid "Closed %s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:28 +#: rhodecode/templates/pullrequests/pullrequest_show.html:31 +#, fuzzy +msgid "Status" +msgstr "變更" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:36 msgid "Pull request status" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.html:35 +#: rhodecode/templates/pullrequests/pullrequest_show.html:44 +msgid "Still not reviewed by" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:47 +#, python-format +msgid "%d reviewer" +msgid_plural "%d reviewers" +msgstr[0] "" + +#: rhodecode/templates/pullrequests/pullrequest_show.html:54 #, fuzzy msgid "Created on" msgstr "建立使用者 %s" -#: rhodecode/templates/pullrequests/pullrequest_show.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:61 #, fuzzy msgid "Compare view" msgstr "比較顯示" -#: rhodecode/templates/pullrequests/pullrequest_show.html:46 +#: rhodecode/templates/pullrequests/pullrequest_show.html:65 #, fuzzy msgid "Incoming changesets" msgstr "尚未有任何變更" @@ -3573,7 +3810,7 @@ msgstr "遞交資訊" msgid "File names" msgstr "檔案名稱" -#: rhodecode/templates/search/search_commit.html:34 +#: rhodecode/templates/search/search_commit.html:35 #: rhodecode/templates/search/search_content.html:21 #: rhodecode/templates/search/search_path.html:15 msgid "Permission denied" @@ -3653,119 +3890,119 @@ msgstr "公開" msgid "remote clone" msgstr "遠端複製" -#: rhodecode/templates/summary/summary.html:112 +#: rhodecode/templates/summary/summary.html:116 msgid "Contact" msgstr "聯絡方式" -#: rhodecode/templates/summary/summary.html:126 +#: rhodecode/templates/summary/summary.html:130 msgid "Clone url" msgstr "複製連結" -#: rhodecode/templates/summary/summary.html:129 +#: rhodecode/templates/summary/summary.html:133 #, fuzzy msgid "Show by Name" msgstr "顯示更多" -#: rhodecode/templates/summary/summary.html:130 +#: rhodecode/templates/summary/summary.html:134 msgid "Show by ID" msgstr "" -#: rhodecode/templates/summary/summary.html:138 +#: rhodecode/templates/summary/summary.html:142 #, fuzzy msgid "Trending files" msgstr "編輯檔案" -#: rhodecode/templates/summary/summary.html:146 -#: rhodecode/templates/summary/summary.html:162 -#: rhodecode/templates/summary/summary.html:190 +#: rhodecode/templates/summary/summary.html:150 +#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:194 msgid "enable" msgstr "啟用" -#: rhodecode/templates/summary/summary.html:154 +#: rhodecode/templates/summary/summary.html:158 msgid "Download" msgstr "下載" -#: rhodecode/templates/summary/summary.html:158 +#: rhodecode/templates/summary/summary.html:162 msgid "There are no downloads yet" msgstr "沒有任何下載" -#: rhodecode/templates/summary/summary.html:160 +#: rhodecode/templates/summary/summary.html:164 msgid "Downloads are disabled for this repository" msgstr "這個版本庫的下載已停用" -#: rhodecode/templates/summary/summary.html:166 +#: rhodecode/templates/summary/summary.html:170 #, fuzzy msgid "Download as zip" msgstr "下載原始文件" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "Check this to download archive with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:169 +#: rhodecode/templates/summary/summary.html:173 msgid "with subrepos" msgstr "" -#: rhodecode/templates/summary/summary.html:182 +#: rhodecode/templates/summary/summary.html:186 msgid "Commit activity by day / author" msgstr "" -#: rhodecode/templates/summary/summary.html:193 +#: rhodecode/templates/summary/summary.html:197 msgid "Stats gathered: " msgstr "" -#: rhodecode/templates/summary/summary.html:214 +#: rhodecode/templates/summary/summary.html:218 msgid "Shortlog" msgstr "簡短紀錄" -#: rhodecode/templates/summary/summary.html:216 +#: rhodecode/templates/summary/summary.html:220 #, fuzzy msgid "Quick start" msgstr "快速過濾..." -#: rhodecode/templates/summary/summary.html:229 +#: rhodecode/templates/summary/summary.html:233 #, python-format msgid "Readme file at revision '%s'" msgstr "" -#: rhodecode/templates/summary/summary.html:232 +#: rhodecode/templates/summary/summary.html:236 msgid "Permalink to this readme" msgstr "" -#: rhodecode/templates/summary/summary.html:289 +#: rhodecode/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "下載 %s 為 %s" -#: rhodecode/templates/summary/summary.html:646 +#: rhodecode/templates/summary/summary.html:650 msgid "commits" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:647 +#: rhodecode/templates/summary/summary.html:651 msgid "files added" msgstr "多個檔案新增" -#: rhodecode/templates/summary/summary.html:648 +#: rhodecode/templates/summary/summary.html:652 msgid "files changed" msgstr "多個檔案修改" -#: rhodecode/templates/summary/summary.html:649 +#: rhodecode/templates/summary/summary.html:653 msgid "files removed" msgstr "移除多個檔案" -#: rhodecode/templates/summary/summary.html:652 +#: rhodecode/templates/summary/summary.html:656 msgid "commit" msgstr "遞交" -#: rhodecode/templates/summary/summary.html:653 +#: rhodecode/templates/summary/summary.html:657 msgid "file added" msgstr "檔案新增" -#: rhodecode/templates/summary/summary.html:654 +#: rhodecode/templates/summary/summary.html:658 msgid "file changed" msgstr "檔案修改" -#: rhodecode/templates/summary/summary.html:655 +#: rhodecode/templates/summary/summary.html:659 msgid "file removed" msgstr "移除檔案"