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 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.19.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.20.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2020-05-22 09:45+0000\n" +"POT-Creation-Date: 2020-07-20 11:46+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -56,16 +56,19 @@ msgstr "" #: rhodecode/templates/admin/integrations/list.mako:172 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7 #: rhodecode/templates/base/issue_tracker_settings.mako:137 +#: rhodecode/templates/changeset/changeset_file_comment.mako:201 +#: rhodecode/templates/changeset/changeset_file_comment.mako:205 +#: rhodecode/templates/changeset/changeset_file_comment.mako:209 #: rhodecode/templates/data_table/_dt_elements.mako:173 #: rhodecode/templates/data_table/_dt_elements.mako:251 #: rhodecode/templates/data_table/_dt_elements.mako:266 #: rhodecode/templates/data_table/_dt_elements.mako:267 #: rhodecode/templates/data_table/_dt_elements.mako:282 #: rhodecode/templates/debug_style/buttons.html:128 -#: rhodecode/templates/files/files_add.mako:56 -#: rhodecode/templates/files/files_edit.mako:58 -#: rhodecode/templates/files/files_source.mako:29 -#: rhodecode/templates/files/files_source.mako:42 +#: rhodecode/templates/files/files_add.mako:55 +#: rhodecode/templates/files/files_edit.mako:57 +#: rhodecode/templates/files/files_source.mako:39 +#: rhodecode/templates/files/files_source.mako:52 #: rhodecode/templates/pullrequests/pullrequest_show.mako:74 #: rhodecode/templates/pullrequests/pullrequest_show.mako:302 #: rhodecode/templates/user_group/profile.mako:8 @@ -81,12 +84,12 @@ msgstr "" msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:328 +#: rhodecode/apps/admin/views/repo_groups.py:342 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:346 +#: rhodecode/apps/admin/views/repo_groups.py:360 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -99,81 +102,81 @@ msgstr "" msgid "Failed to cleanup up old sessions" msgstr "" -#: rhodecode/apps/admin/views/settings.py:162 -#: rhodecode/apps/admin/views/settings.py:317 -#: rhodecode/apps/admin/views/settings.py:392 -#: rhodecode/apps/admin/views/settings.py:726 +#: rhodecode/apps/admin/views/settings.py:163 +#: rhodecode/apps/admin/views/settings.py:319 +#: rhodecode/apps/admin/views/settings.py:394 +#: rhodecode/apps/admin/views/settings.py:727 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124 msgid "Some form inputs contain invalid data." msgstr "" -#: rhodecode/apps/admin/views/settings.py:189 -#: rhodecode/apps/admin/views/settings.py:353 +#: rhodecode/apps/admin/views/settings.py:190 +#: rhodecode/apps/admin/views/settings.py:355 msgid "Error occurred during updating application settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:193 +#: rhodecode/apps/admin/views/settings.py:194 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143 msgid "Updated VCS settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:267 +#: rhodecode/apps/admin/views/settings.py:269 #, python-format msgid "Repositories successfully rescanned added: %s ; removed: %s" msgstr "" -#: rhodecode/apps/admin/views/settings.py:349 +#: rhodecode/apps/admin/views/settings.py:351 msgid "Updated application settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:431 +#: rhodecode/apps/admin/views/settings.py:433 msgid "Updated visualisation settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:434 +#: rhodecode/apps/admin/views/settings.py:436 msgid "Error occurred during updating visualisation settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:496 +#: rhodecode/apps/admin/views/settings.py:498 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127 msgid "Invalid issue tracker pattern: {}" msgstr "" -#: rhodecode/apps/admin/views/settings.py:513 +#: rhodecode/apps/admin/views/settings.py:515 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136 msgid "Updated issue tracker entries" msgstr "" -#: rhodecode/apps/admin/views/settings.py:533 +#: rhodecode/apps/admin/views/settings.py:535 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91 msgid "Removed issue tracker entry." msgstr "" -#: rhodecode/apps/admin/views/settings.py:571 +#: rhodecode/apps/admin/views/settings.py:573 msgid "Please enter email address" msgstr "" -#: rhodecode/apps/admin/views/settings.py:588 +#: rhodecode/apps/admin/views/settings.py:589 msgid "Send email task created" msgstr "" -#: rhodecode/apps/admin/views/settings.py:638 +#: rhodecode/apps/admin/views/settings.py:639 msgid "Added new hook" msgstr "" -#: rhodecode/apps/admin/views/settings.py:653 +#: rhodecode/apps/admin/views/settings.py:654 msgid "Updated hooks" msgstr "" -#: rhodecode/apps/admin/views/settings.py:657 +#: rhodecode/apps/admin/views/settings.py:658 msgid "Error occurred during hook creation" msgstr "" -#: rhodecode/apps/admin/views/settings.py:750 +#: rhodecode/apps/admin/views/settings.py:751 msgid "Error occurred during updating labs settings" msgstr "" -#: rhodecode/apps/admin/views/settings.py:755 +#: rhodecode/apps/admin/views/settings.py:756 msgid "Updated Labs settings" msgstr "" @@ -488,8 +491,8 @@ msgstr "" #: rhodecode/apps/admin/views/users.py:834 #: rhodecode/apps/my_account/views/my_account.py:161 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:22 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:28 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:33 msgid "Role" msgstr "" @@ -583,9 +586,9 @@ msgstr "" msgid "1 month" msgstr "" -#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:46848 +#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:47676 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 #: rhodecode/public/js/src/rhodecode.js:625 msgid "Lifetime" msgstr "" @@ -609,8 +612,8 @@ msgstr "" #: rhodecode/apps/gist/views.py:330 #: rhodecode/templates/admin/gists/gist_show.mako:76 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:44 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55 #: rhodecode/templates/data_table/_dt_elements.mako:341 msgid "never" msgstr "" @@ -638,14 +641,14 @@ msgid "Error occurred during update of g msgstr "" #: rhodecode/apps/home/views.py:452 -#: rhodecode/apps/repository/views/repo_pull_requests.py:914 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:209 +#: rhodecode/apps/repository/views/repo_pull_requests.py:930 +#: 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 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12 -#: rhodecode/templates/base/base.mako:107 -#: rhodecode/templates/base/base.mako:126 -#: rhodecode/templates/base/base.mako:1172 +#: rhodecode/templates/base/base.mako:112 +#: rhodecode/templates/base/base.mako:131 +#: rhodecode/templates/base/base.mako:1192 msgid "Repositories" msgstr "" @@ -653,7 +656,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/form.mako:17 #: rhodecode/templates/admin/integrations/list.mako:10 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:208 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:218 msgid "Repository Groups" msgstr "" @@ -776,12 +779,11 @@ 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:763 +#: rhodecode/apps/repository/views/repo_pull_requests.py:779 msgid "There are no commits yet" msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:71 -#: rhodecode/apps/repository/views/repo_files.py:185 #: rhodecode/apps/repository/views/repo_files.py:205 msgid "No such commit exists for this repository" msgstr "" @@ -801,17 +803,17 @@ msgstr "" msgid "Created repository %s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:111 +#: rhodecode/apps/repository/views/repo_commits.py:112 msgid "No such commit exists. Org exception: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:330 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1399 +#: rhodecode/apps/repository/views/repo_commits.py:331 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1415 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:375 +#: rhodecode/apps/repository/views/repo_commits.py:376 msgid "Changing the status of a commit associated with a closed pull request is not allowed" msgstr "" @@ -872,6 +874,10 @@ msgstr "" msgid "There are no files yet. %s" msgstr "" +#: rhodecode/apps/repository/views/repo_files.py:185 +msgid "No such commit exists for this repository. Commit: {}" +msgstr "" + #: rhodecode/apps/repository/views/repo_files.py:341 msgid "Downloads disabled" msgstr "" @@ -896,11 +902,11 @@ msgstr "" msgid "Unknown archive type" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:990 +#: rhodecode/apps/repository/views/repo_files.py:1005 msgid "Changesets" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1011 +#: rhodecode/apps/repository/views/repo_files.py:1026 #: rhodecode/apps/repository/views/repo_summary.py:264 #: rhodecode/model/pull_request.py:1740 rhodecode/model/scm.py:995 #: rhodecode/templates/base/vcs_settings.mako:235 @@ -908,68 +914,68 @@ msgstr "" msgid "Branches" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1015 +#: rhodecode/apps/repository/views/repo_files.py:1030 #: rhodecode/model/scm.py:1012 rhodecode/templates/base/vcs_settings.mako:260 #: rhodecode/templates/summary/components.mako:34 msgid "Tags" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1169 -#: rhodecode/apps/repository/views/repo_files.py:1197 +#: rhodecode/apps/repository/views/repo_files.py:1184 +#: rhodecode/apps/repository/views/repo_files.py:1212 msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1218 +#: rhodecode/apps/repository/views/repo_files.py:1233 msgid "Successfully deleted file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1222 -#: rhodecode/apps/repository/views/repo_files.py:1339 -#: rhodecode/apps/repository/views/repo_files.py:1470 -#: rhodecode/apps/repository/views/repo_files.py:1593 +#: rhodecode/apps/repository/views/repo_files.py:1237 +#: rhodecode/apps/repository/views/repo_files.py:1354 +#: rhodecode/apps/repository/views/repo_files.py:1485 +#: rhodecode/apps/repository/views/repo_files.py:1608 msgid "Error occurred during commit" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1254 -#: rhodecode/apps/repository/views/repo_files.py:1285 +#: rhodecode/apps/repository/views/repo_files.py:1269 +#: rhodecode/apps/repository/views/repo_files.py:1300 msgid "Edited file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1308 +#: rhodecode/apps/repository/views/repo_files.py:1323 msgid "No changes detected on {}" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1332 +#: rhodecode/apps/repository/views/repo_files.py:1347 msgid "Successfully committed changes to file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1373 -#: rhodecode/apps/repository/views/repo_files.py:1414 +#: rhodecode/apps/repository/views/repo_files.py:1388 +#: rhodecode/apps/repository/views/repo_files.py:1429 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1430 +#: rhodecode/apps/repository/views/repo_files.py:1445 msgid "No filename specified" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1455 +#: rhodecode/apps/repository/views/repo_files.py:1470 msgid "Successfully committed new file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1463 -#: rhodecode/apps/repository/views/repo_files.py:1575 +#: rhodecode/apps/repository/views/repo_files.py:1478 +#: rhodecode/apps/repository/views/repo_files.py:1590 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1520 +#: rhodecode/apps/repository/views/repo_files.py:1535 msgid "Uploaded file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1564 +#: rhodecode/apps/repository/views/repo_files.py:1579 msgid "Successfully committed {} new files" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1566 +#: rhodecode/apps/repository/views/repo_files.py:1581 msgid "Successfully committed 1 new file" msgstr "" @@ -999,72 +1005,72 @@ msgstr "" msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:287 +#: rhodecode/apps/repository/views/repo_pull_requests.py:291 msgid "Pull Request state was force changed to `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:793 +#: rhodecode/apps/repository/views/repo_pull_requests.py:809 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:945 +#: rhodecode/apps/repository/views/repo_pull_requests.py:961 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:965 +#: rhodecode/apps/repository/views/repo_pull_requests.py:981 msgid "source_repo or target repo not found" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:976 +#: rhodecode/apps/repository/views/repo_pull_requests.py:992 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:991 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1007 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1055 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1071 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1058 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1074 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1090 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1145 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1106 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1161 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1112 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1128 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1151 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1167 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1173 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1189 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:1187 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1203 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1222 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1238 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1268 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1284 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1292 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1308 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1325 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1341 msgid "Successfully deleted pull request" msgstr "" @@ -1588,54 +1594,62 @@ msgstr "" msgid "Choose operation scope restriction when authenticating." msgstr "" -#: rhodecode/events/pullrequest.py:79 +#: rhodecode/events/pullrequest.py:78 msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:80 +#: rhodecode/events/pullrequest.py:79 msgid "Event triggered after pull request was created" msgstr "" +#: rhodecode/events/pullrequest.py:88 +msgid "pullrequest closed" +msgstr "" + #: rhodecode/events/pullrequest.py:89 -msgid "pullrequest closed" -msgstr "" - -#: rhodecode/events/pullrequest.py:90 msgid "Event triggered after pull request was closed" msgstr "" +#: rhodecode/events/pullrequest.py:98 +msgid "pullrequest commits updated" +msgstr "" + #: rhodecode/events/pullrequest.py:99 -msgid "pullrequest commits updated" -msgstr "" - -#: rhodecode/events/pullrequest.py:100 msgid "Event triggered after pull requests was updated" msgstr "" +#: rhodecode/events/pullrequest.py:108 +msgid "pullrequest review changed" +msgstr "" + #: rhodecode/events/pullrequest.py:109 -msgid "pullrequest review changed" -msgstr "" - -#: rhodecode/events/pullrequest.py:110 msgid "Event triggered after a review status of a pull requests has changed to other." msgstr "" +#: rhodecode/events/pullrequest.py:123 +msgid "pullrequest merged" +msgstr "" + #: rhodecode/events/pullrequest.py:124 -msgid "pullrequest merged" -msgstr "" - -#: rhodecode/events/pullrequest.py:125 msgid "Event triggered after a successful merge operation was executed on a pull request" msgstr "" +#: rhodecode/events/pullrequest.py:134 +msgid "pullrequest commented" +msgstr "" + #: rhodecode/events/pullrequest.py:135 -msgid "pullrequest commented" -msgstr "" - -#: rhodecode/events/pullrequest.py:136 msgid "Event triggered after a comment was made on a code in the pull request" msgstr "" +#: rhodecode/events/pullrequest.py:173 +msgid "pullrequest comment edited" +msgstr "" + +#: rhodecode/events/pullrequest.py:174 +msgid "Event triggered after a comment was edited on a code in the pull request" +msgstr "" + #: rhodecode/events/repo.py:191 msgid "repository commit comment" msgstr "" @@ -1644,67 +1658,75 @@ msgstr "" msgid "Event triggered after a comment was made on commit inside a repository" msgstr "" -#: rhodecode/events/repo.py:224 +#: rhodecode/events/repo.py:226 +msgid "repository commit edit comment" +msgstr "" + +#: rhodecode/events/repo.py:227 +msgid "Event triggered after a comment was edited on commit inside a repository" +msgstr "" + +#: rhodecode/events/repo.py:260 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:225 +#: rhodecode/events/repo.py:261 msgid "Event triggered before repository is created" msgstr "" -#: rhodecode/events/repo.py:234 +#: rhodecode/events/repo.py:270 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:235 +#: rhodecode/events/repo.py:271 msgid "Event triggered after repository was created" msgstr "" -#: rhodecode/events/repo.py:244 +#: rhodecode/events/repo.py:280 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:245 +#: rhodecode/events/repo.py:281 msgid "Event triggered before a repository is deleted" msgstr "" -#: rhodecode/events/repo.py:254 +#: rhodecode/events/repo.py:290 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:255 +#: rhodecode/events/repo.py:291 msgid "Event triggered after repository was deleted" msgstr "" -#: rhodecode/events/repo.py:295 +#: rhodecode/events/repo.py:331 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:296 +#: rhodecode/events/repo.py:332 msgid "Event triggered before repository code is pulled" msgstr "" -#: rhodecode/events/repo.py:305 +#: rhodecode/events/repo.py:341 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:306 +#: rhodecode/events/repo.py:342 msgid "Event triggered after repository code was pulled" msgstr "" -#: rhodecode/events/repo.py:315 +#: rhodecode/events/repo.py:351 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:316 +#: rhodecode/events/repo.py:352 msgid "Event triggered before the code is pushed to a repository" msgstr "" -#: rhodecode/events/repo.py:328 +#: rhodecode/events/repo.py:364 msgid "repository push" msgstr "" -#: rhodecode/events/repo.py:329 +#: rhodecode/events/repo.py:365 msgid "Event triggered after the code was pushed to a repository" msgstr "" @@ -1753,15 +1775,15 @@ msgid "user permissions change" msgstr "" #: rhodecode/forms/__init__.py:35 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:97 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:103 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:227 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:201 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:207 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:251 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:141 @@ -1769,22 +1791,23 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:215 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:207 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:101 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:217 +#: 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_ssh_keys.mako:72 -#: rhodecode/templates/base/default_perms_box.mako:89 +#: rhodecode/templates/base/default_perms_box.mako:102 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:37802 +#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:38311 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/utils/ajax.js:158 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +#: rhodecode/public/js/src/rhodecode/utils/ajax.js:161 #: rhodecode/templates/admin/gists/gist_show.mako:59 #: rhodecode/templates/admin/integrations/list.mako:179 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:65 #: rhodecode/templates/admin/my_account/my_account_emails.mako:33 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:34 #: rhodecode/templates/admin/notifications/notifications_data.mako:22 @@ -1792,21 +1815,21 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:29 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25 #: rhodecode/templates/admin/settings/settings_hooks.mako:46 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:69 #: rhodecode/templates/admin/users/user_edit_emails.mako:34 #: rhodecode/templates/admin/users/user_edit_ips.mako:40 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 #: rhodecode/templates/base/issue_tracker_settings.mako:146 #: rhodecode/templates/base/vcs_settings.mako:244 #: rhodecode/templates/base/vcs_settings.mako:269 -#: rhodecode/templates/changeset/changeset_file_comment.mako:140 -#: rhodecode/templates/changeset/changeset_file_comment.mako:142 -#: rhodecode/templates/changeset/changeset_file_comment.mako:145 +#: rhodecode/templates/changeset/changeset_file_comment.mako:203 +#: rhodecode/templates/changeset/changeset_file_comment.mako:206 +#: rhodecode/templates/changeset/changeset_file_comment.mako:210 #: rhodecode/templates/data_table/_dt_elements.mako:436 #: rhodecode/templates/debug_style/buttons.html:132 -#: rhodecode/templates/files/files_source.mako:30 -#: rhodecode/templates/files/files_source.mako:37 -#: rhodecode/templates/files/files_source.mako:43 +#: rhodecode/templates/files/files_source.mako:40 +#: rhodecode/templates/files/files_source.mako:47 +#: rhodecode/templates/files/files_source.mako:53 msgid "Delete" msgstr "" @@ -1889,7 +1912,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.mako:86 #: rhodecode/templates/admin/users/user_edit_profile.mako:65 #: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/email_templates/user_registration.mako:50 +#: rhodecode/templates/email_templates/user_registration.mako:51 #: rhodecode/templates/users/user_profile.mako:69 msgid "Email" msgstr "" @@ -1970,7 +1993,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_profile.mako:39 #: rhodecode/templates/admin/users/users.mako:74 #: rhodecode/templates/debug_style/login.html:36 -#: rhodecode/templates/email_templates/user_registration.mako:42 +#: rhodecode/templates/email_templates/user_registration.mako:43 #: rhodecode/templates/user_group/profile.mako:61 #: rhodecode/templates/users/user_profile.mako:29 msgid "Username" @@ -2190,15 +2213,15 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1760 +#: rhodecode/lib/auth.py:1769 msgid "IP {} not allowed" msgstr "" -#: rhodecode/lib/auth.py:1852 +#: rhodecode/lib/auth.py:1861 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1896 +#: rhodecode/lib/auth.py:1905 msgid "You need to be signed in to view this page" msgstr "" @@ -2206,7 +2229,7 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1721 +#: rhodecode/lib/helpers.py:1803 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2228,7 +2251,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1745 +#: rhodecode/lib/helpers.py:1827 #, 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 "" @@ -2265,9 +2288,9 @@ msgstr "" msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22115 +#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22612 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2302,6 +2325,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2772 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2987 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3073 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3079 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266 @@ -2309,7 +2333,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3079 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3110 msgid "Repository no access" msgstr "" @@ -2343,6 +2367,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2773 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2988 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3074 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3080 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267 @@ -2350,7 +2375,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3080 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3111 msgid "Repository read access" msgstr "" @@ -2384,6 +2409,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2774 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2989 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3075 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3081 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268 @@ -2391,7 +2417,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3081 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3112 msgid "Repository write access" msgstr "" @@ -2425,6 +2451,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2775 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2990 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3076 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3082 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269 @@ -2432,7 +2459,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3082 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3113 msgid "Repository admin access" msgstr "" @@ -2506,6 +2533,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2798 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3013 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3099 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3105 #: 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:2287 @@ -2513,7 +2541,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3105 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3136 msgid "Repository creation disabled" msgstr "" @@ -2547,6 +2575,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2799 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3014 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3100 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3106 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288 @@ -2554,7 +2583,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3106 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3137 msgid "Repository creation enabled" msgstr "" @@ -2588,6 +2617,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2803 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3018 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3104 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3110 #: 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:2292 @@ -2595,7 +2625,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3110 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3141 msgid "Repository forking disabled" msgstr "" @@ -2629,6 +2659,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2804 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3019 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3105 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3111 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293 @@ -2636,7 +2667,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3111 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3142 msgid "Repository forking enabled" msgstr "" @@ -2691,6 +2722,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3525 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3757 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3843 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3890 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907 @@ -2698,10 +2730,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3859 -#: rhodecode/public/js/scripts.js:41391 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3935 +#: rhodecode/public/js/scripts.js:42219 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:352 msgid "Not Reviewed" msgstr "" @@ -2735,6 +2767,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3526 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3758 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3844 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3891 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908 @@ -2742,7 +2775,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3860 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3936 msgid "Approved" msgstr "" @@ -2776,6 +2809,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3527 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3759 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3845 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3892 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909 @@ -2783,7 +2817,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3861 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3937 msgid "Rejected" msgstr "" @@ -2817,6 +2851,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3528 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3760 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3846 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3893 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910 @@ -2824,7 +2859,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3862 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3938 msgid "Under Review" msgstr "" @@ -2855,6 +2890,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2777 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2992 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3078 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3084 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271 @@ -2862,7 +2898,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3084 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3115 msgid "Repository group no access" msgstr "" @@ -2893,6 +2929,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2778 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2993 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3079 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3085 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272 @@ -2900,7 +2937,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3085 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3116 msgid "Repository group read access" msgstr "" @@ -2931,6 +2968,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2779 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2994 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3080 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3086 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273 @@ -2938,7 +2976,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3086 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3117 msgid "Repository group write access" msgstr "" @@ -2969,6 +3007,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2780 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2995 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3081 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3087 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274 @@ -2976,7 +3015,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3087 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3118 msgid "Repository group admin access" msgstr "" @@ -3006,6 +3045,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2782 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2997 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3083 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3089 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276 @@ -3013,7 +3053,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3089 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3120 msgid "User group no access" msgstr "" @@ -3043,6 +3083,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2783 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2998 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3084 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3090 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 @@ -3050,7 +3091,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3090 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3121 msgid "User group read access" msgstr "" @@ -3080,6 +3121,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2784 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2999 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3085 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3091 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278 @@ -3087,7 +3129,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3091 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3122 msgid "User group write access" msgstr "" @@ -3117,6 +3159,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2785 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3000 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3086 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3092 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 @@ -3124,7 +3167,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3092 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3123 msgid "User group admin access" msgstr "" @@ -3154,6 +3197,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2792 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3007 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3093 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3099 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 @@ -3161,7 +3205,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3099 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3130 msgid "Repository Group creation disabled" msgstr "" @@ -3191,6 +3235,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2793 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3008 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3094 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3100 #: 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:2282 @@ -3198,7 +3243,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3100 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3131 msgid "Repository Group creation enabled" msgstr "" @@ -3228,6 +3273,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2795 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3010 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3096 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3102 #: 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:2284 @@ -3235,7 +3281,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3102 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3133 msgid "User Group creation disabled" msgstr "" @@ -3265,6 +3311,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2796 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3011 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3097 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3103 #: 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:2285 @@ -3272,7 +3319,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3103 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3134 msgid "User Group creation enabled" msgstr "" @@ -3302,6 +3349,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2806 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3021 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3107 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3113 #: 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:2295 @@ -3309,7 +3357,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3113 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3144 msgid "Registration disabled" msgstr "" @@ -3339,6 +3387,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2807 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3022 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3108 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3114 #: 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:2296 @@ -3346,7 +3395,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3114 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3145 msgid "User Registration with manual account activation" msgstr "" @@ -3376,6 +3425,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2808 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3023 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3109 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3115 #: 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:2297 @@ -3383,7 +3433,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3115 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3146 msgid "User Registration with automatic account activation" msgstr "" @@ -3413,6 +3463,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2814 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3029 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3115 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3121 #: 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:2299 @@ -3420,7 +3471,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3121 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3152 #: rhodecode/model/permission.py:105 msgid "Manual activation of external account" msgstr "" @@ -3451,6 +3502,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2815 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3030 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3116 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3122 #: 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:2300 @@ -3458,7 +3510,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3122 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3153 #: rhodecode/model/permission.py:106 msgid "Automatic activation of external account" msgstr "" @@ -3483,6 +3535,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2800 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3015 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3101 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3107 #: 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:2289 @@ -3490,7 +3543,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3107 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3138 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3514,6 +3567,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2801 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3016 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3102 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3108 #: 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:2290 @@ -3521,7 +3575,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3108 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3139 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3542,6 +3596,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2770 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2985 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3071 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3077 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264 @@ -3549,7 +3604,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3077 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3108 msgid "RhodeCode Super Administrator" msgstr "" @@ -3568,6 +3623,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2817 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3032 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3118 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3124 #: 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:2302 @@ -3575,7 +3631,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3124 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3155 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3594,6 +3650,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2818 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3033 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3119 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3125 #: 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:2303 @@ -3601,7 +3658,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3125 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3156 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3612,6 +3669,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1120 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1137 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1189 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1195 #: 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:910 @@ -3619,7 +3677,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1195 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1202 msgid "all" msgstr "" @@ -3630,6 +3688,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1121 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1138 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1190 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1196 #: 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:911 @@ -3637,7 +3696,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1196 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1203 msgid "http/web interface" msgstr "" @@ -3648,6 +3707,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1122 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1139 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1191 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1197 #: 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:912 @@ -3655,7 +3715,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1197 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1204 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3666,6 +3726,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1123 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1140 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1192 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1198 #: 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:913 @@ -3673,7 +3734,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1198 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1205 msgid "api calls" msgstr "" @@ -3684,6 +3745,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1124 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1141 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1193 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1199 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3691,7 +3753,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1199 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1206 msgid "feed access" msgstr "" @@ -3702,6 +3764,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2511 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2638 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:2729 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:2735 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042 @@ -3709,7 +3772,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2735 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2766 msgid "No parent" msgstr "" @@ -3720,9 +3783,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3025 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3111 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3117 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3117 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3148 msgid "Password reset enabled" msgstr "" @@ -3733,9 +3797,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3026 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3112 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3118 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3118 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3149 msgid "Password reset hidden" msgstr "" @@ -3746,9 +3811,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3027 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3113 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3119 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3119 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3150 msgid "Password reset disabled" msgstr "" @@ -3758,7 +3824,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3088 -#: rhodecode/model/db.py:3094 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3094 +#: rhodecode/model/db.py:3125 msgid "Branch no permissions" msgstr "" @@ -3768,7 +3835,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3089 -#: rhodecode/model/db.py:3095 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3095 +#: rhodecode/model/db.py:3126 msgid "Branch access by web merge" msgstr "" @@ -3778,7 +3846,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3090 -#: rhodecode/model/db.py:3096 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3096 +#: rhodecode/model/db.py:3127 msgid "Branch access by push" msgstr "" @@ -3788,12 +3857,14 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3091 -#: rhodecode/model/db.py:3097 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3097 +#: rhodecode/model/db.py:3128 msgid "Branch access by push with force" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1194 -#: rhodecode/model/db.py:1200 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1200 +#: rhodecode/model/db.py:1207 msgid "artifacts downloads" msgstr "" @@ -3881,14 +3952,38 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:473 +#: rhodecode/model/comment.py:485 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:474 +#: rhodecode/model/comment.py:486 msgid "Show it now" msgstr "" +#: rhodecode/model/db.py:1213 +msgid "Token for all actions." +msgstr "" + +#: rhodecode/model/db.py:1214 +msgid "Token to access RhodeCode pages via web interface without login using `api_access_controllers_whitelist` functionality." +msgstr "" + +#: rhodecode/model/db.py:1216 +msgid "Token to interact over git/hg/svn protocols. Requires auth_token authentication plugin to be active.
Such Token should be used then instead of a password to interact with a repository, and additionally can be limited to single repository using repo scope." +msgstr "" + +#: rhodecode/model/db.py:1221 +msgid "Token limited to api calls." +msgstr "" + +#: rhodecode/model/db.py:1222 +msgid "Token to read RSS/ATOM feed." +msgstr "" + +#: rhodecode/model/db.py:1223 +msgid "Token for artifacts downloads." +msgstr "" + #: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "" @@ -3907,72 +4002,72 @@ msgstr "" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:246 +#: rhodecode/model/notification.py:248 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:247 +#: rhodecode/model/notification.py:249 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:250 +#: rhodecode/model/notification.py:252 #, python-format msgid "%(user)s sent message %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:251 +#: rhodecode/model/notification.py:253 #, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:254 +#: rhodecode/model/notification.py:256 #, python-format msgid "%(user)s mentioned you %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:255 +#: rhodecode/model/notification.py:257 #, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:258 +#: rhodecode/model/notification.py:260 #, python-format msgid "%(user)s registered in RhodeCode %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:259 +#: rhodecode/model/notification.py:261 #, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:262 +#: rhodecode/model/notification.py:264 #, python-format msgid "%(user)s opened new pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:263 +#: rhodecode/model/notification.py:265 #, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:266 +#: rhodecode/model/notification.py:268 #, python-format msgid "%(user)s updated pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:267 +#: rhodecode/model/notification.py:269 #, python-format msgid "%(user)s updated pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:270 +#: rhodecode/model/notification.py:272 #, python-format msgid "%(user)s commented on pull request %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:271 +#: rhodecode/model/notification.py:273 #, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" @@ -3980,7 +4075,7 @@ msgstr "" #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 #: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 msgid "None" @@ -3999,8 +4094,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:17 -#: rhodecode/templates/changeset/changeset_file_comment.mako:272 -#: rhodecode/templates/changeset/changeset_file_comment.mako:323 +#: rhodecode/templates/changeset/changeset_file_comment.mako:337 +#: rhodecode/templates/changeset/changeset_file_comment.mako:388 #: rhodecode/templates/data_table/_dt_elements.mako:450 msgid "Write" msgstr "" @@ -4028,7 +4123,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:18 #: rhodecode/templates/admin/users/user_add.mako:11 #: rhodecode/templates/admin/users/user_edit.mako:12 -#: rhodecode/templates/base/base.mako:832 +#: rhodecode/templates/base/base.mako:839 msgid "Admin" msgstr "" @@ -4122,7 +4217,7 @@ msgstr "" #: rhodecode/model/pull_request.py:1739 rhodecode/model/scm.py:1004 #: rhodecode/templates/admin/my_account/my_account.mako:32 -#: rhodecode/templates/base/base.mako:629 +#: rhodecode/templates/base/base.mako:636 #: rhodecode/templates/summary/components.mako:46 msgid "Bookmarks" msgstr "" @@ -4169,11 +4264,11 @@ msgid "Merge strategy: explicit merge co msgstr "" #: rhodecode/model/pull_request.py:2056 -msgid "Source branch will be closed after merge." +msgid "Source branch will be closed before the merge." msgstr "" #: rhodecode/model/pull_request.py:2058 -msgid "Source branch will be deleted after merge." +msgid "Source branch will be deleted after the merge." msgstr "" #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94 @@ -4290,7 +4385,7 @@ msgid "Repository group with name \"%(re msgstr "" #: rhodecode/model/validators.py:567 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:230 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:236 msgid "Repository name cannot end with .git" msgstr "" @@ -4451,25 +4546,28 @@ msgid "{integration_type} settings" msgstr "" #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52 +msgid "Parent repository group `{}` does not exist" +msgstr "" + #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56 -msgid "Parent repository group `{}` does not exist" -msgstr "" - -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58 +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 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:118 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:125 msgid "Repo group owner with id `{}` does not exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:215 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:143 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:221 msgid "Repository with name `{}` already exists" msgstr "" -#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141 -#: rhodecode/model/validation_schema/schemas/repo_schema.py:220 +#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:148 +#: rhodecode/model/validation_schema/schemas/repo_schema.py:226 msgid "Repository group with name `{}` already exists" msgstr "" @@ -4510,466 +4608,490 @@ msgstr "" msgid "Additional emails can be specified at extra emails page." msgstr "" -#: rhodecode/public/js/scripts.js:20588 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: rhodecode/public/js/scripts.js:19 +msgid ": , " +msgstr "" + +#: rhodecode/public/js/scripts.js:20822 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/scripts.js:22050 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144 +#: rhodecode/public/js/scripts.js:22547 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:161 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/scripts.js:22051 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132 +#: rhodecode/public/js/scripts.js:22548 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:149 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/scripts.js:22052 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127 +#: rhodecode/public/js/scripts.js:22549 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/scripts.js:22053 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129 +#: rhodecode/public/js/scripts.js:22550 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/scripts.js:22054 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131 +#: rhodecode/public/js/scripts.js:22551 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:148 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/scripts.js:22055 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141 +#: rhodecode/public/js/scripts.js:22552 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:158 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/scripts.js:22075 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 +#: rhodecode/public/js/scripts.js:22572 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/scripts.js:22083 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124 +#: rhodecode/public/js/scripts.js:22580 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/scripts.js:22095 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146 +#: rhodecode/public/js/scripts.js:22592 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:163 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:22097 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +#: rhodecode/public/js/scripts.js:22594 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/scripts.js:22101 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125 +#: rhodecode/public/js/scripts.js:22598 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:22103 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126 +#: rhodecode/public/js/scripts.js:22600 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:22105 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 +#: rhodecode/public/js/scripts.js:22602 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:37103 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 +#: rhodecode/public/js/scripts.js:37600 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/scripts.js:37106 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/public/js/scripts.js:37603 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/scripts.js:37109 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/scripts.js:37606 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/scripts.js:37112 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +#: rhodecode/public/js/scripts.js:37609 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/scripts.js:37116 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: rhodecode/public/js/scripts.js:37613 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 #: 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:37118 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140 +#: rhodecode/public/js/scripts.js:37615 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:157 #: 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:37123 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/scripts.js:37620 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/scripts.js:37125 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 +#: rhodecode/public/js/scripts.js:37622 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/scripts.js:37130 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +#: rhodecode/public/js/scripts.js:37627 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/scripts.js:37132 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +#: rhodecode/public/js/scripts.js:37629 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/scripts.js:37136 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/scripts.js:37633 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/scripts.js:37138 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/scripts.js:37635 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/scripts.js:37780 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/utils/ajax.js:136 +#: rhodecode/public/js/scripts.js:38285 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 +#: rhodecode/public/js/src/rhodecode/utils/ajax.js:135 msgid "Ajax Request Error" msgstr "" -#: rhodecode/public/js/scripts.js:38178 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116 +#: rhodecode/public/js/scripts.js:38687 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/scripts.js:38180 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117 +#: rhodecode/public/js/scripts.js:38689 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/scripts.js:38718 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/scripts.js:39227 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode/codemirror.js:363 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/scripts.js:38738 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 +#: rhodecode/public/js/scripts.js:39247 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 #: rhodecode/public/js/src/rhodecode/codemirror.js:383 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/scripts.js:38757 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 +#: rhodecode/public/js/scripts.js:39266 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/rhodecode/codemirror.js:402 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/scripts.js:38777 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +#: rhodecode/public/js/scripts.js:39286 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 #: rhodecode/public/js/src/rhodecode/codemirror.js:422 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/scripts.js:39078 rhodecode/public/js/scripts.js:39432 +#: rhodecode/public/js/scripts.js:39587 rhodecode/public/js/scripts.js:39962 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 #: rhodecode/public/js/src/rhodecode/codemirror.js:723 -#: rhodecode/public/js/src/rhodecode/comments.js:233 +#: rhodecode/public/js/src/rhodecode/comments.js:254 msgid "Status Review" msgstr "" -#: rhodecode/public/js/scripts.js:39093 rhodecode/public/js/scripts.js:39447 +#: rhodecode/public/js/scripts.js:39602 rhodecode/public/js/scripts.js:39977 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/src/rhodecode/codemirror.js:738 -#: rhodecode/public/js/src/rhodecode/comments.js:248 +#: rhodecode/public/js/src/rhodecode/comments.js:269 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" -#: rhodecode/public/js/scripts.js:39174 rhodecode/public/js/scripts.js:39642 -#: rhodecode/public/js/scripts.js:40669 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +#: rhodecode/public/js/scripts.js:39683 rhodecode/public/js/scripts.js:40172 +#: rhodecode/public/js/scripts.js:41495 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 #: rhodecode/public/js/src/rhodecode/codemirror.js:819 -#: rhodecode/public/js/src/rhodecode/comments.js:443 +#: rhodecode/public/js/src/rhodecode/comments.js:464 #: rhodecode/public/js/src/rhodecode/files.js:499 -#: rhodecode/templates/files/files_browser_tree.mako:54 +#: rhodecode/templates/files/files_browser_tree.mako:57 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/scripts.js:39348 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115 -#: rhodecode/public/js/src/rhodecode/comments.js:149 +#: rhodecode/public/js/scripts.js:39844 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/comments.js:136 +msgid "Updated Comment" +msgstr "" + +#: rhodecode/public/js/scripts.js:39868 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132 +#: rhodecode/public/js/src/rhodecode/comments.js:160 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/scripts.js:39591 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 -#: rhodecode/public/js/src/rhodecode/comments.js:392 +#: rhodecode/public/js/scripts.js:40121 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/src/rhodecode/comments.js:413 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/scripts.js:39794 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/comments.js:595 +#: rhodecode/public/js/scripts.js:40403 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 +#: rhodecode/public/js/src/rhodecode/comments.js:695 msgid "Yes, delete comment #{0}!" msgstr "" -#: rhodecode/public/js/scripts.js:39849 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 -#: rhodecode/public/js/src/rhodecode/comments.js:650 +#: rhodecode/public/js/scripts.js:40458 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 +#: rhodecode/public/js/src/rhodecode/comments.js:750 msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/scripts.js:40015 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -#: rhodecode/public/js/src/rhodecode/comments.js:816 +#: rhodecode/public/js/scripts.js:40667 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/comments.js:959 +msgid "Comment body was not changed." +msgstr "" + +#: rhodecode/public/js/scripts.js:40840 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/src/rhodecode/comments.js:1132 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/scripts.js:40140 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 -#: rhodecode/public/js/src/rhodecode/comments.js:941 +#: rhodecode/public/js/scripts.js:40966 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +#: rhodecode/public/js/src/rhodecode/comments.js:1258 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/scripts.js:40418 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119 +#: rhodecode/public/js/scripts.js:41244 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136 #: rhodecode/public/js/src/rhodecode/files.js:248 msgid "truncated result" msgstr "" -#: rhodecode/public/js/scripts.js:40420 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120 +#: rhodecode/public/js/scripts.js:41246 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:137 #: rhodecode/public/js/src/rhodecode/files.js:250 msgid "truncated results" msgstr "" -#: rhodecode/public/js/scripts.js:40429 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: rhodecode/public/js/scripts.js:41255 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 #: rhodecode/public/js/src/rhodecode/files.js:259 msgid "No matching files" msgstr "" -#: rhodecode/public/js/scripts.js:40487 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 +#: rhodecode/public/js/scripts.js:41313 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 #: rhodecode/public/js/src/rhodecode/files.js:317 msgid "Selection link" msgstr "" -#: rhodecode/public/js/scripts.js:40584 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/public/js/scripts.js:41410 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/files.js:414 msgid "All Authors" msgstr "" -#: rhodecode/public/js/scripts.js:40734 rhodecode/public/js/scripts.js:40737 +#: rhodecode/public/js/scripts.js:41560 rhodecode/public/js/scripts.js:41563 #: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 #: rhodecode/public/js/src/rhodecode/files.js:564 #: rhodecode/public/js/src/rhodecode/files.js:567 msgid "File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version." msgstr "" -#: rhodecode/public/js/scripts.js:40740 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/scripts.js:41566 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/rhodecode/files.js:570 msgid "There is an existing path `{0}` at this commit." msgstr "" -#: rhodecode/public/js/scripts.js:40743 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/scripts.js:41569 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/public/js/src/rhodecode/files.js:573 msgid "There is a later version of file tree available. Click {0} to create a file at the latest tree." msgstr "" -#: rhodecode/public/js/scripts.js:40797 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +#: rhodecode/public/js/scripts.js:41623 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stopped watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:40798 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/scripts.js:41624 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 #: rhodecode/public/js/src/rhodecode/followers.js:27 -#: rhodecode/templates/base/base.mako:301 +#: rhodecode/templates/base/base.mako:308 msgid "Watch" msgstr "" -#: rhodecode/public/js/scripts.js:40801 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: rhodecode/public/js/scripts.js:41627 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/followers.js:30 msgid "Started watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:40802 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 +#: rhodecode/public/js/scripts.js:41628 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/src/rhodecode/followers.js:31 -#: rhodecode/templates/base/base.mako:299 +#: rhodecode/templates/base/base.mako:306 msgid "Unwatch" msgstr "" -#: rhodecode/public/js/scripts.js:41182 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:141 +#: rhodecode/public/js/scripts.js:42010 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:41191 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:150 +#: rhodecode/public/js/scripts.js:42019 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:152 msgid "All individual reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:41196 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:155 +#: rhodecode/public/js/scripts.js:42024 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:157 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/scripts.js:41202 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:161 +#: rhodecode/public/js/scripts.js:42030 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:163 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:41218 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:177 +#: rhodecode/public/js/scripts.js:42046 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:179 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/scripts.js:41225 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 +#: rhodecode/public/js/scripts.js:42053 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:186 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/scripts.js:41232 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:191 +#: rhodecode/public/js/scripts.js:42060 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:193 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:41246 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:205 +#: rhodecode/public/js/scripts.js:42074 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:207 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:41268 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:227 +#: rhodecode/public/js/scripts.js:42096 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:229 msgid "Loading diff ..." msgstr "" -#: rhodecode/public/js/scripts.js:41307 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:266 +#: rhodecode/public/js/scripts.js:42135 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:268 msgid "no commits" msgstr "" -#: rhodecode/public/js/scripts.js:41378 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:337 +#: rhodecode/public/js/scripts.js:42206 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:339 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/scripts.js:41384 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:343 +#: rhodecode/public/js/scripts.js:42212 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:345 msgid "User `{0}` already in reviewers" msgstr "" -#: rhodecode/public/js/scripts.js:41487 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:446 +#: rhodecode/public/js/scripts.js:42315 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:448 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:41491 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:450 +#: rhodecode/public/js/scripts.js:42319 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:452 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:41682 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:641 +#: rhodecode/public/js/scripts.js:42510 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:643 msgid "Updating..." msgstr "" -#: rhodecode/public/js/scripts.js:41692 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:651 +#: rhodecode/public/js/scripts.js:42520 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:653 msgid "Force updating..." msgstr "" -#: rhodecode/public/js/scripts.js:46140 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/scripts.js:46968 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/users.js:54 msgid "Show this authentication token?" msgstr "" -#: rhodecode/public/js/scripts.js:46142 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/scripts.js:46970 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/rhodecode/users.js:56 msgid "Show" msgstr "" -#: rhodecode/public/js/scripts.js:46178 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/scripts.js:47006 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 #: rhodecode/public/js/src/rhodecode/users.js:92 msgid "Authentication Token" msgstr "" -#: rhodecode/public/js/scripts.js:46367 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: rhodecode/public/js/scripts.js:47195 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121 #: rhodecode/public/js/src/rhodecode.js:144 msgid "file" msgstr "" -#: rhodecode/public/js/scripts.js:46511 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: rhodecode/public/js/scripts.js:47339 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/src/rhodecode.js:288 msgid "Loading..." msgstr "" -#: rhodecode/public/js/scripts.js:46884 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/scripts.js:47712 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118 #: rhodecode/public/js/src/rhodecode.js:661 msgid "date not in future" msgstr "" -#: rhodecode/public/js/scripts.js:46892 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 +#: rhodecode/public/js/scripts.js:47720 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 #: rhodecode/public/js/src/rhodecode.js:669 msgid "Specified expiration date" msgstr "" @@ -4991,315 +5113,339 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:606 -#: rhodecode/templates/codeblocks/diffs.mako:610 +msgid "{0} file changed, " +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 +msgid "{0} files changed, " +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 +#: rhodecode/templates/codeblocks/diffs.mako:618 +#: rhodecode/templates/codeblocks/diffs.mako:622 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 msgid "Are you sure to close this pull request without merging?" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 msgid "Changed files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/i18n_messages.js:5 #: rhodecode/templates/pullrequests/pullrequest_show.mako:288 msgid "Close" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 #: rhodecode/templates/codeblocks/diffs.mako:131 msgid "Collapse all files" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 -msgid "Collapse {0} commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 -msgid "Collapse {0} commits" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 -msgid "Context file: " +msgid "Collapse {0} commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 -msgid "Delete this comment?" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "Diff to Commit " -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -#: rhodecode/templates/codeblocks/diffs.mako:129 -msgid "Expand all files" +msgid "Collapse {0} commits" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -msgid "Expand {0} commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 -msgid "Expand {0} commits" +msgid "Context file: " msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgid "Delete this comment?" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 -msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgid "Diff to Commit " msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 -msgid "Follow" +msgid "Error during search operation" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: rhodecode/templates/codeblocks/diffs.mako:129 +msgid "Expand all files" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 -msgid "Hide full context diff" +msgid "Expand {0} commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "Hide whitespace changes" +msgid "Expand {0} commits" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +msgid "Follow" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 +msgid "Hide full context diff" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 +msgid "Hide whitespace changes" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 #: rhodecode/public/js/src/i18n_messages.js:4 msgid "Invite reviewers to this discussion" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33 -msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 -msgid "No bookmarks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 -msgid "No branches available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "No forks available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 -msgid "No gists available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 -msgid "No pull requests available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 -msgid "No repositories available yet." +msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 -msgid "No repositories present." +msgid "No bookmarks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 -msgid "No repository groups available yet." +msgid "No branches available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 -msgid "No repository groups present." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 -msgid "No ssh keys available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -msgid "No tags available yet." +msgid "No forks available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +msgid "No gists available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 -msgid "No user groups available yet." +msgid "No pull requests available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 -msgid "No users available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 -#: rhodecode/templates/commits/changelog.mako:78 -msgid "Open new pull request" +msgid "No repositories available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +msgid "No repositories present." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 +msgid "No repository groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +msgid "No repository groups present." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 +msgid "No ssh keys available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 +msgid "No tags available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 +msgid "No user groups available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +msgid "No users available yet." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 +#: rhodecode/templates/commits/changelog.mako:78 +msgid "Open new pull request" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 msgid "Open new pull request for selected commit" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 +msgid "Please wait creating pull request..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 msgid "Saving..." msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 #: rhodecode/public/js/src/i18n_messages.js:6 #: rhodecode/templates/admin/settings/settings_email.mako:50 msgid "Send" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 msgid "Show at Commit " msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 -msgid "Show commit range {0} ... {1}" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 -msgid "Show full context diff" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40 -msgid "Show more" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 -msgid "Show selected commit __S" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -msgid "Show selected commits __S ... __E" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78 -msgid "Show whitespace changes" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 -msgid "Start following this repository" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 -msgid "Stop following this repository" +msgid "Show commit range {0} ... {1}" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 +msgid "Show full context diff" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40 +msgid "Show more" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" +msgid "Show selected commit __S" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -msgid "There are currently no open pull requests requiring your participation." +msgid "Show selected commits __S ... __E" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 +msgid "Show whitespace changes" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 -msgid "Toggle Wide Mode diff" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 -msgid "Unfollow" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 -#: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "activated" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 -msgid "disabled" +msgid "Start following this repository" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "Stop following this repository" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/src/i18n_messages.js:7 +msgid "Switch to chat" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: rhodecode/public/js/src/i18n_messages.js:8 +msgid "Switch to comment" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +msgid "There are currently no open pull requests requiring your participation." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 -msgid "enabled" +msgid "This pull requests will consist of {0} commit." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +msgid "This pull requests will consist of {0} commits." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 -msgid "files" +msgid "Toggle Wide Mode diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 -msgid "go to numeric commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 -#: rhodecode/templates/index_base.mako:27 -#: rhodecode/templates/pullrequests/pullrequest.mako:136 -msgid "loading..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 +msgid "Unfollow" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116 #: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "not active" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118 -msgid "specify commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121 -msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" +msgid "activated" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119 +msgid "disabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120 +msgid "enabled" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122 -msgid "{0} ({1} inactive) of {2} users ({3} inactive)" +msgid "files" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123 -msgid "{0} active out of {1} users" +msgid "go to numeric commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:128 -msgid "{0} days" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130 -msgid "{0} hours" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133 -msgid "{0} months" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134 -msgid "{0} of {1} repositories" +#: rhodecode/templates/index_base.mako:27 +#: rhodecode/templates/pullrequests/pullrequest.mako:136 +msgid "loading..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131 +#: rhodecode/templates/admin/auth/auth_settings.mako:69 +msgid "not active" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:135 -msgid "{0} of {1} repository groups" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136 -msgid "{0} out of {1} ssh keys" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:137 -msgid "{0} out of {1} users" +msgid "specify commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:138 -msgid "{0} repositories" +msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:139 -msgid "{0} repository groups" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142 -msgid "{0} user groups ({1} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143 -msgid "{0} users ({1} inactive)" +msgid "{0} ({1} inactive) of {2} users ({3} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140 +msgid "{0} active out of {1} users" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:145 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:147 +msgid "{0} hours" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:150 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:151 +msgid "{0} of {1} repositories" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:152 +msgid "{0} of {1} repository groups" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:153 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:154 +msgid "{0} out of {1} users" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:155 +msgid "{0} repositories" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:156 +msgid "{0} repository groups" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:159 +msgid "{0} user groups ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:160 +msgid "{0} users ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:162 msgid "{0} years" msgstr "" @@ -5331,11 +5477,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:76 #: rhodecode/templates/admin/user_groups/user_groups.mako:76 #: rhodecode/templates/admin/users/user_edit_groups.mako:57 -#: rhodecode/templates/base/perms_summary.mako:168 -#: rhodecode/templates/base/perms_summary.mako:242 +#: rhodecode/templates/base/perms_summary.mako:173 +#: rhodecode/templates/base/perms_summary.mako:247 #: rhodecode/templates/bookmarks/bookmarks.mako:57 #: rhodecode/templates/branches/branches.mako:56 -#: rhodecode/templates/files/files_browser_tree.mako:13 +#: rhodecode/templates/files/files_browser_tree.mako:16 #: rhodecode/templates/tags/tags.mako:57 msgid "Name" msgstr "" @@ -5343,14 +5489,14 @@ msgstr "" #: rhodecode/templates/index_base.mako:89 #: rhodecode/templates/index_base.mako:176 #: rhodecode/templates/admin/gists/gist_index.mako:109 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:21 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:27 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 #: rhodecode/templates/admin/my_account/my_account_profile.mako:68 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:53 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:58 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:77 #: rhodecode/templates/admin/repos/repo_add_base.mako:83 @@ -5360,8 +5506,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:42 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46 #: rhodecode/templates/admin/user_groups/user_groups.mako:78 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:32 +#: 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 @@ -5369,14 +5515,14 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 #: rhodecode/templates/base/issue_tracker_settings.mako:78 #: rhodecode/templates/compare/compare_commits.mako:19 -#: rhodecode/templates/email_templates/pull_request_review.mako:43 -#: rhodecode/templates/email_templates/pull_request_review.mako:123 -#: rhodecode/templates/email_templates/pull_request_update.mako:43 -#: rhodecode/templates/email_templates/pull_request_update.mako:135 +#: rhodecode/templates/email_templates/pull_request_review.mako:45 +#: rhodecode/templates/email_templates/pull_request_review.mako:126 +#: rhodecode/templates/email_templates/pull_request_update.mako:45 +#: rhodecode/templates/email_templates/pull_request_update.mako:139 #: rhodecode/templates/forks/fork.mako:56 #: rhodecode/templates/forks/forks.mako:62 #: rhodecode/templates/pullrequests/pullrequest.mako:50 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:562 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:560 #: rhodecode/templates/summary/components.mako:159 #: rhodecode/templates/user_group/profile.mako:25 #: rhodecode/templates/users/user_profile.mako:59 @@ -5414,11 +5560,11 @@ msgstr "" #: rhodecode/templates/bookmarks/bookmarks.mako:64 #: rhodecode/templates/branches/branches.mako:63 #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/email_templates/commit_comment.mako:56 -#: rhodecode/templates/email_templates/commit_comment.mako:109 -#: rhodecode/templates/email_templates/commit_comment.mako:135 +#: rhodecode/templates/email_templates/commit_comment.mako:60 +#: 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:560 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:558 #: rhodecode/templates/search/search_commit.mako:9 #: rhodecode/templates/summary/components.mako:117 #: rhodecode/templates/summary/components.mako:125 @@ -5433,8 +5579,8 @@ msgid "%s Repository group dashboard" msgstr "" #: rhodecode/templates/index_repo_group.mako:13 -#: rhodecode/templates/base/base.mako:804 -#: rhodecode/templates/base/base.mako:805 +#: rhodecode/templates/base/base.mako:811 +#: rhodecode/templates/base/base.mako:812 msgid "Home" msgstr "" @@ -5472,7 +5618,7 @@ msgid "Please contact " msgstr "" #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39 -#: rhodecode/templates/base/base.mako:59 +#: rhodecode/templates/base/base.mako:61 msgid "Support" msgstr "" @@ -5599,7 +5745,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_log_entry.mako:63 #: rhodecode/templates/admin/admin_log_base.mako:8 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:25 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86 @@ -5607,7 +5753,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:116 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:75 #: rhodecode/templates/admin/user_groups/user_groups.mako:88 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:30 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36 #: rhodecode/templates/admin/users/user_edit_groups.mako:76 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:18 #: rhodecode/templates/admin/users/users.mako:91 @@ -5629,16 +5775,16 @@ msgstr "" #: rhodecode/templates/admin/admin_log_base.mako:10 #: rhodecode/templates/admin/defaults/defaults.mako:32 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16 -#: rhodecode/templates/base/base.mako:649 -#: rhodecode/templates/base/base.mako:651 -#: rhodecode/templates/base/base.mako:653 +#: rhodecode/templates/base/base.mako:656 +#: rhodecode/templates/base/base.mako:658 +#: rhodecode/templates/base/base.mako:660 #: rhodecode/templates/search/search_commit.mako:8 #: rhodecode/templates/search/search_path.mako:7 msgid "Repository" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:5 -#: rhodecode/templates/base/base.mako:106 +#: rhodecode/templates/base/base.mako:111 msgid "Admin audit logs" msgstr "" @@ -5745,6 +5891,7 @@ msgid "Plugin Name" msgstr "" #: rhodecode/templates/admin/auth/auth_settings.mako:62 +#: rhodecode/templates/base/base.mako:62 msgid "Documentation" msgstr "" @@ -5758,19 +5905,19 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109 #: 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:216 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:226 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:77 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:84 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:200 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:206 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:250 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:206 +#: 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/base/default_perms_box.mako:88 +#: rhodecode/templates/base/default_perms_box.mako:101 msgid "Save" msgstr "" @@ -5851,8 +5998,8 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_edit.mako:54 #: rhodecode/templates/admin/gists/gist_new.mako:48 -#: rhodecode/templates/files/files_add.mako:67 -#: rhodecode/templates/files/files_edit.mako:69 +#: rhodecode/templates/files/files_add.mako:66 +#: rhodecode/templates/files/files_edit.mako:68 msgid "plain" msgstr "" @@ -5862,7 +6009,7 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_edit.mako:100 #: rhodecode/templates/base/issue_tracker_settings.mako:150 -#: rhodecode/templates/changeset/changeset_file_comment.mako:395 +#: rhodecode/templates/changeset/changeset_file_comment.mako:460 #: rhodecode/templates/codeblocks/diffs.mako:88 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75 msgid "Cancel" @@ -5932,8 +6079,8 @@ msgstr "" #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/commits/changelog.mako:119 #: rhodecode/templates/compare/compare_commits.mako:16 -#: rhodecode/templates/files/files_browser_tree.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:559 +#: rhodecode/templates/files/files_browser_tree.mako:20 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:557 #: rhodecode/templates/pullrequests/pullrequests.mako:98 #: rhodecode/templates/search/search_commit.mako:18 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5958,7 +6105,7 @@ msgid "Expires" msgstr "" #: rhodecode/templates/admin/gists/gist_new.mako:5 -#: rhodecode/templates/base/base.mako:568 +#: rhodecode/templates/base/base.mako:575 msgid "New Gist" msgstr "" @@ -6012,7 +6159,7 @@ msgid "Copy the url" msgstr "" #: rhodecode/templates/admin/gists/gist_show.mako:47 -#: rhodecode/templates/files/files_source.mako:106 +#: rhodecode/templates/files/files_source.mako:116 msgid "Copy content" msgstr "" @@ -6029,8 +6176,8 @@ msgid "expires" msgstr "" #: rhodecode/templates/admin/gists/gist_show.mako:95 -#: rhodecode/templates/files/files_delete.mako:58 -#: rhodecode/templates/files/files_source.mako:128 +#: rhodecode/templates/files/files_delete.mako:57 +#: rhodecode/templates/files/files_source.mako:138 msgid "Show as raw" msgstr "" @@ -6050,7 +6197,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:15 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33 #: rhodecode/templates/admin/repos/repo_edit.mako:74 -#: rhodecode/templates/base/base.mako:113 +#: rhodecode/templates/base/base.mako:118 msgid "Integrations" msgstr "" @@ -6065,7 +6212,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:9 -#: rhodecode/templates/base/base.mako:115 +#: rhodecode/templates/base/base.mako:120 msgid "Settings" msgstr "" @@ -6166,7 +6313,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:613 +#: rhodecode/templates/base/base.mako:620 msgid "My account" msgstr "" @@ -6175,7 +6322,7 @@ msgid "My Account" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:29 -#: rhodecode/templates/email_templates/user_registration.mako:54 +#: rhodecode/templates/email_templates/user_registration.mako:55 msgid "Profile" msgstr "" @@ -6217,15 +6364,15 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:45 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42 -#: rhodecode/templates/base/base.mako:376 -#: rhodecode/templates/base/base.mako:617 +#: rhodecode/templates/base/base.mako:383 +#: rhodecode/templates/base/base.mako:624 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:46 #: rhodecode/templates/admin/permissions/permissions.mako:14 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 -#: rhodecode/templates/base/base.mako:111 +#: rhodecode/templates/base/base.mako:116 msgid "Permissions" msgstr "" @@ -6240,57 +6387,57 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:14 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19 -msgid "Authentication tokens can be used to interact with the API, or VCS-over-http. Each token can have a role. Token with a role can be used only in given context, e.g. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations only." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:20 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:25 +msgid "Available roles" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:26 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31 msgid "Token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:28 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:34 msgid "Repository Scope" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:24 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:29 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:30 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:35 msgid "Expiration" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:66 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:70 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:76 msgid "No additional auth tokens specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:84 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:92 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:96 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:98 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:102 msgid "Repository scope works only with tokens with VCS type." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:96 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:102 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:100 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:106 #: rhodecode/templates/admin/users/user_edit_emails.mako:65 #: rhodecode/templates/admin/users/user_edit_ips.mako:75 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:71 msgid "Add" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:129 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:134 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:135 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:140 msgid "Select or enter expiration date" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:164 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:169 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:170 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:175 msgid "repository scope" msgstr "" @@ -6456,8 +6603,8 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:85 #: rhodecode/templates/admin/settings/settings_global.mako:9 -#: rhodecode/templates/email_templates/pull_request_review.mako:41 -#: rhodecode/templates/email_templates/pull_request_update.mako:41 +#: rhodecode/templates/email_templates/pull_request_review.mako:43 +#: rhodecode/templates/email_templates/pull_request_update.mako:43 #: rhodecode/templates/pullrequests/pullrequest.mako:38 #: rhodecode/templates/pullrequests/pullrequests.mako:96 msgid "Title" @@ -6571,7 +6718,7 @@ msgstr "" #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 #: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:671 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:670 msgid "Comments" msgstr "" @@ -6740,8 +6887,8 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13 -#: rhodecode/templates/base/base.mako:108 -#: rhodecode/templates/base/base.mako:129 +#: rhodecode/templates/base/base.mako:113 +#: rhodecode/templates/base/base.mako:134 msgid "Repository groups" msgstr "" @@ -6756,13 +6903,18 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25 #: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33 -#: rhodecode/templates/base/base.mako:662 +#: rhodecode/templates/base/base.mako:669 #: rhodecode/templates/data_table/_dt_elements.mako:217 #: rhodecode/templates/forks/fork.mako:41 msgid "Repository group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50 +#: rhodecode/templates/admin/repos/repo_add_base.mako:49 +msgid "Select my personal group ({})" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:65 #: 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 @@ -6771,7 +6923,7 @@ msgstr "" msgid "Plain text format with {metatags} support." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:62 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:67 #: 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 @@ -6780,17 +6932,17 @@ msgstr "" msgid "Plain text format." msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:74 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:79 #: rhodecode/templates/admin/repos/repo_add_base.mako:104 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 -#: rhodecode/templates/admin/repos/repo_add_base.mako:108 -msgid "Copy permissions from parent repository group." -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:83 +#: rhodecode/templates/admin/repos/repo_add_base.mako:108 +msgid "Copy permissions from parent repository group." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:88 msgid "Create Repository Group" msgstr "" @@ -6898,65 +7050,73 @@ msgid "owner" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:66 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:119 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:92 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:72 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:125 msgid "permission for other logged in and anonymous users" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:74 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:122 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127 msgid "permission for other logged in users" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:73 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133 +msgid "This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133 msgid "inactive duplicate" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:82 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:167 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:115 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:164 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:87 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:177 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:170 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:88 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:172 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:93 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:182 msgid "Remove" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:130 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:140 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:162 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:159 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:167 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:172 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:165 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:177 msgid "members" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:198 -msgid "Add user/user group" -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:197 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:208 +msgid "Add user/user group" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:214 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:210 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:220 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:211 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:221 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen." msgstr "" @@ -6993,16 +7153,10 @@ msgid "Import Existing Repository ?" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:23 -#: rhodecode/templates/base/base.mako:323 +#: rhodecode/templates/base/base.mako:330 msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:49 -#: rhodecode/templates/forks/fork.mako:47 -#, python-format -msgid "Select my personal group (%(repo_group_name)s)" -msgstr "" - #: rhodecode/templates/admin/repos/repo_add_base.mako:52 #: rhodecode/templates/forks/fork.mako:50 msgid "Optionally select a group to put this repository into." @@ -7208,43 +7362,43 @@ msgstr "" msgid "Archive repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:173 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:176 msgid "Archive this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:178 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:183 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:190 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:195 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:201 -msgid "Detach forks" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206 +msgid "Detach forks" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:211 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:216 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221 msgid "Consider to archive this repository instead." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:229 -msgid "Delete this repository" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234 +msgid "Delete this repository" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:239 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:268 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273 msgid "Pick repository" msgstr "" @@ -7385,7 +7539,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31 #: rhodecode/templates/base/issue_tracker_settings.mako:79 -#: rhodecode/templates/base/perms_summary.mako:169 +#: rhodecode/templates/base/perms_summary.mako:174 msgid "Pattern" msgstr "" @@ -7445,7 +7599,7 @@ msgid "only users/user groups explicitly msgstr "" #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:118 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:124 msgid "Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply" msgstr "" @@ -7453,15 +7607,15 @@ msgstr "" msgid "un-set private mode" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:103 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 msgid "used by {} branch rule, requires write+ permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:105 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:111 msgid "used by {} branch rules, requires write+ permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:119 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:125 msgid "set private mode" msgstr "" @@ -7549,10 +7703,10 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 -#: rhodecode/templates/base/perms_summary.mako:111 -#: rhodecode/templates/base/perms_summary.mako:228 -#: rhodecode/templates/base/perms_summary.mako:306 -#: rhodecode/templates/base/perms_summary.mako:308 +#: rhodecode/templates/base/perms_summary.mako:116 +#: rhodecode/templates/base/perms_summary.mako:233 +#: rhodecode/templates/base/perms_summary.mako:311 +#: rhodecode/templates/base/perms_summary.mako:313 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "" @@ -7602,7 +7756,7 @@ msgid "Private repository" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:204 -#: rhodecode/templates/summary/components.mako:238 +#: rhodecode/templates/summary/components.mako:263 msgid "Enable statistics" msgstr "" @@ -8268,8 +8422,8 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:13 #: rhodecode/templates/admin/users/user_edit_advanced.mako:14 -#: rhodecode/templates/base/base.mako:110 -#: rhodecode/templates/base/base.mako:132 +#: rhodecode/templates/base/base.mako:115 +#: rhodecode/templates/base/base.mako:137 msgid "User groups" msgstr "" @@ -8401,7 +8555,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.mako:13 #: rhodecode/templates/admin/users/user_edit.mako:14 -#: rhodecode/templates/base/base.mako:109 +#: rhodecode/templates/base/base.mako:114 msgid "Users" msgstr "" @@ -8451,7 +8605,7 @@ msgid "{} user settings" msgstr "" #: rhodecode/templates/admin/users/user_edit.mako:31 -msgid "This user is set as disabled" +msgid "This user is set as non-active and disabled." msgstr "" #: rhodecode/templates/admin/users/user_edit.mako:39 @@ -8609,7 +8763,7 @@ msgstr "" msgid "Download as JSON" msgstr "" -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:62 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:68 #, python-format msgid "Confirm to remove this auth token: %s" msgstr "" @@ -8678,7 +8832,7 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_profile.mako:118 #: rhodecode/templates/admin/users/users.mako:87 -#: rhodecode/templates/base/perms_summary.mako:145 +#: rhodecode/templates/base/perms_summary.mako:150 msgid "Super-admin" msgstr "" @@ -8765,69 +8919,69 @@ msgstr "" msgid "{} Artifacts" msgstr "" -#: rhodecode/templates/base/base.mako:66 +#: rhodecode/templates/base/base.mako:71 msgid "RhodeCode instance id: {}" msgstr "" -#: rhodecode/templates/base/base.mako:94 +#: rhodecode/templates/base/base.mako:99 msgid "Super-admin Panel" msgstr "" -#: rhodecode/templates/base/base.mako:96 +#: rhodecode/templates/base/base.mako:101 msgid "Delegated Admin Panel" msgstr "" -#: rhodecode/templates/base/base.mako:112 +#: rhodecode/templates/base/base.mako:117 msgid "Authentication" msgstr "" -#: rhodecode/templates/base/base.mako:114 +#: rhodecode/templates/base/base.mako:119 msgid "Defaults" msgstr "" -#: rhodecode/templates/base/base.mako:154 -#: rhodecode/templates/base/base.mako:194 +#: rhodecode/templates/base/base.mako:159 +#: rhodecode/templates/base/base.mako:199 #: rhodecode/templates/changeset/changeset.mako:154 #: rhodecode/templates/files/files_source_header.mako:57 #: rhodecode/templates/files/files_tree_header.mako:44 -#: rhodecode/templates/summary/components.mako:250 +#: rhodecode/templates/summary/components.mako:275 msgid "Show More" msgstr "" -#: rhodecode/templates/base/base.mako:295 -#: rhodecode/templates/base/base.mako:306 +#: rhodecode/templates/base/base.mako:302 +#: rhodecode/templates/base/base.mako:313 msgid "RSS Feed" msgstr "" -#: rhodecode/templates/base/base.mako:297 +#: rhodecode/templates/base/base.mako:304 msgid "Watch this Repository and actions on it in your personalized journal" msgstr "" -#: rhodecode/templates/base/base.mako:315 +#: rhodecode/templates/base/base.mako:322 msgid "Fork of" msgstr "" -#: rhodecode/templates/base/base.mako:332 +#: rhodecode/templates/base/base.mako:339 #, python-format msgid "Repository locked by %(user)s" msgstr "" -#: rhodecode/templates/base/base.mako:337 +#: rhodecode/templates/base/base.mako:344 msgid "Repository not locked. Pull repository to lock it." msgstr "" -#: rhodecode/templates/base/base.mako:353 +#: rhodecode/templates/base/base.mako:360 msgid "This repository has been archived. It is now read-only." msgstr "" -#: rhodecode/templates/base/base.mako:366 +#: rhodecode/templates/base/base.mako:373 #: rhodecode/templates/data_table/_dt_elements.mako:58 #: rhodecode/templates/data_table/_dt_elements.mako:59 #: rhodecode/templates/data_table/_dt_elements.mako:207 msgid "Summary" msgstr "" -#: rhodecode/templates/base/base.mako:367 +#: rhodecode/templates/base/base.mako:374 #: rhodecode/templates/data_table/_dt_elements.mako:63 #: rhodecode/templates/data_table/_dt_elements.mako:64 #: rhodecode/templates/files/file_authors_box.mako:30 @@ -8837,7 +8991,7 @@ msgstr "" msgid "Commits" msgstr "" -#: rhodecode/templates/base/base.mako:368 +#: rhodecode/templates/base/base.mako:375 #: rhodecode/templates/data_table/_dt_elements.mako:68 #: rhodecode/templates/data_table/_dt_elements.mako:69 #: rhodecode/templates/files/files.mako:15 @@ -8845,91 +8999,87 @@ msgstr "" msgid "Files" msgstr "" -#: rhodecode/templates/base/base.mako:369 +#: rhodecode/templates/base/base.mako:376 #: rhodecode/templates/bookmarks/bookmarks.mako:66 #: rhodecode/templates/branches/branches.mako:65 #: rhodecode/templates/tags/tags.mako:66 msgid "Compare" msgstr "" -#: rhodecode/templates/base/base.mako:374 +#: rhodecode/templates/base/base.mako:381 #, python-format msgid "Show Pull Requests for %s" msgstr "" -#: rhodecode/templates/base/base.mako:385 +#: rhodecode/templates/base/base.mako:392 msgid "Artifacts" msgstr "" -#: rhodecode/templates/base/base.mako:391 +#: rhodecode/templates/base/base.mako:398 msgid "Repository Settings" msgstr "" -#: rhodecode/templates/base/base.mako:397 -msgid "Options" -msgstr "" - -#: rhodecode/templates/base/base.mako:402 -msgid "Unlock Repository" -msgstr "" - #: rhodecode/templates/base/base.mako:404 +msgid "Options" +msgstr "" + +#: rhodecode/templates/base/base.mako:409 +msgid "Unlock Repository" +msgstr "" + +#: rhodecode/templates/base/base.mako:411 msgid "Lock Repository" msgstr "" -#: rhodecode/templates/base/base.mako:457 +#: rhodecode/templates/base/base.mako:464 msgid "Group Home" msgstr "" -#: rhodecode/templates/base/base.mako:461 +#: rhodecode/templates/base/base.mako:468 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/base/base.mako:461 +#: rhodecode/templates/base/base.mako:468 msgid "Group Settings" msgstr "" -#: rhodecode/templates/base/base.mako:504 -msgid "Create" -msgstr "" - -#: rhodecode/templates/base/base.mako:512 +#: rhodecode/templates/base/base.mako:519 msgid "This Repository" msgstr "" -#: rhodecode/templates/base/base.mako:514 +#: rhodecode/templates/base/base.mako:521 msgid "Create Pull Request" msgstr "" -#: rhodecode/templates/base/base.mako:518 -msgid "Fork this repository" -msgstr "" - #: rhodecode/templates/base/base.mako:525 +msgid "Fork this repository" +msgstr "" + +#: rhodecode/templates/base/base.mako:532 msgid "This Repository Group" msgstr "" -#: rhodecode/templates/base/base.mako:529 -#: rhodecode/templates/base/base.mako:545 -#: rhodecode/templates/base/base.mako:557 +#: rhodecode/templates/base/base.mako:536 +#: rhodecode/templates/base/base.mako:552 +#: rhodecode/templates/base/base.mako:564 msgid "New Repository" msgstr "" -#: rhodecode/templates/base/base.mako:535 -#: rhodecode/templates/base/base.mako:549 -#: rhodecode/templates/base/base.mako:563 +#: rhodecode/templates/base/base.mako:542 +#: rhodecode/templates/base/base.mako:556 +#: rhodecode/templates/base/base.mako:570 msgid "New Repository Group" msgstr "" -#: rhodecode/templates/base/base.mako:590 +#: rhodecode/templates/base/base.mako:597 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:615 +#: rhodecode/templates/base/base.mako:622 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:621 +#: rhodecode/templates/base/base.mako:628 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8952,133 +9102,133 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:622 +#: rhodecode/templates/base/base.mako:629 msgid "[Style]" msgstr "" -#: rhodecode/templates/base/base.mako:639 +#: rhodecode/templates/base/base.mako:646 msgid "No Bookmarks yet." msgstr "" -#: rhodecode/templates/base/base.mako:677 +#: rhodecode/templates/base/base.mako:684 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:725 +#: rhodecode/templates/base/base.mako:732 msgid "dismiss" msgstr "" -#: rhodecode/templates/base/base.mako:766 +#: rhodecode/templates/base/base.mako:773 msgid "search / go to..." msgstr "" -#: rhodecode/templates/base/base.mako:811 +#: rhodecode/templates/base/base.mako:818 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:812 +#: rhodecode/templates/base/base.mako:819 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:817 +#: rhodecode/templates/base/base.mako:824 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:818 -msgid "Public journal" -msgstr "" - -#: rhodecode/templates/base/base.mako:824 -msgid "Show Gists" -msgstr "" - #: rhodecode/templates/base/base.mako:825 -msgid "Gists" +msgid "Public journal" msgstr "" #: rhodecode/templates/base/base.mako:831 +msgid "Show Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:832 +msgid "Gists" +msgstr "" + +#: rhodecode/templates/base/base.mako:838 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:1135 +#: rhodecode/templates/base/base.mako:1155 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:1143 +#: rhodecode/templates/base/base.mako:1163 msgid "Site-wide shortcuts" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:14 +#: rhodecode/templates/base/default_perms_box.mako:19 msgid "Inherited Permissions" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:15 +#: rhodecode/templates/base/default_perms_box.mako:25 msgid "Custom Permissions" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:17 +#: rhodecode/templates/base/default_perms_box.mako:29 msgid "Default Global Permissions" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:23 +#: rhodecode/templates/base/default_perms_box.mako:36 msgid "The following options configure the default permissions each user or group will inherit. You can override these permissions for each individual user or user group using individual permissions settings." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:27 +#: rhodecode/templates/base/default_perms_box.mako:40 msgid "Repository Creation" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:32 +#: rhodecode/templates/base/default_perms_box.mako:45 msgid "Permission to create root level repositories. When disabled, users can still create repositories inside their own repository groups." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:37 +#: rhodecode/templates/base/default_perms_box.mako:50 msgid "Repository Creation With Group Write Access" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:42 +#: rhodecode/templates/base/default_perms_box.mako:55 msgid "Write permission given on a repository group will allow creating repositories inside that group." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:47 +#: rhodecode/templates/base/default_perms_box.mako:60 msgid "Repository Forking" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:52 +#: rhodecode/templates/base/default_perms_box.mako:65 msgid "Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:57 +#: rhodecode/templates/base/default_perms_box.mako:70 msgid "Repository Group Creation" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:62 +#: rhodecode/templates/base/default_perms_box.mako:75 msgid "Permission to create root level repository groups. When disabled, repository group admins can still create repository subgroups within their repository groups." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:67 +#: rhodecode/templates/base/default_perms_box.mako:80 msgid "User Group Creation" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:72 +#: rhodecode/templates/base/default_perms_box.mako:85 msgid "Permission to allow user group creation." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:78 +#: rhodecode/templates/base/default_perms_box.mako:91 msgid "Inherit Permissions From The Default User" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:83 +#: rhodecode/templates/base/default_perms_box.mako:96 msgid "Inherit default permissions from the default user. Turn off this option to force explicit permissions for users, even if they are more restrictive than the default user permissions." msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:102 +#: rhodecode/templates/base/default_perms_box.mako:115 msgid "Inherit from default settings" msgstr "" -#: rhodecode/templates/base/default_perms_box.mako:107 +#: rhodecode/templates/base/default_perms_box.mako:120 #, python-format msgid "" "Select to inherit permissions from %s permissions settings, including default IP address whitelist and inheritance of \n" @@ -9106,11 +9256,11 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:293 -#: rhodecode/templates/changeset/changeset_file_comment.mako:275 -#: rhodecode/templates/changeset/changeset_file_comment.mako:326 +#: rhodecode/templates/changeset/changeset_file_comment.mako:340 +#: rhodecode/templates/changeset/changeset_file_comment.mako:391 #: rhodecode/templates/data_table/_dt_elements.mako:453 -#: rhodecode/templates/files/files_add.mako:60 -#: rhodecode/templates/files/files_edit.mako:62 +#: rhodecode/templates/files/files_add.mako:59 +#: rhodecode/templates/files/files_edit.mako:61 msgid "Preview" msgstr "" @@ -9118,107 +9268,107 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:26 +#: rhodecode/templates/base/perms_summary.mako:31 msgid "in JSON format" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:35 -#: rhodecode/templates/base/perms_summary.mako:43 +#: rhodecode/templates/base/perms_summary.mako:40 +#: rhodecode/templates/base/perms_summary.mako:48 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:36 -#: rhodecode/templates/base/perms_summary.mako:44 +#: rhodecode/templates/base/perms_summary.mako:41 +#: rhodecode/templates/base/perms_summary.mako:49 msgid "none" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:37 +#: rhodecode/templates/base/perms_summary.mako:42 #: rhodecode/templates/commits/changelog_elements.mako:102 #: rhodecode/templates/files/base.mako:26 msgid "merge" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:38 +#: rhodecode/templates/base/perms_summary.mako:43 msgid "push" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:39 +#: rhodecode/templates/base/perms_summary.mako:44 msgid "push force" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:45 +#: rhodecode/templates/base/perms_summary.mako:50 msgid "read" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:46 +#: rhodecode/templates/base/perms_summary.mako:51 msgid "write" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:47 +#: rhodecode/templates/base/perms_summary.mako:52 msgid "admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:55 +#: rhodecode/templates/base/perms_summary.mako:60 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:63 -#: rhodecode/templates/base/perms_summary.mako:170 -#: rhodecode/templates/base/perms_summary.mako:243 +#: rhodecode/templates/base/perms_summary.mako:68 +#: rhodecode/templates/base/perms_summary.mako:175 +#: rhodecode/templates/base/perms_summary.mako:248 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:65 -#: rhodecode/templates/base/perms_summary.mako:245 +#: rhodecode/templates/base/perms_summary.mako:70 +#: rhodecode/templates/base/perms_summary.mako:250 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:119 -#: rhodecode/templates/base/perms_summary.mako:128 +#: rhodecode/templates/base/perms_summary.mako:124 +#: rhodecode/templates/base/perms_summary.mako:133 msgid "edit global" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:136 +#: rhodecode/templates/base/perms_summary.mako:141 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:139 +#: rhodecode/templates/base/perms_summary.mako:144 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:142 +#: rhodecode/templates/base/perms_summary.mako:147 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:148 +#: rhodecode/templates/base/perms_summary.mako:153 msgid "Inherit permissions" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:151 +#: rhodecode/templates/base/perms_summary.mako:156 msgid "Create repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:154 +#: rhodecode/templates/base/perms_summary.mako:159 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:157 +#: rhodecode/templates/base/perms_summary.mako:162 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:160 +#: rhodecode/templates/base/perms_summary.mako:165 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:172 +#: rhodecode/templates/base/perms_summary.mako:177 msgid "Edit Branch Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:286 +#: rhodecode/templates/base/perms_summary.mako:291 msgid "overridden by" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:321 +#: rhodecode/templates/base/perms_summary.mako:326 msgid "No matching permission defined" msgstr "" @@ -9533,99 +9683,105 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:33 +#: rhodecode/templates/changeset/changeset_file_comment.mako:41 #: rhodecode/templates/pullrequests/pullrequest_show.mako:401 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:40 -msgid "Click to resolve this comment" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:70 -#: rhodecode/templates/changeset/changeset_file_comment.mako:72 -msgid "pull request !{}" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:77 -msgid "Status change on commit" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:85 -#: rhodecode/templates/compare/compare_diff.mako:139 -#: rhodecode/templates/email_templates/commit_comment.mako:53 -msgid "Commit status" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:94 -msgid "Pull request author" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:95 -msgid "author" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:103 -#: rhodecode/templates/changeset/changeset_file_comment.mako:119 -msgid "Outdated comment from pull request version v{0}, latest v{1}" +#: rhodecode/templates/changeset/changeset_file_comment.mako:49 +msgid "Click to create resolution comment." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:58 +msgid "This comment resolves TODO #{}" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:90 +msgid "Status from pull request." msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:107 -#: rhodecode/templates/changeset/changeset_file_comment.mako:122 +msgid "Pull request author" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:108 +msgid "author" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:163 +#: rhodecode/templates/changeset/changeset_file_comment.mako:179 +msgid "Outdated comment from pull request version v{0}, latest v{1}" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:167 +#: rhodecode/templates/changeset/changeset_file_comment.mako:183 msgid "Comment from pull request version v{0}, latest v{1}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:149 -#: rhodecode/templates/changeset/changeset_file_comment.mako:152 -msgid "Prev" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:150 -#: rhodecode/templates/changeset/changeset_file_comment.mako:153 -msgid "Next" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:205 +#: rhodecode/templates/changeset/changeset_file_comment.mako:206 +#: rhodecode/templates/changeset/changeset_file_comment.mako:209 +#: rhodecode/templates/changeset/changeset_file_comment.mako:210 +msgid "Action unavailable" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:214 +msgid "Jump to the previous outdated comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:215 +msgid "Jump to the next outdated comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:217 +msgid "Jump to the previous comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:218 +msgid "Jump to the next comment" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:257 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:194 +#: rhodecode/templates/changeset/changeset_file_comment.mako:259 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:196 +#: rhodecode/templates/changeset/changeset_file_comment.mako:261 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:283 +#: rhodecode/templates/changeset/changeset_file_comment.mako:348 #: rhodecode/templates/codeblocks/diffs.mako:83 msgid "You need to be logged in to leave comments." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/changeset/changeset_file_comment.mako:349 #: rhodecode/templates/codeblocks/diffs.mako:83 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:331 +#: rhodecode/templates/changeset/changeset_file_comment.mako:396 msgid "Mark as" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:354 +#: rhodecode/templates/changeset/changeset_file_comment.mako:419 #: rhodecode/templates/files/files_upload.mako:86 msgid "Drag'n Drop files here or" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:354 +#: rhodecode/templates/changeset/changeset_file_comment.mako:419 #: rhodecode/templates/files/files_upload.mako:86 msgid "Choose your files" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:357 +#: rhodecode/templates/changeset/changeset_file_comment.mako:422 msgid "uploading..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:388 +#: rhodecode/templates/changeset/changeset_file_comment.mako:453 #: rhodecode/templates/compare/compare_diff.mako:108 #: rhodecode/templates/compare/compare_diff.mako:116 #: rhodecode/templates/compare/compare_diff.mako:124 @@ -9633,30 +9789,30 @@ msgstr "" msgid "Comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:407 +#: rhodecode/templates/changeset/changeset_file_comment.mako:472 #: rhodecode/templates/pullrequests/pullrequest_show.mako:39 #: rhodecode/templates/pullrequests/pullrequest_show.mako:103 #: rhodecode/templates/pullrequests/pullrequests.mako:31 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:416 +#: rhodecode/templates/changeset/changeset_file_comment.mako:481 msgid "Comments parsed using {} syntax." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:417 +#: rhodecode/templates/changeset/changeset_file_comment.mako:482 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:418 +#: rhodecode/templates/changeset/changeset_file_comment.mako:483 msgid "and" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:419 +#: rhodecode/templates/changeset/changeset_file_comment.mako:484 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:420 +#: rhodecode/templates/changeset/changeset_file_comment.mako:485 msgid "actions supported." msgstr "" @@ -9690,7 +9846,7 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 #: rhodecode/templates/codeblocks/diffs.mako:208 -#: rhodecode/templates/codeblocks/diffs.mako:272 +#: rhodecode/templates/codeblocks/diffs.mako:283 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -9699,7 +9855,7 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 #: rhodecode/templates/codeblocks/diffs.mako:208 -#: rhodecode/templates/codeblocks/diffs.mako:272 +#: rhodecode/templates/codeblocks/diffs.mako:283 msgid "Show full diff" msgstr "" @@ -9761,124 +9917,124 @@ msgstr "" msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:272 +#: rhodecode/templates/codeblocks/diffs.mako:283 msgid "The requested commit or file is too big and content was truncated." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:279 +#: rhodecode/templates/codeblocks/diffs.mako:290 #, python-format msgid "This diff has been collapsed as it changes many lines, (%i lines changed)" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:281 +#: rhodecode/templates/codeblocks/diffs.mako:292 msgid "Show them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:295 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:320 -#: rhodecode/templates/codeblocks/diffs.mako:339 +#: rhodecode/templates/codeblocks/diffs.mako:332 +#: rhodecode/templates/codeblocks/diffs.mako:351 msgid "Unmatched/outdated inline comments below" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:345 +#: rhodecode/templates/codeblocks/diffs.mako:357 msgid "Unmatched/outdated comments below" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:419 +#: rhodecode/templates/codeblocks/diffs.mako:431 msgid "This file was removed from diff during updates to this pull-request." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:420 +#: rhodecode/templates/codeblocks/diffs.mako:432 msgid "There are still outdated/unresolved comments attached to it." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:487 +#: rhodecode/templates/codeblocks/diffs.mako:499 msgid "Copy file path" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:554 -#: rhodecode/templates/codeblocks/diffs.mako:572 +#: rhodecode/templates/codeblocks/diffs.mako:566 +#: rhodecode/templates/codeblocks/diffs.mako:584 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:556 -#: rhodecode/templates/codeblocks/diffs.mako:563 +#: rhodecode/templates/codeblocks/diffs.mako:568 +#: rhodecode/templates/codeblocks/diffs.mako:575 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:561 -#: rhodecode/templates/codeblocks/diffs.mako:579 +#: rhodecode/templates/codeblocks/diffs.mako:573 +#: rhodecode/templates/codeblocks/diffs.mako:591 #, python-format msgid "File not present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:574 -#: rhodecode/templates/codeblocks/diffs.mako:581 +#: rhodecode/templates/codeblocks/diffs.mako:586 +#: rhodecode/templates/codeblocks/diffs.mako:593 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:588 +#: rhodecode/templates/codeblocks/diffs.mako:600 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:588 +#: rhodecode/templates/codeblocks/diffs.mako:600 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:658 -#: rhodecode/templates/codeblocks/diffs.mako:701 -#: rhodecode/templates/codeblocks/diffs.mako:757 -msgid "comments including outdated" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:660 -#: rhodecode/templates/codeblocks/diffs.mako:703 -#: rhodecode/templates/codeblocks/diffs.mako:759 -msgid "comments" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:828 +#: rhodecode/templates/codeblocks/diffs.mako:691 +#: rhodecode/templates/codeblocks/diffs.mako:734 +#: rhodecode/templates/codeblocks/diffs.mako:796 +msgid "comments including outdated: {}. Click here to display them." +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:693 +#: rhodecode/templates/codeblocks/diffs.mako:736 +#: rhodecode/templates/codeblocks/diffs.mako:798 +msgid "comments: {}. Click to toggle them." +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:867 msgid "Toggle wide diff" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:836 +#: rhodecode/templates/codeblocks/diffs.mako:875 msgid "View diff as side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:838 +#: rhodecode/templates/codeblocks/diffs.mako:877 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:843 +#: rhodecode/templates/codeblocks/diffs.mako:882 msgid "View diff as unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:844 +#: rhodecode/templates/codeblocks/diffs.mako:883 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:849 +#: rhodecode/templates/codeblocks/diffs.mako:888 msgid "Turn off: Show the diff as commit range" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:852 -#: rhodecode/templates/codeblocks/diffs.mako:859 +#: rhodecode/templates/codeblocks/diffs.mako:891 +#: rhodecode/templates/codeblocks/diffs.mako:898 msgid "Range Diff" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:856 +#: rhodecode/templates/codeblocks/diffs.mako:895 msgid "Show the diff as commit range" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:900 +#: rhodecode/templates/codeblocks/diffs.mako:960 msgid "Disabled on range diff" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:1131 +#: rhodecode/templates/codeblocks/diffs.mako:1267 msgid "..." msgstr "" @@ -9984,7 +10140,7 @@ msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:80 #: rhodecode/templates/compare/compare_commits.mako:46 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:595 #: rhodecode/templates/search/search_commit.mako:34 msgid "Expand commit message" msgstr "" @@ -10036,7 +10192,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:558 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:556 msgid "Time" msgstr "" @@ -10066,7 +10222,7 @@ msgid "Target" msgstr "" #: rhodecode/templates/compare/compare_diff.mako:70 -#: rhodecode/templates/files/files_source.mako:100 +#: rhodecode/templates/files/files_source.mako:110 msgid "Source" msgstr "" @@ -10093,6 +10249,11 @@ msgstr "" msgid "Compare commits, branches, bookmarks or tags." msgstr "" +#: rhodecode/templates/compare/compare_diff.mako:139 +#: rhodecode/templates/email_templates/commit_comment.mako:57 +msgid "Commit status" +msgstr "" + #: rhodecode/templates/data_table/_dt_elements.mako:73 #: rhodecode/templates/data_table/_dt_elements.mako:74 msgid "Fork" @@ -10302,222 +10463,207 @@ msgstr "" msgid "Don't have an account ?" msgstr "" -#: rhodecode/templates/email_templates/base.mako:75 -#: rhodecode/templates/email_templates/base.mako:597 +#: rhodecode/templates/email_templates/base.mako:72 +#: rhodecode/templates/email_templates/base.mako:633 msgid "This is a notification from RhodeCode." msgstr "" -#: rhodecode/templates/email_templates/base.mako:577 +#: rhodecode/templates/email_templates/base.mako:613 msgid "RhodeCode" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:23 -#: rhodecode/templates/email_templates/commit_comment.mako:26 -#: rhodecode/templates/email_templates/commit_comment.mako:28 -#: rhodecode/templates/email_templates/pull_request_comment.mako:24 -#: rhodecode/templates/email_templates/pull_request_comment.mako:27 -#: rhodecode/templates/email_templates/pull_request_comment.mako:29 -msgid "[mention]" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:23 -msgid "{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:23 -#: rhodecode/templates/email_templates/commit_comment.mako:26 -#: rhodecode/templates/email_templates/commit_comment.mako:28 -msgid "in the `{repo_name}` repository" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:26 -msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`" +#: rhodecode/templates/email_templates/commit_comment.mako:24 +msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}` in the `{repo_name}` repository" msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:28 -msgid "{user} left a {comment_type} on commit `{commit_id}`" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:50 -#: rhodecode/templates/email_templates/pull_request_comment.mako:60 +msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:31 +msgid "{mention_prefix}{user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:54 +#: rhodecode/templates/email_templates/pull_request_comment.mako:63 msgid "Comment link" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:53 -#: rhodecode/templates/email_templates/commit_comment.mako:129 +#: rhodecode/templates/email_templates/commit_comment.mako:57 +#: rhodecode/templates/email_templates/commit_comment.mako:135 msgid "Status was changed to" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:58 -#: rhodecode/templates/email_templates/commit_comment.mako:141 +#: rhodecode/templates/email_templates/commit_comment.mako:62 +#: rhodecode/templates/email_templates/commit_comment.mako:147 #: rhodecode/templates/search/search_commit.mako:12 #: rhodecode/templates/summary/summary_commits.mako:9 msgid "Commit message" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:61 -#: rhodecode/templates/email_templates/pull_request_comment.mako:74 +#: rhodecode/templates/email_templates/commit_comment.mako:65 +#: rhodecode/templates/email_templates/pull_request_comment.mako:77 msgid "File: {comment_file} on line {comment_line}" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:65 -#: rhodecode/templates/email_templates/commit_comment.mako:155 -#: rhodecode/templates/email_templates/pull_request_comment.mako:78 -#: rhodecode/templates/email_templates/pull_request_comment.mako:186 +#: rhodecode/templates/email_templates/commit_comment.mako:69 +#: rhodecode/templates/email_templates/commit_comment.mako:161 +#: rhodecode/templates/email_templates/pull_request_comment.mako:81 +#: rhodecode/templates/email_templates/pull_request_comment.mako:191 msgid "`TODO` number" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:67 -#: rhodecode/templates/email_templates/commit_comment.mako:157 -#: rhodecode/templates/email_templates/pull_request_comment.mako:80 -#: rhodecode/templates/email_templates/pull_request_comment.mako:188 +#: rhodecode/templates/email_templates/commit_comment.mako:71 +#: rhodecode/templates/email_templates/commit_comment.mako:163 +#: rhodecode/templates/email_templates/pull_request_comment.mako:83 +#: rhodecode/templates/email_templates/pull_request_comment.mako:193 msgid "`Note` number" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:99 -#: rhodecode/templates/email_templates/pull_request_comment.mako:120 -msgid "left a" -msgstr "" - -#: rhodecode/templates/email_templates/commit_comment.mako:102 -msgid "{comment_type} on file `{comment_file}` in commit." -msgstr "" - #: rhodecode/templates/email_templates/commit_comment.mako:104 -msgid "{comment_type} on commit." +#: rhodecode/templates/email_templates/pull_request_comment.mako:124 +msgid "left a" +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:107 +msgid "{comment_type} on file `{comment_file}` in commit." msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:109 +msgid "{comment_type} on commit." +msgstr "" + +#: rhodecode/templates/email_templates/commit_comment.mako:114 msgid "of repository" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:127 +#: rhodecode/templates/email_templates/commit_comment.mako:133 msgid "Commit Status" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:147 -#: rhodecode/templates/email_templates/pull_request_comment.mako:178 +#: rhodecode/templates/email_templates/commit_comment.mako:153 +#: rhodecode/templates/email_templates/pull_request_comment.mako:183 #: rhodecode/templates/search/search_path.mako:9 msgid "File" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:148 -#: rhodecode/templates/email_templates/pull_request_comment.mako:179 +#: rhodecode/templates/email_templates/commit_comment.mako:154 +#: rhodecode/templates/email_templates/pull_request_comment.mako:184 msgid "`{comment_file}` on line {comment_line}" msgstr "" -#: rhodecode/templates/email_templates/commit_comment.mako:167 -#: rhodecode/templates/email_templates/pull_request_comment.mako:198 +#: rhodecode/templates/email_templates/commit_comment.mako:173 +#: rhodecode/templates/email_templates/pull_request_comment.mako:203 msgid "Reply" msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:24 -msgid "{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:27 -msgid "[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:29 -msgid "{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\"" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:62 +msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:28 +msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:31 +msgid "{mention_prefix}{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\"" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:65 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:24 msgid "Pull Request" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:64 -#: rhodecode/templates/email_templates/pull_request_review.mako:39 -#: rhodecode/templates/email_templates/pull_request_update.mako:39 -msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}" -msgstr "" - #: rhodecode/templates/email_templates/pull_request_comment.mako:67 -msgid "{user} submitted pull request !{pr_id} status: *{status}*" +#: rhodecode/templates/email_templates/pull_request_review.mako:41 +#: rhodecode/templates/email_templates/pull_request_update.mako:41 +msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}" msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:70 +msgid "{user} submitted pull request !{pr_id} status: *{status}*" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:73 msgid "{user} submitted pull request !{pr_id} status: *{status} and closed*" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:123 +#: rhodecode/templates/email_templates/pull_request_comment.mako:127 msgid "{comment_type} on file `{comment_file}` in pull request." msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:125 +#: rhodecode/templates/email_templates/pull_request_comment.mako:129 msgid "{comment_type} on pull request." msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:130 -#: rhodecode/templates/email_templates/pull_request_comment.mako:159 -#: rhodecode/templates/email_templates/pull_request_review.mako:89 -#: rhodecode/templates/email_templates/pull_request_review.mako:105 -#: rhodecode/templates/email_templates/pull_request_update.mako:101 -#: rhodecode/templates/email_templates/pull_request_update.mako:117 +#: rhodecode/templates/email_templates/pull_request_comment.mako:134 +#: rhodecode/templates/email_templates/pull_request_comment.mako:164 +#: rhodecode/templates/email_templates/pull_request_review.mako:91 +#: rhodecode/templates/email_templates/pull_request_review.mako:108 +#: rhodecode/templates/email_templates/pull_request_update.mako:104 +#: rhodecode/templates/email_templates/pull_request_update.mako:121 msgid "Pull request" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:148 -msgid "Review Status" -msgstr "" - -#: rhodecode/templates/email_templates/pull_request_comment.mako:151 -msgid "Closed pull request with status" -msgstr "" - #: rhodecode/templates/email_templates/pull_request_comment.mako:153 +msgid "Review Status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:156 +msgid "Closed pull request with status" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_comment.mako:158 msgid "Submitted review status" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:168 -#: rhodecode/templates/email_templates/pull_request_review.mako:114 -#: rhodecode/templates/email_templates/pull_request_update.mako:126 +#: rhodecode/templates/email_templates/pull_request_comment.mako:173 +#: rhodecode/templates/email_templates/pull_request_review.mako:117 +#: rhodecode/templates/email_templates/pull_request_update.mako:130 msgid "Commit Flow" msgstr "" -#: rhodecode/templates/email_templates/pull_request_comment.mako:170 -#: rhodecode/templates/email_templates/pull_request_comment.mako:172 -#: rhodecode/templates/email_templates/pull_request_review.mako:116 -#: rhodecode/templates/email_templates/pull_request_review.mako:118 -#: rhodecode/templates/email_templates/pull_request_update.mako:128 -#: rhodecode/templates/email_templates/pull_request_update.mako:130 +#: rhodecode/templates/email_templates/pull_request_comment.mako:175 +#: rhodecode/templates/email_templates/pull_request_comment.mako:177 +#: rhodecode/templates/email_templates/pull_request_review.mako:119 +#: rhodecode/templates/email_templates/pull_request_review.mako:121 +#: rhodecode/templates/email_templates/pull_request_update.mako:132 +#: rhodecode/templates/email_templates/pull_request_update.mako:134 #: rhodecode/templates/pullrequests/pullrequest_show.mako:128 #: rhodecode/templates/pullrequests/pullrequest_show.mako:137 msgid "of" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:15 +#: rhodecode/templates/email_templates/pull_request_review.mako:14 msgid "{user} requested a pull request review. !{pr_id}: \"{pr_title}\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:37 -#: rhodecode/templates/email_templates/pull_request_update.mako:37 +#: rhodecode/templates/email_templates/pull_request_review.mako:39 +#: rhodecode/templates/email_templates/pull_request_update.mako:39 msgid "Pull Request link" msgstr "" -#: rhodecode/templates/email_templates/pull_request_review.mako:83 -msgid "requested a" -msgstr "" - #: rhodecode/templates/email_templates/pull_request_review.mako:85 +msgid "requested a" +msgstr "" + +#: rhodecode/templates/email_templates/pull_request_review.mako:87 msgid "pull request review." msgstr "" -#: rhodecode/templates/email_templates/pull_request_update.mako:15 +#: rhodecode/templates/email_templates/pull_request_update.mako:14 msgid "{updating_user} updated pull request. !{pr_id}: \"{pr_title}\"" msgstr "" -#: rhodecode/templates/email_templates/pull_request_update.mako:95 +#: rhodecode/templates/email_templates/pull_request_update.mako:98 msgid "updated" msgstr "" -#: rhodecode/templates/email_templates/pull_request_update.mako:97 +#: rhodecode/templates/email_templates/pull_request_update.mako:100 msgid "pull request." msgstr "" -#: rhodecode/templates/email_templates/pull_request_update.mako:139 +#: rhodecode/templates/email_templates/pull_request_update.mako:143 msgid "Changes" msgstr "" @@ -10525,7 +10671,7 @@ msgstr "" msgid "hello \"world\"" msgstr "" -#: rhodecode/templates/email_templates/test.mako:22 +#: rhodecode/templates/email_templates/test.mako:18 msgid "Translation String" msgstr "" @@ -10533,7 +10679,7 @@ msgstr "" msgid "New user {user} has registered on {date}" msgstr "" -#: rhodecode/templates/email_templates/user_registration.mako:46 +#: rhodecode/templates/email_templates/user_registration.mako:47 msgid "Full Name" msgstr "" @@ -10576,24 +10722,24 @@ msgstr "" msgid "Add new file" msgstr "" -#: rhodecode/templates/files/files_add.mako:44 -#: rhodecode/templates/files/files_edit.mako:45 +#: rhodecode/templates/files/files_add.mako:43 +#: rhodecode/templates/files/files_edit.mako:44 msgid "Filename e.g example.py, or docs/readme.md" msgstr "" -#: rhodecode/templates/files/files_add.mako:64 -#: rhodecode/templates/files/files_edit.mako:66 +#: rhodecode/templates/files/files_add.mako:63 +#: rhodecode/templates/files/files_edit.mako:65 msgid "Line wraps on" msgstr "" -#: rhodecode/templates/files/files_add.mako:64 -#: rhodecode/templates/files/files_edit.mako:66 +#: rhodecode/templates/files/files_add.mako:63 +#: rhodecode/templates/files/files_edit.mako:65 msgid "line wraps off" msgstr "" -#: rhodecode/templates/files/files_add.mako:87 -#: rhodecode/templates/files/files_delete.mako:72 -#: rhodecode/templates/files/files_edit.mako:89 +#: rhodecode/templates/files/files_add.mako:86 +#: rhodecode/templates/files/files_delete.mako:71 +#: rhodecode/templates/files/files_edit.mako:88 #: rhodecode/templates/files/files_upload.mako:102 msgid "Commit changes" msgstr "" @@ -10606,38 +10752,42 @@ msgstr "" msgid "Next commit" msgstr "" -#: rhodecode/templates/files/files_browser.mako:22 -msgid "Upload File" -msgstr "" - -#: rhodecode/templates/files/files_browser.mako:25 +#: rhodecode/templates/files/files_browser.mako:24 msgid "Add File" msgstr "" -#: rhodecode/templates/files/files_browser.mako:35 +#: rhodecode/templates/files/files_browser.mako:27 +msgid "more options" +msgstr "" + +#: rhodecode/templates/files/files_browser.mako:36 +msgid "Upload File" +msgstr "" + +#: rhodecode/templates/files/files_browser.mako:51 msgid "Download full tree ZIP" msgstr "" -#: rhodecode/templates/files/files_browser.mako:39 +#: rhodecode/templates/files/files_browser.mako:55 msgid "Download this tree ZIP" msgstr "" -#: rhodecode/templates/files/files_browser.mako:67 +#: rhodecode/templates/files/files_browser.mako:83 #: rhodecode/templates/summary/summary.mako:37 #, python-format msgid "Readme file from commit %s:%s" msgstr "" -#: rhodecode/templates/files/files_browser_tree.mako:14 +#: rhodecode/templates/files/files_browser_tree.mako:17 #: rhodecode/templates/search/search_path.mako:12 msgid "Size" msgstr "" -#: rhodecode/templates/files/files_browser_tree.mako:15 +#: rhodecode/templates/files/files_browser_tree.mako:18 msgid "Modified" msgstr "" -#: rhodecode/templates/files/files_browser_tree.mako:16 +#: rhodecode/templates/files/files_browser_tree.mako:19 msgid "Last Commit" msgstr "" @@ -10649,13 +10799,13 @@ msgstr "" msgid "Delete file" msgstr "" -#: rhodecode/templates/files/files_delete.mako:53 +#: rhodecode/templates/files/files_delete.mako:52 #, python-format msgid "Binary file (%s)" msgstr "" -#: rhodecode/templates/files/files_delete.mako:58 -#: rhodecode/templates/files/files_source.mako:128 +#: rhodecode/templates/files/files_delete.mako:57 +#: rhodecode/templates/files/files_source.mako:138 msgid "File size {} is bigger then allowed limit {}. " msgstr "" @@ -10667,59 +10817,59 @@ msgstr "" msgid "Edit file" msgstr "" -#: rhodecode/templates/files/files_source.mako:16 +#: rhodecode/templates/files/files_source.mako:26 msgid "Download largefile" msgstr "" -#: rhodecode/templates/files/files_source.mako:20 +#: rhodecode/templates/files/files_source.mako:30 msgid "Download file" msgstr "" -#: rhodecode/templates/files/files_source.mako:29 +#: rhodecode/templates/files/files_source.mako:39 msgid "Editing binary files not allowed" msgstr "" -#: rhodecode/templates/files/files_source.mako:33 -msgid "Edit on branch: " -msgstr "" - -#: rhodecode/templates/files/files_source.mako:42 -msgid "Editing files allowed only when on branch head commit" -msgstr "" - #: rhodecode/templates/files/files_source.mako:43 +msgid "Edit on branch: " +msgstr "" + +#: rhodecode/templates/files/files_source.mako:52 +msgid "Editing files allowed only when on branch head commit" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:53 msgid "Deleting files allowed only when on branch head commit" msgstr "" -#: rhodecode/templates/files/files_source.mako:65 +#: rhodecode/templates/files/files_source.mako:75 msgid "lines" msgstr "" -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:83 msgid "This file is a pointer to large binary file" msgstr "" -#: rhodecode/templates/files/files_source.mako:73 +#: rhodecode/templates/files/files_source.mako:83 msgid "LargeFile" msgstr "" -#: rhodecode/templates/files/files_source.mako:96 +#: rhodecode/templates/files/files_source.mako:106 msgid "History" msgstr "" -#: rhodecode/templates/files/files_source.mako:102 +#: rhodecode/templates/files/files_source.mako:112 msgid "Annotation" msgstr "" -#: rhodecode/templates/files/files_source.mako:104 +#: rhodecode/templates/files/files_source.mako:114 msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:107 +#: rhodecode/templates/files/files_source.mako:117 msgid "Copy permalink" msgstr "" -#: rhodecode/templates/files/files_source.mako:123 +#: rhodecode/templates/files/files_source.mako:133 msgid "Binary file ({})" msgstr "" @@ -10761,6 +10911,11 @@ msgstr "" msgid "Fork name" msgstr "" +#: rhodecode/templates/forks/fork.mako:47 +#, python-format +msgid "Select my personal group (%(repo_group_name)s)" +msgstr "" + #: rhodecode/templates/forks/fork.mako:78 msgid "Copy permissions" msgstr "" @@ -11049,68 +11204,68 @@ msgid "Please update this pull request, msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:470 -msgid "Consider doing a {force_refresh_url} in case you think this is an error." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 -msgid "There are new changes for {}:{} in source repository, please consider updating this pull request." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 +msgid "Consider doing a `force update commits` in case you think this is an error." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +msgid "There are new changes for `{}:{}` in source repository, please consider updating this pull request." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:489 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:514 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:536 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:512 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:534 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:517 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:515 msgid "more update options" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:525 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:523 msgid "Force update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:526 msgid "Update commits and force refresh this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:536 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:534 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:547 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:545 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:551 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:549 msgid "commits added: {}, removed: {}" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:567 +msgid "Commit added in displayed changes" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:569 -msgid "Commit added in displayed changes" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 msgid "Commit removed in displayed changes" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:678 +msgid "there is {num} general comment from older versions" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:679 -msgid "there is {num} general comment from older versions" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:680 msgid "show it" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:681 +msgid "there are {num} general comments from older versions" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_show.mako:682 -msgid "there are {num} general comments from older versions" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:683 msgid "show them" msgstr "" @@ -11239,19 +11394,23 @@ msgstr "" msgid "Downloads are disabled for this repository" msgstr "" -#: rhodecode/templates/summary/components.mako:203 +#: rhodecode/templates/summary/components.mako:196 +msgid "more download options" +msgstr "" + +#: rhodecode/templates/summary/components.mako:228 msgid "Repository size" msgstr "" -#: rhodecode/templates/summary/components.mako:215 +#: rhodecode/templates/summary/components.mako:240 msgid "Calculating Repository Size..." msgstr "" -#: rhodecode/templates/summary/components.mako:226 +#: rhodecode/templates/summary/components.mako:251 msgid "Code Statistics" msgstr "" -#: rhodecode/templates/summary/components.mako:235 +#: rhodecode/templates/summary/components.mako:260 msgid "Statistics are disabled for this repository" msgstr ""