# HG changeset patch # User Marcin Kuzminski # Date 2020-06-13 08:48:00 # Node ID 4a6591470c24c744c0476ccf5f4f2d4a7fc5d906 # Parent edb9d44713f649aa39d04cc454ad6f80696e43f1 # Parent 4c71370f9e63fac7f7ca32fa33d17fdd8f2d4f58 release: merge back stable branch into default diff --git a/.hgtags b/.hgtags --- a/.hgtags +++ b/.hgtags @@ -62,3 +62,6 @@ f37a3126570477543507f0bc9d245ce75546181a 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3 +ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0 +c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1 +7ac623a4a2405917e2af660d645ded662011e40d v4.19.2 diff --git a/docs/integrations/jira.rst b/docs/integrations/jira.rst --- a/docs/integrations/jira.rst +++ b/docs/integrations/jira.rst @@ -25,3 +25,10 @@ transition status id in the *Workflow* s Once you have the transition status id, you can create a JIRA integration as outlined in :ref:`creating-integrations`. + + +.. note:: + + There's an option to configure integration templates. + Please see :ref:`integrations-rcextensions` section. + rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py diff --git a/docs/integrations/redmine.rst b/docs/integrations/redmine.rst --- a/docs/integrations/redmine.rst +++ b/docs/integrations/redmine.rst @@ -26,3 +26,9 @@ available. Once you have the API key, create a Redmine integration as outlined in :ref:`creating-integrations`. + + +.. note:: + + There's an option to configure integration templates. Please see :ref:`integrations-rcextensions` section. + rcextensions examples are here: https://code.rhodecode.com/rhodecode-enterprise-ce/files/default/rhodecode/config/rcextensions/examples/custom_integration_templates.py \ No newline at end of file diff --git a/docs/release-notes/release-notes-4.19.1.rst b/docs/release-notes/release-notes-4.19.1.rst new file mode 100644 --- /dev/null +++ b/docs/release-notes/release-notes-4.19.1.rst @@ -0,0 +1,41 @@ +|RCE| 4.19.1 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2020-05-25 + + +New Features +^^^^^^^^^^^^ + + + +General +^^^^^^^ + + + +Security +^^^^^^^^ + +- issue-tracker: fixed XSS inside the newly generated description fields. + + +Performance +^^^^^^^^^^^ + +- + + +Fixes +^^^^^ + +- HTTP: fixed headers problems in the application. + + +Upgrade notes +^^^^^^^^^^^^^ + +- Un-scheduled release addressing problems in 4.19.X releases. diff --git a/docs/release-notes/release-notes-4.19.2.rst b/docs/release-notes/release-notes-4.19.2.rst new file mode 100644 --- /dev/null +++ b/docs/release-notes/release-notes-4.19.2.rst @@ -0,0 +1,52 @@ +|RCE| 4.19.2 |RNS| +------------------ + +Release Date +^^^^^^^^^^^^ + +- 2020-06-10 + + +New Features +^^^^^^^^^^^^ + +- Files: landing refs will be the default for files view, resulting in names of branches instead of hashes. + This fixes some problems reported with navigation, and also SVN. +- Diffs: expose per-file comment counts. + + +General +^^^^^^^ + +- Navigation: explicitly link to summary page for summary link. +- Main Page: simplify footer, and expose docs link. +- Docs: added mention how to change default integration templates. +- Files: use ref names in the url, and make usage of default landing refs. +- Files: report the name of missing commit. +- Sweet alerts: reduced font size. + + +Security +^^^^^^^^ + +- Branch permissions: fix XSS on branch permissions adding screen. + + +Performance +^^^^^^^^^^^ + + + +Fixes +^^^^^ + +- Emails: improved styling, and fixed problems with some email clients rendering. +- Files: fixed label for copy-path action. +- Files: use a common function to handle url-by-refs, and fix landing refs for SVN. + + +Upgrade notes +^^^^^^^^^^^^^ + +- Un-scheduled release addressing problems in 4.19.X releases. + It brings some added features that weren't ready for 4.19.0. diff --git a/docs/release-notes/release-notes.rst b/docs/release-notes/release-notes.rst --- a/docs/release-notes/release-notes.rst +++ b/docs/release-notes/release-notes.rst @@ -9,6 +9,8 @@ Release Notes .. toctree:: :maxdepth: 1 + release-notes-4.19.2.rst + release-notes-4.19.1.rst release-notes-4.19.0.rst release-notes-4.18.3.rst release-notes-4.18.2.rst diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py --- a/rhodecode/apps/_base/__init__.py +++ b/rhodecode/apps/_base/__init__.py @@ -531,8 +531,6 @@ class BaseReferencesView(RepoAppView): """ def load_default_context(self): c = self._get_local_tmpl_context() - - return c def load_refs_context(self, ref_items, partials_template): @@ -562,7 +560,9 @@ class BaseReferencesView(RepoAppView): 'repo_files', repo_name=self.db_repo_name, f_path=ref_name if is_svn else '', - commit_id=commit_id) + commit_id=commit_id, + _query=dict(at=ref_name) + ) else: files_url = h.route_path( @@ -570,7 +570,8 @@ class BaseReferencesView(RepoAppView): repo_name=self.db_repo_name, f_path=ref_name if is_svn else '', commit_id=ref_name, - _query=dict(at=ref_name)) + _query=dict(at=ref_name) + ) data.append({ "name": _render('name', ref_name, files_url, closed), diff --git a/rhodecode/apps/debug_style/views.py b/rhodecode/apps/debug_style/views.py --- a/rhodecode/apps/debug_style/views.py +++ b/rhodecode/apps/debug_style/views.py @@ -187,6 +187,7 @@ Check if we should use full-topic or min I think something like this would be better ```py +// markdown renderer def db(): global connection @@ -226,10 +227,26 @@ def db(): 'comment_body': ''' I like this ! -But please check this code:: - - def main(): - print 'ok' +But please check this code + +.. code-block:: javascript + + // THIS IS RST CODE + + this.createResolutionComment = function(commentId) { + // hide the trigger text + $('#resolve-comment-{0}'.format(commentId)).hide(); + + var comment = $('#comment-'+commentId); + var commentData = comment.data(); + if (commentData.commentInline) { + this.createComment(comment, commentId) + } else { + Rhodecode.comments.createGeneralComment('general', "$placeholder", commentId) + } + + return false; + }; This should work better ! ''', diff --git a/rhodecode/apps/home/tests/test_home.py b/rhodecode/apps/home/tests/test_home.py --- a/rhodecode/apps/home/tests/test_home.py +++ b/rhodecode/apps/home/tests/test_home.py @@ -158,7 +158,7 @@ class TestHomeController(TestController) ('Enabled', True), ]) def test_index_show_version(self, autologin_user, name, state): - version_string = 'RhodeCode Enterprise %s' % rhodecode.__version__ + version_string = 'RhodeCode %s' % rhodecode.__version__ sett = SettingsModel().create_or_update_setting( 'show_version', state, 'bool') diff --git a/rhodecode/apps/repository/tests/test_repo_files.py b/rhodecode/apps/repository/tests/test_repo_files.py --- a/rhodecode/apps/repository/tests/test_repo_files.py +++ b/rhodecode/apps/repository/tests/test_repo_files.py @@ -178,10 +178,10 @@ class TestFilesViews(object): commit_id='tip', f_path='/')) # make sure Files menu url is not tip but new commit - landing_rev = backend.repo.landing_rev[1] + landing_rev = backend.repo.landing_ref_name files_url = route_path('repo_files:default_path', repo_name=backend.repo_name, - commit_id=landing_rev) + commit_id=landing_rev, params={'at': landing_rev}) assert landing_rev != 'tip' response.mustcontain( diff --git a/rhodecode/apps/repository/views/repo_files.py b/rhodecode/apps/repository/views/repo_files.py --- a/rhodecode/apps/repository/views/repo_files.py +++ b/rhodecode/apps/repository/views/repo_files.py @@ -125,7 +125,7 @@ class RepoFilesView(RepoAppView): self.db_repo_name, branch_name) if branch_perm and branch_perm not in ['branch.push', 'branch.push_force']: message = _('Branch `{}` changes forbidden by rule {}.').format( - branch_name, rule) + h.escape(branch_name), rule) h.flash(message, 'warning') if json_mode: @@ -137,7 +137,7 @@ class RepoFilesView(RepoAppView): raise HTTPFound(files_url) def _get_commit_and_path(self): - default_commit_id = self.db_repo.landing_rev[1] + default_commit_id = self.db_repo.landing_ref_name default_f_path = '/' commit_id = self.request.matchdict.get( @@ -181,8 +181,8 @@ class RepoFilesView(RepoAppView): raise HTTPFound( h.route_path('repo_summary', repo_name=self.db_repo_name)) - except (CommitDoesNotExistError, LookupError): - msg = _('No such commit exists for this repository') + except (CommitDoesNotExistError, LookupError) as e: + msg = _('No such commit exists for this repository. Commit: {}').format(commit_id) h.flash(msg, category='error') raise HTTPNotFound() except RepositoryError as e: @@ -589,6 +589,24 @@ class RepoFilesView(RepoAppView): raise HTTPFound(compare_url) @LoginRequired() + @view_config( + route_name='repo_files:default_commit', request_method='GET', + renderer=None) + def repo_files_default(self): + c = self.load_default_context() + ref_name = c.rhodecode_db_repo.landing_ref_name + landing_url = h.repo_files_by_ref_url( + c.rhodecode_db_repo.repo_name, + c.rhodecode_db_repo.repo_type, + f_path='', + ref_name=ref_name, + commit_id='tip', + query=dict(at=ref_name) + ) + + raise HTTPFound(landing_url) + + @LoginRequired() @HasRepoPermissionAnyDecorator( 'repository.read', 'repository.write', 'repository.admin') @view_config( @@ -598,9 +616,6 @@ class RepoFilesView(RepoAppView): route_name='repo_files:default_path', request_method='GET', renderer=None) @view_config( - route_name='repo_files:default_commit', request_method='GET', - renderer=None) - @view_config( route_name='repo_files:rendered', request_method='GET', renderer=None) @view_config( diff --git a/rhodecode/apps/repository/views/repo_forks.py b/rhodecode/apps/repository/views/repo_forks.py --- a/rhodecode/apps/repository/views/repo_forks.py +++ b/rhodecode/apps/repository/views/repo_forks.py @@ -138,10 +138,10 @@ class RepoForksView(RepoAppView, DataGri url_link = h.route_path( 'repo_compare', repo_name=fork.repo_name, - source_ref_type=self.db_repo.landing_rev[0], - source_ref=self.db_repo.landing_rev[1], - target_ref_type=self.db_repo.landing_rev[0], - target_ref=self.db_repo.landing_rev[1], + source_ref_type=self.db_repo.landing_ref_type, + source_ref=self.db_repo.landing_ref_name, + target_ref_type=self.db_repo.landing_ref_type, + target_ref=self.db_repo.landing_ref_name, _query=dict(merge=1, target_repo=f.repo_name)) return h.link_to(_('Compare fork'), url_link, class_='btn-link') 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.18.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.19.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2020-01-08 13:56+0000\n" +"POT-Creation-Date: 2020-05-22 09:45+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -57,12 +57,12 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_profile.mako:7 #: rhodecode/templates/base/issue_tracker_settings.mako:137 #: rhodecode/templates/data_table/_dt_elements.mako:173 -#: rhodecode/templates/data_table/_dt_elements.mako:249 -#: rhodecode/templates/data_table/_dt_elements.mako:262 -#: rhodecode/templates/data_table/_dt_elements.mako:263 -#: rhodecode/templates/data_table/_dt_elements.mako:276 +#: 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:57 +#: 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 @@ -178,7 +178,7 @@ msgid "Updated Labs settings" msgstr "" #: rhodecode/apps/admin/views/svn_config.py:46 -msgid "Apache configuration for Subversion generated." +msgid "Apache configuration for Subversion generated at `{}`." msgstr "" #: rhodecode/apps/admin/views/svn_config.py:54 @@ -356,200 +356,210 @@ msgstr "" msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:221 +#: rhodecode/apps/admin/views/users.py:222 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:242 +#: rhodecode/apps/admin/views/users.py:243 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:344 +#: rhodecode/apps/admin/views/users.py:345 msgid "User updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:362 +#: rhodecode/apps/admin/views/users.py:363 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:391 -#, python-format -msgid "Detached %s repositories" -msgstr "" - #: rhodecode/apps/admin/views/users.py:394 #, python-format +msgid "Detached %s repositories" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:397 +#, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:400 -#, python-format -msgid "Detached %s repository groups" -msgstr "" - #: rhodecode/apps/admin/views/users.py:403 #, python-format +msgid "Detached %s repository groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:406 +#, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:409 -#, python-format -msgid "Detached %s user groups" -msgstr "" - #: rhodecode/apps/admin/views/users.py:412 #, python-format +msgid "Detached %s user groups" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:415 +#, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:418 -#, python-format -msgid "Detached %s artifacts" -msgstr "" - #: rhodecode/apps/admin/views/users.py:421 #, python-format +msgid "Detached %s pull requests" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:424 +#, python-format +msgid "Deleted %s pull requests" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:430 +#, python-format +msgid "Detached %s artifacts" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:433 +#, python-format msgid "Deleted %s artifacts" msgstr "" -#: rhodecode/apps/admin/views/users.py:454 +#: rhodecode/apps/admin/views/users.py:482 msgid "Successfully deleted user `{}`" msgstr "" -#: rhodecode/apps/admin/views/users.py:460 +#: rhodecode/apps/admin/views/users.py:489 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/apps/admin/views/users.py:525 +#: rhodecode/apps/admin/views/users.py:558 msgid "" "The user participates as reviewer in {} pull request and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:531 +#: rhodecode/apps/admin/views/users.py:564 msgid "" "The user participates as reviewer in {} pull requests and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:620 +#: rhodecode/apps/admin/views/users.py:653 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:638 +#: rhodecode/apps/admin/views/users.py:671 #: rhodecode/apps/user_group/views/__init__.py:479 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:661 +#: rhodecode/apps/admin/views/users.py:694 msgid "Force password change enabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:669 -#: rhodecode/apps/admin/views/users.py:699 +#: rhodecode/apps/admin/views/users.py:702 +#: rhodecode/apps/admin/views/users.py:732 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:690 +#: rhodecode/apps/admin/views/users.py:723 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:737 +#: rhodecode/apps/admin/views/users.py:796 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:743 +#: rhodecode/apps/admin/views/users.py:802 #, python-format msgid "Created repository group `%s`" msgstr "" -#: rhodecode/apps/admin/views/users.py:747 +#: rhodecode/apps/admin/views/users.py:806 #, python-format msgid "Repository group `%s` is already taken" msgstr "" -#: rhodecode/apps/admin/views/users.py:752 +#: rhodecode/apps/admin/views/users.py:811 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:775 -#: rhodecode/apps/my_account/views/my_account.py:160 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 +#: 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 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:814 -#: rhodecode/apps/my_account/views/my_account.py:195 +#: rhodecode/apps/admin/views/users.py:892 +#: rhodecode/apps/my_account/views/my_account.py:217 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:843 -#: rhodecode/apps/my_account/views/my_account.py:219 +#: rhodecode/apps/admin/views/users.py:921 +#: rhodecode/apps/my_account/views/my_account.py:241 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:916 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114 +#: rhodecode/apps/admin/views/users.py:997 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:117 msgid "Ssh Key successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:922 -#: rhodecode/apps/admin/views/users.py:926 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124 +#: rhodecode/apps/admin/views/users.py:1003 +#: rhodecode/apps/admin/views/users.py:1007 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:127 msgid "An error occurred during ssh key saving: {}" msgstr "" -#: rhodecode/apps/admin/views/users.py:960 -#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154 +#: rhodecode/apps/admin/views/users.py:1041 +#: rhodecode/apps/my_account/views/my_account_ssh_keys.py:157 msgid "Ssh key successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:1006 +#: rhodecode/apps/admin/views/users.py:1087 #, python-format msgid "Added new email address `%s` for user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1012 +#: rhodecode/apps/admin/views/users.py:1093 msgid "Email `{}` is already registered for another user." msgstr "" -#: rhodecode/apps/admin/views/users.py:1016 +#: rhodecode/apps/admin/views/users.py:1097 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1043 +#: rhodecode/apps/admin/views/users.py:1124 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1089 +#: rhodecode/apps/admin/views/users.py:1170 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1111 +#: rhodecode/apps/admin/views/users.py:1192 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1115 +#: rhodecode/apps/admin/views/users.py:1196 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1145 +#: rhodecode/apps/admin/views/users.py:1226 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1210 +#: rhodecode/apps/admin/views/users.py:1291 msgid "Groups successfully changed" msgstr "" -#: rhodecode/apps/admin/views/users.py:1330 +#: rhodecode/apps/admin/views/users.py:1411 msgid "Deleted {} cache keys" msgstr "" @@ -573,10 +583,10 @@ msgstr "" msgid "1 month" msgstr "" -#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068 +#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:46848 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 -#: rhodecode/public/js/src/rhodecode.js:621 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: rhodecode/public/js/src/rhodecode.js:625 msgid "Lifetime" msgstr "" @@ -598,10 +608,10 @@ msgid "Deleted gist %s" msgstr "" #: rhodecode/apps/gist/views.py:330 -#: rhodecode/templates/admin/gists/gist_show.mako:73 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36 -#: rhodecode/templates/data_table/_dt_elements.mako:333 +#: 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/data_table/_dt_elements.mako:341 msgid "never" msgstr "" @@ -627,23 +637,23 @@ msgstr "" msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/apps/home/views.py:397 -#: rhodecode/apps/repository/views/repo_pull_requests.py:879 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199 +#: 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/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:1111 +#: rhodecode/templates/base/base.mako:1172 msgid "Repositories" msgstr "" -#: rhodecode/apps/home/views.py:424 +#: rhodecode/apps/home/views.py:479 #: 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:198 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:208 msgid "Repository Groups" msgstr "" @@ -683,48 +693,48 @@ msgstr "" msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:135 +#: rhodecode/apps/my_account/views/my_account.py:136 msgid "Error occurred during update of user password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:142 +#: rhodecode/apps/my_account/views/my_account.py:143 msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:283 +#: rhodecode/apps/my_account/views/my_account.py:305 msgid "Error occurred during adding email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:286 -msgid "Successfully added email" -msgstr "" - #: rhodecode/apps/my_account/views/my_account.py:308 +msgid "Successfully added email" +msgstr "" + +#: rhodecode/apps/my_account/views/my_account.py:330 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:518 +#: rhodecode/apps/my_account/views/my_account.py:540 msgid "Position {} is defined twice. Please correct this error." msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:531 +#: rhodecode/apps/my_account/views/my_account.py:553 msgid "Update Bookmarks" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:533 +#: rhodecode/apps/my_account/views/my_account.py:555 msgid "Failed to update bookmarks. Make sure an unique position is used." msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:685 +#: rhodecode/apps/my_account/views/my_account.py:707 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:692 +#: rhodecode/apps/my_account/views/my_account.py:714 msgid "Error occurred during update of user" msgstr "" #: rhodecode/apps/repo_group/views/repo_group_advanced.py:57 -#: rhodecode/apps/repository/views/repo_settings_advanced.py:77 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:85 msgid "updated commit cache" msgstr "" @@ -738,12 +748,12 @@ msgstr "" msgid "Error occurred during deletion of repository group %s" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:75 #: rhodecode/apps/user_group/views/__init__.py:346 msgid "Cannot change permission for yourself as admin" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:99 msgid "Repository Group permissions updated" msgstr "" @@ -766,7 +776,7 @@ 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:728 +#: rhodecode/apps/repository/views/repo_pull_requests.py:763 msgid "There are no commits yet" msgstr "" @@ -796,7 +806,7 @@ msgid "No such commit exists. Org except msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:330 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1362 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1399 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" @@ -886,80 +896,80 @@ msgstr "" msgid "Unknown archive type" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:989 +#: rhodecode/apps/repository/views/repo_files.py:990 msgid "Changesets" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1010 +#: rhodecode/apps/repository/views/repo_files.py:1011 #: rhodecode/apps/repository/views/repo_summary.py:264 -#: rhodecode/model/pull_request.py:1572 rhodecode/model/scm.py:995 +#: rhodecode/model/pull_request.py:1740 rhodecode/model/scm.py:995 #: rhodecode/templates/base/vcs_settings.mako:235 #: rhodecode/templates/summary/components.mako:10 msgid "Branches" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1014 +#: rhodecode/apps/repository/views/repo_files.py:1015 #: 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:1118 -#: rhodecode/apps/repository/views/repo_files.py:1146 +#: rhodecode/apps/repository/views/repo_files.py:1169 +#: rhodecode/apps/repository/views/repo_files.py:1197 msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1167 +#: rhodecode/apps/repository/views/repo_files.py:1218 msgid "Successfully deleted file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1171 -#: rhodecode/apps/repository/views/repo_files.py:1288 -#: rhodecode/apps/repository/views/repo_files.py:1419 -#: rhodecode/apps/repository/views/repo_files.py:1542 +#: 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 msgid "Error occurred during commit" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1203 -#: rhodecode/apps/repository/views/repo_files.py:1234 +#: rhodecode/apps/repository/views/repo_files.py:1254 +#: rhodecode/apps/repository/views/repo_files.py:1285 msgid "Edited file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1257 +#: rhodecode/apps/repository/views/repo_files.py:1308 msgid "No changes detected on {}" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1281 +#: rhodecode/apps/repository/views/repo_files.py:1332 msgid "Successfully committed changes to file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1322 -#: rhodecode/apps/repository/views/repo_files.py:1363 +#: rhodecode/apps/repository/views/repo_files.py:1373 +#: rhodecode/apps/repository/views/repo_files.py:1414 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1379 +#: rhodecode/apps/repository/views/repo_files.py:1430 msgid "No filename specified" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1404 +#: rhodecode/apps/repository/views/repo_files.py:1455 msgid "Successfully committed new file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1412 -#: rhodecode/apps/repository/views/repo_files.py:1524 +#: rhodecode/apps/repository/views/repo_files.py:1463 +#: rhodecode/apps/repository/views/repo_files.py:1575 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1469 +#: rhodecode/apps/repository/views/repo_files.py:1520 msgid "Uploaded file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1513 +#: rhodecode/apps/repository/views/repo_files.py:1564 msgid "Successfully committed {} new files" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1515 +#: rhodecode/apps/repository/views/repo_files.py:1566 msgid "Successfully committed 1 new file" msgstr "" @@ -972,85 +982,89 @@ msgstr "" msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:55 +#: rhodecode/apps/repository/views/repo_permissions.py:57 msgid "Explicitly add user or user group with write+ permission to modify their branch permissions." msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:90 +#: rhodecode/apps/repository/views/repo_permissions.py:92 msgid "Repository access permissions updated" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:112 +#: rhodecode/apps/repository/views/repo_permissions.py:126 msgid "Repository `{}` private mode set successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:116 +#: rhodecode/apps/repository/views/repo_permissions.py:134 #: rhodecode/apps/repository/views/repo_settings.py:176 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:758 +#: rhodecode/apps/repository/views/repo_pull_requests.py:287 +msgid "Pull Request state was force changed to `{}`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:793 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:910 +#: rhodecode/apps/repository/views/repo_pull_requests.py:945 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:929 +#: rhodecode/apps/repository/views/repo_pull_requests.py:965 msgid "source_repo or target repo not found" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:940 +#: rhodecode/apps/repository/views/repo_pull_requests.py:976 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:955 +#: rhodecode/apps/repository/views/repo_pull_requests.py:991 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1018 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1055 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1021 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1058 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1053 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1108 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1090 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1145 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1075 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1112 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1114 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1151 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1136 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1173 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:1150 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1187 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1185 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1222 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1231 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1268 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1255 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1292 msgid "Pull request reviewers updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1288 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1325 msgid "Successfully deleted pull request" msgstr "" @@ -1072,7 +1086,7 @@ msgid "Repository has been %s" msgstr "" #: rhodecode/apps/repository/views/repo_settings.py:220 -#: rhodecode/apps/repository/views/repo_settings_advanced.py:297 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:305 msgid "An error occurred during unlocking" msgstr "" @@ -1080,78 +1094,78 @@ msgstr "" msgid "An error occurred during deletion of repository stats" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:106 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:114 #, python-format msgid "Archived repository `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:111 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:119 #, python-format msgid "An error occurred during archiving of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:149 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:157 #, python-format msgid "Detached %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:151 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:159 #, python-format msgid "Deleted %s forks" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:160 -#, python-format -msgid "Deleted repository `%s`" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings_advanced.py:167 -msgid "detach or delete" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings_advanced.py:168 +#, python-format +msgid "Deleted repository `%s`" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:175 +msgid "detach or delete" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings_advanced.py:176 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:183 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:191 msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead." msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:192 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:200 #, python-format msgid "An error occurred during deletion of `%s`" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:217 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:225 msgid "Updated repository visibility in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:221 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:229 msgid "An error occurred during setting this repository in public journal" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:257 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:265 msgid "Nothing" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:260 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:268 #, python-format msgid "Marked repo %s as fork of %s" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:267 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:275 msgid "An error occurred during this operation" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:291 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:299 msgid "Locked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:294 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:302 msgid "Unlocked repository" msgstr "" -#: rhodecode/apps/repository/views/repo_settings_advanced.py:314 +#: rhodecode/apps/repository/views/repo_settings_advanced.py:322 msgid "installed updated hooks into this repository" msgstr "" @@ -1255,9 +1269,9 @@ msgid "Enable or disable this authentica msgstr "" #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115 -#: rhodecode/model/permission.py:119 rhodecode/model/permission.py:123 -#: rhodecode/model/permission.py:127 rhodecode/model/permission.py:131 +#: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114 +#: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122 +#: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195 #: rhodecode/templates/admin/auth/auth_settings.mako:64 #: rhodecode/templates/admin/integrations/list.mako:71 @@ -1279,15 +1293,15 @@ msgstr "" msgid "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:104 rhodecode/authentication/views.py:163 +#: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:164 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:166 +#: rhodecode/authentication/views.py:167 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:174 +#: rhodecode/authentication/views.py:175 msgid "Error occurred during update of auth settings." msgstr "" @@ -1304,7 +1318,7 @@ msgid "The Port in use by the Atlassian msgstr "" #: rhodecode/authentication/plugins/auth_crowd.py:69 -#: rhodecode/authentication/plugins/auth_ldap.py:254 +#: rhodecode/authentication/plugins/auth_ldap.py:270 msgid "Port" msgstr "" @@ -1376,157 +1390,152 @@ msgstr "" msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:242 +#: rhodecode/authentication/plugins/auth_ldap.py:258 msgid "" "Host[s] of the LDAP Server \n" "(e.g., 192.168.2.154, or ldap-server.domain.com.\n" " Multiple servers can be specified using commas" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:246 +#: rhodecode/authentication/plugins/auth_ldap.py:262 msgid "LDAP Host" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:251 -msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 689 for LDAPS(SSL)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:261 +#: rhodecode/authentication/plugins/auth_ldap.py:267 +msgid "Custom port that the LDAP server is listening on. Default value is: 389, use 636 for LDAPS (SSL)" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:277 msgid "Timeout for LDAP connection" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:263 +#: rhodecode/authentication/plugins/auth_ldap.py:279 msgid "Connection timeout" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:270 +#: rhodecode/authentication/plugins/auth_ldap.py:286 msgid "" "Optional user DN/account to connect to LDAP if authentication is required. \n" "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:275 -msgid "Account" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:280 +#: rhodecode/authentication/plugins/auth_ldap.py:291 +msgid "Bind account" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:296 msgid "Password to authenticate for given user DN." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:283 -#: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:51 -#: rhodecode/templates/register.mako:62 -#: rhodecode/templates/admin/my_account/my_account.mako:31 -#: rhodecode/templates/admin/users/user_add.mako:44 -#: rhodecode/templates/debug_style/login.html:45 -msgid "Password" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:288 +#: rhodecode/authentication/plugins/auth_ldap.py:299 +msgid "Bind account password" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:304 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:289 +#: rhodecode/authentication/plugins/auth_ldap.py:305 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:295 +#: rhodecode/authentication/plugins/auth_ldap.py:311 msgid "" "Require Cert over TLS?. Self-signed and custom certificates can be used when\n" " `RhodeCode Certificate` found in admin > settings > system info page is extended." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:298 +#: rhodecode/authentication/plugins/auth_ldap.py:314 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:304 -msgid "" -"This specifies the PEM-format file path containing certificates for use in TLS connection.\n" -"If not specified `TLS Cert dir` will be used" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:307 -msgid "TLS Cert file" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:313 -msgid "This specifies the path of a directory that contains individual CA certificates in separate files." -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:315 -msgid "TLS Cert dir" -msgstr "" - #: rhodecode/authentication/plugins/auth_ldap.py:320 msgid "" -"Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n" +"This specifies the PEM-format file path containing certificates for use in TLS connection.\n" +"If not specified `TLS Cert dir` will be used" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:323 +msgid "TLS Cert file" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:329 +msgid "This specifies the path of a directory that contains individual CA certificates in separate files." +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:331 +msgid "TLS Cert dir" +msgstr "" + +#: rhodecode/authentication/plugins/auth_ldap.py:336 +msgid "" +"Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user username \n" "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:325 +#: rhodecode/authentication/plugins/auth_ldap.py:341 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:330 +#: rhodecode/authentication/plugins/auth_ldap.py:346 msgid "" "Filter to narrow results \n" "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n" "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:335 +#: rhodecode/authentication/plugins/auth_ldap.py:351 msgid "LDAP Search Filter" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:341 +#: rhodecode/authentication/plugins/auth_ldap.py:357 msgid "How deep to search LDAP. If unsure set to SUBTREE" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:342 +#: rhodecode/authentication/plugins/auth_ldap.py:358 msgid "LDAP Search Scope" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:348 +#: rhodecode/authentication/plugins/auth_ldap.py:364 msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:350 +#: rhodecode/authentication/plugins/auth_ldap.py:366 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:351 +#: rhodecode/authentication/plugins/auth_ldap.py:367 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:356 +#: rhodecode/authentication/plugins/auth_ldap.py:372 msgid "" "LDAP Attribute to map to email address (e.g., mail).\n" "Emails are a crucial part of RhodeCode. \n" "If possible add a valid email attribute to ldap users." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:361 +#: rhodecode/authentication/plugins/auth_ldap.py:377 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:366 +#: rhodecode/authentication/plugins/auth_ldap.py:382 msgid "LDAP Attribute to map to first name (e.g., givenName)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:369 +#: rhodecode/authentication/plugins/auth_ldap.py:385 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:374 +#: rhodecode/authentication/plugins/auth_ldap.py:390 msgid "LDAP Attribute to map to last name (e.g., sn)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:377 +#: rhodecode/authentication/plugins/auth_ldap.py:393 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:409 +#: rhodecode/authentication/plugins/auth_ldap.py:425 msgid "LDAP" msgstr "" @@ -1583,70 +1592,146 @@ msgstr "" msgid "pullrequest created" msgstr "" -#: rhodecode/events/pullrequest.py:88 +#: rhodecode/events/pullrequest.py:80 +msgid "Event triggered after pull request was created" +msgstr "" + +#: rhodecode/events/pullrequest.py:89 msgid "pullrequest closed" msgstr "" -#: rhodecode/events/pullrequest.py:97 +#: rhodecode/events/pullrequest.py:90 +msgid "Event triggered after pull request was closed" +msgstr "" + +#: rhodecode/events/pullrequest.py:99 msgid "pullrequest commits updated" msgstr "" -#: rhodecode/events/pullrequest.py:106 +#: rhodecode/events/pullrequest.py:100 +msgid "Event triggered after pull requests was updated" +msgstr "" + +#: rhodecode/events/pullrequest.py:109 msgid "pullrequest review changed" msgstr "" -#: rhodecode/events/pullrequest.py:119 +#: 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:124 msgid "pullrequest merged" msgstr "" -#: rhodecode/events/pullrequest.py:128 +#: rhodecode/events/pullrequest.py:125 +msgid "Event triggered after a successful merge operation was executed on a pull request" +msgstr "" + +#: rhodecode/events/pullrequest.py:135 msgid "pullrequest commented" msgstr "" -#: rhodecode/events/repo.py:190 +#: rhodecode/events/pullrequest.py:136 +msgid "Event triggered after a comment was made on a code in the pull request" +msgstr "" + +#: rhodecode/events/repo.py:191 +msgid "repository commit comment" +msgstr "" + +#: rhodecode/events/repo.py:192 +msgid "Event triggered after a comment was made on commit inside a repository" +msgstr "" + +#: rhodecode/events/repo.py:224 msgid "repository pre create" msgstr "" -#: rhodecode/events/repo.py:199 +#: rhodecode/events/repo.py:225 +msgid "Event triggered before repository is created" +msgstr "" + +#: rhodecode/events/repo.py:234 msgid "repository created" msgstr "" -#: rhodecode/events/repo.py:208 +#: rhodecode/events/repo.py:235 +msgid "Event triggered after repository was created" +msgstr "" + +#: rhodecode/events/repo.py:244 msgid "repository pre delete" msgstr "" -#: rhodecode/events/repo.py:217 +#: rhodecode/events/repo.py:245 +msgid "Event triggered before a repository is deleted" +msgstr "" + +#: rhodecode/events/repo.py:254 msgid "repository deleted" msgstr "" -#: rhodecode/events/repo.py:257 +#: rhodecode/events/repo.py:255 +msgid "Event triggered after repository was deleted" +msgstr "" + +#: rhodecode/events/repo.py:295 msgid "repository pre pull" msgstr "" -#: rhodecode/events/repo.py:266 +#: rhodecode/events/repo.py:296 +msgid "Event triggered before repository code is pulled" +msgstr "" + +#: rhodecode/events/repo.py:305 msgid "repository pull" msgstr "" -#: rhodecode/events/repo.py:275 +#: rhodecode/events/repo.py:306 +msgid "Event triggered after repository code was pulled" +msgstr "" + +#: rhodecode/events/repo.py:315 msgid "repository pre push" msgstr "" -#: rhodecode/events/repo.py:286 +#: rhodecode/events/repo.py:316 +msgid "Event triggered before the code is pushed to a repository" +msgstr "" + +#: rhodecode/events/repo.py:328 msgid "repository push" msgstr "" +#: rhodecode/events/repo.py:329 +msgid "Event triggered after the code was pushed to a repository" +msgstr "" + #: rhodecode/events/repo_group.py:62 msgid "repository group created" msgstr "" -#: rhodecode/events/repo_group.py:71 +#: rhodecode/events/repo_group.py:63 +msgid "Event triggered after a repository group was created" +msgstr "" + +#: rhodecode/events/repo_group.py:72 msgid "repository group deleted" msgstr "" -#: rhodecode/events/repo_group.py:80 +#: rhodecode/events/repo_group.py:73 +msgid "Event triggered after a repository group was deleted" +msgstr "" + +#: rhodecode/events/repo_group.py:82 msgid "repository group update" msgstr "" +#: rhodecode/events/repo_group.py:83 +msgid "Event triggered after a repository group was updated" +msgstr "" + #: rhodecode/events/user.py:37 msgid "user registered" msgstr "" @@ -1668,59 +1753,56 @@ msgid "user permissions change" msgstr "" #: rhodecode/forms/__init__.py:35 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:97 +#: 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:207 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217 +#: 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_issuetracker.mako:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:192 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:244 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:201 +#: 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 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:16 #: 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:193 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88 -#: rhodecode/templates/admin/users/user_edit_emails.mako:63 -#: rhodecode/templates/admin/users/user_edit_ips.mako:71 -#: rhodecode/templates/admin/users/user_edit_profile.mako:146 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:67 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:207 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:101 +#: 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 msgid "Reset" msgstr "" -#: rhodecode/forms/__init__.py:36 -#: rhodecode/templates/admin/gists/gist_show.mako:57 +#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:37802 +#: rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/utils/ajax.js:158 +#: 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:50 -#: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59 +#: 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 #: rhodecode/templates/admin/notifications/notifications_show.mako:37 #: 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:50 -#: rhodecode/templates/admin/users/user_edit_emails.mako:31 -#: rhodecode/templates/admin/users/user_edit_ips.mako:35 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:63 +#: 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/data_table/_dt_elements.mako:179 -#: rhodecode/templates/data_table/_dt_elements.mako:253 -#: rhodecode/templates/data_table/_dt_elements.mako:268 -#: rhodecode/templates/data_table/_dt_elements.mako:280 -#: rhodecode/templates/data_table/_dt_elements.mako:426 +#: 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 @@ -1788,104 +1870,104 @@ msgstr "" msgid "Integration {integration_name} updated successfully." msgstr "" -#: rhodecode/integrations/types/email.py:156 +#: rhodecode/integrations/types/email.py:157 msgid "Recipients" msgstr "" -#: rhodecode/integrations/types/email.py:157 +#: rhodecode/integrations/types/email.py:158 msgid "Email addresses to send push events to" msgstr "" -#: rhodecode/integrations/types/email.py:162 #: rhodecode/integrations/types/email.py:163 +#: rhodecode/integrations/types/email.py:164 msgid "Email address" msgstr "" -#: rhodecode/integrations/types/email.py:174 +#: rhodecode/integrations/types/email.py:175 #: rhodecode/templates/register.mako:95 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:67 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:78 #: rhodecode/templates/admin/users/user_add.mako:86 -#: rhodecode/templates/admin/users/user_edit_profile.mako:62 +#: 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/users/user_profile.mako:69 msgid "Email" msgstr "" -#: rhodecode/integrations/types/email.py:175 +#: rhodecode/integrations/types/email.py:176 msgid "Send repo push summaries to a list of recipients via email" msgstr "" -#: rhodecode/integrations/types/hipchat.py:62 -msgid "Yellow" -msgstr "" - #: rhodecode/integrations/types/hipchat.py:63 -msgid "Red" +msgid "Yellow" msgstr "" #: rhodecode/integrations/types/hipchat.py:64 -msgid "Green" +msgid "Red" msgstr "" #: rhodecode/integrations/types/hipchat.py:65 -msgid "Purple" +msgid "Green" msgstr "" #: rhodecode/integrations/types/hipchat.py:66 +msgid "Purple" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:67 msgid "Gray" msgstr "" -#: rhodecode/integrations/types/hipchat.py:71 -msgid "Hipchat server URL" -msgstr "" - #: rhodecode/integrations/types/hipchat.py:72 +msgid "Hipchat server URL" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:73 msgid "Hipchat integration url." msgstr "" -#: rhodecode/integrations/types/hipchat.py:82 -msgid "Notify" -msgstr "" - #: rhodecode/integrations/types/hipchat.py:83 +msgid "Notify" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:84 msgid "Make a notification to the users in room." msgstr "" -#: rhodecode/integrations/types/hipchat.py:89 -msgid "Color" -msgstr "" - #: rhodecode/integrations/types/hipchat.py:90 +msgid "Color" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:91 msgid "Background color of message." msgstr "" -#: rhodecode/integrations/types/hipchat.py:101 -msgid "Hipchat" -msgstr "" - #: rhodecode/integrations/types/hipchat.py:102 +msgid "Hipchat" +msgstr "" + +#: rhodecode/integrations/types/hipchat.py:103 msgid "Send events such as repo pushes and pull requests to your hipchat channel." msgstr "" -#: rhodecode/integrations/types/slack.py:71 -msgid "Slack service URL" -msgstr "" - #: rhodecode/integrations/types/slack.py:72 +msgid "Slack service URL" +msgstr "" + +#: rhodecode/integrations/types/slack.py:73 msgid "This can be setup at the slack app manager" msgstr "" -#: rhodecode/integrations/types/slack.py:85 -#: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:44 +#: rhodecode/integrations/types/slack.py:86 +#: rhodecode/integrations/types/webhook.py:81 rhodecode/templates/login.mako:44 #: rhodecode/templates/register.mako:48 #: rhodecode/templates/admin/admin_log_base.mako:7 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:27 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:38 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:29 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:74 #: rhodecode/templates/admin/users/user_add.mako:35 -#: rhodecode/templates/admin/users/user_edit_profile.mako:36 +#: 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 @@ -1894,87 +1976,95 @@ msgstr "" msgid "Username" msgstr "" -#: rhodecode/integrations/types/slack.py:86 +#: rhodecode/integrations/types/slack.py:87 msgid "Username to show notifications coming from." msgstr "" -#: rhodecode/integrations/types/slack.py:95 -msgid "Channel" -msgstr "" - #: rhodecode/integrations/types/slack.py:96 +msgid "Channel" +msgstr "" + +#: rhodecode/integrations/types/slack.py:97 msgid "Channel to send notifications to." msgstr "" -#: rhodecode/integrations/types/slack.py:105 -msgid "Emoji" -msgstr "" - #: rhodecode/integrations/types/slack.py:106 +msgid "Emoji" +msgstr "" + +#: rhodecode/integrations/types/slack.py:107 msgid "Emoji to use eg. :studio_microphone:" msgstr "" -#: rhodecode/integrations/types/slack.py:117 -msgid "Slack" -msgstr "" - #: rhodecode/integrations/types/slack.py:118 +msgid "Slack" +msgstr "" + +#: rhodecode/integrations/types/slack.py:119 msgid "Send events such as repo pushes and pull requests to your slack channel." msgstr "" -#: rhodecode/integrations/types/webhook.py:48 +#: rhodecode/integrations/types/webhook.py:49 msgid "Webhook URL" msgstr "" -#: rhodecode/integrations/types/webhook.py:50 +#: rhodecode/integrations/types/webhook.py:51 msgid "URL to which Webhook should submit data. If used some of the variables would trigger multiple calls, like ${branch} or ${commit_id}. Webhook will be called as many times as unique objects in data in such cases." msgstr "" -#: rhodecode/integrations/types/webhook.py:68 +#: rhodecode/integrations/types/webhook.py:70 msgid "Secret Token" msgstr "" -#: rhodecode/integrations/types/webhook.py:69 +#: rhodecode/integrations/types/webhook.py:71 msgid "Optional string used to validate received payloads. It will be sent together with event data in JSON" msgstr "" -#: rhodecode/integrations/types/webhook.py:80 +#: rhodecode/integrations/types/webhook.py:82 msgid "Optional username to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:90 +#: rhodecode/integrations/types/webhook.py:91 rhodecode/templates/login.mako:51 +#: rhodecode/templates/register.mako:62 +#: rhodecode/templates/admin/my_account/my_account.mako:31 +#: rhodecode/templates/admin/users/user_add.mako:44 +#: rhodecode/templates/debug_style/login.html:45 +msgid "Password" +msgstr "" + +#: rhodecode/integrations/types/webhook.py:92 msgid "Optional password to authenticate the call." msgstr "" -#: rhodecode/integrations/types/webhook.py:100 +#: rhodecode/integrations/types/webhook.py:102 msgid "Custom Header Key" msgstr "" -#: rhodecode/integrations/types/webhook.py:101 +#: rhodecode/integrations/types/webhook.py:103 msgid "Custom Header name to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:110 +#: rhodecode/integrations/types/webhook.py:112 msgid "Custom Header Value" msgstr "" -#: rhodecode/integrations/types/webhook.py:111 +#: rhodecode/integrations/types/webhook.py:113 msgid "Custom Header value to be set when calling endpoint." msgstr "" -#: rhodecode/integrations/types/webhook.py:120 +#: rhodecode/integrations/types/webhook.py:122 msgid "Call Method" msgstr "" -#: rhodecode/integrations/types/webhook.py:121 +#: rhodecode/integrations/types/webhook.py:123 msgid "Select a HTTP method to use when calling the Webhook." msgstr "" -#: rhodecode/integrations/types/webhook.py:133 +#: rhodecode/integrations/types/webhook.py:135 msgid "Webhook" msgstr "" -#: rhodecode/integrations/types/webhook.py:134 +#: rhodecode/integrations/types/webhook.py:136 msgid "send JSON data to a url endpoint" msgstr "" @@ -2100,23 +2190,23 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1672 +#: rhodecode/lib/auth.py:1760 msgid "IP {} not allowed" msgstr "" -#: rhodecode/lib/auth.py:1764 +#: rhodecode/lib/auth.py:1852 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1808 +#: rhodecode/lib/auth.py:1896 msgid "You need to be signed in to view this page" msgstr "" -#: rhodecode/lib/diffs.py:902 +#: rhodecode/lib/diffs.py:903 msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1706 +#: rhodecode/lib/helpers.py:1721 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2138,7 +2228,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1730 +#: rhodecode/lib/helpers.py:1745 #, 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 "" @@ -2175,9 +2265,9 @@ msgstr "" msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:25634 +#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22115 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" msgstr "" @@ -2211,6 +2301,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2772 #: 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_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 @@ -2218,7 +2309,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:3061 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3079 msgid "Repository no access" msgstr "" @@ -2251,6 +2342,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2773 #: 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_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 @@ -2258,7 +2350,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:3062 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3080 msgid "Repository read access" msgstr "" @@ -2291,6 +2383,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2774 #: 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_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 @@ -2298,7 +2391,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:3063 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3081 msgid "Repository write access" msgstr "" @@ -2331,6 +2424,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2775 #: 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_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 @@ -2338,7 +2432,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:3064 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3082 msgid "Repository admin access" msgstr "" @@ -2411,6 +2505,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2798 #: 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_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 @@ -2418,7 +2513,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:3087 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3105 msgid "Repository creation disabled" msgstr "" @@ -2451,6 +2546,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2799 #: 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_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 @@ -2458,7 +2554,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:3088 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3106 msgid "Repository creation enabled" msgstr "" @@ -2491,6 +2587,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2803 #: 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_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 @@ -2498,7 +2595,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:3092 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3110 msgid "Repository forking disabled" msgstr "" @@ -2531,6 +2628,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2804 #: 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_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 @@ -2538,7 +2636,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:3093 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3111 msgid "Repository forking enabled" msgstr "" @@ -2592,6 +2690,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3524 #: 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_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 @@ -2599,10 +2698,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:3831 -#: rhodecode/public/js/scripts.js:44680 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:320 +#: 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 msgid "Not Reviewed" msgstr "" @@ -2635,6 +2734,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3525 #: 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_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 @@ -2642,7 +2742,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:3832 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3860 msgid "Approved" msgstr "" @@ -2675,6 +2775,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3526 #: 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_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 @@ -2682,7 +2783,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:3833 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3861 msgid "Rejected" msgstr "" @@ -2715,6 +2816,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3527 #: 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_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 @@ -2722,7 +2824,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:3834 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3862 msgid "Under Review" msgstr "" @@ -2752,6 +2854,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2777 #: 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_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 @@ -2759,7 +2862,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:3066 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3084 msgid "Repository group no access" msgstr "" @@ -2789,6 +2892,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2778 #: 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_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 @@ -2796,7 +2900,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:3067 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3085 msgid "Repository group read access" msgstr "" @@ -2826,6 +2930,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2779 #: 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_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 @@ -2833,7 +2938,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:3068 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3086 msgid "Repository group write access" msgstr "" @@ -2863,6 +2968,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2780 #: 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_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 @@ -2870,7 +2976,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:3069 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3087 msgid "Repository group admin access" msgstr "" @@ -2899,6 +3005,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2782 #: 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_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 @@ -2906,7 +3013,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:3071 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3089 msgid "User group no access" msgstr "" @@ -2935,6 +3042,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2783 #: 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_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 @@ -2942,7 +3050,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:3072 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3090 msgid "User group read access" msgstr "" @@ -2971,6 +3079,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2784 #: 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_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 @@ -2978,7 +3087,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:3073 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3091 msgid "User group write access" msgstr "" @@ -3007,6 +3116,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2785 #: 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_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 @@ -3014,7 +3124,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:3074 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3092 msgid "User group admin access" msgstr "" @@ -3043,6 +3153,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2792 #: 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_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 @@ -3050,7 +3161,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:3081 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3099 msgid "Repository Group creation disabled" msgstr "" @@ -3079,6 +3190,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2793 #: 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_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 @@ -3086,7 +3198,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:3082 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3100 msgid "Repository Group creation enabled" msgstr "" @@ -3115,6 +3227,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2795 #: 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_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 @@ -3122,7 +3235,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:3084 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3102 msgid "User Group creation disabled" msgstr "" @@ -3151,6 +3264,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2796 #: 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_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 @@ -3158,7 +3272,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:3085 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3103 msgid "User Group creation enabled" msgstr "" @@ -3187,6 +3301,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2806 #: 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_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 @@ -3194,7 +3309,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:3095 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3113 msgid "Registration disabled" msgstr "" @@ -3223,6 +3338,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2807 #: 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_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 @@ -3230,7 +3346,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:3096 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3114 msgid "User Registration with manual account activation" msgstr "" @@ -3259,6 +3375,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2808 #: 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_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 @@ -3266,7 +3383,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:3097 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3115 msgid "User Registration with automatic account activation" msgstr "" @@ -3295,6 +3412,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2814 #: 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_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 @@ -3302,8 +3420,8 @@ 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:3103 -#: rhodecode/model/permission.py:106 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3121 +#: rhodecode/model/permission.py:105 msgid "Manual activation of external account" msgstr "" @@ -3332,6 +3450,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2815 #: 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_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 @@ -3339,8 +3458,8 @@ 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:3104 -#: rhodecode/model/permission.py:107 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3122 +#: rhodecode/model/permission.py:106 msgid "Automatic activation of external account" msgstr "" @@ -3363,6 +3482,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2800 #: 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_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 @@ -3370,7 +3490,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:3089 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3107 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3393,6 +3513,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2801 #: 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_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 @@ -3400,7 +3521,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:3090 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3108 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3420,6 +3541,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2770 #: 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_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 @@ -3427,7 +3549,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:3059 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3077 msgid "RhodeCode Super Administrator" msgstr "" @@ -3445,6 +3567,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2817 #: 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_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 @@ -3452,7 +3575,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:3106 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3124 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3470,6 +3593,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2818 #: 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_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 @@ -3477,7 +3601,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:3107 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3125 msgid "Inherit object permissions from default user enabled" msgstr "" @@ -3487,6 +3611,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1120 #: 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_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 @@ -3494,7 +3619,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:1178 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1195 msgid "all" msgstr "" @@ -3504,6 +3629,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1121 #: 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_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 @@ -3511,7 +3637,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:1179 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1196 msgid "http/web interface" msgstr "" @@ -3521,6 +3647,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1122 #: 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_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 @@ -3528,7 +3655,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:1180 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1197 msgid "vcs (git/hg/svn protocol)" msgstr "" @@ -3538,6 +3665,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1123 #: 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_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 @@ -3545,7 +3673,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:1181 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1198 msgid "api calls" msgstr "" @@ -3555,6 +3683,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1124 #: 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_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 @@ -3562,7 +3691,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:1182 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1199 msgid "feed access" msgstr "" @@ -3572,6 +3701,7 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2511 #: 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_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 @@ -3579,7 +3709,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:2717 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2735 msgid "No parent" msgstr "" @@ -3589,9 +3719,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2810 #: 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_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:3099 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3117 msgid "Password reset enabled" msgstr "" @@ -3601,9 +3732,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2811 #: 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_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:3100 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3118 msgid "Password reset hidden" msgstr "" @@ -3613,9 +3745,10 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2812 #: 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_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:3101 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3119 msgid "Password reset disabled" msgstr "" @@ -3624,7 +3757,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2787 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002 -#: rhodecode/model/db.py:3076 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3088 +#: rhodecode/model/db.py:3094 msgid "Branch no permissions" msgstr "" @@ -3633,7 +3767,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2788 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003 -#: rhodecode/model/db.py:3077 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3089 +#: rhodecode/model/db.py:3095 msgid "Branch access by web merge" msgstr "" @@ -3642,7 +3777,8 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2789 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004 -#: rhodecode/model/db.py:3078 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3090 +#: rhodecode/model/db.py:3096 msgid "Branch access by push" msgstr "" @@ -3651,10 +3787,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2790 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005 -#: rhodecode/model/db.py:3079 +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:3091 +#: rhodecode/model/db.py:3097 msgid "Branch access by push with force" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1194 +#: rhodecode/model/db.py:1200 +msgid "artifacts downloads" +msgstr "" + #: rhodecode/lib/index/whoosh.py:189 msgid "Index Type" msgstr "" @@ -3747,10 +3889,6 @@ msgstr "" msgid "Show it now" msgstr "" -#: rhodecode/model/db.py:1183 -msgid "artifacts downloads" -msgstr "" - #: rhodecode/model/forms.py:88 msgid "Please enter a login" msgstr "" @@ -3769,106 +3907,106 @@ msgstr "" msgid "Enter %(min)i characters or more" msgstr "" -#: rhodecode/model/notification.py:245 +#: rhodecode/model/notification.py:246 #, python-format msgid "%(user)s commented on commit %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:246 +#: rhodecode/model/notification.py:247 #, python-format msgid "%(user)s commented on commit at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:249 -#, python-format -msgid "%(user)s sent message %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:250 #, python-format +msgid "%(user)s sent message %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:251 +#, python-format msgid "%(user)s sent message at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:253 -#, python-format -msgid "%(user)s mentioned you %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:254 #, python-format +msgid "%(user)s mentioned you %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:255 +#, python-format msgid "%(user)s mentioned you at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:257 -#, python-format -msgid "%(user)s registered in RhodeCode %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:258 #, python-format +msgid "%(user)s registered in RhodeCode %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:259 +#, python-format msgid "%(user)s registered in RhodeCode at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:261 -#, python-format -msgid "%(user)s opened new pull request %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:262 #, python-format +msgid "%(user)s opened new pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:263 +#, python-format msgid "%(user)s opened new pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:265 -#, python-format -msgid "%(user)s updated pull request %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:266 #, python-format +msgid "%(user)s updated pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:267 +#, python-format msgid "%(user)s updated pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/notification.py:269 -#, python-format -msgid "%(user)s commented on pull request %(date_or_age)s" -msgstr "" - #: rhodecode/model/notification.py:270 #, python-format +msgid "%(user)s commented on pull request %(date_or_age)s" +msgstr "" + +#: rhodecode/model/notification.py:271 +#, python-format msgid "%(user)s commented on pull request at %(date_or_age)s" 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/repos/repo_edit_permissions.mako:11 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 +msgid "None" +msgstr "" + #: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78 #: rhodecode/model/permission.py:84 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 -msgid "None" +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:16 +msgid "Read" msgstr "" #: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79 #: rhodecode/model/permission.py:85 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 -msgid "Read" +#: 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/data_table/_dt_elements.mako:450 +msgid "Write" msgstr "" #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80 #: rhodecode/model/permission.py:86 -#: 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:13 -#: rhodecode/templates/changeset/changeset_file_comment.mako:268 -#: rhodecode/templates/changeset/changeset_file_comment.mako:319 -#: rhodecode/templates/data_table/_dt_elements.mako:440 -msgid "Write" -msgstr "" - -#: rhodecode/model/permission.py:75 rhodecode/model/permission.py:81 -#: rhodecode/model/permission.py:87 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 #: rhodecode/templates/admin/integrations/base.mako:21 @@ -3887,154 +4025,154 @@ msgstr "" #: rhodecode/templates/admin/settings/settings.mako:12 #: rhodecode/templates/admin/user_groups/user_group_add.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:12 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14 +#: 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:801 +#: rhodecode/templates/base/base.mako:832 msgid "Admin" msgstr "" +#: rhodecode/model/permission.py:89 +msgid "Protected/No Access" +msgstr "" + #: rhodecode/model/permission.py:90 -msgid "Protected/No Access" +msgid "Web merge" msgstr "" #: rhodecode/model/permission.py:91 -msgid "Web merge" +msgid "Push" msgstr "" #: rhodecode/model/permission.py:92 -msgid "Push" -msgstr "" - -#: rhodecode/model/permission.py:93 msgid "Force Push" msgstr "" -#: rhodecode/model/permission.py:96 rhodecode/model/permission.py:110 -#: rhodecode/model/permission.py:114 rhodecode/model/permission.py:118 -#: rhodecode/model/permission.py:122 rhodecode/model/permission.py:126 -#: rhodecode/model/permission.py:130 +#: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109 +#: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117 +#: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125 +#: rhodecode/model/permission.py:129 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:27 msgid "Disabled" msgstr "" +#: rhodecode/model/permission.py:96 +msgid "Allowed with manual account activation" +msgstr "" + #: rhodecode/model/permission.py:97 -msgid "Allowed with manual account activation" -msgstr "" - -#: rhodecode/model/permission.py:98 msgid "Allowed with automatic account activation" msgstr "" +#: rhodecode/model/permission.py:100 +msgid "Allow password recovery" +msgstr "" + #: rhodecode/model/permission.py:101 -msgid "Allow password recovery" +msgid "Hide password recovery link" msgstr "" #: rhodecode/model/permission.py:102 -msgid "Hide password recovery link" -msgstr "" - -#: rhodecode/model/permission.py:103 msgid "Disable password recovery" msgstr "" -#: rhodecode/model/pull_request.py:90 +#: rhodecode/model/pull_request.py:215 msgid "Pull request update successful." msgstr "" -#: rhodecode/model/pull_request.py:92 +#: rhodecode/model/pull_request.py:217 msgid "Pull request update failed because of an unknown error." msgstr "" -#: rhodecode/model/pull_request.py:94 +#: rhodecode/model/pull_request.py:219 msgid "No update needed because the source and target have not changed." msgstr "" -#: rhodecode/model/pull_request.py:96 +#: rhodecode/model/pull_request.py:221 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed." msgstr "" -#: rhodecode/model/pull_request.py:99 +#: rhodecode/model/pull_request.py:224 msgid "This pull request cannot be updated because the target reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:102 +#: rhodecode/model/pull_request.py:227 msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1355 +#: rhodecode/model/pull_request.py:1518 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1357 +#: rhodecode/model/pull_request.py:1521 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1371 +#: rhodecode/model/pull_request.py:1535 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1390 +#: rhodecode/model/pull_request.py:1552 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1393 +#: rhodecode/model/pull_request.py:1555 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1571 rhodecode/model/scm.py:1004 +#: 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:633 +#: rhodecode/templates/base/base.mako:629 #: rhodecode/templates/summary/components.mako:46 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1576 -msgid "Commit IDs" -msgstr "" - -#: rhodecode/model/pull_request.py:1579 -#: rhodecode/templates/summary/components.mako:22 -msgid "Closed Branches" -msgstr "" - #: rhodecode/model/pull_request.py:1744 +msgid "Commit IDs" +msgstr "" + +#: rhodecode/model/pull_request.py:1747 +#: rhodecode/templates/summary/components.mako:22 +msgid "Closed Branches" +msgstr "" + +#: rhodecode/model/pull_request.py:1929 msgid "WIP marker in title prevents from accidental merge." msgstr "" -#: rhodecode/model/pull_request.py:1755 +#: rhodecode/model/pull_request.py:1939 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1773 +#: rhodecode/model/pull_request.py:1957 msgid "Target branch `{}` changes rejected by rule {}." msgstr "" -#: rhodecode/model/pull_request.py:1787 +#: rhodecode/model/pull_request.py:1971 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1801 +#: rhodecode/model/pull_request.py:1985 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1804 +#: rhodecode/model/pull_request.py:1988 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1839 +#: rhodecode/model/pull_request.py:2043 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1844 +#: rhodecode/model/pull_request.py:2048 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1852 +#: rhodecode/model/pull_request.py:2056 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1854 +#: rhodecode/model/pull_request.py:2058 msgid "Source branch will be deleted after merge." msgstr "" @@ -4372,684 +4510,796 @@ msgstr "" msgid "Additional emails can be specified at extra emails page." msgstr "" -#: rhodecode/public/js/scripts.js:19 -msgid ": , " -msgstr "" - -#: rhodecode/public/js/scripts.js:24109 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 +#: 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/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/scripts.js:25569 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130 +#: 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/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/scripts.js:25570 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120 +#: 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/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/scripts.js:25571 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115 +#: 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/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/scripts.js:25572 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117 +#: 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/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/scripts.js:25573 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119 +#: 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/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/scripts.js:25574 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127 +#: 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/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/scripts.js:25594 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: 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/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/scripts.js:25602 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 +#: 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/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25614 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132 +#: 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/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25616 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 +#: 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/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25620 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 +#: 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/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:25622 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 +#: 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/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/scripts.js:25624 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: 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/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/scripts.js:40622 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +#: 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/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/scripts.js:40625 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:55 +#: 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/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/scripts.js:40628 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 +#: 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/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/scripts.js:40631 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28 +#: 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/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/scripts.js:40635 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 +#: 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/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/scripts.js:40637 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126 +#: 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/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:40642 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 +#: 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/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/scripts.js:40644 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 +#: 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/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/scripts.js:40649 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +#: 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/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/scripts.js:40651 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 +#: 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/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/scripts.js:40655 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: 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/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/scripts.js:40657 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: 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/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/scripts.js:41595 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 +#: rhodecode/public/js/scripts.js:37780 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/utils/ajax.js:136 +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/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/scripts.js:41597 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +#: 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/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/scripts.js:42136 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58 +#: 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/src/rhodecode/codemirror.js:363 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/scripts.js:42156 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 +#: 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/src/rhodecode/codemirror.js:383 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/scripts.js:42175 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 +#: 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/src/rhodecode/codemirror.js:402 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/scripts.js:42195 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 +#: 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/src/rhodecode/codemirror.js:422 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/scripts.js:42496 rhodecode/public/js/scripts.js:42850 +#: rhodecode/public/js/scripts.js:39078 rhodecode/public/js/scripts.js:39432 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/rhodecode/codemirror.js:723 #: rhodecode/public/js/src/rhodecode/comments.js:233 msgid "Status Review" msgstr "" -#: rhodecode/public/js/scripts.js:42511 rhodecode/public/js/scripts.js:42865 +#: rhodecode/public/js/scripts.js:39093 rhodecode/public/js/scripts.js:39447 #: rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/codemirror.js:738 #: rhodecode/public/js/src/rhodecode/comments.js:248 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" -#: rhodecode/public/js/scripts.js:42592 rhodecode/public/js/scripts.js:43061 -#: rhodecode/public/js/scripts.js:44066 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +#: 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/src/rhodecode/codemirror.js:819 -#: rhodecode/public/js/src/rhodecode/comments.js:444 -#: rhodecode/public/js/src/rhodecode/files.js:495 -#: rhodecode/templates/files/files_browser_tree.mako:55 +#: rhodecode/public/js/src/rhodecode/comments.js:443 +#: rhodecode/public/js/src/rhodecode/files.js:499 +#: rhodecode/templates/files/files_browser_tree.mako:54 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/scripts.js:42766 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 +#: 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 msgid "resolve comment" msgstr "" -#: rhodecode/public/js/scripts.js:43010 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 -#: rhodecode/public/js/src/rhodecode/comments.js:393 +#: 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 msgid "Submitting..." msgstr "" -#: rhodecode/public/js/scripts.js:43175 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16 -#: rhodecode/public/js/src/rhodecode/comments.js:560 -msgid "Delete this comment?" -msgstr "" - -#: rhodecode/public/js/scripts.js:43249 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 -msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" -msgstr "" - -#: rhodecode/public/js/scripts.js:43415 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 -#: rhodecode/public/js/src/rhodecode/comments.js:800 +#: rhodecode/public/js/scripts.js:39794 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/comments.js:595 +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 +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 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/scripts.js:43541 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77 -#: rhodecode/public/js/src/rhodecode/comments.js:926 +#: 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 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/scripts.js:43819 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 +#: 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/src/rhodecode/files.js:248 msgid "truncated result" msgstr "" -#: rhodecode/public/js/scripts.js:43821 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 +#: 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/src/rhodecode/files.js:250 msgid "truncated results" msgstr "" -#: rhodecode/public/js/scripts.js:43830 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35 +#: 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/src/rhodecode/files.js:259 msgid "No matching files" msgstr "" -#: rhodecode/public/js/scripts.js:43888 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 +#: 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/src/rhodecode/files.js:317 msgid "Selection link" msgstr "" -#: rhodecode/public/js/scripts.js:43981 rhodecode/public/js/scripts.min.js:1 +#: 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/src/rhodecode/files.js:410 +#: rhodecode/public/js/src/rhodecode/files.js:414 msgid "All Authors" msgstr "" -#: rhodecode/public/js/scripts.js:44117 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 +#: rhodecode/public/js/scripts.js:40734 rhodecode/public/js/scripts.js:40737 +#: rhodecode/public/js/scripts.min.js:1 +#: 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/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/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/src/rhodecode/followers.js:26 msgid "Stopped watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:44118 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 +#: 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/src/rhodecode/followers.js:27 #: rhodecode/templates/base/base.mako:301 msgid "Watch" msgstr "" -#: rhodecode/public/js/scripts.js:44121 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: 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/src/rhodecode/followers.js:30 msgid "Started watching this repository" msgstr "" -#: rhodecode/public/js/scripts.js:44122 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 +#: 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/src/rhodecode/followers.js:31 #: rhodecode/templates/base/base.mako:299 msgid "Unwatch" msgstr "" -#: rhodecode/public/js/scripts.js:44495 rhodecode/public/js/scripts.min.js:1 +#: 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:135 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:141 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:44504 rhodecode/public/js/scripts.min.js:1 +#: 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:144 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:150 msgid "All individual reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:44509 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:149 -msgid "At least {0} reviewer must vote." -msgstr "" - -#: rhodecode/public/js/scripts.js:44515 rhodecode/public/js/scripts.min.js:1 +#: 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 +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 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/scripts.js:44531 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:171 +#: 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 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/scripts.js:44538 rhodecode/public/js/scripts.min.js:1 +#: 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:178 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/scripts.js:44545 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:185 +#: 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 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:44559 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:199 +#: 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 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/scripts.js:44667 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:307 +#: rhodecode/public/js/scripts.js:41268 rhodecode/public/js/scripts.min.js:1 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:227 +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 +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 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/scripts.js:44673 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:313 +#: 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 msgid "User `{0}` already in reviewers" msgstr "" -#: rhodecode/public/js/scripts.js:44773 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:413 +#: 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 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:44777 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:417 +#: 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 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/scripts.js:44953 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:608 +#: 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 msgid "Updating..." msgstr "" -#: rhodecode/public/js/scripts.js:44963 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:618 +#: 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 msgid "Force updating..." msgstr "" -#: rhodecode/public/js/scripts.js:49591 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 +#: rhodecode/public/js/scripts.js:46140 rhodecode/public/js/scripts.min.js:1 +#: 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/src/rhodecode/users.js:56 +msgid "Show" +msgstr "" + +#: rhodecode/public/js/scripts.js:46178 rhodecode/public/js/scripts.min.js:1 +#: 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/src/rhodecode.js:144 msgid "file" msgstr "" -#: rhodecode/public/js/scripts.js:49735 rhodecode/public/js/scripts.min.js:1 +#: 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/src/rhodecode.js:288 msgid "Loading..." msgstr "" -#: rhodecode/public/js/scripts.js:50104 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90 -#: rhodecode/public/js/src/rhodecode.js:657 +#: 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/src/rhodecode.js:661 msgid "date not in future" msgstr "" -#: rhodecode/public/js/scripts.js:50112 rhodecode/public/js/scripts.min.js:1 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/public/js/src/rhodecode.js:665 +#: 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/src/rhodecode.js:669 msgid "Specified expiration date" msgstr "" +#: rhodecode/public/js/scripts.min.js:1 +msgid "action" +msgstr "" + +#: rhodecode/public/js/scripts.min.js:1 +msgid "target" +msgstr "" + +#: rhodecode/public/js/scripts.min.js:1 +msgid "text" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:2 msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:594 -#: rhodecode/templates/codeblocks/diffs.mako:598 +#: rhodecode/templates/codeblocks/diffs.mako:606 +#: rhodecode/templates/codeblocks/diffs.mako:610 msgid "Add another comment" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 -msgid "Changed files" +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 +msgid "Are you sure to close this pull request without merging?" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 +msgid "Changed files" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 #: 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/templates/codeblocks/diffs.mako:131 +msgid "Collapse all files" +msgstr "" + #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15 -msgid "Context file: " -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 -msgid "Diff to Commit " -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18 -msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +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 "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgid "Context file: " msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 -msgid "Follow" +msgid "Delete this comment?" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 -msgid "Hide full context diff" +msgid "Diff to Commit " msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -msgid "Hide whitespace changes" +#: rhodecode/templates/codeblocks/diffs.mako:129 +msgid "Expand all files" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 -#: rhodecode/public/js/src/i18n_messages.js:4 -msgid "Invite reviewers to this discussion" +msgid "Expand {0} commit" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 +msgid "Expand {0} commits" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:25 +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:26 +msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:27 +msgid "Follow" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 +msgid "Hide full context diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 -msgid "No bookmarks available yet." +msgid "Hide whitespace changes" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31 -msgid "No branches available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32 -msgid "No forks available yet." +#: 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 "No gists available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36 -msgid "No pull requests available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37 -msgid "No repositories available yet." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38 -msgid "No repository groups available yet." +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 ssh keys available yet." +msgid "No bookmarks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 -msgid "No tags available yet." +msgid "No branches available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42 -msgid "No user groups available yet." +msgid "No forks available yet." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43 -msgid "No users available yet." +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 -#: 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:48 -msgid "Open new pull request for selected commit" +msgid "No repositories present." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:49 +msgid "No repository groups 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." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 -msgid "Saving..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57 -#: rhodecode/public/js/src/i18n_messages.js:6 -#: rhodecode/templates/admin/settings/settings_email.mako:50 -msgid "Send" +msgid "No user groups 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" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 -msgid "Show at Commit " -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 -msgid "Show commit range {0} ... {1}" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 -msgid "Show full context diff" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39 -msgid "Show more" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64 -msgid "Show selected commit __S" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65 -msgid "Show selected commits __S ... __E" +msgid "Open new pull request for selected commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -msgid "Show whitespace changes" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68 -msgid "Start following this repository" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 -msgid "Stop following this repository" +msgid "Saving..." +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 +#: 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 +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 -#: rhodecode/public/js/src/i18n_messages.js:7 -msgid "Switch to chat" +msgid "Show full context diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 -#: rhodecode/public/js/src/i18n_messages.js:8 -msgid "Switch to comment" +#: 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 "There are currently no open pull requests requiring your participation." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 -msgid "Toggle Wide Mode diff" +msgid "Show whitespace changes" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:80 -msgid "Unfollow" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 -#: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "activated" +msgid "Start following this repository" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 +msgid "Stop following this repository" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 +#: rhodecode/public/js/src/i18n_messages.js:7 +msgid "Switch to chat" +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." msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 -msgid "disabled" +msgid "Toggle Wide Mode diff" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 -msgid "enabled" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 -msgid "files" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 -msgid "go to numeric commit" +msgid "Unfollow" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 -#: rhodecode/templates/pullrequests/pullrequest.mako:136 -msgid "loading..." -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 #: rhodecode/templates/admin/auth/auth_settings.mako:69 -msgid "not active" +msgid "activated" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 +msgid "disabled" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 +msgid "enabled" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 -msgid "specify commit" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 -msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 -msgid "{0} ({1} inactive) of {2} users ({3} inactive)" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 -msgid "{0} active out of {1} users" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116 -msgid "{0} days" +msgid "files" +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 +#: rhodecode/templates/admin/auth/auth_settings.mako:69 +msgid "not active" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:118 -msgid "{0} hours" +msgid "specify commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:121 -msgid "{0} months" +msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122 -msgid "{0} of {1} repository groups" +msgid "{0} ({1} inactive) of {2} users ({3} inactive)" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123 -msgid "{0} out of {1} ssh keys" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124 -msgid "{0} out of {1} users" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125 -msgid "{0} repository groups" +msgid "{0} active out of {1} users" 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" +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" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:138 +msgid "{0} repositories" +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:129 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143 msgid "{0} users ({1} inactive)" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:145 msgid "{0} years" msgstr "" @@ -5061,20 +5311,16 @@ msgstr "" msgid "MathML" msgstr "" -#: rhodecode/public/js/src/rhodecode/comments.js:634 -msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}" -msgstr "" - #: rhodecode/templates/index.mako:5 msgid "Dashboard" msgstr "" -#: rhodecode/templates/index_base.mako:20 +#: rhodecode/templates/index_base.mako:21 msgid "No repositories or repositories groups exists here." msgstr "" -#: rhodecode/templates/index_base.mako:62 -#: rhodecode/templates/index_base.mako:153 +#: rhodecode/templates/index_base.mako:80 +#: rhodecode/templates/index_base.mako:167 #: rhodecode/templates/admin/gists/gist_index.mako:107 #: rhodecode/templates/admin/integrations/list.mako:72 #: rhodecode/templates/admin/my_account/my_account_repos.mako:28 @@ -5084,7 +5330,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:76 #: rhodecode/templates/admin/user_groups/user_groups.mako:76 -#: rhodecode/templates/admin/users/user_edit_groups.mako:54 +#: 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/bookmarks/bookmarks.mako:57 @@ -5094,35 +5340,35 @@ msgstr "" msgid "Name" msgstr "" -#: rhodecode/templates/index_base.mako:71 -#: rhodecode/templates/index_base.mako:162 +#: 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:15 -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:57 +#: 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_profile.mako:68 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57 +#: 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_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:77 -#: rhodecode/templates/admin/repos/repo_add_base.mako:66 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 +#: rhodecode/templates/admin/repos/repo_add_base.mako:83 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170 #: rhodecode/templates/admin/repos/repos.mako:84 #: rhodecode/templates/admin/user_groups/user_group_add.mako:42 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.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:15 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:72 -#: rhodecode/templates/admin/users/user_edit_groups.mako:59 -#: rhodecode/templates/admin/users/user_edit_ips.mako:12 -#: rhodecode/templates/admin/users/user_edit_profile.mako:71 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52 +#: 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_groups.mako:62 +#: rhodecode/templates/admin/users/user_edit_ips.mako:17 +#: rhodecode/templates/admin/users/user_edit_profile.mako:74 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:15 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 #: rhodecode/templates/base/issue_tracker_settings.mako:78 -#: rhodecode/templates/compare/compare_commits.mako:21 +#: 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 @@ -5130,22 +5376,22 @@ msgstr "" #: rhodecode/templates/forks/fork.mako:56 #: rhodecode/templates/forks/forks.mako:62 #: rhodecode/templates/pullrequests/pullrequest.mako:50 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:547 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:562 #: rhodecode/templates/summary/components.mako:159 #: rhodecode/templates/user_group/profile.mako:25 #: rhodecode/templates/users/user_profile.mako:59 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:78 -#: rhodecode/templates/index_base.mako:169 +#: rhodecode/templates/index_base.mako:96 +#: rhodecode/templates/index_base.mako:183 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80 #: rhodecode/templates/admin/repos/repos.mako:91 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.mako:91 -#: rhodecode/templates/index_base.mako:182 +#: rhodecode/templates/index_base.mako:109 +#: rhodecode/templates/index_base.mako:196 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 @@ -5154,25 +5400,25 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:152 #: rhodecode/templates/admin/repos/repos.mako:104 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:28 #: rhodecode/templates/admin/user_groups/user_groups.mako:86 -#: rhodecode/templates/admin/users/user_edit_groups.mako:65 +#: rhodecode/templates/admin/users/user_edit_groups.mako:68 #: rhodecode/templates/forks/forks.mako:58 #: rhodecode/templates/summary/components.mako:148 #: rhodecode/templates/user_group/profile.mako:35 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:176 +#: rhodecode/templates/index_base.mako:190 #: rhodecode/templates/admin/repos/repos.mako:98 #: rhodecode/templates/bookmarks/bookmarks.mako:64 #: rhodecode/templates/branches/branches.mako:63 -#: rhodecode/templates/compare/compare_commits.mako:19 +#: 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/files/file_authors_box.mako:28 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:545 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:560 #: rhodecode/templates/search/search_commit.mako:9 #: rhodecode/templates/summary/components.mako:117 #: rhodecode/templates/summary/components.mako:125 @@ -5187,8 +5433,8 @@ msgid "%s Repository group dashboard" msgstr "" #: rhodecode/templates/index_repo_group.mako:13 -#: rhodecode/templates/base/base.mako:773 -#: rhodecode/templates/base/base.mako:774 +#: rhodecode/templates/base/base.mako:804 +#: rhodecode/templates/base/base.mako:805 msgid "Home" msgstr "" @@ -5296,19 +5542,19 @@ msgid "Re-enter password" msgstr "" #: rhodecode/templates/register.mako:81 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:37 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:48 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:38 #: rhodecode/templates/admin/users/user_add.mako:68 -#: rhodecode/templates/admin/users/user_edit_profile.mako:44 +#: rhodecode/templates/admin/users/user_edit_profile.mako:47 #: rhodecode/templates/admin/users/users.mako:78 msgid "First Name" msgstr "" #: rhodecode/templates/register.mako:88 -#: rhodecode/templates/admin/my_account/my_account_profile.mako:47 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:58 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:47 #: rhodecode/templates/admin/users/user_add.mako:77 -#: rhodecode/templates/admin/users/user_edit_profile.mako:53 +#: rhodecode/templates/admin/users/user_edit_profile.mako:56 #: rhodecode/templates/admin/users/users.mako:80 msgid "Last Name" msgstr "" @@ -5353,17 +5599,17 @@ 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:19 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:25 #: 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 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:116 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 +#: 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:19 -#: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:30 +#: 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 #: rhodecode/templates/forks/forks.mako:69 msgid "Action" @@ -5383,9 +5629,9 @@ 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:655 -#: rhodecode/templates/base/base.mako:657 #: rhodecode/templates/search/search_commit.mako:8 #: rhodecode/templates/search/search_path.mako:7 msgid "Repository" @@ -5402,7 +5648,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:26 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 -#: rhodecode/templates/admin/users/user_edit_audit.mako:16 +#: rhodecode/templates/admin/users/user_edit_audit.mako:18 #: rhodecode/templates/journal/journal.mako:13 msgid "filter" msgstr "" @@ -5415,7 +5661,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:29 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18 -#: rhodecode/templates/admin/users/user_edit_audit.mako:19 +#: rhodecode/templates/admin/users/user_edit_audit.mako:21 #: rhodecode/templates/journal/journal.mako:16 msgid "Example Queries" msgstr "" @@ -5512,17 +5758,18 @@ 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:206 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:71 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:243 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:216 +#: 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_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:192 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 -#: rhodecode/templates/admin/users/user_edit_groups.mako:27 -#: rhodecode/templates/admin/users/user_edit_profile.mako:145 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:206 +#: 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 msgid "Save" msgstr "" @@ -5543,21 +5790,20 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/gist_index.mako:105 #: rhodecode/templates/admin/integrations/list.mako:73 -#: rhodecode/templates/admin/repos/repo_add_base.mako:57 +#: rhodecode/templates/admin/repos/repo_add_base.mako:58 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23 -#: rhodecode/templates/admin/repos/repo_add_base.mako:89 +#: rhodecode/templates/admin/repos/repo_add_base.mako:113 msgid "Private Repository" msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 -#: rhodecode/templates/admin/repos/repo_add_base.mako:93 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:192 -#: rhodecode/templates/forks/fork.mako:85 +#: rhodecode/templates/admin/repos/repo_add_base.mako:117 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:199 +#: rhodecode/templates/forks/fork.mako:92 msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" @@ -5605,7 +5851,7 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_edit.mako:54 #: rhodecode/templates/admin/gists/gist_new.mako:48 -#: rhodecode/templates/files/files_add.mako:68 +#: rhodecode/templates/files/files_add.mako:67 #: rhodecode/templates/files/files_edit.mako:69 msgid "plain" msgstr "" @@ -5616,8 +5862,8 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_edit.mako:100 #: rhodecode/templates/base/issue_tracker_settings.mako:150 -#: rhodecode/templates/changeset/changeset_file_comment.mako:391 -#: rhodecode/templates/codeblocks/diffs.mako:84 +#: rhodecode/templates/changeset/changeset_file_comment.mako:395 +#: rhodecode/templates/codeblocks/diffs.mako:88 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75 msgid "Cancel" msgstr "" @@ -5664,6 +5910,7 @@ msgid "Create New Gist" msgstr "" #: rhodecode/templates/admin/gists/gist_index.mako:54 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:23 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 @@ -5680,13 +5927,13 @@ msgid "quick filter..." msgstr "" #: rhodecode/templates/admin/gists/gist_index.mako:103 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:91 #: rhodecode/templates/bookmarks/bookmarks.mako:61 #: rhodecode/templates/branches/branches.mako:60 #: rhodecode/templates/commits/changelog.mako:119 -#: rhodecode/templates/compare/compare_commits.mako:18 +#: rhodecode/templates/compare/compare_commits.mako:16 #: rhodecode/templates/files/files_browser_tree.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:544 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:559 #: rhodecode/templates/pullrequests/pullrequests.mako:98 #: rhodecode/templates/search/search_commit.mako:18 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5701,8 +5948,8 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:7 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:52 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:16 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:51 msgid "Created on" msgstr "" @@ -5711,7 +5958,7 @@ msgid "Expires" msgstr "" #: rhodecode/templates/admin/gists/gist_new.mako:5 -#: rhodecode/templates/base/base.mako:572 +#: rhodecode/templates/base/base.mako:568 msgid "New Gist" msgstr "" @@ -5737,7 +5984,7 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_new.mako:69 #: rhodecode/templates/admin/gists/gist_new.mako:70 -#: rhodecode/templates/data_table/_dt_elements.mako:344 +#: rhodecode/templates/data_table/_dt_elements.mako:352 msgid "Private Gist" msgstr "" @@ -5747,7 +5994,7 @@ msgstr "" #: rhodecode/templates/admin/gists/gist_new.mako:73 #: rhodecode/templates/admin/gists/gist_new.mako:74 -#: rhodecode/templates/data_table/_dt_elements.mako:342 +#: rhodecode/templates/data_table/_dt_elements.mako:350 msgid "Public Gist" msgstr "" @@ -5773,21 +6020,17 @@ msgstr "" msgid "Show as Raw" msgstr "" -#: rhodecode/templates/admin/gists/gist_show.mako:57 -msgid "Confirm to delete this Gist" -msgstr "" - -#: rhodecode/templates/admin/gists/gist_show.mako:70 +#: rhodecode/templates/admin/gists/gist_show.mako:73 msgid "created" msgstr "" -#: rhodecode/templates/admin/gists/gist_show.mako:71 +#: rhodecode/templates/admin/gists/gist_show.mako:74 msgid "expires" msgstr "" -#: rhodecode/templates/admin/gists/gist_show.mako:92 +#: rhodecode/templates/admin/gists/gist_show.mako:95 #: rhodecode/templates/files/files_delete.mako:58 -#: rhodecode/templates/files/files_source.mako:125 +#: rhodecode/templates/files/files_source.mako:128 msgid "Show as raw" msgstr "" @@ -5821,6 +6064,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:42 #: 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 msgid "Settings" msgstr "" @@ -5922,7 +6166,7 @@ msgid "No description available" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:5 -#: rhodecode/templates/base/base.mako:617 +#: rhodecode/templates/base/base.mako:613 msgid "My account" msgstr "" @@ -5950,7 +6194,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions.mako:51 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 #: rhodecode/templates/admin/users/user_edit.mako:41 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:7 msgid "SSH Keys" msgstr "" @@ -5974,13 +6218,12 @@ 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:621 +#: rhodecode/templates/base/base.mako:617 msgid "Pull Requests" msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:46 #: rhodecode/templates/admin/permissions/permissions.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 #: rhodecode/templates/base/base.mako:111 msgid "Permissions" @@ -5990,70 +6233,64 @@ msgstr "" msgid "Live Notifications" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:3 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:3 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:9 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:13 msgid "Authentication Tokens" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:8 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:8 -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:14 -#: rhodecode/templates/admin/users/user_edit_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 "Token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:17 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:17 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:28 msgid "Repository Scope" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:24 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:29 msgid "Expiration" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49 -#, python-format -msgid "Confirm to remove this auth token: %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:57 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:57 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:66 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:70 msgid "No additional auth tokens specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:69 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:69 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 msgid "New authentication token" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:83 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:92 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:96 msgid "Repository scope works only with tokens with VCS type." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:96 +#: 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:87 -#: rhodecode/templates/admin/users/user_edit_emails.mako:62 -#: rhodecode/templates/admin/users/user_edit_ips.mako:70 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:100 +#: 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:120 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:121 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:129 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:134 msgid "Select or enter expiration date" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:155 -#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:156 +#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:164 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:169 msgid "repository scope" msgstr "" @@ -6126,28 +6363,22 @@ msgid "Account Emails" msgstr "" #: rhodecode/templates/admin/my_account/my_account_emails.mako:17 -#: rhodecode/templates/admin/users/user_edit_emails.mako:16 +#: rhodecode/templates/admin/users/user_edit_emails.mako:19 msgid "Primary" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.mako:31 -msgid "Confirm to delete this email: {}" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_emails.mako:42 -#: rhodecode/templates/admin/users/user_edit_emails.mako:41 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:43 +#: rhodecode/templates/admin/users/user_edit_emails.mako:44 msgid "No additional emails specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_emails.mako:51 -#: rhodecode/templates/admin/my_account/my_account_password.mako:6 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17 -msgid "Your user account details are managed by an external source. Details cannot be managed here." -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_emails.mako:52 -#: rhodecode/templates/admin/my_account/my_account_password.mako:7 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18 +#: rhodecode/templates/admin/my_account/my_account_password.mako:6 +msgid "Your user account details are managed by an external source. Details cannot be managed here." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_emails.mako:53 +#: rhodecode/templates/admin/my_account/my_account_password.mako:9 msgid "Source type" msgstr "" @@ -6167,46 +6398,63 @@ msgstr "" msgid "Change Your Account Password" msgstr "" +#: rhodecode/templates/admin/my_account/my_account_password.mako:7 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:18 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:19 +msgid "For VCS access please generate" +msgstr "" + #: rhodecode/templates/admin/my_account/my_account_profile.mako:6 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 msgid "My Profile" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.mako:13 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:54 -#: rhodecode/templates/admin/users/user_edit_profile.mako:23 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:15 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:16 +#: rhodecode/templates/admin/users/user_edit_profile.mako:19 +#, python-format +msgid "This user was created from external source (%s). Editing some of the settings is limited." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_profile.mako:24 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:60 +#: rhodecode/templates/admin/users/user_edit_profile.mako:26 #: rhodecode/templates/users/user_profile.mako:15 msgid "Photo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile.mako:71 +#: rhodecode/templates/admin/my_account/my_account_profile.mako:82 #: rhodecode/templates/users/user_profile.mako:73 msgid "Missing email, please update your user email address." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:59 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:65 msgid "Change your avatar at" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:6 -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:8 -msgid "Show Closed Pull Requests" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:15 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:13 +#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 +msgid "All" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:14 +msgid "All + Closed" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:33 msgid "Pull Requests You Participate In" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:51 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:67 msgid "Target Repo" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:79 #: rhodecode/templates/pullrequests/pullrequests.mako:94 msgid "Id" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57 +#: 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 @@ -6215,7 +6463,7 @@ msgstr "" msgid "Title" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63 +#: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:103 #: rhodecode/templates/pullrequests/pullrequests.mako:102 msgid "Last Update" msgstr "" @@ -6226,13 +6474,13 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:9 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:47 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:9 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:14 msgid "Fingerprint" msgstr "" #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:17 msgid "Accessed on" msgstr "" @@ -6240,44 +6488,38 @@ msgstr "" msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:32 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:29 -#, python-format -msgid "Confirm to remove ssh key %s" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:40 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:37 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:41 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:42 msgid "No additional ssh keys specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:54 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:49 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:54 msgid "New ssh key" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:59 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:54 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:60 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59 msgid "Generate random RSA key" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:66 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:61 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:75 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:76 msgid "Click add to use this generated SSH key" msgstr "" #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49 -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:47 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:51 #: rhodecode/templates/admin/user_groups/user_group_add.mako:51 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:55 #: rhodecode/templates/admin/user_groups/user_groups.mako:84 #: rhodecode/templates/admin/users/user_add.mako:97 -#: rhodecode/templates/admin/users/user_edit_groups.mako:64 -#: rhodecode/templates/admin/users/user_edit_profile.mako:101 +#: rhodecode/templates/admin/users/user_edit_groups.mako:67 +#: rhodecode/templates/admin/users/user_edit_profile.mako:110 #: rhodecode/templates/admin/users/users.mako:85 #: rhodecode/templates/user_group/profile.mako:44 msgid "Active" @@ -6327,13 +6569,9 @@ msgstr "" msgid "Unread" msgstr "" -#: rhodecode/templates/admin/notifications/notifications_show_all.mako:40 -msgid "All" -msgstr "" - #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41 #: rhodecode/templates/changeset/changeset.mako:172 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:656 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:671 msgid "Comments" msgstr "" @@ -6409,7 +6647,7 @@ msgstr "" #: rhodecode/templates/admin/permissions/permissions_branch.mako:6 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6 -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:67 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6 #: rhodecode/templates/admin/settings/settings_automation.mako:6 #: rhodecode/templates/artifacts/artifact_list.mako:24 @@ -6421,28 +6659,28 @@ msgid "Default IP Whitelist For All User msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:9 -#: rhodecode/templates/admin/users/user_edit_ips.mako:7 +#: rhodecode/templates/admin/users/user_edit_ips.mako:12 msgid "Current IP address" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:30 -#: rhodecode/templates/admin/users/user_edit_ips.mako:36 +#: rhodecode/templates/admin/users/user_edit_ips.mako:41 #, python-format msgid "Confirm to delete this ip: %s" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:37 -#: rhodecode/templates/admin/users/user_edit_ips.mako:44 +#: rhodecode/templates/admin/users/user_edit_ips.mako:49 msgid "All IP addresses are allowed" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:52 -#: rhodecode/templates/admin/users/user_edit_ips.mako:60 +#: rhodecode/templates/admin/users/user_edit_ips.mako:65 msgid "New IP Address" msgstr "" #: rhodecode/templates/admin/permissions/permissions_ips.mako:56 -#: rhodecode/templates/admin/users/user_edit_ips.mako:63 +#: rhodecode/templates/admin/users/user_edit_ips.mako:68 msgid "Description..." msgstr "" @@ -6510,7 +6748,7 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:35 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:34 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:15 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:19 msgid "Group name" msgstr "" @@ -6518,28 +6756,41 @@ 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:666 -#: rhodecode/templates/data_table/_dt_elements.mako:215 +#: rhodecode/templates/base/base.mako:662 +#: 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:58 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:62 -msgid "Plain text format with support of {metatags}" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68 -#: rhodecode/templates/admin/repos/repo_add_base.mako:80 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:64 +#: rhodecode/templates/admin/repos/repo_add_base.mako:90 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:179 +#: rhodecode/templates/admin/users/user_edit_profile.mako:81 +#: rhodecode/templates/forks/fork.mako:63 +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_edit_settings.mako:66 +#: rhodecode/templates/admin/repos/repo_add_base.mako:92 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:181 +#: rhodecode/templates/admin/users/user_edit_profile.mako:83 +#: rhodecode/templates/forks/fork.mako:65 +msgid "Plain text format." +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:74 +#: rhodecode/templates/admin/repos/repo_add_base.mako:104 msgid "Copy Parent Group Permissions" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72 -#: rhodecode/templates/admin/repos/repo_add_base.mako:84 +#: 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:77 +#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:83 msgid "Create Repository Group" msgstr "" @@ -6548,9 +6799,17 @@ msgstr "" msgid "%s repository group settings" msgstr "" +#: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31 +#: rhodecode/templates/admin/repos/repo_edit.mako:45 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:8 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:30 +msgid "Access Permissions" +msgstr "" + #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:32 #: rhodecode/templates/admin/repos/repo_edit.mako:51 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:36 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:24 #: rhodecode/templates/admin/users/user_edit.mako:42 msgid "Advanced" msgstr "" @@ -6622,74 +6881,82 @@ msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:15 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:15 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:19 msgid "User/User Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:37 msgid "super-admin" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:36 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:40 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:64 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:86 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:66 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109 -msgid "permission for all other users" +#: 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/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 +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:111 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:90 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:70 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:113 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 +#: 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 +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 msgid "inactive duplicate" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:157 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:155 +#: 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/repos/repo_edit_strip.mako:46 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:158 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:88 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:172 msgid "Remove" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:116 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:130 msgid "delegated admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:152 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:153 +#: 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 msgid "members" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:184 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:182 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:184 -msgid "Add user/user group" -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 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:200 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:210 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:201 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:211 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen." msgstr "" @@ -6741,18 +7008,17 @@ msgstr "" msgid "Optionally select a group to put this repository into." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:61 +#: rhodecode/templates/admin/repos/repo_add_base.mako:78 msgid "Set the type of repository to create." msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:71 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177 -#: rhodecode/templates/admin/users/user_edit_profile.mako:76 -#: rhodecode/templates/forks/fork.mako:61 -msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:97 +#: rhodecode/templates/admin/repos/repo_add_base.mako:94 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:183 +#: rhodecode/templates/forks/fork.mako:67 +msgid "Add a README file for longer descriptions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:121 msgid "Create Repository" msgstr "" @@ -6773,10 +7039,6 @@ msgstr "" msgid "{} repository settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:45 -msgid "Access Permissions" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.mako:48 msgid "Branch Permissions" msgstr "" @@ -6795,7 +7057,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit.mako:63 #: rhodecode/templates/admin/users/user_edit.mako:49 -#: rhodecode/templates/admin/users/user_edit_caches.mako:5 +#: rhodecode/templates/admin/users/user_edit_caches.mako:7 msgid "Caches" msgstr "" @@ -6890,114 +7152,99 @@ msgstr "" msgid "This Repository is not currently locked." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96 -msgid "Confirm to unlock repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99 msgid "Unlock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:103 -msgid "Confirm to lock repository." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:107 msgid "Lock repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:111 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:113 msgid "Force repository locking. This only works when anonymous access is disabled. Pulling from the repository locks the repository to that user until the same user pushes to that repository again." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:123 msgid "Hooks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125 -msgid "Hook type" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:126 -msgid "Hook version" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127 +msgid "Hook type" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:128 +msgid "Hook version" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129 msgid "Current version" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:132 msgid "PRE HOOK" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:135 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:137 msgid "POST HOOK" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:143 msgid "Unable to read hook information from VCS Server" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:149 msgid "Confirm to reinstall hooks for this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:148 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:150 msgid "Update Hooks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:155 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154 +msgid "Outdated hooks detected, please update hooks using `Update Hooks` action." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:162 msgid "Archive repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:164 -#, python-format -msgid "Confirm to archive this repository: %s" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:165 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:173 msgid "Archive this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:170 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:178 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:182 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:190 msgid "Delete repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:193 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:201 msgid "Detach forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:198 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206 msgid "Delete forks" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:208 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:216 msgid "Consider to archive this repository instead." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219 -#: rhodecode/templates/data_table/_dt_elements.mako:180 -#, python-format -msgid "Confirm to delete this repository: %s" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:220 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:229 msgid "Delete this repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:225 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234 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:259 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268 msgid "Change repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259 +#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268 msgid "Pick repository" msgstr "" @@ -7006,7 +7253,7 @@ msgid "Repository Audit Logs" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14 -#: rhodecode/templates/admin/users/user_edit_audit.mako:15 +#: rhodecode/templates/admin/users/user_edit_audit.mako:17 msgid "audit filter..." msgstr "" @@ -7026,67 +7273,63 @@ msgstr "" msgid "Cache purge can be automated by such api call. Can be called periodically in crontab etc." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:23 msgid "Invalidate repository cache" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:20 -msgid "Confirm to invalidate repository cache" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:32 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:36 msgid "Invalidation keys" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:40 -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:84 -#: rhodecode/templates/admin/users/user_edit_caches.mako:19 -msgid "Show all" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_caches.mako:44 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:88 +#: rhodecode/templates/admin/users/user_edit_caches.mako:22 +msgid "Show all" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:48 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:92 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 msgid "Key" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:45 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:49 msgid "State UID" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:46 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:50 msgid "Namespace" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:65 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:69 msgid "Cache keys" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:93 msgid "Region" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:106 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:110 msgid "Shadow Repositories" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:118 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:122 msgid "No Shadow repositories exist for this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:129 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:133 msgid "Diff Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:137 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:141 msgid "Cached diff name" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:145 -msgid "Cached diff files" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_caches.mako:149 +msgid "Cached diff files" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:153 msgid "Cached diff size" msgstr "" @@ -7140,27 +7383,27 @@ msgstr "" msgid "Inherited Issue Tracker Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31 #: rhodecode/templates/base/issue_tracker_settings.mako:79 #: rhodecode/templates/base/perms_summary.mako:169 msgid "Pattern" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 #: rhodecode/templates/base/issue_tracker_settings.mako:80 msgid "Url" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:33 msgid "Prefix" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:75 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5 msgid "Issue Tracker / Wiki Patterns" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:91 +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:95 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:24 msgid "Test Patterns" msgstr "" @@ -7201,15 +7444,24 @@ msgstr "" msgid "only users/user groups explicitly added here will have access" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:62 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:118 +msgid "Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:63 +msgid "un-set private mode" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:103 msgid "used by {} branch rule, requires write+ permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:96 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:105 msgid "used by {} branch rules, requires write+ permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:119 msgid "set private mode" msgstr "" @@ -7234,7 +7486,7 @@ msgid "This repository does not have any msgstr "" #: rhodecode/templates/admin/repos/repo_edit_remote.mako:17 -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:55 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:60 msgid "Set remote url." msgstr "" @@ -7242,19 +7494,15 @@ msgstr "" msgid "Pull can be automated by such api call. Can be called periodically in crontab etc." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:40 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:44 msgid "Pull changes from remote location" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:40 -msgid "Confirm to pull changes from remote side" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:49 -msgid "Push url" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_remote.mako:54 +msgid "Push url" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:59 msgid "This repository does not have any push url set." msgstr "" @@ -7348,34 +7596,34 @@ msgstr "" msgid "Change owner of this repository." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:187 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:194 #: rhodecode/templates/data_table/_dt_elements.mako:104 msgid "Private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:197 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:204 #: rhodecode/templates/summary/components.mako:238 msgid "Enable statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:202 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:209 msgid "Enable statistics window on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:207 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:214 #: rhodecode/templates/summary/components.mako:184 msgid "Enable downloads" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:212 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:219 msgid "Enable download menu on summary page." msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:217 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:224 msgid "Enable automatic locking" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:222 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:229 msgid "Enable automatic locking on repository. Pulling from this repository creates a lock that can be released by pushing back by the same user" msgstr "" @@ -7536,22 +7784,19 @@ msgid "Exceptions Tracker - Exception ID msgstr "" #: rhodecode/templates/admin/settings/settings_exceptions.mako:8 +#: rhodecode/templates/email_templates/exception_tracker.mako:14 msgid "Exception `{}` generated on UTC date: {}" msgstr "" -#: rhodecode/templates/admin/settings/settings_exceptions.mako:12 -msgid "Unable to Read Exception. It might be removed or non-existing." -msgstr "" - #: rhodecode/templates/admin/settings/settings_exceptions.mako:21 +msgid "Unable to Read Exception. It might be removed or non-existing." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:30 msgid "Delete this Exception" msgstr "" -#: rhodecode/templates/admin/settings/settings_exceptions.mako:29 -msgid "Confirm to delete this exception" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_exceptions.mako:31 +#: rhodecode/templates/admin/settings/settings_exceptions.mako:40 msgid "Delete This Exception" msgstr "" @@ -7571,19 +7816,15 @@ msgstr "" msgid "Store directory" msgstr "" -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:19 -msgid "Confirm to delete all exceptions" -msgstr "" - -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:22 +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:23 msgid "Delete All `{}`" msgstr "" -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:24 +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:25 msgid "Delete All" msgstr "" -#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:38 +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39 msgid "Exceptions Tracker - Showing the last {} Exceptions" msgstr "" @@ -7604,7 +7845,7 @@ msgid "Set a custom text that is shown a msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:36 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:80 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:83 msgid "Personal Repository Group" msgstr "" @@ -8033,7 +8274,7 @@ msgid "User groups" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_add.mako:46 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:46 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:50 msgid "Short, optional description for this user group." msgstr "" @@ -8083,72 +8324,70 @@ msgstr "" msgid "Assigned to review rules" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:21 -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:6 -#, python-format -msgid "User Group: %s" -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:31 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:22 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:6 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:7 +#: rhodecode/templates/data_table/_dt_elements.mako:305 +#: rhodecode/templates/user_group/user_group.mako:4 +msgid "User group" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:35 msgid "Group members sync" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:38 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:42 msgid "This group is set to be automatically synchronised." msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:39 -msgid "This group synchronization was set by" -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:43 +msgid "This group synchronization was set by" +msgstr "" + +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:47 msgid "This group is not set to be automatically synchronised" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:52 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:56 msgid "Disable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:54 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:58 msgid "Enable synchronization" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:60 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:64 msgid "Users will be added or removed from this group when they authenticate with RhodeCode system, based on LDAP group membership. This requires `LDAP+User group` authentication plugin to be configured and enabled. (EE only feature)" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:73 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:77 msgid "Delete User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:83 #, python-format msgid "Confirm to delete user group `%(ugroup)s` with all permission assignments" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:81 +#: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:85 msgid "Delete This User Group" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:5 -msgid "User Group Permissions" -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:36 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:40 msgid "Change owner of this user group." msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:60 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:64 msgid "Add members" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:96 +#: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:100 #: rhodecode/templates/user_group/profile.mako:78 msgid "No members yet" msgstr "" #: rhodecode/templates/admin/user_groups/user_groups.mako:5 -#: rhodecode/templates/admin/users/user_edit_groups.mako:6 +#: rhodecode/templates/admin/users/user_edit_groups.mako:8 msgid "User groups administration" msgstr "" @@ -8216,7 +8455,7 @@ msgid "This user is set as disabled" msgstr "" #: rhodecode/templates/admin/users/user_edit.mako:39 -#: rhodecode/templates/admin/users/user_edit_profile.mako:5 +#: rhodecode/templates/admin/users/user_edit_profile.mako:7 #: rhodecode/templates/users/user_profile.mako:6 msgid "User Profile" msgstr "" @@ -8267,239 +8506,250 @@ msgstr "" msgid "Force password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:28 -msgid "User: {}" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:46 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:49 msgid "Force Password Reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:52 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:55 msgid "Disable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:57 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:60 msgid "Clear the forced password change flag." msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:64 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:67 msgid "Confirm to enable forced password change" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:65 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:68 msgid "Enable forced password reset" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:70 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:73 msgid "When this is enabled user will have to change they password when they next use RhodeCode system. This will also forbid vcs operations until someone makes a password change in the web interface" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:86 -msgid "Users personal repository group" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_advanced.mako:89 +msgid "Users personal repository group" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:92 msgid "This user currently does not have a personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:91 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:94 #, python-format msgid "New group will be created at: `/%(path)s`" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:96 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:99 msgid "Create personal repository group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:105 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:108 msgid "Delete User" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:116 -msgid "Detach repositories" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_advanced.mako:119 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:131 -#: rhodecode/templates/admin/users/user_edit_advanced.mako:143 +msgid "Detach repositories" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:122 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:134 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:146 msgid "Delete repositories" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:128 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:131 msgid "Detach repository groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:140 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:143 msgid "Detach user groups" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:152 -msgid "Detach Artifacts" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_advanced.mako:155 +msgid "Detach pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:158 +msgid "Delete pull requests" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:167 +msgid "Detach Artifacts" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_advanced.mako:170 msgid "Delete Artifacts" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:165 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:180 msgid "New owner for detached objects" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:172 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:188 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the above user." msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:174 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:190 msgid "The delete option will delete the user and all his owned objects!" msgstr "" -#: rhodecode/templates/admin/users/user_edit_advanced.mako:187 -#: rhodecode/templates/data_table/_dt_elements.mako:269 -#, python-format -msgid "Confirm to delete this user: %s" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_advanced.mako:189 +#: rhodecode/templates/admin/users/user_edit_advanced.mako:205 msgid "Delete this user" msgstr "" -#: rhodecode/templates/admin/users/user_edit_audit.mako:7 -msgid "User Audit Logs" -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_audit.mako:10 +#: rhodecode/templates/admin/users/user_edit_audit.mako:9 +msgid "Audit Logs" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_audit.mako:12 msgid "Download as JSON" msgstr "" -#: rhodecode/templates/admin/users/user_edit_caches.mako:33 +#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:62 +#, python-format +msgid "Confirm to remove this auth token: %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_caches.mako:36 msgid "Invalidate user cache" msgstr "" -#: rhodecode/templates/admin/users/user_edit_caches.mako:33 +#: rhodecode/templates/admin/users/user_edit_caches.mako:36 msgid "Confirm to invalidate user cache" msgstr "" -#: rhodecode/templates/admin/users/user_edit_emails.mako:5 +#: rhodecode/templates/admin/users/user_edit_emails.mako:7 msgid "Additional Email Addresses" msgstr "" -#: rhodecode/templates/admin/users/user_edit_emails.mako:30 +#: rhodecode/templates/admin/users/user_edit_emails.mako:33 #, python-format msgid "Confirm to delete this email: %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_emails.mako:55 +#: rhodecode/templates/admin/users/user_edit_emails.mako:58 msgid "New email address" msgstr "" -#: rhodecode/templates/admin/users/user_edit_groups.mako:12 +#: rhodecode/templates/admin/users/user_edit_groups.mako:15 #, python-format msgid "Add `%s` to user group" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:3 +#: rhodecode/templates/admin/users/user_edit_ips.mako:7 msgid "Custom IP Whitelist" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:10 +#: rhodecode/templates/admin/users/user_edit_ips.mako:15 msgid "IP Address" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:11 +#: rhodecode/templates/admin/users/user_edit_ips.mako:16 msgid "IP Range" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:20 +#: rhodecode/templates/admin/users/user_edit_ips.mako:25 #, python-format msgid "Inherited from %s" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ips.mako:64 +#: rhodecode/templates/admin/users/user_edit_ips.mako:69 msgid "" "Enter comma separated list of ip addresses like 10.0.0.1,10.0.0.2.\n" "Use a ip address with a mask 127.0.0.1/24, to create a network match pattern.\n" "To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:16 -#, python-format -msgid "This user was created from external source (%s). Editing some of the settings is limited." -msgstr "" - -#: rhodecode/templates/admin/users/user_edit_profile.mako:28 +#: rhodecode/templates/admin/users/user_edit_profile.mako:31 msgid "Change the avatar at" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:85 +#: rhodecode/templates/admin/users/user_edit_profile.mako:94 msgid "New Password" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:93 +#: rhodecode/templates/admin/users/user_edit_profile.mako:102 msgid "New Password Confirmation" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:109 +#: rhodecode/templates/admin/users/user_edit_profile.mako:118 #: rhodecode/templates/admin/users/users.mako:87 #: rhodecode/templates/base/perms_summary.mako:145 msgid "Super-admin" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:117 +#: rhodecode/templates/admin/users/user_edit_profile.mako:126 msgid "Authentication type" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:121 +#: rhodecode/templates/admin/users/user_edit_profile.mako:130 msgid "When user was created using an external source. He is bound to authentication using this method." msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:126 -msgid "Name in Source of Record" -msgstr "" - #: rhodecode/templates/admin/users/user_edit_profile.mako:135 +msgid "Name in Source of Record" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_profile.mako:144 msgid "Language" msgstr "" -#: rhodecode/templates/admin/users/user_edit_profile.mako:141 +#: rhodecode/templates/admin/users/user_edit_profile.mako:150 #, python-format msgid "User interface language. Help translate %(rc_link)s into your language." msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:70 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:34 +#, python-format +msgid "Confirm to remove ssh key %s" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:75 msgid "Click add to use this generate SSH key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:3 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:7 msgid "New SSH Key generation" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:8 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13 msgid "Below is a 2048 bit generated SSH RSA key." msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:9 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13 +msgid "If you use older systems please try to generate a" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:13 +msgid "legacy format" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:14 msgid "If You wish to use it to access RhodeCode via the SSH please save the private key and click `Use this generated key` at the bottom." msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:11 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:16 msgid "Private key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:27 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:32 msgid "Public key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:38 -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:43 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:45 msgid "Use this generated key" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:42 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:47 msgid "Confirmation required on the next screen" msgstr "" -#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:46 +#: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:51 msgid "SSH key generator has been disabled." msgstr "" @@ -8539,7 +8789,7 @@ msgstr "" #: rhodecode/templates/base/base.mako:194 #: rhodecode/templates/changeset/changeset.mako:154 #: rhodecode/templates/files/files_source_header.mako:57 -#: rhodecode/templates/files/files_tree_header.mako:43 +#: rhodecode/templates/files/files_tree_header.mako:44 #: rhodecode/templates/summary/components.mako:250 msgid "Show More" msgstr "" @@ -8573,7 +8823,7 @@ msgstr "" #: rhodecode/templates/base/base.mako:366 #: rhodecode/templates/data_table/_dt_elements.mako:58 #: rhodecode/templates/data_table/_dt_elements.mako:59 -#: rhodecode/templates/data_table/_dt_elements.mako:205 +#: rhodecode/templates/data_table/_dt_elements.mako:207 msgid "Summary" msgstr "" @@ -8616,7 +8866,6 @@ msgid "Repository Settings" msgstr "" #: rhodecode/templates/base/base.mako:397 -#: rhodecode/templates/base/base.mako:410 msgid "Options" msgstr "" @@ -8628,59 +8877,59 @@ msgstr "" msgid "Lock Repository" msgstr "" -#: rhodecode/templates/base/base.mako:461 +#: rhodecode/templates/base/base.mako:457 msgid "Group Home" msgstr "" -#: rhodecode/templates/base/base.mako:465 +#: rhodecode/templates/base/base.mako:461 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/base/base.mako:465 +#: rhodecode/templates/base/base.mako:461 msgid "Group Settings" msgstr "" -#: rhodecode/templates/base/base.mako:508 +#: rhodecode/templates/base/base.mako:504 msgid "Create" msgstr "" -#: rhodecode/templates/base/base.mako:516 +#: rhodecode/templates/base/base.mako:512 msgid "This Repository" msgstr "" +#: rhodecode/templates/base/base.mako:514 +msgid "Create Pull Request" +msgstr "" + #: rhodecode/templates/base/base.mako:518 -msgid "Create Pull Request" -msgstr "" - -#: rhodecode/templates/base/base.mako:522 msgid "Fork this repository" msgstr "" +#: rhodecode/templates/base/base.mako:525 +msgid "This Repository Group" +msgstr "" + #: rhodecode/templates/base/base.mako:529 -msgid "This Repository Group" -msgstr "" - -#: rhodecode/templates/base/base.mako:533 -#: rhodecode/templates/base/base.mako:549 -#: rhodecode/templates/base/base.mako:561 +#: rhodecode/templates/base/base.mako:545 +#: rhodecode/templates/base/base.mako:557 msgid "New Repository" msgstr "" -#: rhodecode/templates/base/base.mako:539 -#: rhodecode/templates/base/base.mako:553 -#: rhodecode/templates/base/base.mako:567 +#: rhodecode/templates/base/base.mako:535 +#: rhodecode/templates/base/base.mako:549 +#: rhodecode/templates/base/base.mako:563 msgid "New Repository Group" msgstr "" -#: rhodecode/templates/base/base.mako:594 +#: rhodecode/templates/base/base.mako:590 msgid "Sign in" msgstr "" -#: rhodecode/templates/base/base.mako:619 +#: rhodecode/templates/base/base.mako:615 msgid "My personal group" msgstr "" -#: rhodecode/templates/base/base.mako:625 +#: rhodecode/templates/base/base.mako:621 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -8703,57 +8952,61 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:626 +#: rhodecode/templates/base/base.mako:622 msgid "[Style]" msgstr "" -#: rhodecode/templates/base/base.mako:643 +#: rhodecode/templates/base/base.mako:639 msgid "No Bookmarks yet." msgstr "" -#: rhodecode/templates/base/base.mako:681 +#: rhodecode/templates/base/base.mako:677 msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:737 +#: rhodecode/templates/base/base.mako:725 +msgid "dismiss" +msgstr "" + +#: rhodecode/templates/base/base.mako:766 msgid "search / go to..." msgstr "" -#: rhodecode/templates/base/base.mako:780 +#: rhodecode/templates/base/base.mako:811 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:781 +#: rhodecode/templates/base/base.mako:812 #: rhodecode/templates/journal/journal.mako:4 #: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:786 +#: rhodecode/templates/base/base.mako:817 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:787 +#: rhodecode/templates/base/base.mako:818 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:793 +#: rhodecode/templates/base/base.mako:824 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:794 +#: rhodecode/templates/base/base.mako:825 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:800 +#: rhodecode/templates/base/base.mako:831 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:1074 +#: rhodecode/templates/base/base.mako:1135 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:1082 +#: rhodecode/templates/base/base.mako:1143 msgid "Site-wide shortcuts" msgstr "" @@ -8853,10 +9106,10 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:293 -#: rhodecode/templates/changeset/changeset_file_comment.mako:271 -#: rhodecode/templates/changeset/changeset_file_comment.mako:322 -#: rhodecode/templates/data_table/_dt_elements.mako:443 -#: rhodecode/templates/files/files_add.mako:61 +#: rhodecode/templates/changeset/changeset_file_comment.mako:275 +#: rhodecode/templates/changeset/changeset_file_comment.mako:326 +#: rhodecode/templates/data_table/_dt_elements.mako:453 +#: rhodecode/templates/files/files_add.mako:60 #: rhodecode/templates/files/files_edit.mako:62 msgid "Preview" msgstr "" @@ -8881,7 +9134,7 @@ msgstr "" #: rhodecode/templates/base/perms_summary.mako:37 #: rhodecode/templates/commits/changelog_elements.mako:102 -#: rhodecode/templates/files/base.mako:11 +#: rhodecode/templates/files/base.mako:26 msgid "merge" msgstr "" @@ -8969,7 +9222,7 @@ msgstr "" msgid "No matching permission defined" msgstr "" -#: rhodecode/templates/base/root.mako:155 +#: rhodecode/templates/base/root.mako:156 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -9332,47 +9585,47 @@ msgstr "" msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:188 +#: rhodecode/templates/changeset/changeset_file_comment.mako:192 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:190 +#: rhodecode/templates/changeset/changeset_file_comment.mako:194 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:192 +#: rhodecode/templates/changeset/changeset_file_comment.mako:196 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:279 -#: rhodecode/templates/codeblocks/diffs.mako:79 +#: rhodecode/templates/changeset/changeset_file_comment.mako:283 +#: rhodecode/templates/codeblocks/diffs.mako:83 msgid "You need to be logged in to leave comments." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:280 -#: rhodecode/templates/codeblocks/diffs.mako:79 +#: rhodecode/templates/changeset/changeset_file_comment.mako:284 +#: rhodecode/templates/codeblocks/diffs.mako:83 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:327 +#: rhodecode/templates/changeset/changeset_file_comment.mako:331 msgid "Mark as" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:354 #: rhodecode/templates/files/files_upload.mako:86 msgid "Drag'n Drop files here or" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:350 +#: rhodecode/templates/changeset/changeset_file_comment.mako:354 #: rhodecode/templates/files/files_upload.mako:86 msgid "Choose your files" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:353 +#: rhodecode/templates/changeset/changeset_file_comment.mako:357 msgid "uploading..." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:384 +#: rhodecode/templates/changeset/changeset_file_comment.mako:388 #: rhodecode/templates/compare/compare_diff.mako:108 #: rhodecode/templates/compare/compare_diff.mako:116 #: rhodecode/templates/compare/compare_diff.mako:124 @@ -9380,30 +9633,30 @@ msgstr "" msgid "Comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:403 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:16 +#: rhodecode/templates/changeset/changeset_file_comment.mako:407 +#: 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:412 +#: rhodecode/templates/changeset/changeset_file_comment.mako:416 msgid "Comments parsed using {} syntax." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:413 +#: rhodecode/templates/changeset/changeset_file_comment.mako:417 msgid "Use @username inside this text to send notification to this RhodeCode user" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:414 +#: rhodecode/templates/changeset/changeset_file_comment.mako:418 msgid "and" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:415 +#: rhodecode/templates/changeset/changeset_file_comment.mako:419 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:416 +#: rhodecode/templates/changeset/changeset_file_comment.mako:420 msgid "actions supported." msgstr "" @@ -9436,8 +9689,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:204 -#: rhodecode/templates/codeblocks/diffs.mako:268 +#: rhodecode/templates/codeblocks/diffs.mako:208 +#: rhodecode/templates/codeblocks/diffs.mako:272 msgid "Showing a big diff might take some time and resources, continue?" msgstr "" @@ -9445,8 +9698,8 @@ msgstr "" #: rhodecode/templates/changeset/diff_block.mako:10 #: rhodecode/templates/changeset/diff_block.mako:25 #: rhodecode/templates/changeset/diff_block.mako:46 -#: rhodecode/templates/codeblocks/diffs.mako:204 -#: rhodecode/templates/codeblocks/diffs.mako:268 +#: rhodecode/templates/codeblocks/diffs.mako:208 +#: rhodecode/templates/codeblocks/diffs.mako:272 msgid "Show full diff" msgstr "" @@ -9459,177 +9712,173 @@ msgstr "" msgid "Diff was truncated. File content available only in full diff." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:125 -msgid "Expand all files" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:127 -msgid "Collapse all files" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:137 +#: rhodecode/templates/codeblocks/diffs.mako:141 msgid "not available in this view" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:146 +#: rhodecode/templates/codeblocks/diffs.mako:150 msgid "{} unresolved" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:149 +#: rhodecode/templates/codeblocks/diffs.mako:153 msgid "0 unresolved" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:152 +#: rhodecode/templates/codeblocks/diffs.mako:156 msgid "{} Resolved" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:166 +#: rhodecode/templates/codeblocks/diffs.mako:170 msgid "0 General" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:174 +#: rhodecode/templates/codeblocks/diffs.mako:178 msgid "0 Inline" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:185 -#: rhodecode/templates/codeblocks/diffs.mako:190 +#: rhodecode/templates/codeblocks/diffs.mako:189 +#: rhodecode/templates/codeblocks/diffs.mako:194 msgid "{} Outdated" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:187 +#: rhodecode/templates/codeblocks/diffs.mako:191 msgid "show outdated" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:188 +#: rhodecode/templates/codeblocks/diffs.mako:192 msgid "hide outdated" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:203 +#: rhodecode/templates/codeblocks/diffs.mako:207 msgid "The requested changes are too big and content was truncated." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:227 +#: rhodecode/templates/codeblocks/diffs.mako:231 msgid "Some changes may be hidden" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:229 +#: rhodecode/templates/codeblocks/diffs.mako:233 msgid "No files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:268 +#: rhodecode/templates/codeblocks/diffs.mako:272 msgid "The requested commit or file is too big and content was truncated." msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:275 +#: rhodecode/templates/codeblocks/diffs.mako:279 #, python-format msgid "This diff has been collapsed as it changes many lines, (%i lines changed)" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:277 +#: rhodecode/templates/codeblocks/diffs.mako:281 msgid "Show them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:280 +#: rhodecode/templates/codeblocks/diffs.mako:284 msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:316 -#: rhodecode/templates/codeblocks/diffs.mako:335 +#: rhodecode/templates/codeblocks/diffs.mako:320 +#: rhodecode/templates/codeblocks/diffs.mako:339 msgid "Unmatched/outdated inline comments below" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:341 +#: rhodecode/templates/codeblocks/diffs.mako:345 msgid "Unmatched/outdated comments below" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:409 -msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it." -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:476 -msgid "Copy the full path" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:543 -#: rhodecode/templates/codeblocks/diffs.mako:561 +#: rhodecode/templates/codeblocks/diffs.mako:419 +msgid "This file was removed from diff during updates to this pull-request." +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:420 +msgid "There are still outdated/unresolved comments attached to it." +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:487 +msgid "Copy file path" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:554 +#: rhodecode/templates/codeblocks/diffs.mako:572 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:545 -#: rhodecode/templates/codeblocks/diffs.mako:552 +#: rhodecode/templates/codeblocks/diffs.mako:556 +#: rhodecode/templates/codeblocks/diffs.mako:563 msgid "Show file before" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:550 -#: rhodecode/templates/codeblocks/diffs.mako:568 +#: rhodecode/templates/codeblocks/diffs.mako:561 +#: rhodecode/templates/codeblocks/diffs.mako:579 #, python-format msgid "File not present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:563 -#: rhodecode/templates/codeblocks/diffs.mako:570 +#: rhodecode/templates/codeblocks/diffs.mako:574 +#: rhodecode/templates/codeblocks/diffs.mako:581 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:577 +#: rhodecode/templates/codeblocks/diffs.mako:588 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:577 +#: rhodecode/templates/codeblocks/diffs.mako:588 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:646 -#: rhodecode/templates/codeblocks/diffs.mako:689 -#: rhodecode/templates/codeblocks/diffs.mako:745 +#: 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:648 -#: rhodecode/templates/codeblocks/diffs.mako:691 -#: rhodecode/templates/codeblocks/diffs.mako:747 +#: 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:816 +#: rhodecode/templates/codeblocks/diffs.mako:828 msgid "Toggle wide diff" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:824 +#: rhodecode/templates/codeblocks/diffs.mako:836 msgid "View diff as side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:826 +#: rhodecode/templates/codeblocks/diffs.mako:838 msgid "Side by Side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:831 +#: rhodecode/templates/codeblocks/diffs.mako:843 msgid "View diff as unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:832 -msgid "Unified" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:837 -msgid "Turn off: Show the diff as commit range" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:840 -#: rhodecode/templates/codeblocks/diffs.mako:847 -msgid "Range Diff" -msgstr "" - #: rhodecode/templates/codeblocks/diffs.mako:844 +msgid "Unified" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:849 +msgid "Turn off: Show the diff as commit range" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:852 +#: rhodecode/templates/codeblocks/diffs.mako:859 +msgid "Range Diff" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:856 msgid "Show the diff as commit range" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:888 +#: rhodecode/templates/codeblocks/diffs.mako:900 msgid "Disabled on range diff" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:1119 +#: rhodecode/templates/codeblocks/diffs.mako:1131 msgid "..." msgstr "" @@ -9734,28 +9983,28 @@ msgid "Hidden Evolve State" msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:80 -#: rhodecode/templates/compare/compare_commits.mako:48 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:582 +#: rhodecode/templates/compare/compare_commits.mako:46 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:597 #: rhodecode/templates/search/search_commit.mako:34 msgid "Expand commit message" msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:108 -#: rhodecode/templates/files/base.mako:36 +#: rhodecode/templates/files/base.mako:51 #: rhodecode/templates/summary/summary_commits.mako:78 #, python-format msgid "Branch %s" msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:116 -#: rhodecode/templates/files/base.mako:17 +#: rhodecode/templates/files/base.mako:32 #: rhodecode/templates/summary/summary_commits.mako:64 #, python-format msgid "Bookmark %s" msgstr "" #: rhodecode/templates/commits/changelog_elements.mako:124 -#: rhodecode/templates/files/base.mako:27 +#: rhodecode/templates/files/base.mako:42 #: rhodecode/templates/summary/summary_commits.mako:71 #, python-format msgid "Tag %s" @@ -9783,19 +10032,15 @@ msgid "Show Full History" msgstr "" #: rhodecode/templates/compare/compare_commits.mako:5 -msgid "Common Ancestor Commit" -msgstr "" - -#: rhodecode/templates/compare/compare_commits.mako:8 -msgid "Compare was calculated based on this shared commit." -msgstr "" - -#: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:543 +msgid "Compare was calculated based on this common ancestor commit" +msgstr "" + +#: rhodecode/templates/compare/compare_commits.mako:15 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:558 msgid "Time" msgstr "" -#: rhodecode/templates/compare/compare_commits.mako:66 +#: rhodecode/templates/compare/compare_commits.mako:64 msgid "No commits in this compare" msgstr "" @@ -9893,48 +10138,33 @@ msgstr "" msgid "Subscribe to %s atom feed" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:189 +#: rhodecode/templates/data_table/_dt_elements.mako:191 msgid "Creating" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:191 +#: rhodecode/templates/data_table/_dt_elements.mako:193 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:10 msgid "Created" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:234 +#: rhodecode/templates/data_table/_dt_elements.mako:236 msgid "personal" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:281 -#, python-format -msgid "Confirm to delete this user group: %s" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:297 -#: rhodecode/templates/user_group/user_group.mako:4 -msgid "User group" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:379 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:51 -msgid "Pull request !{}" -msgstr "" - #: rhodecode/templates/data_table/_dt_elements.mako:387 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:50 +msgid "Pull request !{}" +msgstr "" + +#: rhodecode/templates/data_table/_dt_elements.mako:395 msgid "Work in progress" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:421 +#: rhodecode/templates/data_table/_dt_elements.mako:429 msgid "Info" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:427 -#, python-format -msgid "Confirm to delete this artifact: %s" -msgstr "" - -#: rhodecode/templates/data_table/_dt_elements.mako:460 +#: rhodecode/templates/data_table/_dt_elements.mako:470 #, python-format msgid "Parsed using %s syntax" msgstr "" @@ -10073,11 +10303,11 @@ msgid "Don't have an account ?" msgstr "" #: rhodecode/templates/email_templates/base.mako:75 -#: rhodecode/templates/email_templates/base.mako:519 +#: rhodecode/templates/email_templates/base.mako:597 msgid "This is a notification from RhodeCode." msgstr "" -#: rhodecode/templates/email_templates/base.mako:501 +#: rhodecode/templates/email_templates/base.mako:577 msgid "RhodeCode" msgstr "" @@ -10307,12 +10537,12 @@ msgstr "" msgid "Full Name" msgstr "" -#: rhodecode/templates/errors/error_document.mako:47 +#: rhodecode/templates/errors/error_document.mako:48 #, python-format msgid "You will be redirected to %s in %s seconds" msgstr "" -#: rhodecode/templates/errors/error_document.mako:65 +#: rhodecode/templates/errors/error_document.mako:66 msgid "Support Page" msgstr "" @@ -10351,17 +10581,17 @@ msgstr "" msgid "Filename e.g example.py, or docs/readme.md" msgstr "" -#: rhodecode/templates/files/files_add.mako:65 +#: rhodecode/templates/files/files_add.mako:64 #: rhodecode/templates/files/files_edit.mako:66 msgid "Line wraps on" msgstr "" -#: rhodecode/templates/files/files_add.mako:65 +#: rhodecode/templates/files/files_add.mako:64 #: rhodecode/templates/files/files_edit.mako:66 msgid "line wraps off" msgstr "" -#: rhodecode/templates/files/files_add.mako:88 +#: 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_upload.mako:102 @@ -10425,7 +10655,7 @@ msgid "Binary file (%s)" msgstr "" #: rhodecode/templates/files/files_delete.mako:58 -#: rhodecode/templates/files/files_source.mako:125 +#: rhodecode/templates/files/files_source.mako:128 msgid "File size {} is bigger then allowed limit {}. " msgstr "" @@ -10485,7 +10715,11 @@ msgstr "" msgid "Raw" msgstr "" -#: rhodecode/templates/files/files_source.mako:120 +#: rhodecode/templates/files/files_source.mako:107 +msgid "Copy permalink" +msgstr "" + +#: rhodecode/templates/files/files_source.mako:123 msgid "Binary file ({})" msgstr "" @@ -10510,7 +10744,7 @@ msgid "Upload new file" msgstr "" #: rhodecode/templates/files/files_upload.mako:109 -msgid "Commiting..." +msgid "Committing..." msgstr "" #: rhodecode/templates/files/files_upload.mako:110 @@ -10527,19 +10761,19 @@ msgstr "" msgid "Fork name" msgstr "" -#: rhodecode/templates/forks/fork.mako:71 +#: rhodecode/templates/forks/fork.mako:78 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.mako:75 +#: rhodecode/templates/forks/fork.mako:82 msgid "Copy permissions from parent repository." msgstr "" -#: rhodecode/templates/forks/fork.mako:81 +#: rhodecode/templates/forks/fork.mako:88 msgid "Private" msgstr "" -#: rhodecode/templates/forks/fork.mako:90 +#: rhodecode/templates/forks/fork.mako:97 msgid "Fork this Repository" msgstr "" @@ -10622,32 +10856,27 @@ msgstr "" msgid "Add reviewer or reviewer group" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:302 -#: rhodecode/templates/pullrequests/pullrequest.mako:519 -msgid "Please select source and target" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:308 -msgid "Loading compare ..." -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:367 +#: rhodecode/templates/pullrequests/pullrequest.mako:317 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:374 +#: rhodecode/templates/pullrequests/pullrequest.mako:324 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:424 -#: rhodecode/templates/pullrequests/pullrequest.mako:450 +#: rhodecode/templates/pullrequests/pullrequest.mako:418 +#: rhodecode/templates/pullrequests/pullrequest.mako:444 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:440 +#: rhodecode/templates/pullrequests/pullrequest.mako:434 msgid "Target repository" msgstr "" +#: rhodecode/templates/pullrequests/pullrequest.mako:513 +msgid "Please select source and target" +msgstr "" + #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:7 msgid "This pull request can be merged automatically." msgstr "" @@ -10683,25 +10912,21 @@ msgstr "" msgid "{} Pull Request !{}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:53 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:52 msgid "Last updated on" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:54 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:53 msgid "by" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:62 msgid "Update title & description" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:67 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 -msgid "Delete pull request" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:68 -msgid "Confirm to delete this pull request" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 +msgid "Delete pull request" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:71 @@ -10803,85 +11028,89 @@ msgstr "" msgid "Cannot show diff when pull request state is changing. Current progress state" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:458 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:454 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:459 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:462 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:467 msgid "Missing commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:463 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:468 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:464 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:465 +#: 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:476 +#: 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 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:499 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:521 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:514 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:536 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:502 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:517 msgid "more update options" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:510 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:525 msgid "Force update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:513 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:528 msgid "Update commits and force refresh this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:521 -msgid "Update is disabled for current view" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:532 -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:536 +msgid "Update is disabled for current view" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:547 +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 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:554 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:569 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:556 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:571 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:664 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:679 msgid "there is {num} general comment from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:665 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:680 msgid "show it" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:667 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:682 msgid "there are {num} general comments from older versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:668 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:683 msgid "show them" msgstr "" diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -256,23 +256,34 @@ tooltip = _ToolTip() files_icon = u'' -def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False): +def files_breadcrumbs(repo_name, repo_type, commit_id, file_path, landing_ref_name=None, at_ref=None, + limit_items=False, linkify_last_item=False, hide_last_item=False, + copy_path_icon=True): if isinstance(file_path, str): file_path = safe_unicode(file_path) - route_qry = {'at': at_ref} if at_ref else None + if at_ref: + route_qry = {'at': at_ref} + default_landing_ref = at_ref or landing_ref_name or commit_id + else: + route_qry = None + default_landing_ref = commit_id - # first segment is a `..` link to repo files + # first segment is a `HOME` link to repo files root location root_name = literal(u'') + url_segments = [ link_to( root_name, - route_path( - 'repo_files', - repo_name=repo_name, + repo_files_by_ref_url( + repo_name, + repo_type, + f_path=None, # None here is a special case for SVN repos, + # that won't prefix with a ref + ref_name=default_landing_ref, commit_id=commit_id, - f_path='', - _query=route_qry), + query=route_qry + ) )] path_segments = file_path.split('/') @@ -284,6 +295,10 @@ def files_breadcrumbs(repo_name, commit_ last_item = cnt == last_cnt + if last_item and hide_last_item: + # iterate over and hide last element + continue + if last_item and linkify_last_item is False: # plain version url_segments.append(segment_html) @@ -291,12 +306,14 @@ def files_breadcrumbs(repo_name, commit_ url_segments.append( link_to( segment_html, - route_path( - 'repo_files', - repo_name=repo_name, + repo_files_by_ref_url( + repo_name, + repo_type, + f_path='/'.join(path_segments[:cnt + 1]), + ref_name=default_landing_ref, commit_id=commit_id, - f_path='/'.join(path_segments[:cnt + 1]), - _query=route_qry), + query=route_qry + ), )) limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:] @@ -304,7 +321,11 @@ def files_breadcrumbs(repo_name, commit_ url_segments = limited_url_segments full_path = file_path - icon = files_icon.format(escape(full_path)) + if copy_path_icon: + icon = files_icon.format(escape(full_path)) + else: + icon = '' + if file_path == '': return root_name else: @@ -323,6 +344,54 @@ def files_url_data(request): return json.dumps(matchdict) +def repo_files_by_ref_url(db_repo_name, db_repo_type, f_path, ref_name, commit_id, query=None, ): + _is_svn = is_svn(db_repo_type) + final_f_path = f_path + + if _is_svn: + """ + For SVN the ref_name cannot be used as a commit_id, it needs to be prefixed with + actually commit_id followed by the ref_name. This should be done only in case + This is a initial landing url, without additional paths. + + like: /1000/tags/1.0.0/?at=tags/1.0.0 + """ + + if ref_name and ref_name != 'tip': + # NOTE(marcink): for svn the ref_name is actually the stored path, so we prefix it + # for SVN we only do this magic prefix if it's root, .eg landing revision + # of files link. If we are in the tree we don't need this since we traverse the url + # that has everything stored + if f_path in ['', '/']: + final_f_path = '/'.join([ref_name, f_path]) + + # SVN always needs a commit_id explicitly, without a named REF + default_commit_id = commit_id + else: + """ + For git and mercurial we construct a new URL using the names instead of commit_id + like: /master/some_path?at=master + """ + # We currently do not support branches with slashes + if '/' in ref_name: + default_commit_id = commit_id + else: + default_commit_id = ref_name + + # sometimes we pass f_path as None, to indicate explicit no prefix, + # we translate it to string to not have None + final_f_path = final_f_path or '' + + files_url = route_path( + 'repo_files', + repo_name=db_repo_name, + commit_id=default_commit_id, + f_path=final_f_path, + _query=query + ) + return files_url + + def code_highlight(code, lexer, formatter, use_hl_filter=False): """ Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. @@ -1492,7 +1561,7 @@ def _process_url_func(match_obj, repo_na 'id-repr': issue_id, 'issue-prefix': entry['pref'], 'serv': entry['url'], - 'title': desc, + 'title': bleach.clean(desc, strip=True), 'hovercard_url': hovercard_url } diff --git a/rhodecode/lib/middleware/utils/scm_app_http.py b/rhodecode/lib/middleware/utils/scm_app_http.py --- a/rhodecode/lib/middleware/utils/scm_app_http.py +++ b/rhodecode/lib/middleware/utils/scm_app_http.py @@ -99,7 +99,7 @@ class VcsHttpProxy(object): 'X-RC-Server-Config-File': self.rc_extras.get('config'), 'X-RC-Auth-User': self.rc_extras.get('username'), - 'X-RC-Auth-User-Id': self.rc_extras.get('user_id'), + 'X-RC-Auth-User-Id': str(self.rc_extras.get('user_id')), 'X-RC-Auth-User-Ip': self.rc_extras.get('ip'), # TODO: johbo: Avoid encoding and put this into payload? diff --git a/rhodecode/lib/rc_cache/__init__.py b/rhodecode/lib/rc_cache/__init__.py --- a/rhodecode/lib/rc_cache/__init__.py +++ b/rhodecode/lib/rc_cache/__init__.py @@ -47,7 +47,7 @@ from .utils import ( FreshRegionCache, ActiveRegionCache) -FILE_TREE_CACHE_VER = 'v3' +FILE_TREE_CACHE_VER = 'v4' def configure_dogpile_cache(settings): diff --git a/rhodecode/model/db.py b/rhodecode/model/db.py --- a/rhodecode/model/db.py +++ b/rhodecode/model/db.py @@ -1758,7 +1758,7 @@ class Repository(Base, BaseModel): @hybrid_property def landing_rev(self): - # always should return [rev_type, rev] + # always should return [rev_type, rev], e.g ['branch', 'master'] if self._landing_revision: _rev_info = self._landing_revision.split(':') if len(_rev_info) < 2: @@ -1766,6 +1766,14 @@ class Repository(Base, BaseModel): return [_rev_info[0], _rev_info[1]] return [None, None] + @property + def landing_ref_type(self): + return self.landing_rev[0] + + @property + def landing_ref_name(self): + return self.landing_rev[1] + @landing_rev.setter def landing_rev(self, val): if ':' not in val: @@ -4954,7 +4962,9 @@ class RepoReviewRule(Base, BaseModel): else: file_pattern = glob2re(self.file_pattern) file_regex = re.compile(file_pattern) - for filename in files_changed: + for file_data in files_changed: + filename = file_data.get('filename') + if file_regex.search(filename): files_matches = True break diff --git a/rhodecode/model/pull_request.py b/rhodecode/model/pull_request.py --- a/rhodecode/model/pull_request.py +++ b/rhodecode/model/pull_request.py @@ -186,7 +186,7 @@ def get_diff_info( email = commit.author_email user = User.get_from_cs_author(author) if user: - user_counts[user] = user_counts.get(user, 0) + 1 + user_counts[user.user_id] = user_counts.get(user.user_id, 0) + 1 author_counts[author] = author_counts.get(author, 0) + 1 email_counts[email] = email_counts.get(email, 0) + 1 diff --git a/rhodecode/public/css/code-block.less b/rhodecode/public/css/code-block.less --- a/rhodecode/public/css/code-block.less +++ b/rhodecode/public/css/code-block.less @@ -911,6 +911,11 @@ input.filediff-collapse-state { * { box-sizing: border-box; } + + .on-hover-icon { + visibility: hidden; + } + .filediff-anchor { visibility: hidden; } @@ -918,6 +923,9 @@ input.filediff-collapse-state { .filediff-anchor { visibility: visible; } + .on-hover-icon { + visibility: visible; + } } .filediff-heading { diff --git a/rhodecode/public/css/main.less b/rhodecode/public/css/main.less --- a/rhodecode/public/css/main.less +++ b/rhodecode/public/css/main.less @@ -112,6 +112,13 @@ input + .action-link, .action-link.first cursor: inherit; } +.grey-link-action { + cursor: pointer; + &:hover { + color: @grey2; + } + color: @grey4; +} .clipboard-action { cursor: pointer; diff --git a/rhodecode/public/css/sweetalert2.less b/rhodecode/public/css/sweetalert2.less --- a/rhodecode/public/css/sweetalert2.less +++ b/rhodecode/public/css/sweetalert2.less @@ -307,7 +307,7 @@ border-radius: 0; background: #fff; font-family: inherit; - font-size: 1rem; + font-size: 13px; } .swal2-popup:focus { diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js --- a/rhodecode/public/js/rhodecode/i18n/be.js +++ b/rhodecode/public/js/rhodecode/i18n/be.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Lifetime', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Send', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Start following this repository', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'just now', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js --- a/rhodecode/public/js/rhodecode/i18n/de.js +++ b/rhodecode/public/js/rhodecode/i18n/de.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Löschen', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Lebensdauer', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Bitte {0} Zeichen löschen', 'Please enter {0} or more character': 'Bitte {0} oder mehr Zeichen eingeben', 'Please enter {0} or more characters': 'Bitte {0} oder mehr Zeichen eingeben', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Senden', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Start following this repository', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'jetzt gerade', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js --- a/rhodecode/public/js/rhodecode/i18n/en.js +++ b/rhodecode/public/js/rhodecode/i18n/en.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Lifetime', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Send', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Start following this repository', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'just now', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js --- a/rhodecode/public/js/rhodecode/i18n/es.js +++ b/rhodecode/public/js/rhodecode/i18n/es.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Delete', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'De por vida', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Send', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Start following this repository', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'just now', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js --- a/rhodecode/public/js/rhodecode/i18n/fr.js +++ b/rhodecode/public/js/rhodecode/i18n/fr.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Supprimer', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Durée de vie', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Envoyer', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Suivre ce dépôt', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'à l’instant', 'loading...': 'Chargement…', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js --- a/rhodecode/public/js/rhodecode/i18n/it.js +++ b/rhodecode/public/js/rhodecode/i18n/it.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Aggiungi un altro commento', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Elimina', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Segui', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'a vita', 'Loading ...': 'Caricamento ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Invia', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Mostra ancora', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Inizia a seguire il repository', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'Al momento non ci sono richieste di PULL che richiedono il tuo intervento', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Smetti di seguire', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'proprio ora', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js --- a/rhodecode/public/js/rhodecode/i18n/ja.js +++ b/rhodecode/public/js/rhodecode/i18n/ja.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': '別のコメントを追加', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': '削除', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'フォロー', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': '有効期間', 'Loading ...': '読み込み中...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': '読み込み失敗', 'Loading more results...': '結果を読み込み中...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': '{0} 文字削除してください', 'Please enter {0} or more character': '{0} 文字以上入力してください', 'Please enter {0} or more characters': '{0} 文字以上入力してください', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': '検索中...', @@ -75,12 +84,14 @@ var _TM = { 'Send': '送信', 'Set status to Approved': 'ステータスを承認にする', 'Set status to Rejected': 'ステータスを拒否にする', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'もっと表示', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'このリポジトリのフォローする', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'アンフォロー', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': '{0} 件のみ選択できます', 'You can only select {0} items': '{0} 件のみ選択できます', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'たったいま', 'loading...': '読み込み中...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js --- a/rhodecode/public/js/rhodecode/i18n/js_translations.js +++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js @@ -1,13 +1,17 @@ // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE _gettext('(from usergroup {0})'); +_gettext('{0} file changed, '); +_gettext('{0} files changed, '); _gettext('Add another comment'); _gettext('Adding new reviewers is forbidden.'); +_gettext('Ajax Request Error'); _gettext('All Authors'); _gettext('All individual reviewers must vote.'); _gettext('All reviewers must vote.'); _gettext('Are you sure to close this pull request without merging?'); _gettext('At least {0} reviewer must vote.'); _gettext('At least {0} reviewers must vote.'); +_gettext('Authentication Token'); _gettext('Author is not allowed to be a reviewer.'); _gettext('Changed files'); _gettext('Close'); @@ -17,13 +21,16 @@ _gettext('Comment text will be set automatically based on currently selected status ({0}) ...'); _gettext('Commit Authors are not allowed to be a reviewer.'); _gettext('Context file: '); +_gettext('Delete'); _gettext('Delete this comment?'); _gettext('Diff to Commit '); +_gettext('Error during search operation'); _gettext('Expand all files'); _gettext('Expand {0} commit'); _gettext('Expand {0} commits'); _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.'); _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.'); +_gettext('File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.'); _gettext('Follow'); _gettext('Force updating...'); _gettext('Hide full context diff'); @@ -34,6 +41,7 @@ _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}'); _gettext('Lifetime'); _gettext('Loading ...'); +_gettext('Loading diff ...'); _gettext('Loading failed'); _gettext('Loading more results...'); _gettext('Loading...'); @@ -62,6 +70,7 @@ _gettext('Please delete {0} characters'); _gettext('Please enter {0} or more character'); _gettext('Please enter {0} or more characters'); +_gettext('Please wait creating pull request...'); _gettext('Reviewers picked from source code changes.'); _gettext('Saving...'); _gettext('Searching...'); @@ -69,12 +78,14 @@ _gettext('Send'); _gettext('Set status to Approved'); _gettext('Set status to Rejected'); +_gettext('Show'); _gettext('Show at Commit '); _gettext('Show commit range {0} ... {1}'); _gettext('Show full context diff'); _gettext('Show more'); _gettext('Show selected commit __S'); _gettext('Show selected commits __S ... __E'); +_gettext('Show this authentication token?'); _gettext('Show whitespace changes'); _gettext('Specified expiration date'); _gettext('Start following this repository'); @@ -88,6 +99,10 @@ _gettext('TODO comment'); _gettext('TODO from comment {0} was fixed.'); _gettext('There are currently no open pull requests requiring your participation.'); +_gettext('There is a later version of file tree available. Click {0} to create a file at the latest tree.'); +_gettext('There is an existing path `{0}` at this commit.'); +_gettext('This pull requests will consist of {0} commit.'); +_gettext('This pull requests will consist of {0} commits.'); _gettext('Toggle Wide Mode diff'); _gettext('Unfollow'); _gettext('Unwatch'); @@ -95,6 +110,7 @@ _gettext('User `{0}` already in reviewers'); _gettext('User `{0}` not allowed to be a reviewer'); _gettext('Watch'); +_gettext('Yes, delete comment #{0}!'); _gettext('You can only select {0} item'); _gettext('You can only select {0} items'); _gettext('activated'); @@ -111,6 +127,7 @@ _gettext('just now'); _gettext('loading...'); _gettext('member of "{0}"'); +_gettext('no commits'); _gettext('not active'); _gettext('resolve comment'); _gettext('showing {0} out of {1} commit'); diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js --- a/rhodecode/public/js/rhodecode/i18n/pl.js +++ b/rhodecode/public/js/rhodecode/i18n/pl.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Dodaj kolejny komentarz', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Zamknij', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Usuń', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Obserwuj', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Czas życia', 'Loading ...': 'Ładuję...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Wyślij', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Pokaż więcej', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Zacznij obserwację tego repozytorium', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Nie obserwuj', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'przed chwilą', 'loading...': 'wczytywanie...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js --- a/rhodecode/public/js/rhodecode/i18n/pt.js +++ b/rhodecode/public/js/rhodecode/i18n/pt.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Adicionar outro comentário', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Excluir', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Seguir', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Tempo de Vida', 'Loading ...': 'Carregando...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Enviar', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Mostrar mais', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Passar a seguir este repositório', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Parar de seguir', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'agora há pouco', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js --- a/rhodecode/public/js/rhodecode/i18n/ru.js +++ b/rhodecode/public/js/rhodecode/i18n/ru.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Добавить другой комментарий', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': 'Удалить', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Наблюдать', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': 'Срок', 'Loading ...': 'Загрузка...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': 'Отправить', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Показать еще', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': 'Наблюдать за репозиторием', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Не наблюдать', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': 'прямо сейчас', 'loading...': 'загрузка...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js --- a/rhodecode/public/js/rhodecode/i18n/zh.js +++ b/rhodecode/public/js/rhodecode/i18n/zh.js @@ -6,14 +6,18 @@ //JS translations map var _TM = { '(from usergroup {0})': '(from usergroup {0})', + '{0} file changed, ': '{0} file changed, ', + '{0} files changed, ': '{0} files changed, ', 'Add another comment': 'Add another comment', 'Adding new reviewers is forbidden.': 'Adding new reviewers is forbidden.', + 'Ajax Request Error': 'Ajax Request Error', 'All Authors': 'All Authors', 'All individual reviewers must vote.': 'All individual reviewers must vote.', 'All reviewers must vote.': 'All reviewers must vote.', 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?', 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.', 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.', + 'Authentication Token': 'Authentication Token', 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.', 'Changed files': 'Changed files', 'Close': 'Close', @@ -23,13 +27,16 @@ var _TM = { 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...', 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.', 'Context file: ': 'Context file: ', + 'Delete': '删除', 'Delete this comment?': 'Delete this comment?', 'Diff to Commit ': 'Diff to Commit ', + 'Error during search operation': 'Error during search operation', 'Expand all files': 'Expand all files', 'Expand {0} commit': 'Expand {0} commit', 'Expand {0} commits': 'Expand {0} commits', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.', + 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.': 'File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version.', 'Follow': 'Follow', 'Force updating...': 'Force updating...', 'Hide full context diff': 'Hide full context diff', @@ -40,6 +47,7 @@ var _TM = { 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}': 'Leave a resolution comment, or click resolve button to resolve TODO comment #{0}', 'Lifetime': '终身', 'Loading ...': 'Loading ...', + 'Loading diff ...': 'Loading diff ...', 'Loading failed': 'Loading failed', 'Loading more results...': 'Loading more results...', 'Loading...': 'Loading...', @@ -68,6 +76,7 @@ var _TM = { 'Please delete {0} characters': 'Please delete {0} characters', 'Please enter {0} or more character': 'Please enter {0} or more character', 'Please enter {0} or more characters': 'Please enter {0} or more characters', + 'Please wait creating pull request...': 'Please wait creating pull request...', 'Reviewers picked from source code changes.': 'Reviewers picked from source code changes.', 'Saving...': 'Saving...', 'Searching...': 'Searching...', @@ -75,12 +84,14 @@ var _TM = { 'Send': '发送', 'Set status to Approved': 'Set status to Approved', 'Set status to Rejected': 'Set status to Rejected', + 'Show': 'Show', 'Show at Commit ': 'Show at Commit ', 'Show commit range {0} ... {1}': 'Show commit range {0} ... {1}', 'Show full context diff': 'Show full context diff', 'Show more': 'Show more', 'Show selected commit __S': 'Show selected commit __S', 'Show selected commits __S ... __E': 'Show selected commits __S ... __E', + 'Show this authentication token?': 'Show this authentication token?', 'Show whitespace changes': 'Show whitespace changes', 'Specified expiration date': 'Specified expiration date', 'Start following this repository': '开始关注该版本库', @@ -94,6 +105,10 @@ var _TM = { 'TODO comment': 'TODO comment', 'TODO from comment {0} was fixed.': 'TODO from comment {0} was fixed.', 'There are currently no open pull requests requiring your participation.': 'There are currently no open pull requests requiring your participation.', + 'There is a later version of file tree available. Click {0} to create a file at the latest tree.': 'There is a later version of file tree available. Click {0} to create a file at the latest tree.', + 'There is an existing path `{0}` at this commit.': 'There is an existing path `{0}` at this commit.', + 'This pull requests will consist of {0} commit.': 'This pull requests will consist of {0} commit.', + 'This pull requests will consist of {0} commits.': 'This pull requests will consist of {0} commits.', 'Toggle Wide Mode diff': 'Toggle Wide Mode diff', 'Unfollow': 'Unfollow', 'Unwatch': 'Unwatch', @@ -101,6 +116,7 @@ var _TM = { 'User `{0}` already in reviewers': 'User `{0}` already in reviewers', 'User `{0}` not allowed to be a reviewer': 'User `{0}` not allowed to be a reviewer', 'Watch': 'Watch', + 'Yes, delete comment #{0}!': 'Yes, delete comment #{0}!', 'You can only select {0} item': 'You can only select {0} item', 'You can only select {0} items': 'You can only select {0} items', 'activated': 'activated', @@ -117,6 +133,7 @@ var _TM = { 'just now': '刚刚', 'loading...': 'loading...', 'member of "{0}"': 'member of "{0}"', + 'no commits': 'no commits', 'not active': 'not active', 'resolve comment': 'resolve comment', 'showing {0} out of {1} commit': 'showing {0} out of {1} commit', diff --git a/rhodecode/templates/base/base.mako b/rhodecode/templates/base/base.mako --- a/rhodecode/templates/base/base.mako +++ b/rhodecode/templates/base/base.mako @@ -50,18 +50,27 @@ @@ -754,9 +776,9 @@ def get_comments_for(diff_type, comments % if comments: <% has_outdated = any([x.outdated for x in comments]) %> % if has_outdated: - + % else: - + % endif % endif diff --git a/rhodecode/templates/commits/changelog.mako b/rhodecode/templates/commits/changelog.mako --- a/rhodecode/templates/commits/changelog.mako +++ b/rhodecode/templates/commits/changelog.mako @@ -60,10 +60,10 @@ class="btn btn-small" href="${h.route_path('repo_compare', repo_name=c.rhodecode_db_repo.fork.repo_name, - source_ref_type=c.rhodecode_db_repo.landing_rev[0], - source_ref=c.rhodecode_db_repo.landing_rev[1], - target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_rev[0], - target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_rev[1], + source_ref_type=c.rhodecode_db_repo.landing_ref_type, + source_ref=c.rhodecode_db_repo.landing_ref_name, + target_ref_type='branch' if request.GET.get('branch') else c.rhodecode_db_repo.landing_ref_type, + target_ref=request.GET.get('branch') or c.rhodecode_db_repo.landing_ref_name, _query=dict(merge=1, target_repo=c.repo_name))}" > ${_('Compare fork with Parent (%s)' % c.rhodecode_db_repo.fork.repo_name)} diff --git a/rhodecode/templates/compare/compare_diff.mako b/rhodecode/templates/compare/compare_diff.mako --- a/rhodecode/templates/compare/compare_diff.mako +++ b/rhodecode/templates/compare/compare_diff.mako @@ -93,10 +93,10 @@ ${_('Compare with origin')} diff --git a/rhodecode/templates/email_templates/base.mako b/rhodecode/templates/email_templates/base.mako --- a/rhodecode/templates/email_templates/base.mako +++ b/rhodecode/templates/email_templates/base.mako @@ -101,6 +101,7 @@ text_monospace = "'Menlo', 'Liberation M margin: 0; padding: 0; font-family: ${text_regular|n}; + color: #000000; } /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/ @@ -211,6 +212,20 @@ text_monospace = "'Menlo', 'Liberation M code { font-family: ${text_monospace|n}; + white-space: pre-line !important; + color: #000000; + } + + ul.changes-ul { + list-style: none; + list-style-type: none; + padding: 0; + margin: 10px 0; + } + ul.changes-ul li { + list-style: none; + list-style-type: none; + margin: 2px 0; } @media only screen and (-webkit-min-device-pixel-ratio: 2) { @@ -237,13 +252,19 @@ text_monospace = "'Menlo', 'Liberation M padding: 3px 5px 3px } - div.markdown-block h1, div.markdown-block h2, div.markdown-block h3, div.markdown-block h4, div.markdown-block h5, div.markdown-block h6 { + div.markdown-block h1, + div.markdown-block h2, + div.markdown-block h3, + div.markdown-block h4, + div.markdown-block h5, + div.markdown-block h6 { border-bottom: none !important; padding: 0 !important; overflow: visible !important } - div.markdown-block h1, div.markdown-block h2 { + div.markdown-block h1, + div.markdown-block h2 { border-bottom: 1px #e6e5e5 solid !important } @@ -290,7 +311,13 @@ text_monospace = "'Menlo', 'Liberation M margin-bottom: 13px } - div.markdown-block ol, div.markdown-block ul, div.markdown-block p, div.markdown-block blockquote, div.markdown-block dl, div.markdown-block li, div.markdown-block table { + div.markdown-block ol, + div.markdown-block ul, + div.markdown-block p, + div.markdown-block blockquote, + div.markdown-block dl, + div.markdown-block li, + div.markdown-block table { margin: 3px 0 13px 0 !important; color: #424242 !important; font-size: 13px !important; @@ -371,27 +398,30 @@ text_monospace = "'Menlo', 'Liberation M background-color: #eeeeee } - div.markdown-block code, div.markdown-block pre, div.markdown-block #ws, div.markdown-block #message { + div.markdown-block code, + div.markdown-block pre, + div.markdown-block #ws, + div.markdown-block #message { font-family: ${text_monospace|n}; font-size: 11px; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; - background-color: white; + background-color: #FFFFFF; color: #7E7F7F } div.markdown-block code { - border: 1px solid #eeeeee; + border: 1px solid #7E7F7F; margin: 0 2px; padding: 0 5px } div.markdown-block pre { - border: 1px solid #dbd9da; + border: 1px solid #7E7F7F; overflow: auto; padding: .5em; - background-color: #F5F5F5 + background-color: #FFFFFF; } div.markdown-block pre > code { @@ -411,7 +441,12 @@ text_monospace = "'Menlo', 'Liberation M font-weight: normal } - div.rst-block h1, div.rst-block h2, div.rst-block h3, div.rst-block h4, div.rst-block h5, div.rst-block h6 { + div.rst-block h1, + div.rst-block h2, + div.rst-block h3, + div.rst-block h4, + div.rst-block h5, + div.rst-block h6 { border-bottom: 0 !important; margin: 0 !important; padding: 0 !important; @@ -461,7 +496,7 @@ text_monospace = "'Menlo', 'Liberation M background-color: ghostWhite !important; color: #444 !important; padding: 0 .2em !important; - border: 1px solid #dedede !important + border: 1px solid #7E7F7F !important } div.rst-block pre code { @@ -474,20 +509,24 @@ text_monospace = "'Menlo', 'Liberation M div.rst-block pre { margin: 1em 0; padding: 15px; - border: 1px solid #eeeeee; + border: 1px solid #7E7F7F; -webkit-border-radius: 2px; -moz-border-radius: 2px; border-radius: 2px; overflow: auto; font-size: 12px; color: #444; - background-color: #F5F5F5 + background-color: #FFFFFF; + } + + .clear-both { + clear:both; } /*elasticmatch is custom rhodecode tag*/ .codehilite .c-ElasticMatch { - background-color: #faffa6; - padding: 0.2em; + background-color: #faffa6; + padding: 0.2em; } .codehilite .c-ElasticMatch { background-color: #faffa6; padding: 0.2em;} @@ -581,7 +620,7 @@ text_monospace = "'Menlo', 'Liberation M - + ${self.body()} diff --git a/rhodecode/templates/email_templates/commit_comment.mako b/rhodecode/templates/email_templates/commit_comment.mako --- a/rhodecode/templates/email_templates/commit_comment.mako +++ b/rhodecode/templates/email_templates/commit_comment.mako @@ -89,12 +89,13 @@ data = { } %> +## header
-

