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 ""