diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po --- a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po +++ b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: RhodeCode\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2016-09-15 14:11+0000\n" -"PO-Revision-Date: 2016-09-15 14:12+0000\n" +"POT-Creation-Date: 2016-12-01 09:53+0000\n" +"PO-Revision-Date: 2016-11-29 14:53+0000\n" "Last-Translator: Marcin Kuzminski \n" "Language-Team: Belarusian (http://www.transifex.com/rhodecode/RhodeCode/language/be/)\n" "MIME-Version: 1.0\n" @@ -43,12 +43,12 @@ msgid "Issue Tracker" msgstr "" #: rhodecode/admin/navigation.py:80 rhodecode/integrations/types/email.py:232 -#: rhodecode/templates/register.html:76 +#: rhodecode/templates/register.html:75 #: rhodecode/templates/admin/my_account/my_account_profile.html:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:94 #: rhodecode/templates/admin/users/user_add.html:86 #: rhodecode/templates/admin/users/user_edit_profile.html:65 -#: rhodecode/templates/admin/users/users.html:90 +#: rhodecode/templates/admin/users/users.html:92 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.html:51 msgid "Email" @@ -76,12 +76,12 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.html:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:51 #: rhodecode/templates/admin/repos/repo_edit.html:72 -#: rhodecode/templates/base/base.html:84 +#: rhodecode/templates/base/base.html:79 msgid "Integrations" msgstr "" #: rhodecode/admin/navigation.py:85 -#: rhodecode/templates/admin/settings/settings_system.html:47 +#: rhodecode/templates/admin/settings/settings_system.html:9 msgid "System Info" msgstr "" @@ -93,11 +93,22 @@ msgstr "" msgid "Labs" msgstr "" +#: rhodecode/admin/views.py:70 +msgid "Apache configuration for Subversion generated." +msgstr "" + +#: rhodecode/admin/views.py:77 +msgid "Failed to generate the Apache configuration for Subversion." +msgstr "" + #: rhodecode/authentication/schema.py:35 msgid "Enable or disable this authentication plugin." msgstr "" #: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 +#: rhodecode/model/permission.py:100 rhodecode/model/permission.py:104 +#: rhodecode/model/permission.py:108 rhodecode/model/permission.py:112 +#: rhodecode/model/permission.py:116 rhodecode/model/permission.py:120 #: rhodecode/model/validation_schema/schemas/integration_schema.py:197 #: rhodecode/templates/admin/integrations/list.html:101 msgid "Enabled" @@ -247,10 +258,10 @@ msgid "Password to connect to LDAP" msgstr "" #: rhodecode/authentication/plugins/auth_ldap.py:101 -#: rhodecode/templates/login.html:50 rhodecode/templates/register.html:48 +#: rhodecode/templates/login.html:49 rhodecode/templates/register.html:47 #: rhodecode/templates/admin/my_account/my_account.html:30 #: rhodecode/templates/admin/users/user_add.html:44 -#: rhodecode/templates/base/base.html:315 +#: rhodecode/templates/base/base.html:310 #: rhodecode/templates/debug_style/login.html:45 msgid "Password" msgstr "" @@ -364,8 +375,8 @@ msgstr "" msgid "Rhodecode Token Auth" msgstr "" -#: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:63 -#: rhodecode/controllers/pullrequests.py:280 +#: rhodecode/controllers/changelog.py:90 rhodecode/controllers/compare.py:64 +#: rhodecode/controllers/pullrequests.py:306 msgid "There are no commits yet" msgstr "" @@ -395,47 +406,47 @@ msgstr "" msgid "Increase context for all diffs" msgstr "" -#: rhodecode/controllers/changeset.py:181 rhodecode/controllers/files.py:104 -#: rhodecode/controllers/files.py:125 +#: rhodecode/controllers/changeset.py:190 rhodecode/controllers/files.py:106 +#: rhodecode/controllers/files.py:127 msgid "No such commit exists for this repository" msgstr "" -#: rhodecode/controllers/changeset.py:335 -#: rhodecode/controllers/pullrequests.py:750 -#: rhodecode/model/pull_request.py:842 +#: rhodecode/controllers/changeset.py:334 +#: rhodecode/controllers/pullrequests.py:806 +#: rhodecode/model/pull_request.py:997 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/controllers/changeset.py:373 +#: rhodecode/controllers/changeset.py:372 msgid "" "Changing the status of a commit associated with a closed pull request is not" " allowed" msgstr "" -#: rhodecode/controllers/compare.py:87 +#: rhodecode/controllers/compare.py:88 msgid "Select commit" msgstr "" -#: rhodecode/controllers/compare.py:139 +#: rhodecode/controllers/compare.py:140 #, python-format msgid "Could not find the original repo: %(repo)s" msgstr "" -#: rhodecode/controllers/compare.py:147 +#: rhodecode/controllers/compare.py:148 #, python-format msgid "Could not find the other repo: %(repo)s" msgstr "" -#: rhodecode/controllers/compare.py:156 +#: rhodecode/controllers/compare.py:157 msgid "The comparison of two different kinds of remote repos is not available" msgstr "" -#: rhodecode/controllers/compare.py:190 +#: rhodecode/controllers/compare.py:191 msgid "Could not compare repos with different large file settings" msgstr "" -#: rhodecode/controllers/compare.py:226 +#: rhodecode/controllers/compare.py:227 #, python-format msgid "" "Repositories unrelated. Cannot compare commit %(commit1)s from repository " @@ -452,116 +463,116 @@ msgstr "" msgid "%s %s feed" msgstr "" -#: rhodecode/controllers/files.py:96 +#: rhodecode/controllers/files.py:98 msgid "Click here to add a new file." msgstr "" -#: rhodecode/controllers/files.py:101 +#: rhodecode/controllers/files.py:103 #, python-format msgid "There are no files yet. %s" msgstr "" -#: rhodecode/controllers/files.py:381 rhodecode/controllers/files.py:434 -#: rhodecode/controllers/files.py:465 rhodecode/controllers/files.py:540 -#: rhodecode/controllers/files.py:585 rhodecode/controllers/files.py:676 +#: rhodecode/controllers/files.py:394 rhodecode/controllers/files.py:447 +#: rhodecode/controllers/files.py:478 rhodecode/controllers/files.py:553 +#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:689 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/controllers/files.py:389 rhodecode/controllers/files.py:442 +#: rhodecode/controllers/files.py:402 rhodecode/controllers/files.py:455 msgid "You can only delete files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:398 rhodecode/controllers/files.py:451 +#: rhodecode/controllers/files.py:411 rhodecode/controllers/files.py:464 #, python-format msgid "Deleted file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:418 +#: rhodecode/controllers/files.py:431 #, python-format msgid "Successfully deleted file %s" msgstr "" -#: rhodecode/controllers/files.py:421 rhodecode/controllers/files.py:527 -#: rhodecode/controllers/files.py:664 +#: rhodecode/controllers/files.py:434 rhodecode/controllers/files.py:540 +#: rhodecode/controllers/files.py:677 msgid "Error occurred during commit" msgstr "" -#: rhodecode/controllers/files.py:473 rhodecode/controllers/files.py:548 +#: rhodecode/controllers/files.py:486 rhodecode/controllers/files.py:561 msgid "You can only edit files with revision being a valid branch " msgstr "" -#: rhodecode/controllers/files.py:485 rhodecode/controllers/files.py:560 +#: rhodecode/controllers/files.py:498 rhodecode/controllers/files.py:573 #, python-format msgid "Edited file %s via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:502 +#: rhodecode/controllers/files.py:515 msgid "No changes" msgstr "" -#: rhodecode/controllers/files.py:524 rhodecode/controllers/files.py:653 +#: rhodecode/controllers/files.py:537 rhodecode/controllers/files.py:666 #, python-format msgid "Successfully committed to %s" msgstr "" -#: rhodecode/controllers/files.py:598 rhodecode/controllers/files.py:687 +#: rhodecode/controllers/files.py:611 rhodecode/controllers/files.py:700 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/controllers/files.py:623 +#: rhodecode/controllers/files.py:636 msgid "No filename" msgstr "" -#: rhodecode/controllers/files.py:656 +#: rhodecode/controllers/files.py:669 msgid "" "The location specified must be a relative path and must not contain .. in " "the path" msgstr "" -#: rhodecode/controllers/files.py:710 +#: rhodecode/controllers/files.py:723 msgid "Downloads disabled" msgstr "" -#: rhodecode/controllers/files.py:716 +#: rhodecode/controllers/files.py:729 #, python-format msgid "Unknown revision %s" msgstr "" -#: rhodecode/controllers/files.py:718 +#: rhodecode/controllers/files.py:731 msgid "Empty repository" msgstr "" -#: rhodecode/controllers/files.py:720 rhodecode/controllers/files.py:754 +#: rhodecode/controllers/files.py:733 rhodecode/controllers/files.py:767 msgid "Unknown archive type" msgstr "" -#: rhodecode/controllers/files.py:921 +#: rhodecode/controllers/files.py:934 #, python-format msgid "Commit %(commit)s does not exist." msgstr "" -#: rhodecode/controllers/files.py:938 +#: rhodecode/controllers/files.py:951 #, python-format msgid "%(file_path)s has not changed between %(commit_1)s and %(commit_2)s." msgstr "" -#: rhodecode/controllers/files.py:1005 +#: rhodecode/controllers/files.py:1018 msgid "Changesets" msgstr "" -#: rhodecode/controllers/files.py:1026 rhodecode/controllers/summary.py:259 -#: rhodecode/model/pull_request.py:1059 rhodecode/model/scm.py:780 -#: rhodecode/templates/base/vcs_settings.html:185 +#: rhodecode/controllers/files.py:1039 rhodecode/controllers/summary.py:269 +#: rhodecode/model/pull_request.py:1222 rhodecode/model/scm.py:782 +#: rhodecode/templates/base/vcs_settings.html:193 msgid "Branches" msgstr "" -#: rhodecode/controllers/files.py:1030 rhodecode/model/scm.py:795 -#: rhodecode/templates/base/vcs_settings.html:210 +#: rhodecode/controllers/files.py:1043 rhodecode/model/scm.py:797 +#: rhodecode/templates/base/vcs_settings.html:218 msgid "Tags" msgstr "" -#: rhodecode/controllers/forks.py:191 +#: rhodecode/controllers/forks.py:190 #, python-format msgid "An error occurred during repository forking %s" msgstr "" @@ -571,13 +582,13 @@ msgid "Groups" msgstr "" #: rhodecode/controllers/home.py:212 rhodecode/controllers/home.py:247 -#: rhodecode/controllers/pullrequests.py:383 +#: rhodecode/controllers/pullrequests.py:412 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:128 #: rhodecode/templates/admin/repos/repo_add.html:15 #: rhodecode/templates/admin/repos/repo_add.html:19 #: rhodecode/templates/admin/users/user_edit_advanced.html:11 -#: rhodecode/templates/base/base.html:78 -#: rhodecode/templates/base/base.html:150 +#: rhodecode/templates/base/base.html:73 +#: rhodecode/templates/base/base.html:145 #: rhodecode/templates/base/base.html:627 msgid "Repositories" msgstr "" @@ -595,79 +606,70 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/controllers/pullrequests.py:294 +#: rhodecode/controllers/pullrequests.py:320 msgid "Commit does not exist" msgstr "" -#: rhodecode/controllers/pullrequests.py:406 +#: rhodecode/controllers/pullrequests.py:437 msgid "Pull request requires a title with min. 3 chars" msgstr "" -#: rhodecode/controllers/pullrequests.py:408 +#: rhodecode/controllers/pullrequests.py:439 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/controllers/pullrequests.py:455 +#: rhodecode/controllers/pullrequests.py:487 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:458 +#: rhodecode/controllers/pullrequests.py:490 msgid "Error occurred during sending pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:498 +#: rhodecode/controllers/pullrequests.py:533 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/controllers/pullrequests.py:504 +#: rhodecode/controllers/pullrequests.py:539 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/controllers/pullrequests.py:514 +#: rhodecode/controllers/pullrequests.py:547 msgid "" "Pull request updated to \"{source_commit_id}\" with {count_added} added, " "{count_removed} removed commits." msgstr "" -#: rhodecode/controllers/pullrequests.py:524 -msgid "Nothing changed in pull request." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:527 -msgid "" -"Skipping update of pull request due to reference type: {reference_type}" -msgstr "" - -#: rhodecode/controllers/pullrequests.py:534 -msgid "Update failed due to missing commits." -msgstr "" - -#: rhodecode/controllers/pullrequests.py:580 +#: rhodecode/controllers/pullrequests.py:562 +msgid "Reload page" +msgstr "" + +#: rhodecode/controllers/pullrequests.py:634 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/controllers/pullrequests.py:594 +#: rhodecode/controllers/pullrequests.py:648 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/controllers/pullrequests.py:632 +#: rhodecode/controllers/pullrequests.py:685 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/controllers/pullrequests.py:668 +#: rhodecode/controllers/pullrequests.py:725 msgid "Reviewer approval is pending." msgstr "" -#: rhodecode/controllers/pullrequests.py:710 +#: rhodecode/controllers/pullrequests.py:766 msgid "Close Pull Request" msgstr "" -#: rhodecode/controllers/pullrequests.py:754 -#: rhodecode/model/pull_request.py:846 +#: rhodecode/controllers/pullrequests.py:810 +#: rhodecode/model/pull_request.py:1001 msgid "Closing with" msgstr "" -#: rhodecode/controllers/pullrequests.py:804 +#: rhodecode/controllers/pullrequests.py:860 #, python-format msgid "" "Closing pull request on other statuses than rejected or approved is " @@ -686,7 +688,7 @@ msgstr "" msgid "Bookmark" msgstr "" -#: rhodecode/controllers/summary.py:260 +#: rhodecode/controllers/summary.py:270 msgid "Closed branches" msgstr "" @@ -698,165 +700,165 @@ msgstr "" msgid "Error occurred during update of default values" msgstr "" +#: rhodecode/controllers/admin/gists.py:62 +#: rhodecode/controllers/admin/my_account.py:378 +#: rhodecode/controllers/admin/users.py:465 +msgid "forever" +msgstr "" + #: rhodecode/controllers/admin/gists.py:63 -#: rhodecode/controllers/admin/my_account.py:317 -#: rhodecode/controllers/admin/users.py:431 -msgid "forever" +#: rhodecode/controllers/admin/my_account.py:379 +#: rhodecode/controllers/admin/users.py:466 +msgid "5 minutes" msgstr "" #: rhodecode/controllers/admin/gists.py:64 -#: rhodecode/controllers/admin/my_account.py:318 -#: rhodecode/controllers/admin/users.py:432 -msgid "5 minutes" +#: rhodecode/controllers/admin/my_account.py:380 +#: rhodecode/controllers/admin/users.py:467 +msgid "1 hour" msgstr "" #: rhodecode/controllers/admin/gists.py:65 -#: rhodecode/controllers/admin/my_account.py:319 -#: rhodecode/controllers/admin/users.py:433 -msgid "1 hour" +#: rhodecode/controllers/admin/my_account.py:381 +#: rhodecode/controllers/admin/users.py:468 +msgid "1 day" msgstr "" #: rhodecode/controllers/admin/gists.py:66 -#: rhodecode/controllers/admin/my_account.py:320 -#: rhodecode/controllers/admin/users.py:434 -msgid "1 day" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:67 -#: rhodecode/controllers/admin/my_account.py:321 -#: rhodecode/controllers/admin/users.py:435 +#: rhodecode/controllers/admin/my_account.py:382 +#: rhodecode/controllers/admin/users.py:469 msgid "1 month" msgstr "" -#: rhodecode/controllers/admin/gists.py:71 -#: rhodecode/controllers/admin/my_account.py:323 -#: rhodecode/controllers/admin/users.py:437 +#: rhodecode/controllers/admin/gists.py:70 +#: rhodecode/controllers/admin/my_account.py:384 +#: rhodecode/controllers/admin/users.py:471 msgid "Lifetime" msgstr "" +#: rhodecode/controllers/admin/gists.py:72 +msgid "Requires registered account" +msgstr "" + #: rhodecode/controllers/admin/gists.py:73 -msgid "Requires registered account" -msgstr "" - -#: rhodecode/controllers/admin/gists.py:74 msgid "Can be accessed by anonymous users" msgstr "" -#: rhodecode/controllers/admin/gists.py:200 +#: rhodecode/controllers/admin/gists.py:199 msgid "Error occurred during gist creation" msgstr "" -#: rhodecode/controllers/admin/gists.py:231 +#: rhodecode/controllers/admin/gists.py:230 #, python-format msgid "Deleted gist %s" msgstr "" -#: rhodecode/controllers/admin/gists.py:308 +#: rhodecode/controllers/admin/gists.py:306 msgid "Successfully updated gist content" msgstr "" -#: rhodecode/controllers/admin/gists.py:313 +#: rhodecode/controllers/admin/gists.py:311 msgid "Successfully updated gist data" msgstr "" -#: rhodecode/controllers/admin/gists.py:316 +#: rhodecode/controllers/admin/gists.py:314 msgid "Error occurred during update of gist {}: {}" msgstr "" -#: rhodecode/controllers/admin/gists.py:320 +#: rhodecode/controllers/admin/gists.py:318 #, python-format msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/controllers/admin/gists.py:343 +#: rhodecode/controllers/admin/gists.py:341 #: rhodecode/templates/admin/gists/show.html:67 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:19 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:42 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:38 -#: rhodecode/templates/data_table/_dt_elements.html:255 +#: rhodecode/templates/data_table/_dt_elements.html:263 msgid "never" msgstr "" -#: rhodecode/controllers/admin/gists.py:348 +#: rhodecode/controllers/admin/gists.py:346 #, python-format msgid "%(expiry)s - current value" msgstr "" -#: rhodecode/controllers/admin/my_account.py:74 +#: rhodecode/controllers/admin/my_account.py:75 msgid "You can't edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/controllers/admin/my_account.py:132 +#: rhodecode/controllers/admin/my_account.py:133 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/controllers/admin/my_account.py:147 -#: rhodecode/controllers/admin/users.py:218 +#: rhodecode/controllers/admin/my_account.py:148 +#: rhodecode/controllers/admin/users.py:231 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/controllers/admin/my_account.py:213 -#: rhodecode/controllers/admin/my_account.py:219 +#: rhodecode/controllers/admin/my_account.py:214 +#: rhodecode/controllers/admin/my_account.py:220 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/controllers/admin/my_account.py:226 +#: rhodecode/controllers/admin/my_account.py:227 msgid "Successfully updated password" msgstr "" -#: rhodecode/controllers/admin/my_account.py:271 -#: rhodecode/controllers/admin/users.py:611 +#: rhodecode/controllers/admin/my_account.py:272 +#: rhodecode/controllers/admin/users.py:645 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:278 -#: rhodecode/controllers/admin/users.py:618 +#: rhodecode/controllers/admin/my_account.py:279 +#: rhodecode/controllers/admin/users.py:652 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/controllers/admin/my_account.py:288 -#: rhodecode/controllers/admin/users.py:633 +#: rhodecode/controllers/admin/my_account.py:289 +#: rhodecode/controllers/admin/users.py:667 msgid "Removed email address from user account" msgstr "" -#: rhodecode/controllers/admin/my_account.py:326 -#: rhodecode/controllers/admin/users.py:440 +#: rhodecode/controllers/admin/my_account.py:387 +#: rhodecode/controllers/admin/users.py:474 msgid "Role" msgstr "" -#: rhodecode/controllers/admin/my_account.py:339 -#: rhodecode/controllers/admin/users.py:464 +#: rhodecode/controllers/admin/my_account.py:400 +#: rhodecode/controllers/admin/users.py:498 msgid "Auth token successfully created" msgstr "" -#: rhodecode/controllers/admin/my_account.py:352 -#: rhodecode/controllers/admin/users.py:483 +#: rhodecode/controllers/admin/my_account.py:413 +#: rhodecode/controllers/admin/users.py:517 msgid "Auth token successfully reset" msgstr "" -#: rhodecode/controllers/admin/my_account.py:356 -#: rhodecode/controllers/admin/users.py:487 +#: rhodecode/controllers/admin/my_account.py:417 +#: rhodecode/controllers/admin/users.py:521 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/controllers/admin/permissions.py:111 +#: rhodecode/controllers/admin/permissions.py:112 msgid "Application permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:126 -#: rhodecode/controllers/admin/permissions.py:175 -#: rhodecode/controllers/admin/permissions.py:229 +#: rhodecode/controllers/admin/permissions.py:127 +#: rhodecode/controllers/admin/permissions.py:176 +#: rhodecode/controllers/admin/permissions.py:230 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/controllers/admin/permissions.py:160 +#: rhodecode/controllers/admin/permissions.py:161 msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/permissions.py:214 +#: rhodecode/controllers/admin/permissions.py:215 msgid "Global permissions updated successfully" msgstr "" @@ -909,7 +911,7 @@ msgid "Error occurred during deletion of msgstr "" #: rhodecode/controllers/admin/repo_groups.py:388 -#: rhodecode/controllers/admin/user_groups.py:325 +#: rhodecode/controllers/admin/user_groups.py:322 msgid "Cannot change permission for yourself as admin" msgstr "" @@ -927,379 +929,514 @@ msgstr "" msgid "Error creating repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:265 +#: rhodecode/controllers/admin/repos.py:264 #, python-format msgid "Created repository %s from %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:274 +#: rhodecode/controllers/admin/repos.py:273 #, python-format msgid "Forked repository %s as %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:277 +#: rhodecode/controllers/admin/repos.py:276 #, python-format msgid "Created repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:319 +#: rhodecode/controllers/admin/repos.py:317 #, python-format msgid "Repository %s updated successfully" msgstr "" -#: rhodecode/controllers/admin/repos.py:338 +#: rhodecode/controllers/admin/repos.py:336 #, python-format msgid "Error occurred during update of repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:366 +#: rhodecode/controllers/admin/repos.py:364 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:369 +#: rhodecode/controllers/admin/repos.py:367 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:374 +#: rhodecode/controllers/admin/repos.py:372 #, python-format msgid "Deleted repository %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:377 +#: rhodecode/controllers/admin/repos.py:375 #, python-format msgid "Cannot delete %s it still contains attached forks" msgstr "" -#: rhodecode/controllers/admin/repos.py:382 +#: rhodecode/controllers/admin/repos.py:380 #, python-format msgid "An error occurred during deletion of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:436 +#: rhodecode/controllers/admin/repos.py:433 msgid "Repository permissions updated" msgstr "" -#: rhodecode/controllers/admin/repos.py:467 +#: rhodecode/controllers/admin/repos.py:464 msgid "An error occurred during creation of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:482 +#: rhodecode/controllers/admin/repos.py:479 msgid "An error occurred during removal of field" msgstr "" -#: rhodecode/controllers/admin/repos.py:521 +#: rhodecode/controllers/admin/repos.py:518 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:525 +#: rhodecode/controllers/admin/repos.py:522 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/controllers/admin/repos.py:549 +#: rhodecode/controllers/admin/repos.py:546 msgid "Nothing" msgstr "" -#: rhodecode/controllers/admin/repos.py:551 +#: rhodecode/controllers/admin/repos.py:548 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:558 +#: rhodecode/controllers/admin/repos.py:555 msgid "An error occurred during this operation" msgstr "" +#: rhodecode/controllers/admin/repos.py:573 +msgid "Locked repository" +msgstr "" + #: rhodecode/controllers/admin/repos.py:576 -msgid "Locked repository" +msgid "Unlocked repository" msgstr "" #: rhodecode/controllers/admin/repos.py:579 -msgid "Unlocked repository" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:582 -#: rhodecode/controllers/admin/repos.py:611 +#: rhodecode/controllers/admin/repos.py:608 msgid "An error occurred during unlocking" msgstr "" -#: rhodecode/controllers/admin/repos.py:601 +#: rhodecode/controllers/admin/repos.py:598 msgid "Unlocked" msgstr "" -#: rhodecode/controllers/admin/repos.py:605 +#: rhodecode/controllers/admin/repos.py:602 msgid "Locked" msgstr "" -#: rhodecode/controllers/admin/repos.py:607 +#: rhodecode/controllers/admin/repos.py:604 #, python-format msgid "Repository has been %s" msgstr "" -#: rhodecode/controllers/admin/repos.py:622 +#: rhodecode/controllers/admin/repos.py:619 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/controllers/admin/repos.py:626 +#: rhodecode/controllers/admin/repos.py:623 msgid "An error occurred during cache invalidation" msgstr "" +#: rhodecode/controllers/admin/repos.py:643 +msgid "Pulled from remote location" +msgstr "" + #: rhodecode/controllers/admin/repos.py:646 -msgid "Pulled from remote location" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:649 msgid "An error occurred during pull from remote location" msgstr "" -#: rhodecode/controllers/admin/repos.py:671 +#: rhodecode/controllers/admin/repos.py:668 msgid "An error occurred during deletion of repository stats" msgstr "" +#: rhodecode/controllers/admin/repos.py:715 +msgid "Error occurred during deleting issue tracker entry" +msgstr "" + #: rhodecode/controllers/admin/repos.py:718 -msgid "Error occurred during deleting issue tracker entry" -msgstr "" - -#: rhodecode/controllers/admin/repos.py:721 -#: rhodecode/controllers/admin/settings.py:366 +#: rhodecode/controllers/admin/settings.py:383 msgid "Removed issue tracker entry" msgstr "" -#: rhodecode/controllers/admin/repos.py:751 -#: rhodecode/controllers/admin/settings.py:412 +#: rhodecode/controllers/admin/repos.py:748 +#: rhodecode/controllers/admin/settings.py:430 msgid "Updated issue tracker entries" msgstr "" -#: rhodecode/controllers/admin/repos.py:812 -#: rhodecode/controllers/admin/settings.py:143 -#: rhodecode/controllers/admin/settings.py:722 +#: rhodecode/controllers/admin/repos.py:809 +#: rhodecode/controllers/admin/settings.py:150 +#: rhodecode/controllers/admin/settings.py:768 msgid "Some form inputs contain invalid data." msgstr "" -#: rhodecode/controllers/admin/repos.py:830 +#: rhodecode/controllers/admin/repos.py:827 msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/controllers/admin/repos.py:834 -#: rhodecode/controllers/admin/settings.py:171 +#: rhodecode/controllers/admin/repos.py:831 +#: rhodecode/controllers/admin/settings.py:178 msgid "Updated VCS settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:167 -#: rhodecode/controllers/admin/settings.py:270 +#: rhodecode/controllers/admin/settings.py:174 +#: rhodecode/controllers/admin/settings.py:285 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:214 +#: rhodecode/controllers/admin/settings.py:225 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/controllers/admin/settings.py:266 +#: rhodecode/controllers/admin/settings.py:281 msgid "Updated application settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:330 +#: rhodecode/controllers/admin/settings.py:347 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:333 +#: rhodecode/controllers/admin/settings.py:350 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:425 -msgid "Please enter email address" -msgstr "" - #: rhodecode/controllers/admin/settings.py:443 +msgid "Please enter email address" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:461 msgid "Send email task created" msgstr "" -#: rhodecode/controllers/admin/settings.py:476 +#: rhodecode/controllers/admin/settings.py:494 msgid "Added new hook" msgstr "" -#: rhodecode/controllers/admin/settings.py:491 +#: rhodecode/controllers/admin/settings.py:509 msgid "Updated hooks" msgstr "" -#: rhodecode/controllers/admin/settings.py:495 +#: rhodecode/controllers/admin/settings.py:513 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/controllers/admin/settings.py:543 -#, python-format -msgid "Critical: your disk space is very low %s%% usedpercent" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:547 -#, python-format -msgid "Warning: your disk space is running low %s%% usedpercent" -msgstr "" - -#: rhodecode/controllers/admin/settings.py:743 +#: rhodecode/controllers/admin/settings.py:573 +msgid "Update info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:575 +msgid "Check for updates" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:576 +#, python-format +msgid "" +"Note: please make sure this server can access `%s` for the update link to " +"work" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:580 +msgid "RhodeCode Version" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:581 +msgid "RhodeCode Server IP" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:582 +msgid "RhodeCode Server ID" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:583 +msgid "RhodeCode Configuration" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:587 +msgid "Database" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:588 +msgid "Database version" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:592 +msgid "Platform" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:593 +msgid "Platform UUID" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:594 +msgid "Python version" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:595 +msgid "Python path" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:599 +msgid "CPU" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:600 +msgid "Load" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:601 +msgid "Memory" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:602 +msgid "Uptime" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:606 +msgid "Storage location" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:607 +msgid "Storage info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:608 +msgid "Storage inodes" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:610 +msgid "Gist storage location" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:611 +msgid "Gist storage info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:613 +msgid "Archive cache storage location" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:614 +msgid "Archive cache info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:616 +msgid "Temp storage location" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:617 +msgid "Temp storage info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:619 +msgid "Search info" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:620 +msgid "Search location" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:624 +msgid "VCS Backends" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:625 +msgid "VCS Server" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:626 +msgid "GIT" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:627 +msgid "HG" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:628 +msgid "SVN" +msgstr "" + +#: rhodecode/controllers/admin/settings.py:789 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/controllers/admin/settings.py:748 +#: rhodecode/controllers/admin/settings.py:794 msgid "Updated Labs settings" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:168 +#: rhodecode/controllers/admin/user_groups.py:164 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:182 +#: rhodecode/controllers/admin/user_groups.py:178 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:223 +#: rhodecode/controllers/admin/user_groups.py:219 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:238 +#: rhodecode/controllers/admin/user_groups.py:235 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:260 +#: rhodecode/controllers/admin/user_groups.py:257 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:265 +#: rhodecode/controllers/admin/user_groups.py:262 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:333 +#: rhodecode/controllers/admin/user_groups.py:330 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:339 +#: rhodecode/controllers/admin/user_groups.py:336 msgid "User Group permissions updated" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:424 +#: rhodecode/controllers/admin/user_groups.py:421 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/user_groups.py:440 -#: rhodecode/controllers/admin/users.py:561 +#: rhodecode/controllers/admin/user_groups.py:437 +#: rhodecode/controllers/admin/users.py:595 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/controllers/admin/users.py:142 +#: rhodecode/controllers/admin/users.py:153 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/controllers/admin/users.py:157 +#: rhodecode/controllers/admin/users.py:169 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/controllers/admin/users.py:201 +#: rhodecode/controllers/admin/users.py:214 msgid "User updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:252 -#, python-format -msgid "Detached %s repositories" -msgstr "" - -#: rhodecode/controllers/admin/users.py:257 -#, python-format -msgid "Deleted %s repositories" -msgstr "" - #: rhodecode/controllers/admin/users.py:265 #, python-format -msgid "Detached %s repository groups" +msgid "Detached %s repositories" msgstr "" #: rhodecode/controllers/admin/users.py:270 #, python-format -msgid "Deleted %s repository groups" +msgid "Deleted %s repositories" msgstr "" #: rhodecode/controllers/admin/users.py:278 #, python-format -msgid "Detached %s user groups" +msgid "Detached %s repository groups" msgstr "" #: rhodecode/controllers/admin/users.py:283 #, python-format +msgid "Deleted %s repository groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:291 +#, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/controllers/admin/users.py:296 +#, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/controllers/admin/users.py:294 +#: rhodecode/controllers/admin/users.py:307 msgid "Successfully deleted user" msgstr "" -#: rhodecode/controllers/admin/users.py:300 +#: rhodecode/controllers/admin/users.py:313 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/controllers/admin/users.py:319 +#: rhodecode/controllers/admin/users.py:332 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/controllers/admin/users.py:321 +#: rhodecode/controllers/admin/users.py:334 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/controllers/admin/users.py:325 +#: rhodecode/controllers/admin/users.py:338 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/controllers/admin/users.py:351 +#: rhodecode/controllers/admin/users.py:371 +#, python-format +msgid "Linked repository group `%s` as personal" +msgstr "" + +#: rhodecode/controllers/admin/users.py:377 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/controllers/admin/users.py:355 +#: rhodecode/controllers/admin/users.py:381 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/controllers/admin/users.py:386 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/controllers/admin/users.py:374 -#: rhodecode/controllers/admin/users.py:395 -#: rhodecode/controllers/admin/users.py:425 -#: rhodecode/controllers/admin/users.py:456 -#: rhodecode/controllers/admin/users.py:473 -#: rhodecode/controllers/admin/users.py:496 -#: rhodecode/controllers/admin/users.py:570 -#: rhodecode/controllers/admin/users.py:583 -#: rhodecode/controllers/admin/users.py:641 +#: rhodecode/controllers/admin/users.py:406 +#: rhodecode/controllers/admin/users.py:427 +#: rhodecode/controllers/admin/users.py:459 +#: rhodecode/controllers/admin/users.py:490 +#: rhodecode/controllers/admin/users.py:507 +#: rhodecode/controllers/admin/users.py:530 +#: rhodecode/controllers/admin/users.py:604 +#: rhodecode/controllers/admin/users.py:617 +#: rhodecode/controllers/admin/users.py:675 msgid "You can't edit this user" msgstr "" -#: rhodecode/controllers/admin/users.py:409 +#: rhodecode/controllers/admin/users.py:443 msgid "" "The user participates as reviewer in pull requests and cannot be deleted. " "You can set the user to \"inactive\" instead of deleting it." msgstr "" -#: rhodecode/controllers/admin/users.py:545 +#: rhodecode/controllers/admin/users.py:579 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/controllers/admin/users.py:673 +#: rhodecode/controllers/admin/users.py:707 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/controllers/admin/users.py:688 +#: rhodecode/controllers/admin/users.py:722 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/controllers/admin/users.py:692 +#: rhodecode/controllers/admin/users.py:726 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/controllers/admin/users.py:710 +#: rhodecode/controllers/admin/users.py:744 msgid "Removed ip address from user whitelist" msgstr "" @@ -1380,6 +1517,10 @@ msgid "user pre create" msgstr "" #: rhodecode/events/user.py:61 +msgid "user post create" +msgstr "" + +#: rhodecode/events/user.py:74 msgid "user pre update" msgstr "" @@ -1388,7 +1529,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:84 #: rhodecode/templates/admin/my_account/my_account_emails.html:65 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:104 -#: rhodecode/templates/admin/permissions/permissions_application.html:51 +#: rhodecode/templates/admin/permissions/permissions_application.html:60 #: rhodecode/templates/admin/permissions/permissions_ips.html:61 #: rhodecode/templates/admin/permissions/permissions_objects.html:57 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:136 @@ -1396,13 +1537,13 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_fields.html:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:80 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:111 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:159 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:161 #: rhodecode/templates/admin/repos/repo_edit_vcs.html:46 -#: rhodecode/templates/admin/settings/settings_global.html:110 +#: rhodecode/templates/admin/settings/settings_global.html:140 #: rhodecode/templates/admin/settings/settings_issuetracker.html:16 #: rhodecode/templates/admin/settings/settings_labs.html:49 #: rhodecode/templates/admin/settings/settings_vcs.html:14 -#: rhodecode/templates/admin/settings/settings_visual.html:220 +#: rhodecode/templates/admin/settings/settings_visual.html:222 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:121 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:23 #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:81 @@ -1417,7 +1558,6 @@ msgstr "" #: rhodecode/templates/admin/integrations/list.html:211 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.html:56 #: rhodecode/templates/admin/my_account/my_account_emails.html:32 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:62 #: rhodecode/templates/admin/permissions/permissions_ips.html:26 #: rhodecode/templates/admin/repos/repo_edit_fields.html:25 #: rhodecode/templates/admin/settings/settings_hooks.html:46 @@ -1425,18 +1565,20 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_emails.html:31 #: rhodecode/templates/admin/users/user_edit_ips.html:34 #: rhodecode/templates/base/issue_tracker_settings.html:70 -#: rhodecode/templates/base/vcs_settings.html:194 -#: rhodecode/templates/base/vcs_settings.html:219 -#: rhodecode/templates/changeset/changeset_file_comment.html:49 -#: rhodecode/templates/changeset/changeset_file_comment.html:99 -#: rhodecode/templates/data_table/_dt_elements.html:119 -#: rhodecode/templates/data_table/_dt_elements.html:176 -#: rhodecode/templates/data_table/_dt_elements.html:190 -#: rhodecode/templates/data_table/_dt_elements.html:202 +#: rhodecode/templates/base/vcs_settings.html:202 +#: rhodecode/templates/base/vcs_settings.html:227 +#: rhodecode/templates/changeset/changeset_file_comment.html:57 +#: rhodecode/templates/changeset/changeset_file_comment.html:97 +#: rhodecode/templates/data_table/_dt_elements.html:123 +#: rhodecode/templates/data_table/_dt_elements.html:184 +#: rhodecode/templates/data_table/_dt_elements.html:198 +#: rhodecode/templates/data_table/_dt_elements.html:210 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.html:34 -#: rhodecode/templates/files/files_source.html:38 -#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/files/files_source.html:35 +#: rhodecode/templates/files/files_source.html:39 +#: rhodecode/templates/files/files_source.html:42 +#: rhodecode/templates/pullrequests/pullrequest_show.html:53 +#: rhodecode/templates/pullrequests/pullrequest_show.html:57 msgid "Delete" msgstr "" @@ -1578,16 +1720,17 @@ msgid "" "/incoming-webhook/\">slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:43 -#: rhodecode/templates/register.html:41 +#: rhodecode/integrations/types/slack.py:58 rhodecode/templates/login.html:42 +#: rhodecode/templates/register.html:40 #: rhodecode/templates/admin/admin_log.html:7 #: rhodecode/templates/admin/my_account/my_account_profile.html:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:21 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:66 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:70 #: rhodecode/templates/admin/users/user_add.html:35 #: rhodecode/templates/admin/users/user_edit_profile.html:39 -#: rhodecode/templates/admin/users/users.html:88 -#: rhodecode/templates/base/base.html:306 +#: rhodecode/templates/admin/users/users.html:90 +#: rhodecode/templates/base/base.html:301 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 #: rhodecode/templates/users/user_profile.html:27 @@ -1623,27 +1766,31 @@ msgid "" "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:40 +#: rhodecode/integrations/types/webhook.py:152 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:41 -msgid "URL of the webhook to receive POST event." -msgstr "" - -#: rhodecode/integrations/types/webhook.py:51 +#: rhodecode/integrations/types/webhook.py:154 +msgid "" +"URL of the webhook to receive POST event. Following variables are allowed to" +" be used: {vars}. Some of the variables would trigger multiple calls, like " +"${{branch}} or ${{commit_id}}. Webhook will be called as many times as " +"unique objects in data in such cases." +msgstr "" + +#: rhodecode/integrations/types/webhook.py:168 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:52 +#: rhodecode/integrations/types/webhook.py:169 msgid "String used to validate received payloads." msgstr "" -#: rhodecode/integrations/types/webhook.py:65 +#: rhodecode/integrations/types/webhook.py:180 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:66 +#: rhodecode/integrations/types/webhook.py:181 msgid "Post json events to a webhook endpoint" msgstr "" @@ -1770,25 +1917,25 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1185 +#: rhodecode/lib/auth.py:1188 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1259 +#: rhodecode/lib/auth.py:1262 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1307 +#: rhodecode/lib/auth.py:1310 #, python-format msgid "Action not supported for %s." msgstr "" -#: rhodecode/lib/auth.py:1344 +#: rhodecode/lib/auth.py:1347 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/base.py:550 +#: rhodecode/lib/base.py:564 #, python-format msgid "The repository at %(repo_name)s cannot be located." msgstr "" @@ -1810,40 +1957,40 @@ msgstr "" msgid "No changes detected" msgstr "" -#: rhodecode/lib/diffs.py:643 +#: rhodecode/lib/diffs.py:918 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1489 +#: rhodecode/lib/helpers.py:1515 #, python-format msgid " and %s more" msgstr "" -#: rhodecode/lib/helpers.py:1493 +#: rhodecode/lib/helpers.py:1519 msgid "No Files" msgstr "" -#: rhodecode/lib/helpers.py:1566 +#: rhodecode/lib/helpers.py:1592 msgid "new file" msgstr "" -#: rhodecode/lib/helpers.py:1569 +#: rhodecode/lib/helpers.py:1595 msgid "mod" msgstr "" -#: rhodecode/lib/helpers.py:1572 +#: rhodecode/lib/helpers.py:1598 msgid "del" msgstr "" -#: rhodecode/lib/helpers.py:1575 +#: rhodecode/lib/helpers.py:1601 msgid "rename" msgstr "" -#: rhodecode/lib/helpers.py:1580 +#: rhodecode/lib/helpers.py:1606 msgid "chmod" msgstr "" -#: rhodecode/lib/helpers.py:1827 +#: rhodecode/lib/helpers.py:1853 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -1862,7 +2009,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1847 +#: rhodecode/lib/helpers.py:1873 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from the" @@ -1958,8 +2105,10 @@ msgstr "" msgid "in %s and %s" msgstr "" -#: rhodecode/lib/utils2.py:514 rhodecode/public/js/scripts.js:25035 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: rhodecode/lib/utils2.py:514 +#: rhodecode/public/js/rhodecode-components.js:33194 +#: rhodecode/public/js/scripts.js:25042 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -1990,7 +2139,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/model/db.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 +#: rhodecode/model/db.py:2292 msgid "Repository no access" msgstr "" @@ -2020,7 +2171,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/model/db.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/model/db.py:2293 msgid "Repository read access" msgstr "" @@ -2050,7 +2203,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/model/db.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/model/db.py:2294 msgid "Repository write access" msgstr "" @@ -2080,7 +2235,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 -#: rhodecode/model/db.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 +#: rhodecode/model/db.py:2295 msgid "Repository admin access" msgstr "" @@ -2150,7 +2307,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/model/db.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 +#: rhodecode/model/db.py:2313 msgid "Repository creation disabled" msgstr "" @@ -2180,7 +2339,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2307 -#: rhodecode/model/db.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2311 +#: rhodecode/model/db.py:2314 msgid "Repository creation enabled" msgstr "" @@ -2210,7 +2371,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2311 -#: rhodecode/model/db.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2315 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2315 +#: rhodecode/model/db.py:2318 msgid "Repository forking disabled" msgstr "" @@ -2240,7 +2403,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/model/db.py:2314 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 +#: rhodecode/model/db.py:2319 msgid "Repository forking enabled" msgstr "" @@ -2291,7 +2456,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2952 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2946 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2946 -#: rhodecode/model/db.py:2948 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2950 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2950 +#: rhodecode/model/db.py:2962 msgid "Not Reviewed" msgstr "" @@ -2321,7 +2488,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2953 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2947 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2947 -#: rhodecode/model/db.py:2949 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2951 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2951 +#: rhodecode/model/db.py:2963 msgid "Approved" msgstr "" @@ -2351,7 +2520,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2954 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2948 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2948 -#: rhodecode/model/db.py:2950 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2952 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2952 +#: rhodecode/model/db.py:2964 msgid "Rejected" msgstr "" @@ -2381,7 +2552,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2955 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2949 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2949 -#: rhodecode/model/db.py:2951 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2953 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2953 +#: rhodecode/model/db.py:2965 msgid "Under Review" msgstr "" @@ -2408,7 +2581,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/model/db.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/model/db.py:2297 msgid "Repository group no access" msgstr "" @@ -2435,7 +2610,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/model/db.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/model/db.py:2298 msgid "Repository group read access" msgstr "" @@ -2462,7 +2639,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/model/db.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/model/db.py:2299 msgid "Repository group write access" msgstr "" @@ -2489,7 +2668,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 -#: rhodecode/model/db.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 +#: rhodecode/model/db.py:2300 msgid "Repository group admin access" msgstr "" @@ -2515,7 +2696,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/model/db.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/model/db.py:2302 msgid "User group no access" msgstr "" @@ -2541,7 +2724,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296 -#: rhodecode/model/db.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 +#: rhodecode/model/db.py:2303 msgid "User group read access" msgstr "" @@ -2567,7 +2752,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/model/db.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/model/db.py:2304 msgid "User group write access" msgstr "" @@ -2593,7 +2780,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/model/db.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/model/db.py:2305 msgid "User group admin access" msgstr "" @@ -2619,7 +2808,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/model/db.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 +#: rhodecode/model/db.py:2307 msgid "Repository Group creation disabled" msgstr "" @@ -2645,7 +2836,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/model/db.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/model/db.py:2308 msgid "Repository Group creation enabled" msgstr "" @@ -2671,7 +2864,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/model/db.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 +#: rhodecode/model/db.py:2310 msgid "User Group creation disabled" msgstr "" @@ -2697,7 +2892,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 -#: rhodecode/model/db.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 +#: rhodecode/model/db.py:2311 msgid "User Group creation enabled" msgstr "" @@ -2723,7 +2920,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2314 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2314 -#: rhodecode/model/db.py:2316 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2318 +#: rhodecode/model/db.py:2321 msgid "Registration disabled" msgstr "" @@ -2749,7 +2948,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/model/db.py:2317 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 +#: rhodecode/model/db.py:2322 msgid "User Registration with manual account activation" msgstr "" @@ -2775,7 +2976,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/model/db.py:2318 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 +#: rhodecode/model/db.py:2323 msgid "User Registration with automatic account activation" msgstr "" @@ -2801,7 +3004,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2318 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2318 -#: rhodecode/model/db.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2322 +#: rhodecode/model/db.py:2329 rhodecode/model/permission.py:95 msgid "Manual activation of external account" msgstr "" @@ -2827,7 +3032,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2327 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2319 -#: rhodecode/model/db.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2323 +#: rhodecode/model/db.py:2330 rhodecode/model/permission.py:96 msgid "Automatic activation of external account" msgstr "" @@ -2847,7 +3054,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/model/db.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 +#: rhodecode/model/db.py:2315 msgid "" "Repository creation enabled with write permission to a repository group" msgstr "" @@ -2868,7 +3077,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/model/db.py:2311 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 +#: rhodecode/model/db.py:2316 msgid "" "Repository creation disabled with write permission to a repository group" msgstr "" @@ -2886,7 +3097,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 -#: rhodecode/model/db.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 +#: rhodecode/model/db.py:2290 msgid "RhodeCode Super Administrator" msgstr "" @@ -2901,7 +3114,9 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2329 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2321 -#: rhodecode/model/db.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2325 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2325 +#: rhodecode/model/db.py:2332 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -2916,44 +3131,58 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2330 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2322 -#: rhodecode/model/db.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2326 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2326 +#: rhodecode/model/db.py:2333 msgid "Inherit object permissions from default user enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:909 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:910 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 rhodecode/model/db.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 rhodecode/model/db.py:907 msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 rhodecode/model/db.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 rhodecode/model/db.py:908 msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 rhodecode/model/db.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 rhodecode/model/db.py:909 msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 rhodecode/model/db.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 rhodecode/model/db.py:910 msgid "api calls" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 rhodecode/model/db.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 rhodecode/model/db.py:911 msgid "feed access" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2069 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2061 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2061 -#: rhodecode/model/db.py:2063 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2065 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2065 +#: rhodecode/model/db.py:2061 msgid "No parent" msgstr "" @@ -2989,19 +3218,23 @@ msgstr "" msgid "Commit index" msgstr "" -#: rhodecode/login/views.py:237 rhodecode/login/views.py:296 -msgid "bad captcha" -msgstr "" - -#: rhodecode/login/views.py:246 +#: rhodecode/login/views.py:246 rhodecode/login/views.py:308 +msgid "Bad captcha" +msgstr "" + +#: rhodecode/login/views.py:255 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/login/views.py:312 +#: rhodecode/login/views.py:297 +msgid "Password reset has been disabled." +msgstr "" + +#: rhodecode/login/views.py:324 msgid "Your password reset link was sent" msgstr "" -#: rhodecode/login/views.py:336 +#: rhodecode/login/views.py:348 msgid "" "Your password reset was successful, a new password has been sent to your " "email" @@ -3015,6 +3248,18 @@ msgstr "" msgid "Show it now" msgstr "" +#: rhodecode/model/db.py:2325 +msgid "Password reset enabled" +msgstr "" + +#: rhodecode/model/db.py:2326 +msgid "Password reset hidden" +msgstr "" + +#: rhodecode/model/db.py:2327 +msgid "Password reset disabled" +msgstr "" + #: rhodecode/model/forms.py:85 msgid "Please enter a login" msgstr "" @@ -3093,49 +3338,180 @@ msgstr "" msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/pull_request.py:69 +#: rhodecode/model/permission.py:67 rhodecode/model/permission.py:73 +#: rhodecode/model/permission.py:79 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11 +msgid "None" +msgstr "" + +#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 +#: rhodecode/model/permission.py:80 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:13 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12 +msgid "Read" +msgstr "" + +#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 +#: rhodecode/model/permission.py:81 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:14 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13 +msgid "Write" +msgstr "" + +#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 +#: rhodecode/model/permission.py:82 +#: rhodecode/templates/admin/auth/auth_settings.html:12 +#: rhodecode/templates/admin/auth/plugin_settings.html:12 +#: rhodecode/templates/admin/defaults/defaults.html:12 +#: rhodecode/templates/admin/integrations/base.html:21 +#: rhodecode/templates/admin/integrations/form.html:15 +#: rhodecode/templates/admin/integrations/form.html:28 +#: rhodecode/templates/admin/integrations/list.html:8 +#: rhodecode/templates/admin/integrations/list.html:14 +#: rhodecode/templates/admin/integrations/new.html:11 +#: rhodecode/templates/admin/integrations/new.html:19 +#: rhodecode/templates/admin/permissions/permissions.html:12 +#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14 +#: rhodecode/templates/admin/repo_groups/repo_groups.html:13 +#: rhodecode/templates/admin/repos/repo_add.html:13 +#: rhodecode/templates/admin/repos/repo_add.html:17 +#: rhodecode/templates/admin/repos/repo_edit_permissions.html:15 +#: rhodecode/templates/admin/repos/repos.html:13 +#: rhodecode/templates/admin/settings/settings.html:12 +#: rhodecode/templates/admin/user_groups/user_group_add.html:11 +#: rhodecode/templates/admin/user_groups/user_group_edit.html:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14 +#: rhodecode/templates/admin/user_groups/user_groups.html:13 +#: rhodecode/templates/admin/users/user_add.html:11 +#: rhodecode/templates/admin/users/user_edit.html:12 +#: rhodecode/templates/admin/users/users.html:13 +#: rhodecode/templates/admin/users/users.html:103 +#: rhodecode/templates/base/base.html:406 +#: rhodecode/templates/base/base.html:413 +msgid "Admin" +msgstr "" + +#: rhodecode/model/permission.py:85 rhodecode/model/permission.py:99 +#: rhodecode/model/permission.py:103 rhodecode/model/permission.py:107 +#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 +#: rhodecode/model/permission.py:119 +msgid "Disabled" +msgstr "" + +#: rhodecode/model/permission.py:86 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/model/permission.py:87 +msgid "Allowed with automatic account activation" +msgstr "" + +#: rhodecode/model/permission.py:90 +msgid "Allow password recovery" +msgstr "" + +#: rhodecode/model/permission.py:91 +msgid "Hide password recovery link" +msgstr "" + +#: rhodecode/model/permission.py:92 +msgid "Disable password recovery" +msgstr "" + +#: rhodecode/model/pull_request.py:77 msgid "This pull request can be automatically merged." msgstr "" -#: rhodecode/model/pull_request.py:71 -msgid "This pull request cannot be merged because of an unhandled exception." -msgstr "" - -#: rhodecode/model/pull_request.py:74 -msgid "This pull request cannot be merged because of conflicts." -msgstr "" - -#: rhodecode/model/pull_request.py:76 -msgid "This pull request could not be merged because push to target failed." -msgstr "" - #: rhodecode/model/pull_request.py:79 -msgid "This pull request cannot be merged because the target is not a head." +msgid "This pull request cannot be merged because of an unhandled exception." msgstr "" #: rhodecode/model/pull_request.py:82 +msgid "This pull request cannot be merged because of conflicts." +msgstr "" + +#: rhodecode/model/pull_request.py:84 +msgid "This pull request could not be merged because push to target failed." +msgstr "" + +#: rhodecode/model/pull_request.py:87 +msgid "This pull request cannot be merged because the target is not a head." +msgstr "" + +#: rhodecode/model/pull_request.py:90 msgid "" "This pull request cannot be merged because the source contains more branches" " than the target." msgstr "" -#: rhodecode/model/pull_request.py:85 +#: rhodecode/model/pull_request.py:93 msgid "" "This pull request cannot be merged because the target has multiple heads." msgstr "" -#: rhodecode/model/pull_request.py:88 +#: rhodecode/model/pull_request.py:96 msgid "" "This pull request cannot be merged because the target repository is locked." msgstr "" -#: rhodecode/model/pull_request.py:91 +#: rhodecode/model/pull_request.py:99 msgid "" "This pull request cannot be merged because the target or the source " "reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:416 +#: rhodecode/model/pull_request.py:102 +msgid "" +"This pull request cannot be merged because the target reference is missing." +msgstr "" + +#: rhodecode/model/pull_request.py:105 +msgid "" +"This pull request cannot be merged because the source reference is missing." +msgstr "" + +#: rhodecode/model/pull_request.py:108 +msgid "" +"This pull request cannot be merged because of conflicts related to sub " +"repositories." +msgstr "" + +#: rhodecode/model/pull_request.py:114 +msgid "Pull request update successful." +msgstr "" + +#: rhodecode/model/pull_request.py:116 +msgid "Pull request update failed because of an unknown error." +msgstr "" + +#: rhodecode/model/pull_request.py:118 +msgid "No update needed because the source reference is already up to date." +msgstr "" + +#: rhodecode/model/pull_request.py:121 +msgid "" +"Pull request cannot be updated because the reference type is not supported " +"for an update." +msgstr "" + +#: rhodecode/model/pull_request.py:124 +msgid "" +"This pull request cannot be updated because the target reference is missing." +msgstr "" + +#: rhodecode/model/pull_request.py:127 +msgid "" +"This pull request cannot be updated because the source reference is missing." +msgstr "" + +#: rhodecode/model/pull_request.py:523 #, python-format msgid "" "Merge pull request #%(pr_id)s from %(source_repo)s %(source_ref_name)s\n" @@ -3143,76 +3519,76 @@ msgid "" " %(pr_title)s" msgstr "" -#: rhodecode/model/pull_request.py:448 +#: rhodecode/model/pull_request.py:555 msgid "Pull request merged and closed" msgstr "" -#: rhodecode/model/pull_request.py:874 +#: rhodecode/model/pull_request.py:1029 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:876 +#: rhodecode/model/pull_request.py:1031 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:887 +#: rhodecode/model/pull_request.py:1043 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:905 +#: rhodecode/model/pull_request.py:1061 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:908 +#: rhodecode/model/pull_request.py:1064 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1058 rhodecode/model/scm.py:788 +#: rhodecode/model/pull_request.py:1221 rhodecode/model/scm.py:790 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1063 +#: rhodecode/model/pull_request.py:1226 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1066 +#: rhodecode/model/pull_request.py:1229 msgid "Closed Branches" msgstr "" -#: rhodecode/model/scm.py:770 +#: rhodecode/model/scm.py:768 msgid "latest tip" msgstr "" -#: rhodecode/model/user.py:124 +#: rhodecode/model/user.py:125 msgid "You can't Edit this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:284 +#: rhodecode/model/user.py:291 #, python-format msgid "" "You can't edit this user (`%(username)s`) since it's crucial for entire " "application" msgstr "" -#: rhodecode/model/user.py:458 +#: rhodecode/model/user.py:464 msgid "You can't remove this user since it's crucial for entire application" msgstr "" -#: rhodecode/model/user.py:466 +#: rhodecode/model/user.py:472 #, python-format msgid "" "user \"%s\" still owns %s repositories and cannot be removed. Switch owners " "or remove those repositories:%s" msgstr "" -#: rhodecode/model/user.py:475 +#: rhodecode/model/user.py:481 #, python-format msgid "" "user \"%s\" still owns %s repository groups and cannot be removed. Switch " "owners or remove those repository groups:%s" msgstr "" -#: rhodecode/model/user.py:484 +#: rhodecode/model/user.py:490 #, python-format msgid "" "user \"%s\" still owns %s user groups and cannot be removed. Switch owners " @@ -3368,6 +3744,7 @@ msgid "You do not have the permission to msgstr "" #: rhodecode/model/validators.py:668 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:102 msgid "" "You do not have the permission to store repositories in the root location." msgstr "" @@ -3395,7 +3772,8 @@ msgid "Revisions %(revs)s are already pa msgstr "" #: rhodecode/model/validators.py:933 -#: rhodecode/model/validation_schema/validators.py:14 +#: rhodecode/model/validation_schema/validators.py:16 +#: rhodecode/model/validation_schema/validators.py:29 msgid "Please enter a valid IPv4 or IpV6 address" msgstr "" @@ -3429,6 +3807,14 @@ msgstr "" msgid "No plugin available with ID \"%(plugin_id)s\"" msgstr "" +#: rhodecode/model/validation_schema/validators.py:37 +msgid "Invalid glob pattern" +msgstr "" + +#: rhodecode/model/validation_schema/validators.py:46 +msgid "Name must start with a letter or number. Got `{}`" +msgstr "" + #: rhodecode/model/validation_schema/schemas/gist_schema.py:89 msgid "Gist with name {} already exists" msgstr "" @@ -3483,6 +3869,48 @@ msgstr "" msgid "{integration_type} settings" msgstr "" +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:46 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:50 +msgid "Parent repository group `{}` does not exist" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +msgid "" +"You do not have the permission to store repository groups in the root " +"location." +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:112 +msgid "Repo group owner with id `{}` does not exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:130 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:181 +msgid "Repository with name `{}` already exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:135 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:186 +msgid "Repository group with name `{}` already exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_schema.py:48 +msgid "Repo owner with id `{}` does not exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_schema.py:68 +msgid "Fork with id `{}` does not exists" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_schema.py:71 +msgid "Cannot set fork of parameter of this repository to itself" +msgstr "" + +#: rhodecode/model/validation_schema/schemas/repo_schema.py:96 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:100 +msgid "Repository group `{}` does not exist" +msgstr "" + #: rhodecode/model/validation_schema/schemas/user_schema.py:36 msgid "Password is incorrect" msgstr "" @@ -3491,359 +3919,453 @@ msgstr "" msgid "New password must be different to old password" msgstr "" -#: rhodecode/public/js/scripts.js:23039 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 +#: rhodecode/public/js/rhodecode-components.js:31198 +#: rhodecode/public/js/scripts.js:23046 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/scripts.js:24970 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode-components.js:33129 +#: rhodecode/public/js/scripts.js:24977 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/scripts.js:24971 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/rhodecode-components.js:33130 +#: rhodecode/public/js/scripts.js:24978 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/scripts.js:24972 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +#: rhodecode/public/js/rhodecode-components.js:33131 +#: rhodecode/public/js/scripts.js:24979 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/scripts.js:24973 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: rhodecode/public/js/rhodecode-components.js:33132 +#: rhodecode/public/js/scripts.js:24980 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/scripts.js:24974 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/rhodecode-components.js:33133 +#: rhodecode/public/js/scripts.js:24981 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/scripts.js:24975 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 +#: rhodecode/public/js/rhodecode-components.js:33134 +#: rhodecode/public/js/scripts.js:24982 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/scripts.js:24995 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: rhodecode/public/js/rhodecode-components.js:33154 +#: rhodecode/public/js/scripts.js:25002 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/scripts.js:25003 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 +#: rhodecode/public/js/rhodecode-components.js:33162 +#: rhodecode/public/js/scripts.js:25010 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25015 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/rhodecode-components.js:33174 +#: rhodecode/public/js/scripts.js:25022 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25017 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 +#: rhodecode/public/js/rhodecode-components.js:33176 +#: rhodecode/public/js/scripts.js:25024 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25021 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: rhodecode/public/js/rhodecode-components.js:33180 +#: rhodecode/public/js/scripts.js:25028 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25023 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: rhodecode/public/js/rhodecode-components.js:33182 +#: rhodecode/public/js/scripts.js:25030 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25025 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 +#: rhodecode/public/js/rhodecode-components.js:33184 +#: rhodecode/public/js/scripts.js:25032 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:39304 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +#: rhodecode/public/js/rhodecode-components.js:47027 +#: rhodecode/public/js/scripts.js:38875 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/scripts.js:39307 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: rhodecode/public/js/rhodecode-components.js:47030 +#: rhodecode/public/js/scripts.js:38878 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/scripts.js:39310 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 +#: rhodecode/public/js/rhodecode-components.js:47033 +#: rhodecode/public/js/scripts.js:38881 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/scripts.js:39313 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/rhodecode-components.js:47036 +#: rhodecode/public/js/scripts.js:38884 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/scripts.js:39317 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 +#: rhodecode/public/js/rhodecode-components.js:47040 +#: rhodecode/public/js/scripts.js:38888 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/scripts.js:39319 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/rhodecode-components.js:47042 +#: rhodecode/public/js/scripts.js:38890 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/scripts.js:39324 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/public/js/rhodecode-components.js:47047 +#: rhodecode/public/js/scripts.js:38895 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/scripts.js:39326 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +#: rhodecode/public/js/rhodecode-components.js:47049 +#: rhodecode/public/js/scripts.js:38897 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/scripts.js:39331 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +#: rhodecode/public/js/rhodecode-components.js:47054 +#: rhodecode/public/js/scripts.js:38902 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/scripts.js:39333 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/rhodecode-components.js:47056 +#: rhodecode/public/js/scripts.js:38904 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/scripts.js:39337 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 +#: rhodecode/public/js/rhodecode-components.js:47060 +#: rhodecode/public/js/scripts.js:38908 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/scripts.js:39339 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/rhodecode-components.js:47062 +#: rhodecode/public/js/scripts.js:38910 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/scripts.js:40911 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: rhodecode/public/js/rhodecode-components.js:48315 +#: rhodecode/public/js/scripts.js:40163 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/rhodecode/codemirror.js:369 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/scripts.js:40929 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 +#: rhodecode/public/js/rhodecode-components.js:48333 +#: rhodecode/public/js/scripts.js:40181 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 #: rhodecode/public/js/src/rhodecode/codemirror.js:387 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/scripts.js:41308 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 +#: rhodecode/public/js/rhodecode-components.js:48713 +#: rhodecode/public/js/scripts.js:40561 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 #: rhodecode/public/js/src/rhodecode/comments.js:236 +#: rhodecode/templates/codeblocks/diffs.html:399 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/scripts.js:41526 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode-components.js:48947 +#: rhodecode/public/js/scripts.js:40795 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 #: rhodecode/public/js/src/rhodecode/comments.js:470 msgid "Status Review" msgstr "" -#: rhodecode/public/js/scripts.js:41540 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 +#: rhodecode/public/js/rhodecode-components.js:48961 +#: rhodecode/public/js/scripts.js:40809 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/comments.js:484 msgid "" "Comment text will be set automatically based on currently selected status " "({0}) ..." msgstr "" -#: rhodecode/public/js/scripts.js:41653 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/rhodecode-components.js:49074 +#: rhodecode/public/js/scripts.js:40922 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/src/rhodecode/comments.js:597 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/scripts.js:41703 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/rhodecode-components.js:49124 +#: rhodecode/public/js/scripts.js:40972 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/rhodecode/comments.js:647 -#: rhodecode/templates/files/files_browser_tree.html:47 +#: rhodecode/templates/files/files_browser_tree.html:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/scripts.js:41903 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/rhodecode-components.js:49197 +#: rhodecode/public/js/scripts.js:41045 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/src/rhodecode/comments.js:720 +msgid "Delete this comment?" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:49546 +#: rhodecode/public/js/scripts.js:41394 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/scripts.js:41905 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/public/js/rhodecode-components.js:49548 +#: rhodecode/public/js/scripts.js:41396 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/scripts.js:41914 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/rhodecode-components.js:49557 +#: rhodecode/public/js/scripts.js:41405 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/scripts.js:42049 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/public/js/rhodecode-components.js:49692 +#: rhodecode/public/js/scripts.js:41540 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/scripts.js:42089 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/rhodecode-components.js:49732 +#: rhodecode/public/js/scripts.js:41580 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/scripts.js:42090 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/rhodecode-components.js:49733 +#: rhodecode/public/js/scripts.js:41581 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/scripts.js:42099 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: rhodecode/public/js/rhodecode-components.js:49742 +#: rhodecode/public/js/scripts.js:41590 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/scripts.js:42100 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 +#: rhodecode/public/js/rhodecode-components.js:49743 +#: rhodecode/public/js/scripts.js:41591 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/scripts.js:43049 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/rhodecode-components.js:50199 +#: rhodecode/public/js/scripts.js:42047 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:212 +msgid "added manually by \"{0}\"" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:50648 +#: rhodecode/public/js/scripts.js:42496 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/scripts.js:43069 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +#: rhodecode/public/js/rhodecode-components.js:50668 +#: rhodecode/public/js/scripts.js:42516 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 #: rhodecode/public/js/src/rhodecode.js:162 msgid "Show more" msgstr "" +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 +msgid "(from usergroup {0})" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 +#: rhodecode/public/js/src/i18n_messages.js:5 +#: rhodecode/templates/pullrequests/pullrequest_show.html:214 +msgid "Close" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/src/i18n_messages.js:4 +msgid "Invite reviewers to this discussion" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 msgid "No bookmarks available yet." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 -msgid "No branches available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -msgid "No gists available yet." -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 -msgid "No pull requests available yet." +msgid "No branches available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 -msgid "No repository groups available yet." +msgid "No gists available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 -msgid "No tags available yet." +msgid "No pull requests available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -msgid "No user groups available yet." +msgid "No repositories available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 -msgid "No users available yet." +msgid "No repository groups available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -#: rhodecode/templates/changelog/changelog.html:62 -msgid "Open new pull request" +msgid "No tags available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 +msgid "No user groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +#: rhodecode/templates/changelog/changelog.html:62 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "Show selected commit __S" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 +#: rhodecode/public/js/src/i18n_messages.js:6 +#: rhodecode/templates/admin/settings/settings_email.html:48 +msgid "Send" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +msgid "Show selected commit __S" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 msgid "Show selected commits __S ... __E" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 -msgid "Updating..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -#: rhodecode/templates/admin/auth/auth_settings.html:71 -msgid "disabled" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 -#: rhodecode/templates/admin/auth/auth_settings.html:71 -msgid "enabled" +#: rhodecode/public/js/src/i18n_messages.js:7 +msgid "Switch to chat" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +msgid "" +"There are currently no open pull requests requiring your participation." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 +msgid "Updating..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/templates/admin/auth/auth_settings.html:71 +msgid "disabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: rhodecode/templates/admin/auth/auth_settings.html:71 +msgid "enabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 msgid "files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 msgid "specify commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 -msgid "{0} months" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 msgid "{0} years" msgstr "" @@ -3863,6 +4385,10 @@ msgstr "" msgid "FocusEvent" msgstr "" +#: rhodecode/svn_support/events.py:30 +msgid "Configuration for Apaache mad_dav_svn changed." +msgstr "" + #: rhodecode/templates/index.html:5 msgid "Dashboard" msgstr "" @@ -3912,6 +4438,7 @@ msgstr "" #: rhodecode/templates/index_base.html:122 #: rhodecode/templates/admin/gists/index.html:112 #: rhodecode/templates/admin/integrations/list.html:102 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:39 #: rhodecode/templates/admin/my_account/my_account_repos.html:31 #: rhodecode/templates/admin/my_account/my_account_watched.html:31 #: rhodecode/templates/admin/repo_groups/repo_groups.html:53 @@ -3937,7 +4464,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_groups.html:56 #: rhodecode/templates/admin/repos/repo_add_base.html:32 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:29 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:96 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:98 #: rhodecode/templates/admin/repos/repos.html:57 #: rhodecode/templates/admin/user_groups/user_group_add.html:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:42 @@ -3945,7 +4472,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.html:74 #: rhodecode/templates/base/issue_tracker_settings.html:10 #: rhodecode/templates/changeset/changeset.html:53 -#: rhodecode/templates/compare/compare_commits.html:24 +#: rhodecode/templates/compare/compare_commits.html:25 #: rhodecode/templates/email_templates/commit_comment.mako:82 #: rhodecode/templates/email_templates/pull_request_review.mako:41 #: rhodecode/templates/email_templates/pull_request_review.mako:75 @@ -3954,7 +4481,7 @@ msgstr "" #: rhodecode/templates/forks/fork.html:48 #: rhodecode/templates/forks/forks_data.html:9 #: rhodecode/templates/pullrequests/pullrequest.html:47 -#: rhodecode/templates/pullrequests/pullrequest_show.html:122 +#: rhodecode/templates/pullrequests/pullrequest_show.html:151 #: rhodecode/templates/summary/components.html:73 msgid "Description" msgstr "" @@ -3965,7 +4492,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:24 #: rhodecode/templates/admin/repo_groups/repo_groups.html:60 #: rhodecode/templates/admin/repos/repo_edit_advanced.html:5 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:78 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:80 #: rhodecode/templates/admin/repos/repos.html:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.html:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:24 @@ -3989,7 +4516,7 @@ msgstr "" #: rhodecode/templates/changelog/changelog.html:104 #: rhodecode/templates/changelog/changelog_summary_data.html:8 #: rhodecode/templates/changeset/changeset.html:36 -#: rhodecode/templates/compare/compare_commits.html:22 +#: rhodecode/templates/compare/compare_commits.html:23 #: rhodecode/templates/email_templates/commit_comment.mako:45 #: rhodecode/templates/email_templates/commit_comment.mako:81 #: rhodecode/templates/search/search_commit.html:6 @@ -4006,17 +4533,17 @@ msgstr "" msgid "Home" msgstr "" -#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:35 -#: rhodecode/templates/login.html:64 rhodecode/templates/base/base.html:329 +#: rhodecode/templates/login.html:5 rhodecode/templates/login.html:34 +#: rhodecode/templates/login.html:75 rhodecode/templates/base/base.html:326 #: rhodecode/templates/debug_style/login.html:60 msgid "Sign In" msgstr "" -#: rhodecode/templates/login.html:37 +#: rhodecode/templates/login.html:36 msgid "Go to the registration page to create a new account." msgstr "" -#: rhodecode/templates/login.html:58 +#: rhodecode/templates/login.html:57 msgid "Remember me" msgstr "" @@ -4024,79 +4551,106 @@ msgstr "" msgid "Forgot your password?" msgstr "" +#: rhodecode/templates/login.html:65 +#: rhodecode/templates/password_reset.html:34 +msgid "Password reset is disabled. Please contact " +msgstr "" + +#: rhodecode/templates/login.html:67 +#: rhodecode/templates/password_reset.html:36 +#: rhodecode/templates/base/base.html:43 +#: rhodecode/templates/errors/error_document.html:62 +msgid "Support" +msgstr "" + +#: rhodecode/templates/login.html:68 +#: rhodecode/templates/password_reset.html:37 +#: rhodecode/templates/files/files_add.html:54 +#: rhodecode/templates/files/files_add.html:65 +msgid "or" +msgstr "" + +#: rhodecode/templates/login.html:70 +#: rhodecode/templates/password_reset.html:39 +msgid "an administrator if you need help." +msgstr "" + #: rhodecode/templates/password_reset.html:5 -#: rhodecode/templates/register.html:5 -msgid "Create an Account" -msgstr "" - -#: rhodecode/templates/password_reset.html:35 +msgid "Reset Password" +msgstr "" + +#: rhodecode/templates/password_reset.html:46 msgid "Reset your Password" msgstr "" -#: rhodecode/templates/password_reset.html:36 +#: rhodecode/templates/password_reset.html:47 msgid "Go to the login page to sign in." msgstr "" -#: rhodecode/templates/password_reset.html:40 +#: rhodecode/templates/password_reset.html:51 msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.html:49 -#: rhodecode/templates/register.html:85 -msgid "Captcha" -msgstr "" - -#: rhodecode/templates/password_reset.html:59 -msgid "Send password reset email" -msgstr "" - #: rhodecode/templates/password_reset.html:60 +#: rhodecode/templates/register.html:84 +msgid "Captcha" +msgstr "" + +#: rhodecode/templates/password_reset.html:70 +msgid "Send password reset email" +msgstr "" + +#: rhodecode/templates/password_reset.html:71 msgid "Password reset link will be sent to matching email address" msgstr "" +#: rhodecode/templates/register.html:5 +msgid "Create an Account" +msgstr "" + +#: rhodecode/templates/register.html:34 +msgid "Create an account" +msgstr "" + #: rhodecode/templates/register.html:35 -msgid "Create an account" -msgstr "" - -#: rhodecode/templates/register.html:36 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.html:55 +#: rhodecode/templates/register.html:54 msgid "Re-enter password" msgstr "" -#: rhodecode/templates/register.html:62 +#: rhodecode/templates/register.html:61 #: rhodecode/templates/admin/my_account/my_account_profile.html:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:30 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:76 #: rhodecode/templates/admin/users/user_add.html:68 #: rhodecode/templates/admin/users/user_edit_profile.html:47 -#: rhodecode/templates/admin/users/users.html:92 +#: rhodecode/templates/admin/users/users.html:94 msgid "First Name" msgstr "" -#: rhodecode/templates/register.html:69 +#: rhodecode/templates/register.html:68 #: rhodecode/templates/admin/my_account/my_account_profile.html:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:39 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:85 #: rhodecode/templates/admin/users/user_add.html:77 #: rhodecode/templates/admin/users/user_edit_profile.html:56 -#: rhodecode/templates/admin/users/users.html:94 +#: rhodecode/templates/admin/users/users.html:96 msgid "Last Name" msgstr "" -#: rhodecode/templates/register.html:97 +#: rhodecode/templates/register.html:96 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.html:104 +#: rhodecode/templates/register.html:103 msgid "Create Account" msgstr "" #: rhodecode/templates/admin/admin.html:5 #: rhodecode/templates/admin/admin.html:15 -#: rhodecode/templates/base/base.html:77 +#: rhodecode/templates/base/base.html:72 msgid "Admin journal" msgstr "" @@ -4128,8 +4682,9 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_groups.html:62 #: rhodecode/templates/admin/repos/repo_edit_fields.html:13 #: rhodecode/templates/admin/repos/repos.html:69 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:71 #: rhodecode/templates/admin/user_groups/user_groups.html:66 -#: rhodecode/templates/admin/users/users.html:105 +#: rhodecode/templates/admin/users/users.html:107 msgid "Action" msgstr "" @@ -4161,39 +4716,6 @@ msgstr "" msgid "Authentication Settings" msgstr "" -#: rhodecode/templates/admin/auth/auth_settings.html:12 -#: rhodecode/templates/admin/auth/plugin_settings.html:12 -#: rhodecode/templates/admin/defaults/defaults.html:12 -#: rhodecode/templates/admin/integrations/base.html:21 -#: rhodecode/templates/admin/integrations/form.html:15 -#: rhodecode/templates/admin/integrations/form.html:28 -#: rhodecode/templates/admin/integrations/list.html:8 -#: rhodecode/templates/admin/integrations/list.html:14 -#: rhodecode/templates/admin/integrations/new.html:11 -#: rhodecode/templates/admin/integrations/new.html:19 -#: rhodecode/templates/admin/permissions/permissions.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_add.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.html:12 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:14 -#: rhodecode/templates/admin/repo_groups/repo_groups.html:13 -#: rhodecode/templates/admin/repos/repo_add.html:13 -#: rhodecode/templates/admin/repos/repo_add.html:17 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:15 -#: rhodecode/templates/admin/repos/repos.html:13 -#: rhodecode/templates/admin/settings/settings.html:12 -#: rhodecode/templates/admin/user_groups/user_group_add.html:11 -#: rhodecode/templates/admin/user_groups/user_group_edit.html:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:14 -#: rhodecode/templates/admin/user_groups/user_groups.html:13 -#: rhodecode/templates/admin/users/user_add.html:11 -#: rhodecode/templates/admin/users/user_edit.html:12 -#: rhodecode/templates/admin/users/users.html:13 -#: rhodecode/templates/admin/users/users.html:101 -#: rhodecode/templates/base/base.html:406 -#: rhodecode/templates/base/base.html:413 -msgid "Admin" -msgstr "" - #: rhodecode/templates/admin/auth/auth_settings.html:14 #: rhodecode/templates/admin/auth/plugin_settings.html:14 msgid "Authentication Plugins" @@ -4221,21 +4743,21 @@ msgstr "" #: rhodecode/templates/admin/auth/plugin_settings.html:87 #: rhodecode/templates/admin/defaults/defaults_repositories.html:63 #: rhodecode/templates/admin/my_account/my_account_profile_edit.html:103 -#: rhodecode/templates/admin/permissions/permissions_application.html:50 +#: rhodecode/templates/admin/permissions/permissions_application.html:59 #: rhodecode/templates/admin/permissions/permissions_objects.html:56 #: rhodecode/templates/admin/repo_groups/repo_group_add.html:72 #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:135 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.html:67 -#: rhodecode/templates/admin/repos/repo_add_base.html:88 +#: rhodecode/templates/admin/repos/repo_add_base.html:90 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.html:79 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:110 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:158 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:160 #: rhodecode/templates/admin/settings/settings_hooks.html:63 #: rhodecode/templates/admin/settings/settings_issuetracker.html:15 #: rhodecode/templates/admin/user_groups/user_group_add.html:60 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:120 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:89 -#: rhodecode/templates/admin/users/user_add.html:125 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.html:102 +#: rhodecode/templates/admin/users/user_add.html:128 #: rhodecode/templates/admin/users/user_edit_profile.html:134 #: rhodecode/templates/base/default_perms_box.html:88 msgid "Save" @@ -4257,20 +4779,20 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.html:14 #: rhodecode/templates/admin/gists/index.html:110 #: rhodecode/templates/admin/integrations/list.html:103 -#: rhodecode/templates/admin/repos/repo_add_base.html:62 +#: rhodecode/templates/admin/repos/repo_add_base.html:64 #: rhodecode/templates/admin/repos/repo_edit_fields.html:12 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.html:23 -#: rhodecode/templates/admin/repos/repo_add_base.html:80 +#: rhodecode/templates/admin/repos/repo_add_base.html:82 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.html:27 -#: rhodecode/templates/admin/repos/repo_add_base.html:84 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:110 -#: rhodecode/templates/forks/fork.html:85 +#: rhodecode/templates/admin/repos/repo_add_base.html:86 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:112 +#: rhodecode/templates/forks/fork.html:87 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -4307,48 +4829,50 @@ msgstr "" msgid "Edit Gist" msgstr "" -#: rhodecode/templates/admin/gists/edit.html:29 +#: rhodecode/templates/admin/gists/edit.html:33 +#: rhodecode/templates/admin/gists/new.html:30 +msgid "Gist description ..." +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:38 +#: rhodecode/templates/admin/gists/new.html:38 +msgid "Gist lifetime" +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:41 +#: rhodecode/templates/admin/gists/new.html:41 +msgid "Gist access level" +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:56 +#: rhodecode/templates/admin/gists/new.html:50 +#: rhodecode/templates/files/files_add.html:74 +#: rhodecode/templates/files/files_edit.html:78 +msgid "plain" +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:101 +msgid "Update Gist" +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:102 +#: rhodecode/templates/base/issue_tracker_settings.html:74 +#: rhodecode/templates/changeset/changeset_file_comment.html:137 +#: rhodecode/templates/codeblocks/diffs.html:84 +#: rhodecode/templates/codeblocks/diffs.html:98 +#: rhodecode/templates/files/files_add.html:102 +#: rhodecode/templates/files/files_delete.html:69 +#: rhodecode/templates/files/files_edit.html:105 +msgid "Cancel" +msgstr "" + +#: rhodecode/templates/admin/gists/edit.html:122 #, python-format msgid "" "Gist was updated since you started editing. Copy your changes and click " "%(here)s to reload the new version." msgstr "" -#: rhodecode/templates/admin/gists/edit.html:39 -#: rhodecode/templates/admin/gists/new.html:30 -msgid "Gist description ..." -msgstr "" - -#: rhodecode/templates/admin/gists/edit.html:44 -#: rhodecode/templates/admin/gists/new.html:38 -msgid "Gist lifetime" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.html:47 -#: rhodecode/templates/admin/gists/new.html:41 -msgid "Gist access level" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.html:62 -#: rhodecode/templates/admin/gists/new.html:50 -#: rhodecode/templates/files/files_add.html:74 -#: rhodecode/templates/files/files_edit.html:78 -msgid "plain" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.html:107 -msgid "Update Gist" -msgstr "" - -#: rhodecode/templates/admin/gists/edit.html:108 -#: rhodecode/templates/base/issue_tracker_settings.html:74 -#: rhodecode/templates/changeset/changeset_file_comment.html:139 -#: rhodecode/templates/files/files_add.html:102 -#: rhodecode/templates/files/files_delete.html:69 -#: rhodecode/templates/files/files_edit.html:105 -msgid "Cancel" -msgstr "" - #: rhodecode/templates/admin/gists/index.html:6 #: rhodecode/templates/admin/gists/index.html:20 #, python-format @@ -4400,16 +4924,15 @@ msgid "My public" msgstr "" #: rhodecode/templates/admin/gists/index.html:108 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:24 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:88 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:41 #: rhodecode/templates/bookmarks/bookmarks.html:63 #: rhodecode/templates/branches/branches.html:62 #: rhodecode/templates/changelog/changelog.html:110 #: rhodecode/templates/changelog/changelog_summary_data.html:11 -#: rhodecode/templates/changeset/changeset.html:164 -#: rhodecode/templates/compare/compare_commits.html:21 +#: rhodecode/templates/changeset/changeset.html:163 +#: rhodecode/templates/compare/compare_commits.html:22 #: rhodecode/templates/files/files_browser_tree.html:9 -#: rhodecode/templates/pullrequests/pullrequest_show.html:169 +#: rhodecode/templates/pullrequests/pullrequest_show.html:198 #: rhodecode/templates/pullrequests/pullrequests.html:102 #: rhodecode/templates/search/search_commit.html:16 #: rhodecode/templates/tags/tags.html:63 @@ -4467,19 +4990,20 @@ msgstr "" #: rhodecode/templates/admin/integrations/list.html:204 #: rhodecode/templates/admin/my_account/my_account_profile.html:5 #: rhodecode/templates/base/issue_tracker_settings.html:61 -#: rhodecode/templates/changeset/changeset_file_comment.html:145 -#: rhodecode/templates/changeset/changeset_file_comment.html:292 -#: rhodecode/templates/data_table/_dt_elements.html:114 -#: rhodecode/templates/data_table/_dt_elements.html:172 -#: rhodecode/templates/data_table/_dt_elements.html:185 -#: rhodecode/templates/data_table/_dt_elements.html:198 +#: rhodecode/templates/changeset/changeset_file_comment.html:143 +#: rhodecode/templates/changeset/changeset_file_comment.html:267 +#: rhodecode/templates/codeblocks/diffs.html:79 +#: rhodecode/templates/data_table/_dt_elements.html:118 +#: rhodecode/templates/data_table/_dt_elements.html:180 +#: rhodecode/templates/data_table/_dt_elements.html:193 +#: rhodecode/templates/data_table/_dt_elements.html:206 #: rhodecode/templates/debug_style/buttons.html:128 #: rhodecode/templates/files/files_add.html:204 #: rhodecode/templates/files/files_edit.html:165 -#: rhodecode/templates/files/files_source.html:37 -#: rhodecode/templates/files/files_source.html:40 -#: rhodecode/templates/pullrequests/pullrequest_show.html:50 -#: rhodecode/templates/pullrequests/pullrequest_show.html:184 +#: rhodecode/templates/files/files_source.html:38 +#: rhodecode/templates/files/files_source.html:41 +#: rhodecode/templates/pullrequests/pullrequest_show.html:60 +#: rhodecode/templates/pullrequests/pullrequest_show.html:213 #: rhodecode/templates/users/user_profile.html:7 msgid "Edit" msgstr "" @@ -4498,7 +5022,7 @@ msgstr "" #: rhodecode/templates/admin/gists/show.html:91 #: rhodecode/templates/files/files_delete.html:50 -#: rhodecode/templates/files/files_source.html:62 +#: rhodecode/templates/files/files_source.html:73 msgid "Show as raw" msgstr "" @@ -4523,8 +5047,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.html:43 #: rhodecode/templates/admin/settings/settings.html:14 #: rhodecode/templates/admin/user_groups/user_group_edit.html:33 -#: rhodecode/templates/base/base.html:86 -#: rhodecode/templates/base/base.html:251 +#: rhodecode/templates/base/base.html:81 +#: rhodecode/templates/base/base.html:246 msgid "Settings" msgstr "" @@ -4624,7 +5148,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.html:5 -#: rhodecode/templates/base/base.html:343 +#: rhodecode/templates/base/base.html:340 msgid "My account" msgstr "" @@ -4660,7 +5184,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.html:40 #: rhodecode/templates/admin/notifications/notifications.html:33 -#: rhodecode/templates/base/base.html:243 +#: rhodecode/templates/base/base.html:238 msgid "Pull Requests" msgstr "" @@ -4807,16 +5331,14 @@ msgid "Show Closed Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.html:15 -msgid "Pull Requests You Opened" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:23 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:87 +msgid "Pull Requests You Participate In" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:37 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:26 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:90 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43 #: rhodecode/templates/admin/settings/settings_global.html:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 @@ -4825,46 +5347,11 @@ msgstr "" msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:27 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:91 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:47 #: rhodecode/templates/pullrequests/pullrequests.html:108 msgid "Last Update" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:43 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:106 -#: rhodecode/templates/changelog/changelog.html:153 -#: rhodecode/templates/compare/compare_commits.html:49 -#: rhodecode/templates/search/search_commit.html:36 -msgid "Expand commit message" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:52 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:115 -#: rhodecode/templates/changeset/changeset_file_comment.html:284 -#: rhodecode/templates/pullrequests/pullrequest_show.html:14 -#: rhodecode/templates/pullrequests/pullrequest_show.html:112 -#: rhodecode/templates/pullrequests/pullrequests.html:52 -msgid "Closed" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:63 -msgid "Confirm to delete this pull request" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:70 -msgid "You currently have no open pull requests." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:78 -msgid "Pull Requests You Participate In" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.html:127 -msgid "" -"There are currently no open pull requests requiring your participation." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_repos.html:3 msgid "Repositories You Own" msgstr "" @@ -4880,7 +5367,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications.html:32 #: rhodecode/templates/changeset/changeset.html:140 -#: rhodecode/templates/pullrequests/pullrequest_show.html:133 +#: rhodecode/templates/pullrequests/pullrequest_show.html:162 msgid "Comments" msgstr "" @@ -4909,7 +5396,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.html:49 #: rhodecode/templates/admin/repos/repo_edit.html:46 #: rhodecode/templates/admin/user_groups/user_group_edit.html:34 -#: rhodecode/templates/base/base.html:82 +#: rhodecode/templates/base/base.html:77 msgid "Permissions" msgstr "" @@ -4949,16 +5436,20 @@ msgid "Registration" msgstr "" #: rhodecode/templates/admin/permissions/permissions_application.html:33 +msgid "Password Reset" +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_application.html:42 msgid "Registration Page Message" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:37 +#: rhodecode/templates/admin/permissions/permissions_application.html:46 msgid "" "Custom message to be displayed on the registration page. HTML syntax is " "supported." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_application.html:43 +#: rhodecode/templates/admin/permissions/permissions_application.html:52 msgid "External Authentication Account Activation" msgstr "" @@ -5043,14 +5534,13 @@ msgid "Default User Permissions Overview msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.html:5 -#: rhodecode/templates/admin/users/user_add.html:116 msgid "Add repository group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.html:14 #: rhodecode/templates/admin/users/user_edit_advanced.html:12 -#: rhodecode/templates/base/base.html:79 -#: rhodecode/templates/base/base.html:153 +#: rhodecode/templates/base/base.html:74 +#: rhodecode/templates/base/base.html:148 msgid "Repository groups" msgstr "" @@ -5064,7 +5554,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.html:63 -#: rhodecode/templates/admin/repos/repo_add_base.html:53 +#: rhodecode/templates/admin/repos/repo_add_base.html:55 msgid "Copy Parent Group Permissions" msgstr "" @@ -5088,28 +5578,32 @@ msgstr "" msgid "Advanced" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:8 -msgid "Total repositories" +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:7 +msgid "Is Personal Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:9 +msgid "Total repositories" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:10 msgid "Top level repositories" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:11 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:12 msgid "Children groups" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:17 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:18 #, python-format msgid "Repository Group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:27 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:28 msgid "Delete repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:35 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:36 #, python-format msgid "This repository group includes %s children repository group." msgid_plural "This repository group includes %s children repository groups." @@ -5118,7 +5612,7 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:44 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:45 #, python-format msgid "This repository group includes %s repository." msgid_plural "This repository group includes %s repositories." @@ -5127,12 +5621,12 @@ msgstr[1] "" msgstr[2] "" msgstr[3] "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:56 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57 #, python-format msgid "Confirm to delete this group: %s" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:57 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.html:58 msgid "Delete this repository group" msgstr "" @@ -5140,25 +5634,6 @@ msgstr "" msgid "Repository Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:126 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:11 -msgid "None" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:13 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:12 -msgid "Read" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:13 -#: rhodecode/templates/admin/repos/repo_edit_permissions.html:14 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:13 -msgid "Write" -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:16 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:15 @@ -5174,7 +5649,6 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: rhodecode/templates/admin/repos/repo_edit_permissions.html:34 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.html:34 -#: rhodecode/templates/pullrequests/pullrequest_show.html:199 msgid "owner" msgstr "" @@ -5264,7 +5738,7 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:23 -#: rhodecode/templates/base/base.html:198 +#: rhodecode/templates/base/base.html:193 msgid "Clone from" msgstr "" @@ -5273,7 +5747,7 @@ msgid "Optional http[s] URL from which t msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.html:36 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:100 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:102 #: rhodecode/templates/forks/fork.html:52 msgid "" "Keep it short and to the point. Use a README file for longer descriptions." @@ -5283,48 +5757,48 @@ msgstr "" msgid "Repository Group" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:46 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:61 -#: rhodecode/templates/forks/fork.html:63 +#: rhodecode/templates/admin/repos/repo_add_base.html:47 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:62 +#: rhodecode/templates/forks/fork.html:64 #, python-format msgid "Select my personal group (%(repo_group_name)s)" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:48 -#: rhodecode/templates/forks/fork.html:65 +#: rhodecode/templates/admin/repos/repo_add_base.html:50 +#: rhodecode/templates/forks/fork.html:67 msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:57 +#: rhodecode/templates/admin/repos/repo_add_base.html:59 msgid "Copy permission set from the parent repository group." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:66 +#: rhodecode/templates/admin/repos/repo_add_base.html:68 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:71 -#: rhodecode/templates/admin/repos/repo_edit_settings.html:68 -#: rhodecode/templates/forks/fork.html:71 +#: rhodecode/templates/admin/repos/repo_add_base.html:73 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:70 +#: rhodecode/templates/forks/fork.html:73 msgid "Landing commit" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.html:75 +#: rhodecode/templates/admin/repos/repo_add_base.html:77 msgid "" "The default commit for file pages, downloads, full text search index, and " "README generation." msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:9 +#: rhodecode/templates/admin/repos/repo_creating.html:5 #, python-format msgid "%s Creating repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:16 +#: rhodecode/templates/admin/repos/repo_creating.html:12 msgid "Creating repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_creating.html:30 +#: rhodecode/templates/admin/repos/repo_creating.html:26 #, python-format msgid "" "Repository \"%(repo_name)s\" is being created, you will be redirected when " @@ -5353,6 +5827,10 @@ msgstr "" msgid "Statistics" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit.html:87 +msgid "Reviewers" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_advanced.html:7 msgid "Updated on" msgstr "" @@ -5456,7 +5934,7 @@ msgid "Delete forks" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.html:139 -#: rhodecode/templates/data_table/_dt_elements.html:120 +#: rhodecode/templates/data_table/_dt_elements.html:124 #, python-format msgid "Confirm to delete this repository: %s" msgstr "" @@ -5525,7 +6003,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.html:62 #: rhodecode/templates/admin/users/user_add.html:97 #: rhodecode/templates/admin/users/user_edit_profile.html:90 -#: rhodecode/templates/admin/users/users.html:99 +#: rhodecode/templates/admin/users/users.html:101 msgid "Active" msgstr "" @@ -5685,50 +6163,50 @@ msgid "" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.html:56 -#: rhodecode/templates/data_table/_dt_elements.html:160 +#: rhodecode/templates/data_table/_dt_elements.html:164 #: rhodecode/templates/forks/fork.html:58 msgid "Repository group" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:63 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:65 msgid "Optional select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:72 -#: rhodecode/templates/forks/fork.html:75 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:74 +#: rhodecode/templates/forks/fork.html:77 msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:90 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:92 msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:106 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:108 #: rhodecode/templates/data_table/_dt_elements.html:58 msgid "Private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:115 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:117 msgid "Enable statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:119 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:121 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:124 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:126 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:128 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:130 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:133 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:135 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.html:137 +#: rhodecode/templates/admin/repos/repo_edit_settings.html:139 msgid "" "Enable automatic locking on repository. Pulling from this repository creates" " a lock that can be released by pushing back by the same user" @@ -5759,10 +6237,10 @@ msgid "Select to inherit global vcs sett msgstr "" #: rhodecode/templates/admin/repos/repo_edit_vcs.html:45 -#: rhodecode/templates/admin/settings/settings_global.html:109 +#: rhodecode/templates/admin/settings/settings_global.html:139 #: rhodecode/templates/admin/settings/settings_labs.html:48 #: rhodecode/templates/admin/settings/settings_vcs.html:13 -#: rhodecode/templates/admin/settings/settings_visual.html:219 +#: rhodecode/templates/admin/settings/settings_visual.html:221 msgid "Save settings" msgstr "" @@ -5842,10 +6320,6 @@ msgstr "" msgid "Send an auto-generated email from this server to above email..." msgstr "" -#: rhodecode/templates/admin/settings/settings_email.html:48 -msgid "Send" -msgstr "" - #: rhodecode/templates/admin/settings/settings_global.html:5 msgid "Branding" msgstr "" @@ -5865,34 +6339,67 @@ msgid "" "to connect." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:35 +#: rhodecode/templates/admin/settings/settings_global.html:36 +#: rhodecode/templates/admin/users/user_edit_advanced.html:56 +msgid "Personal Repository Group" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:41 +msgid "Create Personal Repository Group" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:44 +msgid "Always create Personal Repository Groups for new users." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:45 +msgid "" +"When creating new users from add user form or API you can still turn this " +"off via a checkbox or flag" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:49 +msgid "Personal Repo Group Pattern" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:55 +msgid "" +"Pattern used to create Personal Repository Groups. Prefix can be other " +"existing repository group path[s], eg. /u/${username}" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:56 +msgid "Available variables are currently ${username} and ${user_id}" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:64 msgid "Registration Captcha" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:39 +#: rhodecode/templates/admin/settings/settings_global.html:68 msgid "Google ReCaptcha public key" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:46 +#: rhodecode/templates/admin/settings/settings_global.html:75 msgid "Public key for reCaptcha system." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:51 +#: rhodecode/templates/admin/settings/settings_global.html:80 msgid "Google ReCaptcha private key" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:58 +#: rhodecode/templates/admin/settings/settings_global.html:87 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha on " "registration" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:66 +#: rhodecode/templates/admin/settings/settings_global.html:95 msgid "Custom Header Code" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:71 -#: rhodecode/templates/admin/settings/settings_global.html:93 +#: rhodecode/templates/admin/settings/settings_global.html:100 +#: rhodecode/templates/admin/settings/settings_global.html:123 #: rhodecode/templates/debug_style/form-elements-small.html:59 #: rhodecode/templates/debug_style/form-elements.html:57 #: rhodecode/templates/debug_style/form-elements.html:82 @@ -5902,7 +6409,7 @@ msgstr "" #: rhodecode/templates/debug_style/form-elements.html:515 #: rhodecode/templates/debug_style/form-elements.html:519 #: rhodecode/templates/debug_style/form-elements.html:537 -#: rhodecode/templates/debug_style/form-elements.html:587 +#: rhodecode/templates/debug_style/form-elements.html:581 #: rhodecode/templates/debug_style/form-inline.html:38 #: rhodecode/templates/debug_style/form-inline.html:139 #: rhodecode/templates/debug_style/form-inline.html:147 @@ -5915,8 +6422,8 @@ msgstr "" msgid "Templates..." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:74 -#: rhodecode/templates/admin/settings/settings_global.html:96 +#: rhodecode/templates/admin/settings/settings_global.html:103 +#: rhodecode/templates/admin/settings/settings_global.html:126 #: rhodecode/templates/debug_style/form-elements-small.html:62 #: rhodecode/templates/debug_style/form-elements.html:60 #: rhodecode/templates/debug_style/form-elements.html:85 @@ -5926,7 +6433,7 @@ msgstr "" #: rhodecode/templates/debug_style/form-elements.html:518 #: rhodecode/templates/debug_style/form-elements.html:522 #: rhodecode/templates/debug_style/form-elements.html:540 -#: rhodecode/templates/debug_style/form-elements.html:590 +#: rhodecode/templates/debug_style/form-elements.html:584 #: rhodecode/templates/debug_style/form-inline.html:41 #: rhodecode/templates/debug_style/form-inline.html:142 #: rhodecode/templates/debug_style/form-inline.html:150 @@ -5939,23 +6446,27 @@ msgstr "" msgid "Server Announcement" msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:80 +#: rhodecode/templates/admin/settings/settings_global.html:104 +msgid "Flash message filtering" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_global.html:110 msgid "Custom js/css code added at the end of the
tag." msgstr "" -#: rhodecode/templates/admin/settings/settings_global.html:81 +#: rhodecode/templates/admin/settings/settings_global.html:111 msgid "Use