-

+
- +
+## main body ## spacing def diff --git a/rhodecode/templates/email_templates/pull_request_comment.mako b/rhodecode/templates/email_templates/pull_request_comment.mako --- a/rhodecode/templates/email_templates/pull_request_comment.mako +++ b/rhodecode/templates/email_templates/pull_request_comment.mako @@ -110,12 +110,13 @@ data = { } %> +## header
-

-

+
- +
+## main body ## spacing def diff --git a/rhodecode/templates/email_templates/pull_request_review.mako b/rhodecode/templates/email_templates/pull_request_review.mako --- a/rhodecode/templates/email_templates/pull_request_review.mako +++ b/rhodecode/templates/email_templates/pull_request_review.mako @@ -72,13 +72,13 @@ data = { 'target_repo_url': h.link_to(pull_request_target_repo.repo_name, pull_request_target_repo_url), } %> - +## header
-

-

+
- +
+## main body ## spacing def diff --git a/rhodecode/templates/email_templates/pull_request_update.mako b/rhodecode/templates/email_templates/pull_request_update.mako --- a/rhodecode/templates/email_templates/pull_request_update.mako +++ b/rhodecode/templates/email_templates/pull_request_update.mako @@ -85,12 +85,13 @@ data = { } %> +## header
-

-

+
- +
+## main body ## spacing def @@ -137,27 +139,31 @@ data = { - diff --git a/rhodecode/templates/email_templates/user_registration.mako b/rhodecode/templates/email_templates/user_registration.mako --- a/rhodecode/templates/email_templates/user_registration.mako +++ b/rhodecode/templates/email_templates/user_registration.mako @@ -19,7 +19,7 @@ A new user `${user.username}` has regist ${self.plaintext_footer()} - +## header
${_('Changes')}:\ + Changed commits: - - - Added: ${len(added_commits)} - - Removed: ${len(removed_commits)} +
    +
  • - Added: ${len(added_commits)}
    • +
  • - Removed: ${len(removed_commits)}
    • +
