diff --git a/.release.cfg b/.release.cfg --- a/.release.cfg +++ b/.release.cfg @@ -5,6 +5,7 @@ done = false done = true [task:rc_tools_pinned] +done = true [task:fixes_on_stable] @@ -13,6 +14,7 @@ done = true [task:changelog_updated] [task:generate_api_docs] +done = true [task:updated_translation] diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -1,14 +1,14 @@ # Translations template for rhodecode-enterprise-ce. -# Copyright (C) 2021 RhodeCode GmbH +# Copyright (C) 2022 RhodeCode GmbH # This file is distributed under the same license as the rhodecode-enterprise-ce project. -# FIRST AUTHOR , 2021. +# FIRST AUTHOR , 2022. # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.25.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.27.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2021-04-05 19:29+0000\n" +"POT-Creation-Date: 2022-10-03 13:29+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -194,164 +194,164 @@ msgstr "" msgid "Failed to generate the Apache configuration for Subversion." msgstr "" -#: rhodecode/apps/admin/views/system_info.py:76 +#: rhodecode/apps/admin/views/system_info.py:110 msgid "Note: please make sure this server can access `${url}` for the update link to work" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:87 -msgid "Update info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:89 -msgid "Check for updates" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:94 -msgid "RhodeCode Version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:95 -msgid "Latest version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:96 -msgid "RhodeCode Base URL" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:97 -msgid "RhodeCode Server IP" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:98 -msgid "RhodeCode Server ID" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:99 -msgid "RhodeCode Configuration" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:100 -msgid "RhodeCode Certificate" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:101 -msgid "Workers" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:102 -msgid "Worker Type" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:106 -msgid "Database" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:107 -msgid "Database version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:111 -msgid "Platform" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:112 -msgid "Platform UUID" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:113 -msgid "Lang" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:114 -msgid "Python version" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:115 -msgid "Python path" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:119 -msgid "CPU" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:120 -msgid "Load" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:121 -msgid "Memory" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:122 -msgid "Uptime" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:126 -msgid "Ulimit" +msgid "Update info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:123 +msgid "Check for updates" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:128 +msgid "RhodeCode Version" msgstr "" #: rhodecode/apps/admin/views/system_info.py:129 -msgid "Storage location" +msgid "Latest version" msgstr "" #: rhodecode/apps/admin/views/system_info.py:130 -msgid "Storage info" +msgid "RhodeCode Base URL" msgstr "" #: rhodecode/apps/admin/views/system_info.py:131 -msgid "Storage inodes" +msgid "RhodeCode Server IP" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:132 +msgid "RhodeCode Server ID" msgstr "" #: rhodecode/apps/admin/views/system_info.py:133 -msgid "Gist storage location" +msgid "RhodeCode Configuration" msgstr "" #: rhodecode/apps/admin/views/system_info.py:134 -msgid "Gist storage info" +msgid "RhodeCode Certificate" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:135 +msgid "Workers" msgstr "" #: rhodecode/apps/admin/views/system_info.py:136 -msgid "Archive cache storage location" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:137 -msgid "Archive cache info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:139 -msgid "Temp storage location" +msgid "Worker Type" msgstr "" #: rhodecode/apps/admin/views/system_info.py:140 -msgid "Temp storage info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:142 -msgid "Search info" -msgstr "" - -#: rhodecode/apps/admin/views/system_info.py:143 -msgid "Search location" +msgid "Database" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:141 +msgid "Database version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:145 +msgid "Platform" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:146 +msgid "Platform UUID" msgstr "" #: rhodecode/apps/admin/views/system_info.py:147 -msgid "VCS Backends" +msgid "Lang" msgstr "" #: rhodecode/apps/admin/views/system_info.py:148 -#: rhodecode/templates/admin/settings/settings_system.mako:32 -msgid "VCS Server" +msgid "Python version" msgstr "" #: rhodecode/apps/admin/views/system_info.py:149 +msgid "Python path" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:153 +msgid "CPU" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:154 +msgid "Load" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:155 +msgid "Memory" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:156 +msgid "Uptime" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:160 +msgid "Ulimit" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:163 +msgid "Storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:164 +msgid "Storage info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:165 +msgid "Storage inodes" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:167 +msgid "Gist storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:168 +msgid "Gist storage info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:170 +msgid "Archive cache storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:171 +msgid "Archive cache info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:173 +msgid "Temp storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:174 +msgid "Temp storage info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:176 +msgid "Search info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:177 +msgid "Search location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:181 +msgid "VCS Backends" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:182 +#: rhodecode/templates/admin/settings/settings_system.mako:32 +msgid "VCS Server" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:183 msgid "GIT" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:150 +#: rhodecode/apps/admin/views/system_info.py:184 msgid "HG" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:151 +#: rhodecode/apps/admin/views/system_info.py:185 msgid "SVN" msgstr "" @@ -375,200 +375,200 @@ msgstr "" msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:332 +#: rhodecode/apps/admin/views/users.py:335 msgid "User updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:350 +#: rhodecode/apps/admin/views/users.py:353 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:378 -#, python-format -msgid "Detached %s repositories" -msgstr "" - #: rhodecode/apps/admin/views/users.py:381 #, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:384 +#, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:387 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - #: rhodecode/apps/admin/views/users.py:390 #, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:393 +#, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:396 -#, python-format -msgid "Detached %s user groups" -msgstr "" - #: rhodecode/apps/admin/views/users.py:399 #, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:402 +#, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:405 -#, python-format -msgid "Detached %s pull requests" -msgstr "" - #: rhodecode/apps/admin/views/users.py:408 #, python-format +msgid "Detached %s pull requests" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:411 +#, python-format msgid "Deleted %s pull requests" msgstr "" -#: rhodecode/apps/admin/views/users.py:414 -#, python-format -msgid "Detached %s artifacts" -msgstr "" - #: rhodecode/apps/admin/views/users.py:417 #, python-format +msgid "Detached %s artifacts" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:420 +#, python-format msgid "Deleted %s artifacts" msgstr "" -#: rhodecode/apps/admin/views/users.py:466 +#: rhodecode/apps/admin/views/users.py:469 msgid "Successfully deleted user `{}`" msgstr "" -#: rhodecode/apps/admin/views/users.py:473 +#: rhodecode/apps/admin/views/users.py:476 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/apps/admin/views/users.py:536 +#: rhodecode/apps/admin/views/users.py:540 msgid "" "The user participates as reviewer in {} pull request and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:542 +#: rhodecode/apps/admin/views/users.py:546 msgid "" "The user participates as reviewer in {} pull requests and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:625 +#: rhodecode/apps/admin/views/users.py:629 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:643 +#: rhodecode/apps/admin/views/users.py:647 #: rhodecode/apps/user_group/views/__init__.py:449 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:663 +#: rhodecode/apps/admin/views/users.py:667 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:671 -#: rhodecode/apps/admin/views/users.py:698 +#: rhodecode/apps/admin/views/users.py:675 +#: rhodecode/apps/admin/views/users.py:702 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:689 +#: rhodecode/apps/admin/views/users.py:693 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:756 +#: rhodecode/apps/admin/views/users.py:760 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:762 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - #: rhodecode/apps/admin/views/users.py:766 #, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:770 +#, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:771 +#: rhodecode/apps/admin/views/users.py:775 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:791 +#: rhodecode/apps/admin/views/users.py:795 #: rhodecode/apps/my_account/views/my_account.py:216 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:28 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:33 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:844 +#: rhodecode/apps/admin/views/users.py:848 #: rhodecode/apps/my_account/views/my_account.py:267 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:871 +#: rhodecode/apps/admin/views/users.py:875 #: rhodecode/apps/my_account/views/my_account.py:289 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:939 +#: rhodecode/apps/admin/views/users.py:943 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:106 msgid "Ssh Key successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:945 #: rhodecode/apps/admin/views/users.py:949 +#: rhodecode/apps/admin/views/users.py:953 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:112 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:116 msgid "An error occurred during ssh key saving: {}" msgstr "" -#: rhodecode/apps/admin/views/users.py:981 +#: rhodecode/apps/admin/views/users.py:985 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:144 msgid "Ssh key successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:1022 +#: rhodecode/apps/admin/views/users.py:1026 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1028 -msgid "Email `{}` is already registered for another user." -msgstr "" - #: rhodecode/apps/admin/views/users.py:1032 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:1036 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1057 +#: rhodecode/apps/admin/views/users.py:1061 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1098 +#: rhodecode/apps/admin/views/users.py:1102 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1120 -msgid "An error occurred during ip saving" -msgstr "" - #: rhodecode/apps/admin/views/users.py:1124 +msgid "An error occurred during ip saving" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:1128 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1152 +#: rhodecode/apps/admin/views/users.py:1156 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1212 +#: rhodecode/apps/admin/views/users.py:1216 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/admin/views/users.py:1315 +#: rhodecode/apps/admin/views/users.py:1319 msgid "Deleted {} cache keys" msgstr "" @@ -647,7 +647,7 @@ msgid "Error occurred during update of g msgstr "" #: rhodecode/apps/home/views.py:442 -#: rhodecode/apps/repository/views/repo_pull_requests.py:972 +#: rhodecode/apps/repository/views/repo_pull_requests.py:980 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:219 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 @@ -775,17 +775,21 @@ msgstr "" msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:75 -msgid "Cache invalidation successful" -msgstr "" - -#: rhodecode/apps/repository/views/repo_caches.py:79 +#: rhodecode/apps/repository/views/repo_caches.py:77 msgid "An error occurred during cache invalidation" msgstr "" +#: rhodecode/apps/repository/views/repo_caches.py:85 +msgid "An error occurred during vcsserver cache invalidation" +msgstr "" + +#: rhodecode/apps/repository/views/repo_caches.py:89 +msgid "Cache invalidation successful. Stages {}/2" +msgstr "" + #: rhodecode/apps/repository/views/repo_changelog.py:66 #: rhodecode/apps/repository/views/repo_compare.py:64 -#: rhodecode/apps/repository/views/repo_pull_requests.py:830 +#: rhodecode/apps/repository/views/repo_pull_requests.py:838 msgid "There are no commits yet" msgstr "" @@ -814,7 +818,7 @@ msgid "No such commit exists. Org except msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:388 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1588 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1604 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -824,12 +828,12 @@ msgid "Changing the status of a commit a msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:472 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1671 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1687 msgid "posted {} new {} comment" msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:474 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1673 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1689 msgid "posted {} new {} comments" msgstr "" @@ -923,15 +927,15 @@ msgid "Changesets" msgstr "" #: rhodecode/apps/repository/views/repo_files.py:1014 -#: rhodecode/apps/repository/views/repo_summary.py:239 -#: rhodecode/model/pull_request.py:1912 rhodecode/model/scm.py:999 +#: rhodecode/apps/repository/views/repo_summary.py:240 +#: rhodecode/model/pull_request.py:2042 rhodecode/model/scm.py:1000 #: rhodecode/templates/base/vcs_settings.mako:235 #: rhodecode/templates/summary/components.mako:10 msgid "Branches" msgstr "" #: rhodecode/apps/repository/views/repo_files.py:1018 -#: rhodecode/model/scm.py:1016 rhodecode/templates/base/vcs_settings.mako:260 +#: rhodecode/model/scm.py:1017 rhodecode/templates/base/vcs_settings.mako:260 #: rhodecode/templates/summary/components.mako:34 msgid "Tags" msgstr "" @@ -1021,72 +1025,72 @@ msgstr "" msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:326 +#: rhodecode/apps/repository/views/repo_pull_requests.py:334 msgid "Pull Request state was force changed to `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:857 +#: rhodecode/apps/repository/views/repo_pull_requests.py:865 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1119 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1127 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1139 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1147 msgid "source_repo or target repo not found" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1150 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1158 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1165 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1173 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1235 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1243 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1238 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1246 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1267 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1336 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1278 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1347 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1299 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1310 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1342 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1353 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1364 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1380 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1404 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1420 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1428 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1444 msgid "Pull request observers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1452 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1468 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1498 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1514 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1526 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1542 msgid "Successfully deleted pull request" msgstr "" @@ -1215,23 +1219,23 @@ msgstr "" msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:218 +#: rhodecode/apps/repository/views/repo_summary.py:219 #: rhodecode/templates/admin/permissions/permissions.mako:42 #: rhodecode/templates/summary/components.mako:8 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:219 +#: rhodecode/apps/repository/views/repo_summary.py:220 #: rhodecode/templates/summary/components.mako:32 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:220 +#: rhodecode/apps/repository/views/repo_summary.py:221 #: rhodecode/templates/summary/components.mako:44 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:240 +#: rhodecode/apps/repository/views/repo_summary.py:241 msgid "Closed branches" msgstr "" @@ -1811,7 +1815,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:107 #: rhodecode/templates/admin/users/user_edit_emails.mako:66 #: rhodecode/templates/admin/users/user_edit_ips.mako:76 -#: rhodecode/templates/admin/users/user_edit_profile.mako:155 +#: rhodecode/templates/admin/users/user_edit_profile.mako:164 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:72 #: rhodecode/templates/base/default_perms_box.mako:102 msgid "Reset" @@ -1926,7 +1930,7 @@ msgstr "" #: rhodecode/templates/register.mako:97 #: rhodecode/templates/admin/my_account/my_account_profile.mako:78 #: rhodecode/templates/admin/users/user_add.mako:86 -#: rhodecode/templates/admin/users/user_edit_profile.mako:65 +#: rhodecode/templates/admin/users/user_edit_profile.mako:74 #: rhodecode/templates/admin/users/users.mako:76 #: rhodecode/templates/email_templates/user_registration.mako:51 #: rhodecode/templates/users/user_profile.mako:69 @@ -2006,7 +2010,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:74 #: rhodecode/templates/admin/users/user_add.mako:35 -#: rhodecode/templates/admin/users/user_edit_profile.mako:39 +#: rhodecode/templates/admin/users/user_edit_profile.mako:42 #: rhodecode/templates/admin/users/users.mako:74 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:43 @@ -2249,7 +2253,7 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1883 +#: rhodecode/lib/helpers.py:1884 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2271,7 +2275,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1907 +#: rhodecode/lib/helpers.py:1908 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" @@ -4261,79 +4265,79 @@ msgstr "" msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1690 +#: rhodecode/model/pull_request.py:1820 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1693 +#: rhodecode/model/pull_request.py:1823 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1707 +#: rhodecode/model/pull_request.py:1837 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1724 +#: rhodecode/model/pull_request.py:1854 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1727 +#: rhodecode/model/pull_request.py:1857 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1911 rhodecode/model/scm.py:1008 +#: rhodecode/model/pull_request.py:2041 rhodecode/model/scm.py:1009 #: rhodecode/templates/admin/my_account/my_account.mako:32 #: rhodecode/templates/base/base.mako:639 #: rhodecode/templates/summary/components.mako:46 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1916 +#: rhodecode/model/pull_request.py:2046 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1919 +#: rhodecode/model/pull_request.py:2049 #: rhodecode/templates/summary/components.mako:22 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:2105 -msgid "WIP marker in title prevents from accidental merge." -msgstr "" - -#: rhodecode/model/pull_request.py:2115 -msgid "User `{}` not allowed to perform merge." -msgstr "" - -#: rhodecode/model/pull_request.py:2133 -msgid "Target branch `{}` changes rejected by rule {}." -msgstr "" - -#: rhodecode/model/pull_request.py:2148 -msgid "Pull request reviewer approval is pending." -msgstr "" - -#: rhodecode/model/pull_request.py:2162 -msgid "Cannot merge, {} TODO still not resolved." -msgstr "" - -#: rhodecode/model/pull_request.py:2165 -msgid "Cannot merge, {} TODOs still not resolved." -msgstr "" - -#: rhodecode/model/pull_request.py:2220 -msgid "Merge strategy: rebase" -msgstr "" - -#: rhodecode/model/pull_request.py:2225 -msgid "Merge strategy: explicit merge commit" -msgstr "" - -#: rhodecode/model/pull_request.py:2233 -msgid "Source branch will be closed before the merge." -msgstr "" - #: rhodecode/model/pull_request.py:2235 +msgid "WIP marker in title prevents from accidental merge." +msgstr "" + +#: rhodecode/model/pull_request.py:2245 +msgid "User `{}` not allowed to perform merge." +msgstr "" + +#: rhodecode/model/pull_request.py:2263 +msgid "Target branch `{}` changes rejected by rule {}." +msgstr "" + +#: rhodecode/model/pull_request.py:2278 +msgid "Pull request reviewer approval is pending." +msgstr "" + +#: rhodecode/model/pull_request.py:2292 +msgid "Cannot merge, {} TODO still not resolved." +msgstr "" + +#: rhodecode/model/pull_request.py:2295 +msgid "Cannot merge, {} TODOs still not resolved." +msgstr "" + +#: rhodecode/model/pull_request.py:2350 +msgid "Merge strategy: rebase" +msgstr "" + +#: rhodecode/model/pull_request.py:2355 +msgid "Merge strategy: explicit merge commit" +msgstr "" + +#: rhodecode/model/pull_request.py:2363 +msgid "Source branch will be closed before the merge." +msgstr "" + +#: rhodecode/model/pull_request.py:2365 msgid "Source branch will be deleted after the merge." msgstr "" @@ -4451,13 +4455,13 @@ msgid "Repository group with name \"%(re msgstr "" #: rhodecode/model/validators.py:567 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:236 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:237 msgid "Repository name cannot end with .git" msgstr "" #: rhodecode/model/validators.py:627 #, python-format -msgid "invalid clone url for %(rtype)s repository" +msgid "invalid clone url or credentials for %(rtype)s repository" msgstr "" #: rhodecode/model/validators.py:628 @@ -4474,7 +4478,7 @@ msgid "You do not have the permission to msgstr "" #: rhodecode/model/validators.py:680 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:136 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:137 msgid "You do not have the permission to store repositories in the root location." msgstr "" @@ -4550,7 +4554,7 @@ msgid "Name must start with a letter or msgstr "" #: rhodecode/model/validation_schema/validators.py:142 -msgid "invalid clone url for {repo_type} repository" +msgid "invalid clone url or credentials for {repo_type} repository" msgstr "" #: rhodecode/model/validation_schema/validators.py:151 @@ -4615,54 +4619,54 @@ msgstr "" msgid "{integration_type} settings" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:53 msgid "Parent repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:57 msgid "You do not have the permissions to store repository groups inside repository group `{}`" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:59 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:60 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:125 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:127 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:143 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:221 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:145 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:222 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:148 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:226 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:150 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:227 msgid "Repository group with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:60 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:61 msgid "Repo owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:102 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:103 msgid "Fork with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:105 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:106 msgid "Cannot set fork of parameter of this repository to itself" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_schema.py:130 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:134 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:131 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:135 msgid "Repository group `{}` does not exist" msgstr "" -#: rhodecode/model/validation_schema/schemas/user_group_schema.py:32 +#: rhodecode/model/validation_schema/schemas/user_group_schema.py:33 msgid "Allowed in name are letters, numbers, and `-`, `_`, `.` Name must start with a letter or number. Got `{}`" msgstr "" -#: rhodecode/model/validation_schema/schemas/user_group_schema.py:48 +#: rhodecode/model/validation_schema/schemas/user_group_schema.py:50 msgid "User group owner with id `{}` does not exists" msgstr "" @@ -4932,47 +4936,47 @@ msgstr "" #: rhodecode/public/js/scripts.js:40479 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:131 -#: rhodecode/public/js/src/rhodecode/comments.js:759 +#: rhodecode/public/js/src/rhodecode/comments.js:760 msgid "Yes, delete comment #{0}!" msgstr "" #: rhodecode/public/js/scripts.js:40524 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 -#: rhodecode/public/js/src/rhodecode/comments.js:804 +#: rhodecode/public/js/src/rhodecode/comments.js:810 msgid "Submit {0} draft comment." msgstr "" #: rhodecode/public/js/scripts.js:40527 rhodecode/public/js/scripts.js:41225 #: rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:130 -#: rhodecode/public/js/src/rhodecode/comments.js:807 -#: rhodecode/public/js/src/rhodecode/comments.js:1505 +#: rhodecode/public/js/src/rhodecode/comments.js:813 +#: rhodecode/public/js/src/rhodecode/comments.js:1511 msgid "Yes" msgstr "" #: rhodecode/public/js/scripts.js:40619 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -#: rhodecode/public/js/src/rhodecode/comments.js:899 +#: rhodecode/public/js/src/rhodecode/comments.js:905 msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}" msgstr "" #: rhodecode/public/js/scripts.js:40823 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -#: rhodecode/public/js/src/rhodecode/comments.js:1103 +#: rhodecode/public/js/src/rhodecode/comments.js:1109 msgid "Comment body was not changed." msgstr "" #: rhodecode/public/js/scripts.js:41074 rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 -#: rhodecode/public/js/src/rhodecode/comments.js:1354 +#: rhodecode/public/js/src/rhodecode/comments.js:1360 msgid "Leave a comment on file {0} line {1}." msgstr "" #: rhodecode/public/js/scripts.js:41214 rhodecode/public/js/scripts.js:41267 #: rhodecode/public/js/scripts.min.js:1 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 -#: rhodecode/public/js/src/rhodecode/comments.js:1494 -#: rhodecode/public/js/src/rhodecode/comments.js:1547 +#: rhodecode/public/js/src/rhodecode/comments.js:1500 +#: rhodecode/public/js/src/rhodecode/comments.js:1553 msgid "TODO from comment {0} was fixed." msgstr "" @@ -5673,7 +5677,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:91 #: rhodecode/templates/admin/users/user_edit_groups.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:17 -#: rhodecode/templates/admin/users/user_edit_profile.mako:74 +#: rhodecode/templates/admin/users/user_edit_profile.mako:83 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:15 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 #: rhodecode/templates/base/issue_tracker_settings.mako:79 @@ -5685,7 +5689,7 @@ msgstr "" #: rhodecode/templates/forks/fork.mako:56 #: rhodecode/templates/forks/forks.mako:62 #: rhodecode/templates/pullrequests/pullrequest.mako:104 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:398 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:399 #: rhodecode/templates/summary/components.mako:159 #: rhodecode/templates/user_group/profile.mako:25 #: rhodecode/templates/users/user_profile.mako:59 @@ -5727,7 +5731,7 @@ msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:114 #: rhodecode/templates/email_templates/commit_comment.mako:141 #: rhodecode/templates/files/file_authors_box.mako:28 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:397 #: rhodecode/templates/search/search_commit.mako:9 #: rhodecode/templates/summary/components.mako:117 #: rhodecode/templates/summary/components.mako:125 @@ -5853,7 +5857,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:38 #: rhodecode/templates/admin/users/user_add.mako:68 -#: rhodecode/templates/admin/users/user_edit_profile.mako:47 +#: rhodecode/templates/admin/users/user_edit_profile.mako:56 #: rhodecode/templates/admin/users/users.mako:78 msgid "First Name" msgstr "" @@ -5862,7 +5866,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile.mako:58 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:47 #: rhodecode/templates/admin/users/user_add.mako:77 -#: rhodecode/templates/admin/users/user_edit_profile.mako:56 +#: rhodecode/templates/admin/users/user_edit_profile.mako:65 #: rhodecode/templates/admin/users/users.mako:80 msgid "Last Name" msgstr "" @@ -6025,6 +6029,26 @@ msgstr "" msgid "Add User Group" msgstr "" +#: rhodecode/templates/admin/artifacts/artifacts.mako:5 +msgid "Artifacts Admin" +msgstr "" + +#: rhodecode/templates/admin/artifacts/artifacts.mako:27 +msgid "Artifacts Administration." +msgstr "" + +#: rhodecode/templates/admin/artifacts/artifacts.mako:30 +#: rhodecode/templates/admin/permissions/permissions_branch.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:67 +#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6 +#: rhodecode/templates/admin/settings/settings_automation.mako:6 +#: rhodecode/templates/artifacts/artifact_list.mako:24 +#: rhodecode/templates/pullrequests/pullrequest.mako:197 +msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license." +msgstr "" + #: rhodecode/templates/admin/auth/auth_settings.mako:5 #: rhodecode/templates/admin/auth/plugin_settings.mako:5 msgid "Authentication Settings" @@ -6064,7 +6088,7 @@ msgstr "" #: rhodecode/templates/admin/auth/auth_settings.mako:85 #: rhodecode/templates/admin/auth/plugin_settings.mako:96 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63 -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:100 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:226 @@ -6078,7 +6102,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:216 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:106 #: rhodecode/templates/admin/users/user_edit_groups.mako:30 -#: rhodecode/templates/admin/users/user_edit_profile.mako:154 +#: rhodecode/templates/admin/users/user_edit_profile.mako:163 #: rhodecode/templates/base/default_perms_box.mako:101 msgid "Save" msgstr "" @@ -6217,7 +6241,7 @@ msgid "Create New Gist" msgstr "" #: rhodecode/templates/admin/gists/gist_index.mako:54 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:23 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:36 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 @@ -6228,20 +6252,20 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:39 #: rhodecode/templates/branches/branches.mako:39 #: rhodecode/templates/journal/journal.mako:12 -#: rhodecode/templates/pullrequests/pullrequests.mako:53 +#: rhodecode/templates/pullrequests/pullrequests.mako:54 #: rhodecode/templates/tags/tags.mako:39 msgid "quick filter..." msgstr "" #: rhodecode/templates/admin/gists/gist_index.mako:103 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:87 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:100 #: rhodecode/templates/bookmarks/bookmarks.mako:73 #: rhodecode/templates/branches/branches.mako:72 #: rhodecode/templates/commits/changelog.mako:138 #: rhodecode/templates/compare/compare_commits.mako:19 #: rhodecode/templates/files/files_browser_tree.mako:20 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:395 -#: rhodecode/templates/pullrequests/pullrequests.mako:100 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:396 +#: rhodecode/templates/pullrequests/pullrequests.mako:122 #: rhodecode/templates/search/search_commit.mako:18 #: rhodecode/templates/summary/summary_commits.mako:11 #: rhodecode/templates/tags/tags.mako:73 @@ -6613,55 +6637,43 @@ msgstr "" msgid "Clear" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30 -msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:31 msgid "Redirect URL" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44 -msgid "Repository template" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50 -msgid "Repository group template" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56 -msgid "Template Repository or Repository group" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:37 +msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:42 +msgid "Templates" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:54 msgid "Available as ${repo_url} e.g. Redirect url: ${repo_url}/changelog" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:58 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70 -msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:71 msgid "Your Bookmarks" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:76 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. " msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:78 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:132 msgid "repository" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192 +#: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:183 msgid "repository group" msgstr "" @@ -6718,14 +6730,14 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile.mako:15 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:16 -#: rhodecode/templates/admin/users/user_edit_profile.mako:19 +#: rhodecode/templates/admin/users/user_edit_profile.mako:22 #, python-format msgid "This user was created from external source (%s). Editing some of the settings is limited." msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:60 -#: rhodecode/templates/admin/users/user_edit_profile.mako:26 +#: rhodecode/templates/admin/users/user_edit_profile.mako:29 #: rhodecode/templates/users/user_profile.mako:15 msgid "Photo" msgstr "" @@ -6739,39 +6751,44 @@ msgstr "" msgid "Change your avatar at" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:5 +msgid "Pull Requests You Participate In" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:13 -#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 -msgid "All" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:14 +#: rhodecode/templates/pullrequests/pullrequests.mako:28 +msgid "Open" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:18 msgid "All + Closed" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:33 -msgid "Pull Requests You Participate In" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:75 -#: rhodecode/templates/pullrequests/pullrequests.mako:96 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:24 +#: rhodecode/templates/pullrequests/pullrequests.mako:31 +msgid "Awaiting my review" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:88 +#: rhodecode/templates/pullrequests/pullrequests.mako:110 msgid "Id" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:81 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:94 #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:47 #: rhodecode/templates/email_templates/pull_request_update.mako:43 #: rhodecode/templates/pullrequests/pullrequest.mako:91 -#: rhodecode/templates/pullrequests/pullrequests.mako:98 +#: rhodecode/templates/pullrequests/pullrequests.mako:116 msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:99 -#: rhodecode/templates/pullrequests/pullrequests.mako:104 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:112 +#: rhodecode/templates/pullrequests/pullrequests.mako:134 msgid "Last Update" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:105 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:118 msgid "Target Repo" msgstr "" @@ -6826,7 +6843,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:84 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:67 -#: rhodecode/templates/admin/users/user_edit_profile.mako:110 +#: rhodecode/templates/admin/users/user_edit_profile.mako:119 #: rhodecode/templates/admin/users/users.mako:85 #: rhodecode/templates/user_group/profile.mako:44 msgid "Active" @@ -6876,6 +6893,10 @@ msgstr "" msgid "Unread" msgstr "" +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "All" +msgstr "" + #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 #: rhodecode/templates/changeset/changeset.mako:252 #: rhodecode/templates/changeset/changeset.mako:262 @@ -6953,17 +6974,6 @@ msgstr "" msgid "Default Permissions for Branches." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_branch.mako:6 -#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6 -#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6 -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:67 -#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6 -#: rhodecode/templates/admin/settings/settings_automation.mako:6 -#: rhodecode/templates/artifacts/artifact_list.mako:24 -#: rhodecode/templates/pullrequests/pullrequest.mako:197 -msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license." -msgstr "" - #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" @@ -7081,7 +7091,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:64 #: rhodecode/templates/admin/repos/repo_add_base.mako:90 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 -#: rhodecode/templates/admin/users/user_edit_profile.mako:81 +#: rhodecode/templates/admin/users/user_edit_profile.mako:90 #: rhodecode/templates/forks/fork.mako:63 msgid "Plain text format with {metatags} support." msgstr "" @@ -7090,7 +7100,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:66 #: rhodecode/templates/admin/repos/repo_add_base.mako:92 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:181 -#: rhodecode/templates/admin/users/user_edit_profile.mako:83 +#: rhodecode/templates/admin/users/user_edit_profile.mako:92 #: rhodecode/templates/forks/fork.mako:65 msgid "Plain text format." msgstr "" @@ -7529,39 +7539,43 @@ msgstr "" msgid "Archive this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:183 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:184 +msgid "This action is irreversible" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:186 msgid "Archiving the repository will make it entirely read-only. The repository cannot be committed to.It is hidden from the search results and dashboard. " msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:195 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:198 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:209 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:211 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:214 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:224 msgid "Consider to archive this repository instead." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:237 msgid "Delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:239 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:242 msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:276 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:276 msgid "Pick repository" msgstr "" @@ -8415,6 +8429,10 @@ msgstr "" msgid "Python Packages" msgstr "" +#: rhodecode/templates/admin/settings/settings_system.mako:67 +msgid "Env Variables" +msgstr "" + #: rhodecode/templates/admin/settings/settings_visual.mako:5 #: rhodecode/templates/base/vcs_settings.mako:10 msgid "General" @@ -8981,41 +8999,45 @@ msgid "" "To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:31 +#: rhodecode/templates/admin/users/user_edit_profile.mako:34 msgid "Change the avatar at" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:94 +#: rhodecode/templates/admin/users/user_edit_profile.mako:49 +msgid "Super-admin can edit this field by entering " +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_profile.mako:103 msgid "New Password" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:102 +#: rhodecode/templates/admin/users/user_edit_profile.mako:111 msgid "New Password Confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:118 +#: rhodecode/templates/admin/users/user_edit_profile.mako:127 #: rhodecode/templates/admin/users/users.mako:87 #: rhodecode/templates/base/perms_summary.mako:150 msgid "Super-admin" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:126 +#: rhodecode/templates/admin/users/user_edit_profile.mako:135 msgid "Authentication type" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:130 +#: rhodecode/templates/admin/users/user_edit_profile.mako:139 msgid "When user was created using an external source. He is bound to authentication using this method." msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:135 -msgid "Name in Source of Record" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_profile.mako:144 +msgid "Name in Source of Record" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_profile.mako:153 msgid "Language" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:150 +#: rhodecode/templates/admin/users/user_edit_profile.mako:159 #, python-format msgid "User interface language. Help translate %(rc_link)s into your language." msgstr "" @@ -9829,7 +9851,7 @@ msgid "Download Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:160 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:503 msgid "General Comments" msgstr "" @@ -9988,7 +10010,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:526 #: rhodecode/templates/pullrequests/pullrequest_show.mako:46 -#: rhodecode/templates/pullrequests/pullrequests.mako:31 +#: rhodecode/templates/pullrequests/pullrequests.mako:32 msgid "Closed" msgstr "" @@ -10301,7 +10323,7 @@ msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:80 #: rhodecode/templates/compare/compare_commits.mako:55 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:433 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:434 #: rhodecode/templates/search/search_commit.mako:34 msgid "Expand commit message" msgstr "" @@ -10353,7 +10375,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:18 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:394 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:395 msgid "Time" msgstr "" @@ -11332,92 +11354,100 @@ msgstr "" msgid "Cannot show diff when pull request state is changing. Current progress state" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:295 -msgid "Missing requirements:" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:278 +msgid "Consider refreshing the page to check if the status transition was finished" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:282 +msgid "If you think this is an error try " msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:296 +msgid "Missing requirements:" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:297 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:304 -msgid "Missing commits" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:305 -msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository." +msgid "Missing commits" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request." +msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository." msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:307 +msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:308 msgid "Consider doing a `force update commits` in case you think this is an error." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:316 msgid "There are new changes for `{}:{}` in source repository, please consider updating this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:326 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:327 msgid "Showing changes at v{}, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:349 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:371 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:350 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:372 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:352 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:353 msgid "more update options" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:360 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:361 msgid "Force update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:363 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:364 msgid "Update commits and force refresh this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:371 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:372 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:383 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:384 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:387 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:405 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:406 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:407 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:510 -msgid "there is {num} general comment from older versions" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:511 +msgid "there is {num} general comment from older versions" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:512 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:513 -msgid "there are {num} general comments from older versions" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:514 +msgid "there are {num} general comments from older versions" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:515 msgid "show them" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:556 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:557 #: rhodecode/templates/pullrequests/pullrequest_show.mako:567 msgid "Drafts" msgstr "" @@ -11465,27 +11495,19 @@ msgstr "" msgid "{} Pull Requests" msgstr "" -#: rhodecode/templates/pullrequests/pullrequests.mako:27 -msgid "Opened" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequests.mako:28 -msgid "Opened by me" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequests.mako:29 -msgid "Awaiting review" +msgid "Created by me" msgstr "" #: rhodecode/templates/pullrequests/pullrequests.mako:30 -msgid "Awaiting my review" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequests.mako:32 +msgid "Awaiting review" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequests.mako:33 msgid "From this repo" msgstr "" -#: rhodecode/templates/pullrequests/pullrequests.mako:40 +#: rhodecode/templates/pullrequests/pullrequests.mako:41 msgid "Open new Pull Request" msgstr "" @@ -11620,23 +11642,23 @@ msgstr "" msgid "%s RSS feed" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:117 +#: rhodecode/templates/summary/summary_commits.mako:118 msgid "Add or upload files directly via RhodeCode:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:119 +#: rhodecode/templates/summary/summary_commits.mako:120 msgid "Add New File" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:122 +#: rhodecode/templates/summary/summary_commits.mako:123 msgid "Upload New File" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:128 +#: rhodecode/templates/summary/summary_commits.mako:130 msgid "Push new repo:" msgstr "" -#: rhodecode/templates/summary/summary_commits.mako:151 +#: rhodecode/templates/summary/summary_commits.mako:153 msgid "Existing repository?" msgstr ""