# HG changeset patch # User Marcin Kuzminski # Date 2016-12-01 10:18:35 # Node ID 344ee981b80fa0651833a3ecb09c1e15a254b786 # Parent 66ac4b2d6d39bd0409892a50da0e248ad11a67be # Parent b63df6554bb6704686ce54026b8e1debbd9a287f release: merge back stable branch into default diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -10,3 +10,4 @@ 0e4dc11b58cad833c513fe17bac39e6850edf959 8a876f48f5cb1d018b837db28ff928500cb32cfb v4.4.0 8dd86b410b1aac086ffdfc524ef300f896af5047 v4.4.1 d2514226abc8d3b4f6fb57765f47d1b6fb360a05 v4.4.2 +27d783325930af6dad2741476c0d0b1b7c8415c2 v4.5.0 diff --git a/pkgs/python-packages.nix b/pkgs/python-packages.nix --- a/pkgs/python-packages.nix +++ b/pkgs/python-packages.nix @@ -1,4 +1,4 @@ -# Generated by pip2nix 0.4.0.dev1 +# Generated by pip2nix 0.4.0 # See https://github.com/johbo/pip2nix { @@ -1381,13 +1381,13 @@ }; }; python-editor = super.buildPythonPackage { - name = "python-editor-1.0.1"; + name = "python-editor-1.0.3"; buildInputs = with self; []; doCheck = false; propagatedBuildInputs = with self; []; src = fetchurl { - url = "https://pypi.python.org/packages/2b/c0/df7b87d5cf016f82eab3b05cd35f53287c1178ad8c42bfb6fa61b89b22f6/python-editor-1.0.1.tar.gz"; - md5 = "e1fa63535b40e022fa4fd646fd8b511a"; + url = "https://pypi.python.org/packages/65/1e/adf6e000ea5dc909aa420352d6ba37f16434c8a3c2fa030445411a1ed545/python-editor-1.0.3.tar.gz"; + md5 = "0aca5f2ef176ce68e98a5b7e31372835"; }; meta = { license = [ pkgs.lib.licenses.asl20 { fullName = "Apache"; } ]; diff --git a/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo b/rhodecode/i18n/be/LC_MESSAGES/rhodecode.mo index 0e41006dcb8e946f56e3d9e155dc408832ed97e4..0a8052062b0279bb43b849ceb469a1dab136d01c GIT binary patch literal 142858 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

X1POmY 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 PsIqT(Z&J|*zm)x7+2+Lp 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