Changed files: +
    %if not changed_files: - No file changes found +
  • No file changes found
    • %else: - %for file_name in added_files: - - A ${file_name} - %endfor - %for file_name in modified_files: - - M ${file_name} - %endfor - %for file_name in removed_files: - - R ${file_name} - %endfor + %for file_name in added_files: +
  • - A ${file_name}
    • + %endfor + %for file_name in modified_files: +
  • - M ${file_name}
    • + %endfor + %for file_name in removed_files: +
  • - R ${file_name}
    • + %endfor %endif + +
@@ -31,7 +31,8 @@ A new user `${user.username}` has regist
- +
+## main body ## spacing def diff --git a/rhodecode/templates/files/files_add.mako b/rhodecode/templates/files/files_add.mako --- a/rhodecode/templates/files/files_add.mako +++ b/rhodecode/templates/files/files_add.mako @@ -36,8 +36,7 @@
  • - / - ${c.f_path} ${('/' if c.f_path else '')} + ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.f_path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=False, linkify_last_item=True, copy_path_icon=False)} /
  • diff --git a/rhodecode/templates/files/files_browser.mako b/rhodecode/templates/files/files_browser.mako --- a/rhodecode/templates/files/files_browser.mako +++ b/rhodecode/templates/files/files_browser.mako @@ -64,10 +64,10 @@ %if c.readme_data:
    -
    +
    diff --git a/rhodecode/templates/files/files_browser_tree.mako b/rhodecode/templates/files/files_browser_tree.mako --- a/rhodecode/templates/files/files_browser_tree.mako +++ b/rhodecode/templates/files/files_browser_tree.mako @@ -1,10 +1,13 @@ <%namespace name="base" file="/base/base.mako"/> <% - if request.GET.get('at'): - query={'at': request.GET.get('at')} + at_ref = request.GET.get('at') + if at_ref: + query={'at': at_ref} + default_landing_ref = at_ref or c.rhodecode_db_repo.landing_ref_name else: query=None + default_landing_ref = c.commit.raw_id %>
@@ -21,7 +24,7 @@ @@ -41,7 +44,7 @@ % endif % else: - + ${node.name} % endif diff --git a/rhodecode/templates/files/files_delete.mako b/rhodecode/templates/files/files_delete.mako --- a/rhodecode/templates/files/files_delete.mako +++ b/rhodecode/templates/files/files_delete.mako @@ -35,8 +35,7 @@
  • - / - ${c.file.dir_path} ${('/' if c.file.dir_path else '')} + ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
  • diff --git a/rhodecode/templates/files/files_edit.mako b/rhodecode/templates/files/files_edit.mako --- a/rhodecode/templates/files/files_edit.mako +++ b/rhodecode/templates/files/files_edit.mako @@ -36,8 +36,7 @@
    • - / - ${c.file.dir_path} ${('/' if c.file.dir_path else '')} + ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True, hide_last_item=True, copy_path_icon=False)} /
    • diff --git a/rhodecode/templates/files/files_source.mako b/rhodecode/templates/files/files_source.mako --- a/rhodecode/templates/files/files_source.mako +++ b/rhodecode/templates/files/files_source.mako @@ -1,5 +1,15 @@ <%namespace name="sourceblock" file="/codeblocks/source.mako"/> +<% + at_ref = request.GET.get('at') + if at_ref: + query={'at': at_ref} + default_commit_id = at_ref or c.rhodecode_db_repo.landing_ref_name + else: + query=None + default_commit_id = c.commit.raw_id +%> +
      @@ -27,13 +37,13 @@ ## binary files are delete only % if c.file.is_binary: ${h.link_to(_('Edit'), '#Edit', class_="btn btn-default disabled tooltip", title=_('Editing binary files not allowed'))} - ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path),class_="btn btn-danger")} + ${h.link_to(_('Delete'), h.route_path('repo_files_remove_file',repo_name=c.repo_name,commit_id=c.branch_or_raw_id,f_path=c.f_path, _query=query),class_="btn btn-danger")} % else: - + ${_('Edit on branch: ')}${c.branch_name} - + ${_('Delete')} % endif @@ -88,7 +98,7 @@
      - ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'))} + ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'))}
      @@ -104,7 +114,7 @@ | ${h.link_to(_('Raw'), h.route_path('repo_file_raw',repo_name=c.repo_name,commit_id=c.commit.raw_id,f_path=c.f_path))} % if not c.file.is_binary: |${_('Copy content')} - |${_('Copy permalink')} + |${_('Copy permalink')} % endif
      diff --git a/rhodecode/templates/pullrequests/pullrequest_show.mako b/rhodecode/templates/pullrequests/pullrequest_show.mako --- a/rhodecode/templates/pullrequests/pullrequest_show.mako +++ b/rhodecode/templates/pullrequests/pullrequest_show.mako @@ -476,7 +476,7 @@
      % if c.pr_merge_source_commit.changed: - ${_('There are new changes for {}:{} in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)} + ${_('There are new changes for `{}:{}` in source repository, please consider updating this pull request.').format(c.pr_merge_source_commit.ref_spec.type, c.pr_merge_source_commit.ref_spec.name)} % endif
      diff --git a/rhodecode/templates/search/search_content.mako b/rhodecode/templates/search/search_content.mako --- a/rhodecode/templates/search/search_content.mako +++ b/rhodecode/templates/search/search_content.mako @@ -93,7 +93,7 @@
      - ${h.files_breadcrumbs(entry['repository'],entry.get('commit_id', 'tip'),entry['f_path'], linkify_last_item=True)} + ${h.files_breadcrumbs(entry['repository'], repo_type, entry.get('commit_id', 'tip'), entry['f_path'], linkify_last_item=True)}
      diff --git a/rhodecode/templates/search/search_path.mako b/rhodecode/templates/search/search_path.mako --- a/rhodecode/templates/search/search_path.mako +++ b/rhodecode/templates/search/search_path.mako @@ -27,7 +27,7 @@
    • - ${h.files_breadcrumbs(c.repo_name,c.commit.raw_id,c.file.path, request.GET.get('at'), limit_items=True)} + ${h.files_breadcrumbs(c.repo_name, c.rhodecode_db_repo.repo_type, c.commit.raw_id, c.file.path, c.rhodecode_db_repo.landing_ref_name, request.GET.get('at'), limit_items=True)}
    ${h.link_to(h.literal(entry['f_path']), - h.route_path('repo_files',repo_name=entry['repository'],commit_id='tip',f_path=entry['f_path']))} + h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))} %if entry.get('size'): diff --git a/rhodecode/templates/summary/summary.mako b/rhodecode/templates/summary/summary.mako --- a/rhodecode/templates/summary/summary.mako +++ b/rhodecode/templates/summary/summary.mako @@ -34,10 +34,10 @@
    -
    +
    diff --git a/rhodecode/tests/lib/test_helpers.py b/rhodecode/tests/lib/test_helpers.py --- a/rhodecode/tests/lib/test_helpers.py +++ b/rhodecode/tests/lib/test_helpers.py @@ -82,9 +82,8 @@ def test_urlify_text(url, expected_url): 'bX"X'), ], ids=['simple1', 'simple2', 'one_segment', 'empty_path', 'simple_quote']) -def test_files_breadcrumbs_xss( - repo_name, commit_id, path, app, expected_result): - result = helpers.files_breadcrumbs(repo_name, commit_id, path) +def test_files_breadcrumbs_xss(repo_name, commit_id, path, app, expected_result): + result = helpers.files_breadcrumbs(repo_name, 'hg', commit_id, path) # Expect it to encode all path fragments properly. This is important # because it returns an instance of `literal`. if path != '':