release: merge back stable branch into default

docs/release-notes/release-notes-4.20.1.rst

@@ -0,0 +1,42 b''
+|RCE| 4.20.1 |RNS|
+------------------
+
+Release Date
+^^^^^^^^^^^^
+
+- 2020-07-27
+
+
+New Features
+^^^^^^^^^^^^
+
+
+
+General
+^^^^^^^
+
+- Permissions: rename write+ to write or higher for more explicit meaning.
+
+
+Security
+^^^^^^^^
+
+
+
+Performance
+^^^^^^^^^^^
+
+
+
+Fixes
+^^^^^
+
+- Files: fixed creation of new files for empty repos.
+- Notifications: properly inject the custom email headers into templates.
+- Store file integration: fixed support for nested subdirs.
+
+
+Upgrade notes
+^^^^^^^^^^^^^
+
+- Un-scheduled release addressing problems in 4.20.X releases.

.hgtags

@@ -1,68 +1,70 b''
 1bd3e92b7e2e2d2024152b34bb88dff1db544a71 v4.0.0
 170c5398320ea6cddd50955e88d408794c21d43a v4.0.1
 c3fe200198f5aa34cf2e4066df2881a9cefe3704 v4.1.0
 7fd5c850745e2ea821fb4406af5f4bff9b0a7526 v4.1.1
 41c87da28a179953df86061d817bc35533c66dd2 v4.1.2
 baaf9f5bcea3bae0ef12ae20c8b270482e62abb6 v4.2.0
 32a70c7e56844a825f61df496ee5eaf8c3c4e189 v4.2.1
 fa695cdb411d294679ac081d595ac654e5613b03 v4.3.0
 0e4dc11b58cad833c513fe17bac39e6850edf959 v4.3.1
 8a876f48f5cb1d018b837db28ff928500cb32cfb v4.4.0
 8dd86b410b1aac086ffdfc524ef300f896af5047 v4.4.1
 d2514226abc8d3b4f6fb57765f47d1b6fb360a05 v4.4.2
 27d783325930af6dad2741476c0d0b1b7c8415c2 v4.5.0
 7f2016f352abcbdba4a19d4039c386e9629449da v4.5.1
 416fec799314c70a5c780fb28b3357b08869333a v4.5.2
 27c3b85fafc83143e6678fbc3da69e1615bcac55 v4.6.0
 5ad13deb9118c2a5243d4032d4d9cc174e5872db v4.6.1
 2be921e01fa24bb102696ada596f87464c3666f6 v4.7.0
 7198bdec29c2872c974431d55200d0398354cdb1 v4.7.1
 bd1c8d230fe741c2dfd7100a0ef39fd0774fd581 v4.7.2
 9731914f89765d9628dc4dddc84bc9402aa124c8 v4.8.0
 c5a2b7d0e4bbdebc4a62d7b624befe375207b659 v4.9.0
 d9aa3b27ac9f7e78359775c75fedf7bfece232f1 v4.9.1
 4ba4d74981cec5d6b28b158f875a2540952c2f74 v4.10.0
 0a6821cbd6b0b3c21503002f88800679fa35ab63 v4.10.1
 434ad90ec8d621f4416074b84f6e9ce03964defb v4.10.2
 68baee10e698da2724c6e0f698c03a6abb993bf2 v4.10.3
 00821d3afd1dce3f4767cc353f84a17f7d5218a1 v4.10.4
 22f6744ad8cc274311825f63f953e4dee2ea5cb9 v4.10.5
 96eb24bea2f5f9258775245e3f09f6fa0a4dda01 v4.10.6
 3121217a812c956d7dd5a5875821bd73e8002a32 v4.11.0
 fa98b454715ac5b912f39e84af54345909a2a805 v4.11.1
 3982abcfdcc229a723cebe52d3a9bcff10bba08e v4.11.2
 33195f145db9172f0a8f1487e09207178a6ab065 v4.11.3
 194c74f33e32bbae6fc4d71ec5a999cff3c13605 v4.11.4
 8fbd8b0c3ddc2fa4ac9e4ca16942a03eb593df2d v4.11.5
 f0609aa5d5d05a1ca2f97c3995542236131c9d8a v4.11.6
 b5b30547d90d2e088472a70c84878f429ffbf40d v4.12.0
 9072253aa8894d20c00b4a43dc61c2168c1eff94 v4.12.1
 6a517543ea9ef9987d74371bd2a315eb0b232dc9 v4.12.2
 7fc0731b024c3114be87865eda7ab621cc957e32 v4.12.3
 6d531c0b068c6eda62dddceedc9f845ecb6feb6f v4.12.4
 3d6bf2d81b1564830eb5e83396110d2a9a93eb1e v4.13.0
 5468fc89e708bd90e413cd0d54350017abbdbc0e v4.13.1
 610d621550521c314ee97b3d43473ac0bcf06fb8 v4.13.2
 7dc62c090881fb5d03268141e71e0940d7c3295d v4.13.3
 9151328c1c46b72ba6f00d7640d9141e75aa1ca2 v4.14.0
 a47eeac5dfa41fa6779d90452affba4091c3ade8 v4.14.1
 4b34ce0d2c3c10510626b3b65044939bb7a2cddf v4.15.0
 14502561d22e6b70613674cd675ae9a604b7989f v4.15.1
 4aaa40b605b01af78a9f6882eca561c54b525ef0 v4.15.2
 797744642eca86640ed20bef2cd77445780abaec v4.16.0
 6c3452c7c25ed35ff269690929e11960ed6ad7d3 v4.16.1
 5d8057df561c4b6b81b6401aed7d2f911e6e77f7 v4.16.2
 13acfc008896ef4c62546bab5074e8f6f89b4fa7 v4.17.0
 45b9b610976f483877142fe75321808ce9ebac59 v4.17.1
 ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901 v4.17.2
 037f5794b55a6236d68f6485a485372dde6566e0 v4.17.3
 83bc3100cfd6094c1d04f475ddb299b7dc3d0b33 v4.17.4
 e3de8c95baf8cc9109ca56aee8193a2cb6a54c8a v4.17.4
 f37a3126570477543507f0bc9d245ce75546181a v4.18.0
 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
 ddef396a6567117de531d67d44c739cbbfc3eebb v4.19.0
 c0c65acd73914bf4368222d510afe1161ab8c07c v4.19.1
 7ac623a4a2405917e2af660d645ded662011e40d v4.19.2
 ef7ffda65eeb90c3ba88590a6cb816ef9b0bc232 v4.19.3
+3e635489bb7961df93b01e42454ad1a8730ae968 v4.20.0
+7e2eb896a02ca7cd2cd9f0f853ef3dac3f0039e3 v4.20.1

docs/release-notes/release-notes.rst

@@ -1,145 +1,146 b''
 .. _rhodecode-release-notes-ref:
 
 Release Notes
 =============
 
 |RCE| 4.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
+   release-notes-4.20.1.rst
    release-notes-4.20.0.rst
    release-notes-4.19.3.rst
    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
    release-notes-4.18.1.rst
    release-notes-4.18.0.rst
    release-notes-4.17.4.rst
    release-notes-4.17.3.rst
    release-notes-4.17.2.rst
    release-notes-4.17.1.rst
    release-notes-4.17.0.rst
    release-notes-4.16.2.rst
    release-notes-4.16.1.rst
    release-notes-4.16.0.rst
    release-notes-4.15.2.rst
    release-notes-4.15.1.rst
    release-notes-4.15.0.rst
    release-notes-4.14.1.rst
    release-notes-4.14.0.rst
    release-notes-4.13.3.rst
    release-notes-4.13.2.rst
    release-notes-4.13.1.rst
    release-notes-4.13.0.rst
    release-notes-4.12.4.rst
    release-notes-4.12.3.rst
    release-notes-4.12.2.rst
    release-notes-4.12.1.rst
    release-notes-4.12.0.rst
    release-notes-4.11.6.rst
    release-notes-4.11.5.rst
    release-notes-4.11.4.rst
    release-notes-4.11.3.rst
    release-notes-4.11.2.rst
    release-notes-4.11.1.rst
    release-notes-4.11.0.rst
    release-notes-4.10.6.rst
    release-notes-4.10.5.rst
    release-notes-4.10.4.rst
    release-notes-4.10.3.rst
    release-notes-4.10.2.rst
    release-notes-4.10.1.rst
    release-notes-4.10.0.rst
    release-notes-4.9.1.rst
    release-notes-4.9.0.rst
    release-notes-4.8.0.rst
    release-notes-4.7.2.rst
    release-notes-4.7.1.rst
    release-notes-4.7.0.rst
    release-notes-4.6.1.rst
    release-notes-4.6.0.rst
    release-notes-4.5.2.rst
    release-notes-4.5.1.rst
    release-notes-4.5.0.rst
    release-notes-4.4.2.rst
    release-notes-4.4.1.rst
    release-notes-4.4.0.rst
    release-notes-4.3.1.rst
    release-notes-4.3.0.rst
    release-notes-4.2.1.rst
    release-notes-4.2.0.rst
    release-notes-4.1.2.rst
    release-notes-4.1.1.rst
    release-notes-4.1.0.rst
    release-notes-4.0.1.rst
    release-notes-4.0.0.rst
 
 |RCE| 3.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-3.8.4.rst
    release-notes-3.8.3.rst
    release-notes-3.8.2.rst
    release-notes-3.8.1.rst
    release-notes-3.8.0.rst
    release-notes-3.7.1.rst
    release-notes-3.7.0.rst
    release-notes-3.6.1.rst
    release-notes-3.6.0.rst
    release-notes-3.5.2.rst
    release-notes-3.5.1.rst
    release-notes-3.5.0.rst
    release-notes-3.4.1.rst
    release-notes-3.4.0.rst
    release-notes-3.3.4.rst
    release-notes-3.3.3.rst
    release-notes-3.3.2.rst
    release-notes-3.3.1.rst
    release-notes-3.3.0.rst
    release-notes-3.2.3.rst
    release-notes-3.2.2.rst
    release-notes-3.2.1.rst
    release-notes-3.2.0.rst
    release-notes-3.1.1.rst
    release-notes-3.1.0.rst
    release-notes-3.0.2.rst
    release-notes-3.0.1.rst
    release-notes-3.0.0.rst
 
 |RCE| 2.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-2.2.8.rst
    release-notes-2.2.7.rst
    release-notes-2.2.6.rst
    release-notes-2.2.5.rst
    release-notes-2.2.4.rst
    release-notes-2.2.3.rst
    release-notes-2.2.2.rst
    release-notes-2.2.1.rst
    release-notes-2.2.0.rst
    release-notes-2.1.0.rst
    release-notes-2.0.2.rst
    release-notes-2.0.1.rst
    release-notes-2.0.0.rst
 
 |RCE| 1.x Versions
 ------------------
 
 .. toctree::
    :maxdepth: 1
 
    release-notes-1.7.2.rst
    release-notes-1.7.1.rst
    release-notes-1.7.0.rst
    release-notes-1.6.0.rst

rhodecode/apps/repository/views/repo_files.py

@@ -1,1618 +1,1631 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import itertools
 import logging
 import os
 import shutil
 import tempfile
 import collections
 import urllib
 import pathlib2
 
 from pyramid.httpexceptions import HTTPNotFound, HTTPBadRequest, HTTPFound
 from pyramid.view import view_config
 from pyramid.renderers import render
 from pyramid.response import Response
 
 import rhodecode
 from rhodecode.apps._base import RepoAppView
 
 
 from rhodecode.lib import diffs, helpers as h, rc_cache
 from rhodecode.lib import audit_logger
 from rhodecode.lib.view_utils import parse_path_ref
 from rhodecode.lib.exceptions import NonRelativePathError
 from rhodecode.lib.codeblocks import (
     filenode_as_lines_tokens, filenode_as_annotated_lines_tokens)
 from rhodecode.lib.utils2 import (
     convert_line_endings, detect_mode, safe_str, str2bool, safe_int, sha1, safe_unicode)
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.vcs import path as vcspath
 from rhodecode.lib.vcs.backends.base import EmptyCommit
 from rhodecode.lib.vcs.conf import settings
 from rhodecode.lib.vcs.nodes import FileNode
 from rhodecode.lib.vcs.exceptions import (
     RepositoryError, CommitDoesNotExistError, EmptyRepositoryError,
     ImproperArchiveTypeError, VCSError, NodeAlreadyExistsError,
     NodeDoesNotExistError, CommitError, NodeError)
 
 from rhodecode.model.scm import ScmModel
 from rhodecode.model.db import Repository
 
 log = logging.getLogger(__name__)
 
 
 class RepoFilesView(RepoAppView):
 
     @staticmethod
     def adjust_file_path_for_svn(f_path, repo):
         """
         Computes the relative path of `f_path`.
 
         This is mainly based on prefix matching of the recognized tags and
         branches in the underlying repository.
         """
         tags_and_branches = itertools.chain(
             repo.branches.iterkeys(),
             repo.tags.iterkeys())
         tags_and_branches = sorted(tags_and_branches, key=len, reverse=True)
 
         for name in tags_and_branches:
             if f_path.startswith('{}/'.format(name)):
                 f_path = vcspath.relpath(f_path, name)
                 break
         return f_path
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.rhodecode_repo = self.rhodecode_vcs_repo
         c.enable_downloads = self.db_repo.enable_downloads
         return c
 
     def _ensure_not_locked(self, commit_id='tip'):
         _ = self.request.translate
 
         repo = self.db_repo
         if repo.enable_locking and repo.locked[0]:
             h.flash(_('This repository has been locked by %s on %s')
                     % (h.person_by_id(repo.locked[0]),
                     h.format_date(h.time_to_datetime(repo.locked[1]))),
                     'warning')
             files_url = h.route_path(
                 'repo_files:default_path',
                 repo_name=self.db_repo_name, commit_id=commit_id)
             raise HTTPFound(files_url)
 
     def forbid_non_head(self, is_head, f_path, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         if not is_head:
             message = _('Cannot modify file. '
                         'Given commit `{}` is not head of a branch.').format(commit_id)
             h.flash(message, category='warning')
 
             if json_mode:
                 return message
 
             files_url = h.route_path(
                 'repo_files', repo_name=self.db_repo_name, commit_id=commit_id,
                 f_path=f_path)
             raise HTTPFound(files_url)
 
     def check_branch_permission(self, branch_name, commit_id='tip', json_mode=False):
         _ = self.request.translate
 
         rule, branch_perm = self._rhodecode_user.get_rule_and_branch_permission(
             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(
                 h.escape(branch_name), h.escape(rule))
             h.flash(message, 'warning')
 
             if json_mode:
                 return message
 
             files_url = h.route_path(
                 'repo_files:default_path', repo_name=self.db_repo_name, commit_id=commit_id)
 
             raise HTTPFound(files_url)
 
     def _get_commit_and_path(self):
         default_commit_id = self.db_repo.landing_ref_name
         default_f_path = '/'
 
         commit_id = self.request.matchdict.get(
             'commit_id', default_commit_id)
         f_path = self._get_f_path(self.request.matchdict, default_f_path)
         return commit_id, f_path
 
     def _get_default_encoding(self, c):
         enc_list = getattr(c, 'default_encodings', [])
         return enc_list[0] if enc_list else 'UTF-8'
 
     def _get_commit_or_redirect(self, commit_id, redirect_after=True):
         """
         This is a safe way to get commit. If an error occurs it redirects to
         tip with proper message
 
         :param commit_id: id of commit to fetch
         :param redirect_after: toggle redirection
         """
         _ = self.request.translate
 
         try:
             return self.rhodecode_vcs_repo.get_commit(commit_id)
         except EmptyRepositoryError:
             if not redirect_after:
                 return None
 
             _url = h.route_path(
                 'repo_files_add_file',
                 repo_name=self.db_repo_name, commit_id=0, f_path='')
 
             if h.HasRepoPermissionAny(
                     'repository.write', 'repository.admin')(self.db_repo_name):
                 add_new = h.link_to(
                     _('Click here to add a new file.'), _url, class_="alert-link")
             else:
                 add_new = ""
 
             h.flash(h.literal(
                 _('There are no files yet. %s') % add_new), category='warning')
             raise HTTPFound(
                 h.route_path('repo_summary', repo_name=self.db_repo_name))
 
         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:
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
     def _get_filenode_or_redirect(self, commit_obj, path):
         """
         Returns file_node, if error occurs or given path is directory,
         it'll redirect to top level path
         """
         _ = self.request.translate
 
         try:
             file_node = commit_obj.get_node(path)
             if file_node.is_dir():
                 raise RepositoryError('The given path is a directory')
         except CommitDoesNotExistError:
             log.exception('No such commit exists for this repository')
             h.flash(_('No such commit exists for this repository'), category='error')
             raise HTTPNotFound()
         except RepositoryError as e:
             log.warning('Repository error while fetching filenode `%s`. Err:%s', path, e)
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         return file_node
 
-    def _is_valid_head(self, commit_id, repo):
+    def _is_valid_head(self, commit_id, repo, landing_ref):
         branch_name = sha_commit_id = ''
         is_head = False
         log.debug('Checking if commit_id `%s` is a head for %s.', commit_id, repo)
 
         for _branch_name, branch_commit_id in repo.branches.items():
             # simple case we pass in branch name, it's a HEAD
             if commit_id == _branch_name:
                 is_head = True
                 branch_name = _branch_name
                 sha_commit_id = branch_commit_id
                 break
             # case when we pass in full sha commit_id, which is a head
             elif commit_id == branch_commit_id:
                 is_head = True
                 branch_name = _branch_name
                 sha_commit_id = branch_commit_id
                 break
 
         if h.is_svn(repo) and not repo.is_empty():
             # Note: Subversion only has one head.
             if commit_id == repo.get_commit(commit_idx=-1).raw_id:
                 is_head = True
                 return branch_name, sha_commit_id, is_head
 
         # checked branches, means we only need to try to get the branch/commit_sha
-        if not repo.is_empty():
+        if repo.is_empty():
+            is_head = True
+            branch_name = landing_ref
+            sha_commit_id = EmptyCommit().raw_id
+        else:
             commit = repo.get_commit(commit_id=commit_id)
             if commit:
                 branch_name = commit.branch
                 sha_commit_id = commit.raw_id
 
         return branch_name, sha_commit_id, is_head
 
     def _get_tree_at_commit(self, c, commit_id, f_path, full_load=False, at_rev=None):
 
         repo_id = self.db_repo.repo_id
         force_recache = self.get_recache_flag()
 
         cache_seconds = safe_int(
             rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
         cache_on = not force_recache and cache_seconds > 0
         log.debug(
             'Computing FILE TREE for repo_id %s commit_id `%s` and path `%s`'
             'with caching: %s[TTL: %ss]' % (
                 repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
 
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_tree(ver, _name_hash, _repo_id, _commit_id, _f_path, _full_load, _at_rev):
             log.debug('Generating cached file tree at ver:%s for repo_id: %s, %s, %s',
                       ver, _repo_id, _commit_id, _f_path)
 
             c.full_load = _full_load
             return render(
                 'rhodecode:templates/files/files_browser_tree.mako',
                 self._get_template_context(c), self.request, _at_rev)
 
         return compute_file_tree(
             rc_cache.FILE_TREE_CACHE_VER, self.db_repo.repo_name_hash,
             self.db_repo.repo_id, commit_id, f_path, full_load, at_rev)
 
     def _get_archive_spec(self, fname):
         log.debug('Detecting archive spec for: `%s`', fname)
 
         fileformat = None
         ext = None
         content_type = None
         for a_type, content_type, extension in settings.ARCHIVE_SPECS:
 
             if fname.endswith(extension):
                 fileformat = a_type
                 log.debug('archive is of type: %s', fileformat)
                 ext = extension
                 break
 
         if not fileformat:
             raise ValueError()
 
         # left over part of whole fname is the commit
         commit_id = fname[:-len(ext)]
 
         return commit_id, ext, fileformat, content_type
 
     def create_pure_path(self, *parts):
         # Split paths and sanitize them, removing any ../ etc
         sanitized_path = [
             x for x in pathlib2.PurePath(*parts).parts
             if x not in ['.', '..']]
 
         pure_path = pathlib2.PurePath(*sanitized_path)
         return pure_path
 
     def _is_lf_enabled(self, target_repo):
         lf_enabled = False
 
         lf_key_for_vcs_map = {
             'hg': 'extensions_largefiles',
             'git': 'vcs_git_lfs_enabled'
         }
 
         lf_key_for_vcs = lf_key_for_vcs_map.get(target_repo.repo_type)
 
         if lf_key_for_vcs:
             lf_enabled = self._get_repo_setting(target_repo, lf_key_for_vcs)
 
         return lf_enabled
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_archivefile', request_method='GET',
         renderer=None)
     def repo_archivefile(self):
         # archive cache config
         from rhodecode import CONFIG
         _ = self.request.translate
         self.load_default_context()
         default_at_path = '/'
         fname = self.request.matchdict['fname']
         subrepos = self.request.GET.get('subrepos') == 'true'
         at_path = self.request.GET.get('at_path') or default_at_path
 
         if not self.db_repo.enable_downloads:
             return Response(_('Downloads disabled'))
 
         try:
             commit_id, ext, fileformat, content_type = \
                 self._get_archive_spec(fname)
         except ValueError:
             return Response(_('Unknown archive type for: `{}`').format(
                 h.escape(fname)))
 
         try:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id)
         except CommitDoesNotExistError:
             return Response(_('Unknown commit_id {}').format(
                 h.escape(commit_id)))
         except EmptyRepositoryError:
             return Response(_('Empty repository'))
 
         try:
             at_path = commit.get_node(at_path).path or default_at_path
         except Exception:
             return Response(_('No node at path {} for this repository').format(at_path))
 
         path_sha = sha1(at_path)[:8]
 
         # original backward compat name of archive
         clean_name = safe_str(self.db_repo_name.replace('/', '_'))
         short_sha = safe_str(commit.short_id)
 
         if at_path == default_at_path:
             archive_name = '{}-{}{}{}'.format(
                 clean_name,
                 '-sub' if subrepos else '',
                 short_sha,
                 ext)
         # custom path and new name
         else:
             archive_name = '{}-{}{}-{}{}'.format(
                 clean_name,
                 '-sub' if subrepos else '',
                 short_sha,
                 path_sha,
                 ext)
 
         use_cached_archive = False
         archive_cache_enabled = CONFIG.get(
             'archive_cache_dir') and not self.request.GET.get('no_cache')
         cached_archive_path = None
 
         if archive_cache_enabled:
             # check if we it's ok to write
             if not os.path.isdir(CONFIG['archive_cache_dir']):
                 os.makedirs(CONFIG['archive_cache_dir'])
             cached_archive_path = os.path.join(
                 CONFIG['archive_cache_dir'], archive_name)
             if os.path.isfile(cached_archive_path):
                 log.debug('Found cached archive in %s', cached_archive_path)
                 fd, archive = None, cached_archive_path
                 use_cached_archive = True
             else:
                 log.debug('Archive %s is not yet cached', archive_name)
 
         if not use_cached_archive:
             # generate new archive
             fd, archive = tempfile.mkstemp()
             log.debug('Creating new temp archive in %s', archive)
             try:
                 commit.archive_repo(archive, kind=fileformat, subrepos=subrepos,
                                     archive_at_path=at_path)
             except ImproperArchiveTypeError:
                 return _('Unknown archive type')
             if archive_cache_enabled:
                 # if we generated the archive and we have cache enabled
                 # let's use this for future
                 log.debug('Storing new archive in %s', cached_archive_path)
                 shutil.move(archive, cached_archive_path)
                 archive = cached_archive_path
 
         # store download action
         audit_logger.store_web(
             'repo.archive.download', action_data={
                 'user_agent': self.request.user_agent,
                 'archive_name': archive_name,
                 'archive_spec': fname,
                 'archive_cached': use_cached_archive},
             user=self._rhodecode_user,
             repo=self.db_repo,
             commit=True
         )
 
         def get_chunked_archive(archive_path):
             with open(archive_path, 'rb') as stream:
                 while True:
                     data = stream.read(16 * 1024)
                     if not data:
                         if fd:  # fd means we used temporary file
                             os.close(fd)
                         if not archive_cache_enabled:
                             log.debug('Destroying temp archive %s', archive_path)
                             os.remove(archive_path)
                         break
                     yield data
 
         response = Response(app_iter=get_chunked_archive(archive))
         response.content_disposition = str(
             'attachment; filename=%s' % archive_name)
         response.content_type = str(content_type)
 
         return response
 
     def _get_file_node(self, commit_id, f_path):
         if commit_id not in ['', None, 'None', '0' * 12, '0' * 40]:
             commit = self.rhodecode_vcs_repo.get_commit(commit_id=commit_id)
             try:
                 node = commit.get_node(f_path)
                 if node.is_dir():
                     raise NodeError('%s path is a %s not a file'
                                     % (node, type(node)))
             except NodeDoesNotExistError:
                 commit = EmptyCommit(
                     commit_id=commit_id,
                     idx=commit.idx,
                     repo=commit.repository,
                     alias=commit.repository.alias,
                     message=commit.message,
                     author=commit.author,
                     date=commit.date)
                 node = FileNode(f_path, '', commit=commit)
         else:
             commit = EmptyCommit(
                 repo=self.rhodecode_vcs_repo,
                 alias=self.rhodecode_vcs_repo.alias)
             node = FileNode(f_path, '', commit=commit)
         return node
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_diff', request_method='GET',
         renderer=None)
     def repo_files_diff(self):
         c = self.load_default_context()
         f_path = self._get_f_path(self.request.matchdict)
         diff1 = self.request.GET.get('diff1', '')
         diff2 = self.request.GET.get('diff2', '')
 
         path1, diff1 = parse_path_ref(diff1, default_path=f_path)
 
         ignore_whitespace = str2bool(self.request.GET.get('ignorews'))
         line_context = self.request.GET.get('context', 3)
 
         if not any((diff1, diff2)):
             h.flash(
                 'Need query parameter "diff1" or "diff2" to generate a diff.',
                 category='error')
             raise HTTPBadRequest()
 
         c.action = self.request.GET.get('diff')
         if c.action not in ['download', 'raw']:
             compare_url = h.route_path(
                 'repo_compare',
                 repo_name=self.db_repo_name,
                 source_ref_type='rev',
                 source_ref=diff1,
                 target_repo=self.db_repo_name,
                 target_ref_type='rev',
                 target_ref=diff2,
                 _query=dict(f_path=f_path))
             # redirect to new view if we render diff
             raise HTTPFound(compare_url)
 
         try:
             node1 = self._get_file_node(diff1, path1)
             node2 = self._get_file_node(diff2, f_path)
         except (RepositoryError, NodeError):
             log.exception("Exception while trying to get node from repository")
             raise HTTPFound(
                 h.route_path('repo_files', repo_name=self.db_repo_name,
                              commit_id='tip', f_path=f_path))
 
         if all(isinstance(node.commit, EmptyCommit)
                for node in (node1, node2)):
             raise HTTPNotFound()
 
         c.commit_1 = node1.commit
         c.commit_2 = node2.commit
 
         if c.action == 'download':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
 
             response = Response(self.path_filter.get_raw_patch(diff))
             response.content_type = 'text/plain'
             response.content_disposition = (
                 'attachment; filename=%s_%s_vs_%s.diff' % (f_path, diff1, diff2)
             )
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
             return response
 
         elif c.action == 'raw':
             _diff = diffs.get_gitdiff(node1, node2,
                                       ignore_whitespace=ignore_whitespace,
                                       context=line_context)
             diff = diffs.DiffProcessor(_diff, format='gitdiff')
 
             response = Response(self.path_filter.get_raw_patch(diff))
             response.content_type = 'text/plain'
             charset = self._get_default_encoding(c)
             if charset:
                 response.charset = charset
             return response
 
         # in case we ever end up here
         raise HTTPNotFound()
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_diff_2way_redirect', request_method='GET',
         renderer=None)
     def repo_files_diff_2way_redirect(self):
         """
         Kept only to make OLD links work
         """
         f_path = self._get_f_path_unchecked(self.request.matchdict)
         diff1 = self.request.GET.get('diff1', '')
         diff2 = self.request.GET.get('diff2', '')
 
         if not any((diff1, diff2)):
             h.flash(
                 'Need query parameter "diff1" or "diff2" to generate a diff.',
                 category='error')
             raise HTTPBadRequest()
 
         compare_url = h.route_path(
             'repo_compare',
             repo_name=self.db_repo_name,
             source_ref_type='rev',
             source_ref=diff1,
             target_ref_type='rev',
             target_ref=diff2,
             _query=dict(f_path=f_path, diffmode='sideside',
                         target_repo=self.db_repo_name,))
         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(
         route_name='repo_files', request_method='GET',
         renderer=None)
     @view_config(
         route_name='repo_files:default_path', request_method='GET',
         renderer=None)
     @view_config(
         route_name='repo_files:rendered', request_method='GET',
         renderer=None)
     @view_config(
         route_name='repo_files:annotated', request_method='GET',
         renderer=None)
     def repo_files(self):
         c = self.load_default_context()
 
         view_name = getattr(self.request.matched_route, 'name', None)
 
         c.annotate = view_name == 'repo_files:annotated'
         # default is false, but .rst/.md files later are auto rendered, we can
         # overwrite auto rendering by setting this GET flag
         c.renderer = view_name == 'repo_files:rendered' or \
                         not self.request.GET.get('no-render', False)
 
         commit_id, f_path = self._get_commit_and_path()
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.branch = self.request.GET.get('branch', None)
         c.f_path = f_path
         at_rev = self.request.GET.get('at')
 
         # prev link
         try:
             prev_commit = c.commit.prev(c.branch)
             c.prev_commit = prev_commit
             c.url_prev = h.route_path(
                 'repo_files', repo_name=self.db_repo_name,
                 commit_id=prev_commit.raw_id, f_path=f_path)
             if c.branch:
                 c.url_prev += '?branch=%s' % c.branch
         except (CommitDoesNotExistError, VCSError):
             c.url_prev = '#'
             c.prev_commit = EmptyCommit()
 
         # next link
         try:
             next_commit = c.commit.next(c.branch)
             c.next_commit = next_commit
             c.url_next = h.route_path(
                 'repo_files', repo_name=self.db_repo_name,
                 commit_id=next_commit.raw_id, f_path=f_path)
             if c.branch:
                 c.url_next += '?branch=%s' % c.branch
         except (CommitDoesNotExistError, VCSError):
             c.url_next = '#'
             c.next_commit = EmptyCommit()
 
         # files or dirs
         try:
             c.file = c.commit.get_node(f_path)
             c.file_author = True
             c.file_tree = ''
 
             # load file content
             if c.file.is_file():
                 c.lf_node = {}
 
                 has_lf_enabled = self._is_lf_enabled(self.db_repo)
                 if has_lf_enabled:
                     c.lf_node = c.file.get_largefile_node()
 
                 c.file_source_page = 'true'
                 c.file_last_commit = c.file.last_commit
 
                 c.file_size_too_big = c.file.size > c.visual.cut_off_limit_file
 
                 if not (c.file_size_too_big or c.file.is_binary):
                     if c.annotate:  # annotation has precedence over renderer
                         c.annotated_lines = filenode_as_annotated_lines_tokens(
                             c.file
                         )
                     else:
                         c.renderer = (
                             c.renderer and h.renderer_from_filename(c.file.path)
                         )
                         if not c.renderer:
                             c.lines = filenode_as_lines_tokens(c.file)
 
-                _branch_name, _sha_commit_id, is_head = self._is_valid_head(
-                    commit_id, self.rhodecode_vcs_repo)
+                _branch_name, _sha_commit_id, is_head = \
+                    self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                        landing_ref=self.db_repo.landing_ref_name)
                 c.on_branch_head = is_head
 
                 branch = c.commit.branch if (
                     c.commit.branch and '/' not in c.commit.branch) else None
                 c.branch_or_raw_id = branch or c.commit.raw_id
                 c.branch_name = c.commit.branch or h.short_id(c.commit.raw_id)
 
                 author = c.file_last_commit.author
                 c.authors = [[
                     h.email(author),
                     h.person(author, 'username_or_name_or_email'),
                     1
                 ]]
 
             else:  # load tree content at path
                 c.file_source_page = 'false'
                 c.authors = []
                 # this loads a simple tree without metadata to speed things up
                 # later via ajax we call repo_nodetree_full and fetch whole
                 c.file_tree = self._get_tree_at_commit(c, c.commit.raw_id, f_path, at_rev=at_rev)
 
                 c.readme_data, c.readme_file = \
                     self._get_readme_data(self.db_repo, c.visual.default_renderer,
                                           c.commit.raw_id, f_path)
 
         except RepositoryError as e:
             h.flash(safe_str(h.escape(e)), category='error')
             raise HTTPNotFound()
 
         if self.request.environ.get('HTTP_X_PJAX'):
             html = render('rhodecode:templates/files/files_pjax.mako',
                           self._get_template_context(c), self.request)
         else:
             html = render('rhodecode:templates/files/files.mako',
                           self._get_template_context(c), self.request)
         return Response(html)
 
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files:annotated_previous', request_method='GET',
         renderer=None)
     def repo_files_annotated_previous(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         prev_commit_id = commit.raw_id
         line_anchor = self.request.GET.get('line_anchor')
         is_file = False
         try:
             _file = commit.get_node(f_path)
             is_file = _file.is_file()
         except (NodeDoesNotExistError, CommitDoesNotExistError, VCSError):
             pass
 
         if is_file:
             history = commit.get_path_history(f_path)
             prev_commit_id = history[1].raw_id \
                 if len(history) > 1 else prev_commit_id
         prev_url = h.route_path(
             'repo_files:annotated', repo_name=self.db_repo_name,
             commit_id=prev_commit_id, f_path=f_path,
             _anchor='L{}'.format(line_anchor))
 
         raise HTTPFound(prev_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_nodetree_full', request_method='GET',
         renderer=None, xhr=True)
     @view_config(
         route_name='repo_nodetree_full:default_path', request_method='GET',
         renderer=None, xhr=True)
     def repo_nodetree_full(self):
         """
         Returns rendered html of file tree that contains commit date,
         author, commit_id for the specified combination of
         repo, commit_id and file path
         """
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         try:
             dir_node = commit.get_node(f_path)
         except RepositoryError as e:
             return Response('error: {}'.format(h.escape(safe_str(e))))
 
         if dir_node.is_file():
             return Response('')
 
         c.file = dir_node
         c.commit = commit
         at_rev = self.request.GET.get('at')
 
         html = self._get_tree_at_commit(
             c, commit.raw_id, dir_node.path, full_load=True, at_rev=at_rev)
 
         return Response(html)
 
     def _get_attachement_headers(self, f_path):
         f_name = safe_str(f_path.split(Repository.NAME_SEP)[-1])
         safe_path = f_name.replace('"', '\\"')
         encoded_path = urllib.quote(f_name)
 
         return "attachment; " \
                "filename=\"{}\"; " \
                "filename*=UTF-8\'\'{}".format(safe_path, encoded_path)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_raw', request_method='GET',
         renderer=None)
     def repo_file_raw(self):
         """
         Action for show as raw, some mimetypes are "rendered",
         those include images, icons.
         """
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         raw_mimetype_mapping = {
             # map original mimetype to a mimetype used for "show as raw"
             # you can also provide a content-disposition to override the
             # default "attachment" disposition.
             # orig_type: (new_type, new_dispo)
 
             # show images inline:
             # Do not re-add SVG: it is unsafe and permits XSS attacks. One can
             # for example render an SVG with javascript inside or even render
             # HTML.
             'image/x-icon': ('image/x-icon', 'inline'),
             'image/png': ('image/png', 'inline'),
             'image/gif': ('image/gif', 'inline'),
             'image/jpeg': ('image/jpeg', 'inline'),
             'application/pdf': ('application/pdf', 'inline'),
         }
 
         mimetype = file_node.mimetype
         try:
             mimetype, disposition = raw_mimetype_mapping[mimetype]
         except KeyError:
             # we don't know anything special about this, handle it safely
             if file_node.is_binary:
                 # do same as download raw for binary files
                 mimetype, disposition = 'application/octet-stream', 'attachment'
             else:
                 # do not just use the original mimetype, but force text/plain,
                 # otherwise it would serve text/html and that might be unsafe.
                 # Note: underlying vcs library fakes text/plain mimetype if the
                 # mimetype can not be determined and it thinks it is not
                 # binary.This might lead to erroneous text display in some
                 # cases, but helps in other cases, like with text files
                 # without extension.
                 mimetype, disposition = 'text/plain', 'inline'
 
         if disposition == 'attachment':
             disposition = self._get_attachement_headers(f_path)
 
         stream_content = file_node.stream_bytes()
 
         response = Response(app_iter=stream_content)
         response.content_disposition = disposition
         response.content_type = mimetype
 
         charset = self._get_default_encoding(c)
         if charset:
             response.charset = charset
 
         return response
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_download', request_method='GET',
         renderer=None)
     @view_config(
         route_name='repo_file_download:legacy', request_method='GET',
         renderer=None)
     def repo_file_download(self):
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if self.request.GET.get('lf'):
             # only if lf get flag is passed, we download this file
             # as LFS/Largefile
             lf_node = file_node.get_largefile_node()
             if lf_node:
                 # overwrite our pointer with the REAL large-file
                 file_node = lf_node
 
         disposition = self._get_attachement_headers(f_path)
 
         stream_content = file_node.stream_bytes()
 
         response = Response(app_iter=stream_content)
         response.content_disposition = disposition
         response.content_type = file_node.mimetype
 
         charset = self._get_default_encoding(c)
         if charset:
             response.charset = charset
 
         return response
 
     def _get_nodelist_at_commit(self, repo_name, repo_id, commit_id, f_path):
 
         cache_seconds = safe_int(
             rhodecode.CONFIG.get('rc_cache.cache_repo.expiration_time'))
         cache_on = cache_seconds > 0
         log.debug(
             'Computing FILE SEARCH for repo_id %s commit_id `%s` and path `%s`'
             'with caching: %s[TTL: %ss]' % (
                 repo_id, commit_id, f_path, cache_on, cache_seconds or 0))
 
         cache_namespace_uid = 'cache_repo.{}'.format(repo_id)
         region = rc_cache.get_or_create_region('cache_repo', cache_namespace_uid)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid, condition=cache_on)
         def compute_file_search(_name_hash, _repo_id, _commit_id, _f_path):
             log.debug('Generating cached nodelist for repo_id:%s, %s, %s',
                       _repo_id, commit_id, f_path)
             try:
                 _d, _f = ScmModel().get_quick_filter_nodes(repo_name, _commit_id, _f_path)
             except (RepositoryError, CommitDoesNotExistError, Exception) as e:
                 log.exception(safe_str(e))
                 h.flash(safe_str(h.escape(e)), category='error')
                 raise HTTPFound(h.route_path(
                     'repo_files', repo_name=self.db_repo_name,
                     commit_id='tip', f_path='/'))
 
             return _d + _f
 
         result = compute_file_search(self.db_repo.repo_name_hash, self.db_repo.repo_id,
                                      commit_id, f_path)
         return filter(lambda n: self.path_filter.path_access_allowed(n['name']), result)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_nodelist', request_method='GET',
         renderer='json_ext', xhr=True)
     def repo_nodelist(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
 
         metadata = self._get_nodelist_at_commit(
             self.db_repo_name, self.db_repo.repo_id, commit.raw_id, f_path)
         return {'nodes': metadata}
 
     def _create_references(self, branches_or_tags, symbolic_reference, f_path, ref_type):
         items = []
         for name, commit_id in branches_or_tags.items():
             sym_ref = symbolic_reference(commit_id, name, f_path, ref_type)
             items.append((sym_ref, name, ref_type))
         return items
 
     def _symbolic_reference(self, commit_id, name, f_path, ref_type):
         return commit_id
 
     def _symbolic_reference_svn(self, commit_id, name, f_path, ref_type):
         return commit_id
 
         # NOTE(dan): old code we used in "diff" mode compare
         new_f_path = vcspath.join(name, f_path)
         return u'%s@%s' % (new_f_path, commit_id)
 
     def _get_node_history(self, commit_obj, f_path, commits=None):
         """
         get commit history for given node
 
         :param commit_obj: commit to calculate history
         :param f_path: path for node to calculate history for
         :param commits: if passed don't calculate history and take
             commits defined in this list
         """
         _ = self.request.translate
 
         # calculate history based on tip
         tip = self.rhodecode_vcs_repo.get_commit()
         if commits is None:
             pre_load = ["author", "branch"]
             try:
                 commits = tip.get_path_history(f_path, pre_load=pre_load)
             except (NodeDoesNotExistError, CommitError):
                 # this node is not present at tip!
                 commits = commit_obj.get_path_history(f_path, pre_load=pre_load)
 
         history = []
         commits_group = ([], _("Changesets"))
         for commit in commits:
             branch = ' (%s)' % commit.branch if commit.branch else ''
             n_desc = 'r%s:%s%s' % (commit.idx, commit.short_id, branch)
             commits_group[0].append((commit.raw_id, n_desc, 'sha'))
         history.append(commits_group)
 
         symbolic_reference = self._symbolic_reference
 
         if self.rhodecode_vcs_repo.alias == 'svn':
             adjusted_f_path = RepoFilesView.adjust_file_path_for_svn(
                 f_path, self.rhodecode_vcs_repo)
             if adjusted_f_path != f_path:
                 log.debug(
                     'Recognized svn tag or branch in file "%s", using svn '
                     'specific symbolic references', f_path)
                 f_path = adjusted_f_path
                 symbolic_reference = self._symbolic_reference_svn
 
         branches = self._create_references(
             self.rhodecode_vcs_repo.branches, symbolic_reference, f_path, 'branch')
         branches_group = (branches, _("Branches"))
 
         tags = self._create_references(
             self.rhodecode_vcs_repo.tags, symbolic_reference, f_path, 'tag')
         tags_group = (tags, _("Tags"))
 
         history.append(branches_group)
         history.append(tags_group)
 
         return history, commits
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_history', request_method='GET',
         renderer='json_ext')
     def repo_file_history(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if file_node.is_file():
             file_history, _hist = self._get_node_history(commit, f_path)
 
             res = []
             for section_items, section in file_history:
                 items = []
                 for obj_id, obj_text, obj_type in section_items:
                     at_rev = ''
                     if obj_type in ['branch', 'bookmark', 'tag']:
                         at_rev = obj_text
                     entry = {
                         'id': obj_id,
                         'text': obj_text,
                         'type': obj_type,
                         'at_rev': at_rev
                     }
 
                     items.append(entry)
 
                 res.append({
                     'text': section,
                     'children': items
                 })
 
             data = {
                 'more': False,
                 'results': res
             }
             return data
 
         log.warning('Cannot fetch history for directory')
         raise HTTPBadRequest()
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='repo_file_authors', request_method='GET',
         renderer='rhodecode:templates/files/file_authors_box.mako')
     def repo_file_authors(self):
         c = self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         commit = self._get_commit_or_redirect(commit_id)
         file_node = self._get_filenode_or_redirect(commit, f_path)
 
         if not file_node.is_file():
             raise HTTPBadRequest()
 
         c.file_last_commit = file_node.last_commit
         if self.request.GET.get('annotate') == '1':
             # use _hist from annotation if annotation mode is on
             commit_ids = set(x[1] for x in file_node.annotate)
             _hist = (
                 self.rhodecode_vcs_repo.get_commit(commit_id)
                 for commit_id in commit_ids)
         else:
             _f_history, _hist = self._get_node_history(commit, f_path)
         c.file_author = False
 
         unique = collections.OrderedDict()
         for commit in _hist:
             author = commit.author
             if author not in unique:
                 unique[commit.author] = [
                     h.email(author),
                     h.person(author, 'username_or_name_or_email'),
                     1  # counter
                 ]
 
             else:
                 # increase counter
                 unique[commit.author][2] += 1
 
         c.authors = [val for val in unique.values()]
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_check_head', request_method='POST',
         renderer='json_ext', xhr=True)
     def repo_files_check_head(self):
         self.load_default_context()
 
         commit_id, f_path = self._get_commit_and_path()
         _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                landing_ref=self.db_repo.landing_ref_name)
 
         new_path = self.request.POST.get('path')
         operation = self.request.POST.get('operation')
         path_exist = ''
 
         if new_path and operation in ['create', 'upload']:
             new_f_path = os.path.join(f_path.lstrip('/'), new_path)
             try:
                 commit_obj = self.rhodecode_vcs_repo.get_commit(commit_id)
                 # NOTE(dan): construct whole path without leading /
                 file_node = commit_obj.get_node(new_f_path)
                 if file_node is not None:
                     path_exist = new_f_path
             except EmptyRepositoryError:
                 pass
             except Exception:
                 pass
 
         return {
             'branch': _branch_name,
             'sha': _sha_commit_id,
             'is_head': is_head,
             'path_exists': path_exist
         }
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_remove_file', request_method='GET',
         renderer='rhodecode:templates/files/files_delete.mako')
     def repo_files_remove_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         c.default_message = _(
             'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_delete_file', request_method='POST',
         renderer=None)
     def repo_files_delete_file(self):
         _ = self.request.translate
 
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path)
         self.check_branch_permission(_branch_name)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         c.default_message = _(
             'Deleted file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
         node_path = f_path
         author = self._rhodecode_db_user.full_contact
         message = self.request.POST.get('message') or c.default_message
         try:
             nodes = {
                 node_path: {
                     'content': ''
                 }
             }
             ScmModel().delete_nodes(
                 user=self._rhodecode_db_user.user_id, repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
 
             h.flash(
                 _('Successfully deleted file `{}`').format(
                     h.escape(f_path)), category='success')
         except Exception:
             log.exception('Error during commit operation')
             h.flash(_('Error occurred during commit'), category='error')
         raise HTTPFound(
             h.route_path('repo_commit', repo_name=self.db_repo_name,
                          commit_id='tip'))
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_edit_file', request_method='GET',
         renderer='rhodecode:templates/files/files_edit.mako')
     def repo_files_edit_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
         _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
             files_url = h.route_path(
                 'repo_files',
                 repo_name=self.db_repo_name,
                 commit_id=c.commit.raw_id, f_path=f_path)
             raise HTTPFound(files_url)
 
         c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_update_file', request_method='POST',
         renderer=None)
     def repo_files_update_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id)
         c.file = self._get_filenode_or_redirect(c.commit, f_path)
 
         if c.file.is_binary:
             raise HTTPFound(h.route_path('repo_files', repo_name=self.db_repo_name,
                                          commit_id=c.commit.raw_id, f_path=f_path))
 
         _branch_name, _sha_commit_id, is_head = \
-            self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+            self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = _('Edited file {} via RhodeCode Enterprise').format(f_path)
         c.f_path = f_path
 
         old_content = c.file.content
         sl = old_content.splitlines(1)
         first_line = sl[0] if sl else ''
 
         r_post = self.request.POST
         # line endings:  0 - Unix, 1 - Mac, 2 - DOS
         line_ending_mode = detect_mode(first_line, 0)
         content = convert_line_endings(r_post.get('content', ''), line_ending_mode)
 
         message = r_post.get('message') or c.default_message
         org_node_path = c.file.unicode_path
         filename = r_post['filename']
 
         root_path = c.file.dir_path
         pure_path = self.create_pure_path(root_path, filename)
         node_path = safe_unicode(bytes(pure_path))
 
         default_redirect_url = h.route_path('repo_commit', repo_name=self.db_repo_name,
                                             commit_id=commit_id)
         if content == old_content and node_path == org_node_path:
             h.flash(_('No changes detected on {}').format(h.escape(org_node_path)),
                     category='warning')
             raise HTTPFound(default_redirect_url)
 
         try:
             mapping = {
                 org_node_path: {
                     'org_filename': org_node_path,
                     'filename': node_path,
                     'content': content,
                     'lexer': '',
                     'op': 'mod',
                     'mode': c.file.mode
                 }
             }
 
             commit = ScmModel().update_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=mapping,
                 parent_commit=c.commit,
             )
 
             h.flash(_('Successfully committed changes to file `{}`').format(
                     h.escape(f_path)), category='success')
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @view_config(
         route_name='repo_files_add_file', request_method='GET',
         renderer='rhodecode:templates/files/files_add.mako')
     @view_config(
         route_name='repo_files_upload_file', request_method='GET',
         renderer='rhodecode:templates/files/files_upload.mako')
     def repo_files_add_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                    landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path.lstrip('/')  # ensure not relative path
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_create_file', request_method='POST',
         renderer=None)
     def repo_files_create_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                    landing_ref=self.db_repo.landing_ref_name)
 
         self.forbid_non_head(is_head, f_path, commit_id=commit_id)
         self.check_branch_permission(_branch_name, commit_id=commit_id)
 
         c.default_message = (_('Added file via RhodeCode Enterprise'))
         c.f_path = f_path
 
         r_post = self.request.POST
         message = r_post.get('message') or c.default_message
         filename = r_post.get('filename')
         unix_mode = 0
         content = convert_line_endings(r_post.get('content', ''), unix_mode)
 
         if not filename:
             # If there's no commit, redirect to repo summary
             if type(c.commit) is EmptyCommit:
                 redirect_url = h.route_path(
                     'repo_summary', repo_name=self.db_repo_name)
             else:
                 redirect_url = default_redirect_url
             h.flash(_('No filename specified'), category='warning')
             raise HTTPFound(redirect_url)
 
         root_path = f_path
         pure_path = self.create_pure_path(root_path, filename)
         node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
         author = self._rhodecode_db_user.full_contact
         nodes = {
             node_path: {
                 'content': content
             }
         }
 
         try:
 
             commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
 
             h.flash(_('Successfully committed new file `{}`').format(
                     h.escape(node_path)), category='success')
 
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
             log.exception('Non Relative path found')
             h.flash(_('The location specified must be a relative path and must not '
                       'contain .. in the path'), category='warning')
             raise HTTPFound(default_redirect_url)
         except (NodeError, NodeAlreadyExistsError) as e:
             h.flash(_(h.escape(e)), category='error')
         except Exception:
             log.exception('Error occurred during commit')
             h.flash(_('Error occurred during commit'), category='error')
 
         raise HTTPFound(default_redirect_url)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='repo_files_upload_file', request_method='POST',
         renderer='json_ext')
     def repo_files_upload_file(self):
         _ = self.request.translate
         c = self.load_default_context()
         commit_id, f_path = self._get_commit_and_path()
 
         self._ensure_not_locked()
 
         c.commit = self._get_commit_or_redirect(commit_id, redirect_after=False)
         if c.commit is None:
             c.commit = EmptyCommit(alias=self.rhodecode_vcs_repo.alias)
 
         # calculate redirect URL
         if self.rhodecode_vcs_repo.is_empty():
             default_redirect_url = h.route_path(
                 'repo_summary', repo_name=self.db_repo_name)
         else:
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id='tip')
 
         if self.rhodecode_vcs_repo.is_empty():
             # for empty repository we cannot check for current branch, we rely on
             # c.commit.branch instead
             _branch_name, _sha_commit_id, is_head = c.commit.branch, '', True
         else:
             _branch_name, _sha_commit_id, is_head = \
-                self._is_valid_head(commit_id, self.rhodecode_vcs_repo)
+                self._is_valid_head(commit_id, self.rhodecode_vcs_repo,
+                                    landing_ref=self.db_repo.landing_ref_name)
 
         error = self.forbid_non_head(is_head, f_path, json_mode=True)
         if error:
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         error = self.check_branch_permission(_branch_name, json_mode=True)
         if error:
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         c.default_message = (_('Uploaded file via RhodeCode Enterprise'))
         c.f_path = f_path
 
         r_post = self.request.POST
 
         message = c.default_message
         user_message = r_post.getall('message')
         if isinstance(user_message, list) and user_message:
             # we take the first from duplicated results if it's not empty
             message = user_message[0] if user_message[0] else message
 
         nodes = {}
 
         for file_obj in r_post.getall('files_upload') or []:
             content = file_obj.file
             filename = file_obj.filename
 
             root_path = f_path
             pure_path = self.create_pure_path(root_path, filename)
             node_path = safe_unicode(bytes(pure_path).lstrip('/'))
 
             nodes[node_path] = {
                 'content': content
             }
 
         if not nodes:
             error = 'missing files'
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         author = self._rhodecode_db_user.full_contact
 
         try:
             commit = ScmModel().create_nodes(
                 user=self._rhodecode_db_user.user_id,
                 repo=self.db_repo,
                 message=message,
                 nodes=nodes,
                 parent_commit=c.commit,
                 author=author,
             )
             if len(nodes) == 1:
                 flash_message = _('Successfully committed {} new files').format(len(nodes))
             else:
                 flash_message = _('Successfully committed 1 new file')
 
             h.flash(flash_message, category='success')
 
             default_redirect_url = h.route_path(
                 'repo_commit', repo_name=self.db_repo_name, commit_id=commit.raw_id)
 
         except NonRelativePathError:
             log.exception('Non Relative path found')
             error = _('The location specified must be a relative path and must not '
                       'contain .. in the path')
             h.flash(error, category='warning')
 
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         except (NodeError, NodeAlreadyExistsError) as e:
             error = h.escape(e)
             h.flash(error, category='error')
 
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
         except Exception:
             log.exception('Error occurred during commit')
             error = _('Error occurred during commit')
             h.flash(error, category='error')
             return {
                 'error': error,
                 'redirect_url': default_redirect_url
             }
 
         return {
             'error': None,
             'redirect_url': default_redirect_url
         }

rhodecode/apps/repository/views/repo_permissions.py

@@ -1,140 +1,140 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
 
 from pyramid.httpexceptions import HTTPFound
 from pyramid.view import view_config
 
 from rhodecode.apps._base import RepoAppView
 from rhodecode.lib import helpers as h
 from rhodecode.lib import audit_logger
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
 from rhodecode.lib.utils2 import str2bool
 from rhodecode.model.db import User
 from rhodecode.model.forms import RepoPermsForm
 from rhodecode.model.meta import Session
 from rhodecode.model.permission import PermissionModel
 from rhodecode.model.repo import RepoModel
 
 log = logging.getLogger(__name__)
 
 
 class RepoSettingsPermissionsView(RepoAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context()
         return c
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @view_config(
         route_name='edit_repo_perms', request_method='GET',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
     def edit_permissions(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'permissions'
         if self.request.GET.get('branch_permissions'):
-            h.flash(_('Explicitly add user or user group with write+ '
+            h.flash(_('Explicitly add user or user group with write or higher '
                       'permission to modify their branch permissions.'),
                     category='notice')
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='edit_repo_perms', request_method='POST',
         renderer='rhodecode:templates/admin/repos/repo_edit.mako')
     def edit_permissions_update(self):
         _ = self.request.translate
         c = self.load_default_context()
         c.active = 'permissions'
         data = self.request.POST
         # store private flag outside of HTML to verify if we can modify
         # default user permissions, prevents submission of FAKE post data
         # into the form for private repos
         data['repo_private'] = self.db_repo.private
         form = RepoPermsForm(self.request.translate)().to_python(data)
         changes = RepoModel().update_permissions(
             self.db_repo_name, form['perm_additions'], form['perm_updates'],
             form['perm_deletions'])
 
         action_data = {
             'added': changes['added'],
             'updated': changes['updated'],
             'deleted': changes['deleted'],
         }
         audit_logger.store_web(
             'repo.edit.permissions', action_data=action_data,
             user=self._rhodecode_user, repo=self.db_repo)
 
         Session().commit()
         h.flash(_('Repository access permissions updated'), category='success')
 
         affected_user_ids = None
         if changes.get('default_user_changed', False):
             # if we change the default user, we need to flush everyone permissions
             affected_user_ids = User.get_all_user_ids()
         PermissionModel().flush_user_permission_caches(
             changes, affected_user_ids=affected_user_ids)
 
         raise HTTPFound(
             h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='edit_repo_perms_set_private', request_method='POST',
         renderer='json_ext')
     def edit_permissions_set_private_repo(self):
         _ = self.request.translate
         self.load_default_context()
 
         private_flag = str2bool(self.request.POST.get('private'))
 
         try:
             repo = RepoModel().get(self.db_repo.repo_id)
             repo.private = private_flag
             Session().add(repo)
             RepoModel().grant_user_permission(
                 repo=self.db_repo, user=User.DEFAULT_USER, perm='repository.none'
             )
 
             Session().commit()
 
             h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
                     category='success')
             # NOTE(dan): we change repo private mode we need to notify all USERS
             affected_user_ids = User.get_all_user_ids()
             PermissionModel().trigger_permission_flush(affected_user_ids)
 
         except Exception:
             log.exception("Exception during update of repository")
             h.flash(_('Error occurred during update of repository {}').format(
                 self.db_repo_name), category='error')
 
         return {
             'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
             'private': private_flag
         }

rhodecode/apps/repository/views/repo_pull_requests.py

@@ -1,1631 +1,1637 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import logging
 import collections
 
 import formencode
 import formencode.htmlfill
 import peppercorn
 from pyramid.httpexceptions import (
     HTTPFound, HTTPNotFound, HTTPForbidden, HTTPBadRequest, HTTPConflict)
 from pyramid.view import view_config
 from pyramid.renderers import render
 
 from rhodecode.apps._base import RepoAppView, DataGridAppView
 
 from rhodecode.lib import helpers as h, diffs, codeblocks, channelstream
 from rhodecode.lib.base import vcs_operation_context
 from rhodecode.lib.diffs import load_cached_diff, cache_diff, diff_cache_exist
 from rhodecode.lib.exceptions import CommentVersionMismatch
 from rhodecode.lib.ext_json import json
 from rhodecode.lib.auth import (
     LoginRequired, HasRepoPermissionAny, HasRepoPermissionAnyDecorator,
     NotAnonymous, CSRFRequired)
 from rhodecode.lib.utils2 import str2bool, safe_str, safe_unicode
 from rhodecode.lib.vcs.backends.base import EmptyCommit, UpdateFailureReason
 from rhodecode.lib.vcs.exceptions import (
     CommitDoesNotExistError, RepositoryRequirementError, EmptyRepositoryError)
 from rhodecode.model.changeset_status import ChangesetStatusModel
 from rhodecode.model.comment import CommentsModel
 from rhodecode.model.db import (
     func, or_, PullRequest, ChangesetComment, ChangesetStatus, Repository)
 from rhodecode.model.forms import PullRequestForm
 from rhodecode.model.meta import Session
 from rhodecode.model.pull_request import PullRequestModel, MergeCheck
 from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 
 class RepoPullRequestsView(RepoAppView, DataGridAppView):
 
     def load_default_context(self):
         c = self._get_local_tmpl_context(include_app_defaults=True)
         c.REVIEW_STATUS_APPROVED = ChangesetStatus.STATUS_APPROVED
         c.REVIEW_STATUS_REJECTED = ChangesetStatus.STATUS_REJECTED
         # backward compat., we use for OLD PRs a plain renderer
         c.renderer = 'plain'
         return c
 
     def _get_pull_requests_list(
             self, repo_name, source, filter_type, opened_by, statuses):
 
         draw, start, limit = self._extract_chunk(self.request)
         search_q, order_by, order_dir = self._extract_ordering(self.request)
         _render = self.request.get_partial_renderer(
             'rhodecode:templates/data_table/_dt_elements.mako')
 
         # pagination
 
         if filter_type == 'awaiting_review':
             pull_requests = PullRequestModel().get_awaiting_review(
                 repo_name, search_q=search_q, source=source, opened_by=opened_by,
                 statuses=statuses, offset=start, length=limit,
                 order_by=order_by, order_dir=order_dir)
             pull_requests_total_count = PullRequestModel().count_awaiting_review(
                 repo_name, search_q=search_q, source=source, statuses=statuses,
                 opened_by=opened_by)
         elif filter_type == 'awaiting_my_review':
             pull_requests = PullRequestModel().get_awaiting_my_review(
                 repo_name, search_q=search_q, source=source, opened_by=opened_by,
                 user_id=self._rhodecode_user.user_id, statuses=statuses,
                 offset=start, length=limit, order_by=order_by,
                 order_dir=order_dir)
             pull_requests_total_count = PullRequestModel().count_awaiting_my_review(
                 repo_name, search_q=search_q, source=source, user_id=self._rhodecode_user.user_id,
                 statuses=statuses, opened_by=opened_by)
         else:
             pull_requests = PullRequestModel().get_all(
                 repo_name, search_q=search_q, source=source, opened_by=opened_by,
                 statuses=statuses, offset=start, length=limit,
                 order_by=order_by, order_dir=order_dir)
             pull_requests_total_count = PullRequestModel().count_all(
                 repo_name, search_q=search_q, source=source, statuses=statuses,
                 opened_by=opened_by)
 
         data = []
         comments_model = CommentsModel()
         for pr in pull_requests:
             comments = comments_model.get_all_comments(
                 self.db_repo.repo_id, pull_request=pr)
 
             data.append({
                 'name': _render('pullrequest_name',
                                 pr.pull_request_id, pr.pull_request_state,
                                 pr.work_in_progress, pr.target_repo.repo_name),
                 'name_raw': pr.pull_request_id,
                 'status': _render('pullrequest_status',
                                   pr.calculated_review_status()),
                 'title': _render('pullrequest_title', pr.title, pr.description),
                 'description': h.escape(pr.description),
                 'updated_on': _render('pullrequest_updated_on',
                                       h.datetime_to_time(pr.updated_on)),
                 'updated_on_raw': h.datetime_to_time(pr.updated_on),
                 'created_on': _render('pullrequest_updated_on',
                                       h.datetime_to_time(pr.created_on)),
                 'created_on_raw': h.datetime_to_time(pr.created_on),
                 'state': pr.pull_request_state,
                 'author': _render('pullrequest_author',
                                   pr.author.full_contact, ),
                 'author_raw': pr.author.full_name,
                 'comments': _render('pullrequest_comments', len(comments)),
                 'comments_raw': len(comments),
                 'closed': pr.is_closed(),
             })
 
         data = ({
             'draw': draw,
             'data': data,
             'recordsTotal': pull_requests_total_count,
             'recordsFiltered': pull_requests_total_count,
         })
         return data
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_show_all', request_method='GET',
         renderer='rhodecode:templates/pullrequests/pullrequests.mako')
     def pull_request_list(self):
         c = self.load_default_context()
 
         req_get = self.request.GET
         c.source = str2bool(req_get.get('source'))
         c.closed = str2bool(req_get.get('closed'))
         c.my = str2bool(req_get.get('my'))
         c.awaiting_review = str2bool(req_get.get('awaiting_review'))
         c.awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
 
         c.active = 'open'
         if c.my:
             c.active = 'my'
         if c.closed:
             c.active = 'closed'
         if c.awaiting_review and not c.source:
             c.active = 'awaiting'
         if c.source and not c.awaiting_review:
             c.active = 'source'
         if c.awaiting_my_review:
             c.active = 'awaiting_my'
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_show_all_data', request_method='GET',
         renderer='json_ext', xhr=True)
     def pull_request_list_data(self):
         self.load_default_context()
 
         # additional filters
         req_get = self.request.GET
         source = str2bool(req_get.get('source'))
         closed = str2bool(req_get.get('closed'))
         my = str2bool(req_get.get('my'))
         awaiting_review = str2bool(req_get.get('awaiting_review'))
         awaiting_my_review = str2bool(req_get.get('awaiting_my_review'))
 
         filter_type = 'awaiting_review' if awaiting_review \
             else 'awaiting_my_review' if awaiting_my_review \
             else None
 
         opened_by = None
         if my:
             opened_by = [self._rhodecode_user.user_id]
 
         statuses = [PullRequest.STATUS_NEW, PullRequest.STATUS_OPEN]
         if closed:
             statuses = [PullRequest.STATUS_CLOSED]
 
         data = self._get_pull_requests_list(
             repo_name=self.db_repo_name, source=source,
             filter_type=filter_type, opened_by=opened_by, statuses=statuses)
 
         return data
 
     def _is_diff_cache_enabled(self, target_repo):
         caching_enabled = self._get_general_setting(
             target_repo, 'rhodecode_diff_cache')
         log.debug('Diff caching enabled: %s', caching_enabled)
         return caching_enabled
 
     def _get_diffset(self, source_repo_name, source_repo,
                      ancestor_commit,
                      source_ref_id, target_ref_id,
                      target_commit, source_commit, diff_limit, file_limit,
                      fulldiff, hide_whitespace_changes, diff_context, use_ancestor=True):
 
         if use_ancestor:
             # we might want to not use it for versions
             target_ref_id = ancestor_commit.raw_id
 
         vcs_diff = PullRequestModel().get_diff(
             source_repo, source_ref_id, target_ref_id,
             hide_whitespace_changes, diff_context)
 
         diff_processor = diffs.DiffProcessor(
             vcs_diff, format='newdiff', diff_limit=diff_limit,
             file_limit=file_limit, show_full_diff=fulldiff)
 
         _parsed = diff_processor.prepare()
 
         diffset = codeblocks.DiffSet(
             repo_name=self.db_repo_name,
             source_repo_name=source_repo_name,
             source_node_getter=codeblocks.diffset_node_getter(target_commit),
             target_node_getter=codeblocks.diffset_node_getter(source_commit),
         )
         diffset = self.path_filter.render_patchset_filtered(
             diffset, _parsed, target_commit.raw_id, source_commit.raw_id)
 
         return diffset
 
     def _get_range_diffset(self, source_scm, source_repo,
                            commit1, commit2, diff_limit, file_limit,
                            fulldiff, hide_whitespace_changes, diff_context):
         vcs_diff = source_scm.get_diff(
             commit1, commit2,
             ignore_whitespace=hide_whitespace_changes,
             context=diff_context)
 
         diff_processor = diffs.DiffProcessor(
             vcs_diff, format='newdiff', diff_limit=diff_limit,
             file_limit=file_limit, show_full_diff=fulldiff)
 
         _parsed = diff_processor.prepare()
 
         diffset = codeblocks.DiffSet(
             repo_name=source_repo.repo_name,
             source_node_getter=codeblocks.diffset_node_getter(commit1),
             target_node_getter=codeblocks.diffset_node_getter(commit2))
 
         diffset = self.path_filter.render_patchset_filtered(
             diffset, _parsed, commit1.raw_id, commit2.raw_id)
 
         return diffset
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_show', request_method='GET',
         renderer='rhodecode:templates/pullrequests/pullrequest_show.mako')
     def pull_request_show(self):
         _ = self.request.translate
         c = self.load_default_context()
 
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
         pull_request_id = pull_request.pull_request_id
 
         c.state_progressing = pull_request.is_state_changing()
 
         _new_state = {
             'created': PullRequest.STATE_CREATED,
         }.get(self.request.GET.get('force_state'))
 
         if c.is_super_admin and _new_state:
             with pull_request.set_state(PullRequest.STATE_UPDATING, final_state=_new_state):
                 h.flash(
                     _('Pull Request state was force changed to `{}`').format(_new_state),
                     category='success')
                 Session().commit()
 
             raise HTTPFound(h.route_path(
                 'pullrequest_show', repo_name=self.db_repo_name,
                 pull_request_id=pull_request_id))
 
         version = self.request.GET.get('version')
         from_version = self.request.GET.get('from_version') or version
         merge_checks = self.request.GET.get('merge_checks')
         c.fulldiff = str2bool(self.request.GET.get('fulldiff'))
 
         # fetch global flags of ignore ws or context lines
         diff_context = diffs.get_diff_context(self.request)
         hide_whitespace_changes = diffs.get_diff_whitespace_flag(self.request)
 
         force_refresh = str2bool(self.request.GET.get('force_refresh'))
 
         (pull_request_latest,
          pull_request_at_ver,
          pull_request_display_obj,
          at_version) = PullRequestModel().get_pr_version(
             pull_request_id, version=version)
         pr_closed = pull_request_latest.is_closed()
 
         if pr_closed and (version or from_version):
             # not allow to browse versions
             raise HTTPFound(h.route_path(
                 'pullrequest_show', repo_name=self.db_repo_name,
                 pull_request_id=pull_request_id))
 
         versions = pull_request_display_obj.versions()
         # used to store per-commit range diffs
         c.changes = collections.OrderedDict()
         c.range_diff_on = self.request.GET.get('range-diff') == "1"
 
         c.at_version = at_version
         c.at_version_num = (at_version
                             if at_version and at_version != 'latest'
                             else None)
         c.at_version_pos = ChangesetComment.get_index_from_version(
             c.at_version_num, versions)
 
         (prev_pull_request_latest,
          prev_pull_request_at_ver,
          prev_pull_request_display_obj,
          prev_at_version) = PullRequestModel().get_pr_version(
             pull_request_id, version=from_version)
 
         c.from_version = prev_at_version
         c.from_version_num = (prev_at_version
                               if prev_at_version and prev_at_version != 'latest'
                               else None)
         c.from_version_pos = ChangesetComment.get_index_from_version(
             c.from_version_num, versions)
 
         # define if we're in COMPARE mode or VIEW at version mode
         compare = at_version != prev_at_version
 
         # pull_requests repo_name we opened it against
         # ie. target_repo must match
         if self.db_repo_name != pull_request_at_ver.target_repo.repo_name:
             raise HTTPNotFound()
 
         c.shadow_clone_url = PullRequestModel().get_shadow_clone_url(
             pull_request_at_ver)
 
         c.pull_request = pull_request_display_obj
         c.renderer = pull_request_at_ver.description_renderer or c.renderer
         c.pull_request_latest = pull_request_latest
 
         if compare or (at_version and not at_version == 'latest'):
             c.allowed_to_change_status = False
             c.allowed_to_update = False
             c.allowed_to_merge = False
             c.allowed_to_delete = False
             c.allowed_to_comment = False
             c.allowed_to_close = False
         else:
             can_change_status = PullRequestModel().check_user_change_status(
                 pull_request_at_ver, self._rhodecode_user)
             c.allowed_to_change_status = can_change_status and not pr_closed
 
             c.allowed_to_update = PullRequestModel().check_user_update(
                 pull_request_latest, self._rhodecode_user) and not pr_closed
             c.allowed_to_merge = PullRequestModel().check_user_merge(
                 pull_request_latest, self._rhodecode_user) and not pr_closed
             c.allowed_to_delete = PullRequestModel().check_user_delete(
                 pull_request_latest, self._rhodecode_user) and not pr_closed
             c.allowed_to_comment = not pr_closed
             c.allowed_to_close = c.allowed_to_merge and not pr_closed
 
         c.forbid_adding_reviewers = False
         c.forbid_author_to_review = False
         c.forbid_commit_author_to_review = False
 
         if pull_request_latest.reviewer_data and \
                         'rules' in pull_request_latest.reviewer_data:
             rules = pull_request_latest.reviewer_data['rules'] or {}
             try:
                 c.forbid_adding_reviewers = rules.get(
                     'forbid_adding_reviewers')
                 c.forbid_author_to_review = rules.get(
                     'forbid_author_to_review')
                 c.forbid_commit_author_to_review = rules.get(
                     'forbid_commit_author_to_review')
             except Exception:
                 pass
 
         # check merge capabilities
         _merge_check = MergeCheck.validate(
             pull_request_latest, auth_user=self._rhodecode_user,
             translator=self.request.translate,
             force_shadow_repo_refresh=force_refresh)
 
         c.pr_merge_errors = _merge_check.error_details
         c.pr_merge_possible = not _merge_check.failed
         c.pr_merge_message = _merge_check.merge_msg
         c.pr_merge_source_commit = _merge_check.source_commit
         c.pr_merge_target_commit = _merge_check.target_commit
 
         c.pr_merge_info = MergeCheck.get_merge_conditions(
             pull_request_latest, translator=self.request.translate)
 
         c.pull_request_review_status = _merge_check.review_status
         if merge_checks:
             self.request.override_renderer = \
                 'rhodecode:templates/pullrequests/pullrequest_merge_checks.mako'
             return self._get_template_context(c)
 
         comments_model = CommentsModel()
 
         # reviewers and statuses
         c.pull_request_reviewers = pull_request_at_ver.reviewers_statuses()
         allowed_reviewers = [x[0].user_id for x in c.pull_request_reviewers]
 
         # GENERAL COMMENTS with versions #
         q = comments_model._all_general_comments_of_pull_request(pull_request_latest)
         q = q.order_by(ChangesetComment.comment_id.asc())
         general_comments = q
 
         # pick comments we want to render at current version
         c.comment_versions = comments_model.aggregate_comments(
             general_comments, versions, c.at_version_num)
         c.comments = c.comment_versions[c.at_version_num]['until']
 
         # INLINE COMMENTS with versions  #
         q = comments_model._all_inline_comments_of_pull_request(pull_request_latest)
         q = q.order_by(ChangesetComment.comment_id.asc())
         inline_comments = q
 
         c.inline_versions = comments_model.aggregate_comments(
             inline_comments, versions, c.at_version_num, inline=True)
 
         # TODOs
         c.unresolved_comments = CommentsModel() \
             .get_pull_request_unresolved_todos(pull_request)
         c.resolved_comments = CommentsModel() \
             .get_pull_request_resolved_todos(pull_request)
 
         # inject latest version
         latest_ver = PullRequest.get_pr_display_object(
             pull_request_latest, pull_request_latest)
 
         c.versions = versions + [latest_ver]
 
         # if we use version, then do not show later comments
         # than current version
         display_inline_comments = collections.defaultdict(
             lambda: collections.defaultdict(list))
         for co in inline_comments:
             if c.at_version_num:
                 # pick comments that are at least UPTO given version, so we
                 # don't render comments for higher version
                 should_render = co.pull_request_version_id and \
                                 co.pull_request_version_id <= c.at_version_num
             else:
                 # showing all, for 'latest'
                 should_render = True
 
             if should_render:
                 display_inline_comments[co.f_path][co.line_no].append(co)
 
         # load diff data into template context, if we use compare mode then
         # diff is calculated based on changes between versions of PR
 
         source_repo = pull_request_at_ver.source_repo
         source_ref_id = pull_request_at_ver.source_ref_parts.commit_id
 
         target_repo = pull_request_at_ver.target_repo
         target_ref_id = pull_request_at_ver.target_ref_parts.commit_id
 
         if compare:
             # in compare switch the diff base to latest commit from prev version
             target_ref_id = prev_pull_request_display_obj.revisions[0]
 
         # despite opening commits for bookmarks/branches/tags, we always
         # convert this to rev to prevent changes after bookmark or branch change
         c.source_ref_type = 'rev'
         c.source_ref = source_ref_id
 
         c.target_ref_type = 'rev'
         c.target_ref = target_ref_id
 
         c.source_repo = source_repo
         c.target_repo = target_repo
 
         c.commit_ranges = []
         source_commit = EmptyCommit()
         target_commit = EmptyCommit()
         c.missing_requirements = False
 
         source_scm = source_repo.scm_instance()
         target_scm = target_repo.scm_instance()
 
         shadow_scm = None
         try:
             shadow_scm = pull_request_latest.get_shadow_repo()
         except Exception:
             log.debug('Failed to get shadow repo', exc_info=True)
         # try first the existing source_repo, and then shadow
         # repo if we can obtain one
         commits_source_repo = source_scm
         if shadow_scm:
             commits_source_repo = shadow_scm
 
         c.commits_source_repo = commits_source_repo
         c.ancestor = None  # set it to None, to hide it from PR view
 
         # empty version means latest, so we keep this to prevent
         # double caching
         version_normalized = version or 'latest'
         from_version_normalized = from_version or 'latest'
 
         cache_path = self.rhodecode_vcs_repo.get_create_shadow_cache_pr_path(target_repo)
         cache_file_path = diff_cache_exist(
             cache_path, 'pull_request', pull_request_id, version_normalized,
             from_version_normalized, source_ref_id, target_ref_id,
             hide_whitespace_changes, diff_context, c.fulldiff)
 
         caching_enabled = self._is_diff_cache_enabled(c.target_repo)
         force_recache = self.get_recache_flag()
 
         cached_diff = None
         if caching_enabled:
             cached_diff = load_cached_diff(cache_file_path)
 
         has_proper_commit_cache = (
                 cached_diff and cached_diff.get('commits')
                 and len(cached_diff.get('commits', [])) == 5
                 and cached_diff.get('commits')[0]
                 and cached_diff.get('commits')[3])
 
         if not force_recache and not c.range_diff_on and has_proper_commit_cache:
             diff_commit_cache = \
                 (ancestor_commit, commit_cache, missing_requirements,
                  source_commit, target_commit) = cached_diff['commits']
         else:
             # NOTE(marcink): we reach potentially unreachable errors when a PR has
             # merge errors resulting in potentially hidden commits in the shadow repo.
             maybe_unreachable = _merge_check.MERGE_CHECK in _merge_check.error_details \
                                 and _merge_check.merge_response
             maybe_unreachable = maybe_unreachable \
                                 and _merge_check.merge_response.metadata.get('unresolved_files')
             log.debug("Using unreachable commits due to MERGE_CHECK in merge simulation")
             diff_commit_cache = \
                 (ancestor_commit, commit_cache, missing_requirements,
                  source_commit, target_commit) = self.get_commits(
                     commits_source_repo,
                     pull_request_at_ver,
                     source_commit,
                     source_ref_id,
                     source_scm,
                     target_commit,
                     target_ref_id,
                     target_scm,
                 maybe_unreachable=maybe_unreachable)
 
         # register our commit range
         for comm in commit_cache.values():
             c.commit_ranges.append(comm)
 
         c.missing_requirements = missing_requirements
         c.ancestor_commit = ancestor_commit
         c.statuses = source_repo.statuses(
             [x.raw_id for x in c.commit_ranges])
 
         # auto collapse if we have more than limit
         collapse_limit = diffs.DiffProcessor._collapse_commits_over
         c.collapse_all_commits = len(c.commit_ranges) > collapse_limit
         c.compare_mode = compare
 
         # diff_limit is the old behavior, will cut off the whole diff
         # if the limit is applied  otherwise will just hide the
         # big files from the front-end
         diff_limit = c.visual.cut_off_limit_diff
         file_limit = c.visual.cut_off_limit_file
 
         c.missing_commits = False
         if (c.missing_requirements
             or isinstance(source_commit, EmptyCommit)
             or source_commit == target_commit):
 
             c.missing_commits = True
         else:
             c.inline_comments = display_inline_comments
 
             use_ancestor = True
             if from_version_normalized != version_normalized:
                 use_ancestor = False
 
             has_proper_diff_cache = cached_diff and cached_diff.get('commits')
             if not force_recache and has_proper_diff_cache:
                 c.diffset = cached_diff['diff']
             else:
-                c.diffset = self._get_diffset(
-                    c.source_repo.repo_name, commits_source_repo,
-                    c.ancestor_commit,
-                    source_ref_id, target_ref_id,
-                    target_commit, source_commit,
-                    diff_limit, file_limit, c.fulldiff,
-                    hide_whitespace_changes, diff_context,
-                    use_ancestor=use_ancestor
-                )
-
-                # save cached diff
-                if caching_enabled:
-                    cache_diff(cache_file_path, c.diffset, diff_commit_cache)
-
-            c.limited_diff = c.diffset.limited_diff
-
-            # calculate removed files that are bound to comments
-            comment_deleted_files = [
-                fname for fname in display_inline_comments
-                if fname not in c.diffset.file_stats]
-
-            c.deleted_files_comments = collections.defaultdict(dict)
-            for fname, per_line_comments in display_inline_comments.items():
-                if fname in comment_deleted_files:
-                    c.deleted_files_comments[fname]['stats'] = 0
-                    c.deleted_files_comments[fname]['comments'] = list()
-                    for lno, comments in per_line_comments.items():
-                        c.deleted_files_comments[fname]['comments'].extend(comments)
-
-            # maybe calculate the range diff
-            if c.range_diff_on:
-                # TODO(marcink): set whitespace/context
-                context_lcl = 3
-                ign_whitespace_lcl = False
-
-                for commit in c.commit_ranges:
-                    commit2 = commit
-                    commit1 = commit.first_parent
-
-                    range_diff_cache_file_path = diff_cache_exist(
-                        cache_path, 'diff', commit.raw_id,
-                        ign_whitespace_lcl, context_lcl, c.fulldiff)
-
-                    cached_diff = None
-                    if caching_enabled:
-                        cached_diff = load_cached_diff(range_diff_cache_file_path)
-
-                    has_proper_diff_cache = cached_diff and cached_diff.get('diff')
-                    if not force_recache and has_proper_diff_cache:
-                        diffset = cached_diff['diff']
-                    else:
-                        diffset = self._get_range_diffset(
-                            commits_source_repo, source_repo,
-                            commit1, commit2, diff_limit, file_limit,
-                            c.fulldiff, ign_whitespace_lcl, context_lcl
-                        )
+                try:
+                    c.diffset = self._get_diffset(
+                        c.source_repo.repo_name, commits_source_repo,
+                        c.ancestor_commit,
+                        source_ref_id, target_ref_id,
+                        target_commit, source_commit,
+                        diff_limit, file_limit, c.fulldiff,
+                        hide_whitespace_changes, diff_context,
+                        use_ancestor=use_ancestor
+					)
 
                     # save cached diff
                     if caching_enabled:
-                        cache_diff(range_diff_cache_file_path, diffset, None)
+                        cache_diff(cache_file_path, c.diffset, diff_commit_cache)
+                except CommitDoesNotExistError:
+                    log.exception('Failed to generate diffset')
+                    c.missing_commits = True
+
+            if not c.missing_commits:
+
+                c.limited_diff = c.diffset.limited_diff
+
+                # calculate removed files that are bound to comments
+                comment_deleted_files = [
+                    fname for fname in display_inline_comments
+                    if fname not in c.diffset.file_stats]
+
+                c.deleted_files_comments = collections.defaultdict(dict)
+                for fname, per_line_comments in display_inline_comments.items():
+                    if fname in comment_deleted_files:
+                        c.deleted_files_comments[fname]['stats'] = 0
+                        c.deleted_files_comments[fname]['comments'] = list()
+                        for lno, comments in per_line_comments.items():
+                            c.deleted_files_comments[fname]['comments'].extend(comments)
+
+                # maybe calculate the range diff
+                if c.range_diff_on:
+                    # TODO(marcink): set whitespace/context
+                    context_lcl = 3
+                    ign_whitespace_lcl = False
 
-                    c.changes[commit.raw_id] = diffset
+                    for commit in c.commit_ranges:
+                        commit2 = commit
+                        commit1 = commit.first_parent
+
+                        range_diff_cache_file_path = diff_cache_exist(
+                            cache_path, 'diff', commit.raw_id,
+                            ign_whitespace_lcl, context_lcl, c.fulldiff)
+
+                        cached_diff = None
+                        if caching_enabled:
+                            cached_diff = load_cached_diff(range_diff_cache_file_path)
+
+                        has_proper_diff_cache = cached_diff and cached_diff.get('diff')
+                        if not force_recache and has_proper_diff_cache:
+                            diffset = cached_diff['diff']
+                        else:
+                            diffset = self._get_range_diffset(
+                                commits_source_repo, source_repo,
+                                commit1, commit2, diff_limit, file_limit,
+                                c.fulldiff, ign_whitespace_lcl, context_lcl
+                            )
+
+                        # save cached diff
+                        if caching_enabled:
+                            cache_diff(range_diff_cache_file_path, diffset, None)
+
+                        c.changes[commit.raw_id] = diffset
 
         # this is a hack to properly display links, when creating PR, the
         # compare view and others uses different notation, and
         # compare_commits.mako renders links based on the target_repo.
         # We need to swap that here to generate it properly on the html side
         c.target_repo = c.source_repo
 
         c.commit_statuses = ChangesetStatus.STATUSES
 
         c.show_version_changes = not pr_closed
         if c.show_version_changes:
             cur_obj = pull_request_at_ver
             prev_obj = prev_pull_request_at_ver
 
             old_commit_ids = prev_obj.revisions
             new_commit_ids = cur_obj.revisions
             commit_changes = PullRequestModel()._calculate_commit_id_changes(
                 old_commit_ids, new_commit_ids)
             c.commit_changes_summary = commit_changes
 
             # calculate the diff for commits between versions
             c.commit_changes = []
 
             def mark(cs, fw):
                 return list(h.itertools.izip_longest([], cs, fillvalue=fw))
 
             for c_type, raw_id in mark(commit_changes.added, 'a') \
                                 + mark(commit_changes.removed, 'r') \
                                 + mark(commit_changes.common, 'c'):
 
                 if raw_id in commit_cache:
                     commit = commit_cache[raw_id]
                 else:
                     try:
                         commit = commits_source_repo.get_commit(raw_id)
                     except CommitDoesNotExistError:
                         # in case we fail extracting still use "dummy" commit
                         # for display in commit diff
                         commit = h.AttributeDict(
                             {'raw_id': raw_id,
                              'message': 'EMPTY or MISSING COMMIT'})
                 c.commit_changes.append([c_type, commit])
 
             # current user review statuses for each version
             c.review_versions = {}
             if self._rhodecode_user.user_id in allowed_reviewers:
                 for co in general_comments:
                     if co.author.user_id == self._rhodecode_user.user_id:
                         status = co.status_change
                         if status:
                             _ver_pr = status[0].comment.pull_request_version_id
                             c.review_versions[_ver_pr] = status[0]
 
         return self._get_template_context(c)
 
     def get_commits(
             self, commits_source_repo, pull_request_at_ver, source_commit,
             source_ref_id, source_scm, target_commit, target_ref_id, target_scm,
             maybe_unreachable=False):
 
         commit_cache = collections.OrderedDict()
         missing_requirements = False
 
         try:
             pre_load = ["author", "date", "message", "branch", "parents"]
 
             pull_request_commits = pull_request_at_ver.revisions
             log.debug('Loading %s commits from %s',
                       len(pull_request_commits), commits_source_repo)
 
             for rev in pull_request_commits:
                 comm = commits_source_repo.get_commit(commit_id=rev, pre_load=pre_load,
                                                       maybe_unreachable=maybe_unreachable)
                 commit_cache[comm.raw_id] = comm
 
             # Order here matters, we first need to get target, and then
             # the source
             target_commit = commits_source_repo.get_commit(
                 commit_id=safe_str(target_ref_id))
 
             source_commit = commits_source_repo.get_commit(
                 commit_id=safe_str(source_ref_id), maybe_unreachable=True)
         except CommitDoesNotExistError:
             log.warning('Failed to get commit from `{}` repo'.format(
                 commits_source_repo), exc_info=True)
         except RepositoryRequirementError:
             log.warning('Failed to get all required data from repo', exc_info=True)
             missing_requirements = True
 
         pr_ancestor_id = pull_request_at_ver.common_ancestor_id
 
         try:
             ancestor_commit = source_scm.get_commit(pr_ancestor_id)
         except Exception:
             ancestor_commit = None
 
         return ancestor_commit, commit_cache, missing_requirements, source_commit, target_commit
 
     def assure_not_empty_repo(self):
         _ = self.request.translate
 
         try:
             self.db_repo.scm_instance().get_commit()
         except EmptyRepositoryError:
             h.flash(h.literal(_('There are no commits yet')),
                     category='warning')
             raise HTTPFound(
                 h.route_path('repo_summary', repo_name=self.db_repo.repo_name))
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_new', request_method='GET',
         renderer='rhodecode:templates/pullrequests/pullrequest.mako')
     def pull_request_new(self):
         _ = self.request.translate
         c = self.load_default_context()
 
         self.assure_not_empty_repo()
         source_repo = self.db_repo
 
         commit_id = self.request.GET.get('commit')
         branch_ref = self.request.GET.get('branch')
         bookmark_ref = self.request.GET.get('bookmark')
 
         try:
             source_repo_data = PullRequestModel().generate_repo_data(
                 source_repo, commit_id=commit_id,
                 branch=branch_ref, bookmark=bookmark_ref,
                 translator=self.request.translate)
         except CommitDoesNotExistError as e:
             log.exception(e)
             h.flash(_('Commit does not exist'), 'error')
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=source_repo.repo_name))
 
         default_target_repo = source_repo
 
         if source_repo.parent and c.has_origin_repo_read_perm:
             parent_vcs_obj = source_repo.parent.scm_instance()
             if parent_vcs_obj and not parent_vcs_obj.is_empty():
                 # change default if we have a parent repo
                 default_target_repo = source_repo.parent
 
         target_repo_data = PullRequestModel().generate_repo_data(
             default_target_repo, translator=self.request.translate)
 
         selected_source_ref = source_repo_data['refs']['selected_ref']
         title_source_ref = ''
         if selected_source_ref:
             title_source_ref = selected_source_ref.split(':', 2)[1]
         c.default_title = PullRequestModel().generate_pullrequest_title(
             source=source_repo.repo_name,
             source_ref=title_source_ref,
             target=default_target_repo.repo_name
         )
 
         c.default_repo_data = {
             'source_repo_name': source_repo.repo_name,
             'source_refs_json': json.dumps(source_repo_data),
             'target_repo_name': default_target_repo.repo_name,
             'target_refs_json': json.dumps(target_repo_data),
         }
         c.default_source_ref = selected_source_ref
 
         return self._get_template_context(c)
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_repo_refs', request_method='GET',
         renderer='json_ext', xhr=True)
     def pull_request_repo_refs(self):
         self.load_default_context()
         target_repo_name = self.request.matchdict['target_repo_name']
         repo = Repository.get_by_repo_name(target_repo_name)
         if not repo:
             raise HTTPNotFound()
 
         target_perm = HasRepoPermissionAny(
             'repository.read', 'repository.write', 'repository.admin')(
             target_repo_name)
         if not target_perm:
             raise HTTPNotFound()
 
         return PullRequestModel().generate_repo_data(
             repo, translator=self.request.translate)
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @view_config(
         route_name='pullrequest_repo_targets', request_method='GET',
         renderer='json_ext', xhr=True)
     def pullrequest_repo_targets(self):
         _ = self.request.translate
         filter_query = self.request.GET.get('query')
 
         # get the parents
         parent_target_repos = []
         if self.db_repo.parent:
             parents_query = Repository.query() \
                 .order_by(func.length(Repository.repo_name)) \
                 .filter(Repository.fork_id == self.db_repo.parent.repo_id)
 
             if filter_query:
                 ilike_expression = u'%{}%'.format(safe_unicode(filter_query))
                 parents_query = parents_query.filter(
                     Repository.repo_name.ilike(ilike_expression))
             parents = parents_query.limit(20).all()
 
             for parent in parents:
                 parent_vcs_obj = parent.scm_instance()
                 if parent_vcs_obj and not parent_vcs_obj.is_empty():
                     parent_target_repos.append(parent)
 
         # get other forks, and repo itself
         query = Repository.query() \
             .order_by(func.length(Repository.repo_name)) \
             .filter(
                 or_(Repository.repo_id == self.db_repo.repo_id,  # repo itself
                     Repository.fork_id == self.db_repo.repo_id)  # forks of this repo
             )  \
             .filter(~Repository.repo_id.in_([x.repo_id for x in parent_target_repos]))
 
         if filter_query:
             ilike_expression = u'%{}%'.format(safe_unicode(filter_query))
             query = query.filter(Repository.repo_name.ilike(ilike_expression))
 
         limit = max(20 - len(parent_target_repos), 5)  # not less then 5
         target_repos = query.limit(limit).all()
 
         all_target_repos = target_repos + parent_target_repos
 
         repos = []
         # This checks permissions to the repositories
         for obj in ScmModel().get_repos(all_target_repos):
             repos.append({
                 'id': obj['name'],
                 'text': obj['name'],
                 'type': 'repo',
                 'repo_id': obj['dbrepo']['repo_id'],
                 'repo_type': obj['dbrepo']['repo_type'],
                 'private': obj['dbrepo']['private'],
 
             })
 
         data = {
             'more': False,
             'results': [{
                 'text': _('Repositories'),
                 'children': repos
             }] if repos else []
         }
         return data
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_create', request_method='POST',
         renderer=None)
     def pull_request_create(self):
         _ = self.request.translate
         self.assure_not_empty_repo()
         self.load_default_context()
 
         controls = peppercorn.parse(self.request.POST.items())
 
         try:
             form = PullRequestForm(
                 self.request.translate, self.db_repo.repo_id)()
             _form = form.to_python(controls)
         except formencode.Invalid as errors:
             if errors.error_dict.get('revisions'):
                 msg = 'Revisions: %s' % errors.error_dict['revisions']
             elif errors.error_dict.get('pullrequest_title'):
                 msg = errors.error_dict.get('pullrequest_title')
             else:
                 msg = _('Error creating pull request: {}').format(errors)
             log.exception(msg)
             h.flash(msg, 'error')
 
             # would rather just go back to form ...
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=self.db_repo_name))
 
         source_repo = _form['source_repo']
         source_ref = _form['source_ref']
         target_repo = _form['target_repo']
         target_ref = _form['target_ref']
         commit_ids = _form['revisions'][::-1]
         common_ancestor_id = _form['common_ancestor']
 
         # find the ancestor for this pr
         source_db_repo = Repository.get_by_repo_name(_form['source_repo'])
         target_db_repo = Repository.get_by_repo_name(_form['target_repo'])
 
         if not (source_db_repo or target_db_repo):
             h.flash(_('source_repo or target repo not found'), category='error')
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=self.db_repo_name))
 
         # re-check permissions again here
         # source_repo we must have read permissions
 
         source_perm = HasRepoPermissionAny(
             'repository.read', 'repository.write', 'repository.admin')(
             source_db_repo.repo_name)
         if not source_perm:
             msg = _('Not Enough permissions to source repo `{}`.'.format(
                 source_db_repo.repo_name))
             h.flash(msg, category='error')
             # copy the args back to redirect
             org_query = self.request.GET.mixed()
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=self.db_repo_name,
                              _query=org_query))
 
         # target repo we must have read permissions, and also later on
         # we want to check branch permissions here
         target_perm = HasRepoPermissionAny(
             'repository.read', 'repository.write', 'repository.admin')(
             target_db_repo.repo_name)
         if not target_perm:
             msg = _('Not Enough permissions to target repo `{}`.'.format(
                 target_db_repo.repo_name))
             h.flash(msg, category='error')
             # copy the args back to redirect
             org_query = self.request.GET.mixed()
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=self.db_repo_name,
                              _query=org_query))
 
         source_scm = source_db_repo.scm_instance()
         target_scm = target_db_repo.scm_instance()
 
         source_commit = source_scm.get_commit(source_ref.split(':')[-1])
         target_commit = target_scm.get_commit(target_ref.split(':')[-1])
 
         ancestor = source_scm.get_common_ancestor(
             source_commit.raw_id, target_commit.raw_id, target_scm)
 
         # recalculate target ref based on ancestor
         target_ref_type, target_ref_name, __ = _form['target_ref'].split(':')
         target_ref = ':'.join((target_ref_type, target_ref_name, ancestor))
 
         get_default_reviewers_data, validate_default_reviewers = \
             PullRequestModel().get_reviewer_functions()
 
         # recalculate reviewers logic, to make sure we can validate this
         reviewer_rules = get_default_reviewers_data(
             self._rhodecode_db_user, source_db_repo,
             source_commit, target_db_repo, target_commit)
 
         given_reviewers = _form['review_members']
         reviewers = validate_default_reviewers(
             given_reviewers, reviewer_rules)
 
         pullrequest_title = _form['pullrequest_title']
         title_source_ref = source_ref.split(':', 2)[1]
         if not pullrequest_title:
             pullrequest_title = PullRequestModel().generate_pullrequest_title(
                 source=source_repo,
                 source_ref=title_source_ref,
                 target=target_repo
             )
 
         description = _form['pullrequest_desc']
         description_renderer = _form['description_renderer']
 
         try:
             pull_request = PullRequestModel().create(
                 created_by=self._rhodecode_user.user_id,
                 source_repo=source_repo,
                 source_ref=source_ref,
                 target_repo=target_repo,
                 target_ref=target_ref,
                 revisions=commit_ids,
                 common_ancestor_id=common_ancestor_id,
                 reviewers=reviewers,
                 title=pullrequest_title,
                 description=description,
                 description_renderer=description_renderer,
                 reviewer_data=reviewer_rules,
                 auth_user=self._rhodecode_user
             )
             Session().commit()
 
             h.flash(_('Successfully opened new pull request'),
                     category='success')
         except Exception:
             msg = _('Error occurred during creation of this pull request.')
             log.exception(msg)
             h.flash(msg, category='error')
 
             # copy the args back to redirect
             org_query = self.request.GET.mixed()
             raise HTTPFound(
                 h.route_path('pullrequest_new', repo_name=self.db_repo_name,
                              _query=org_query))
 
         raise HTTPFound(
             h.route_path('pullrequest_show', repo_name=target_repo,
                          pull_request_id=pull_request.pull_request_id))
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_update', request_method='POST',
         renderer='json_ext')
     def pull_request_update(self):
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
         _ = self.request.translate
 
         self.load_default_context()
         redirect_url = None
 
         if pull_request.is_closed():
             log.debug('update: forbidden because pull request is closed')
             msg = _(u'Cannot update closed pull requests.')
             h.flash(msg, category='error')
             return {'response': True,
                     'redirect_url': redirect_url}
 
         is_state_changing = pull_request.is_state_changing()
 
         # only owner or admin can update it
         allowed_to_update = PullRequestModel().check_user_update(
             pull_request, self._rhodecode_user)
         if allowed_to_update:
             controls = peppercorn.parse(self.request.POST.items())
             force_refresh = str2bool(self.request.POST.get('force_refresh'))
 
             if 'review_members' in controls:
                 self._update_reviewers(
                     pull_request, controls['review_members'],
                     pull_request.reviewer_data)
             elif str2bool(self.request.POST.get('update_commits', 'false')):
                 if is_state_changing:
                     log.debug('commits update: forbidden because pull request is in state %s',
                               pull_request.pull_request_state)
                     msg = _(u'Cannot update pull requests commits in state other than `{}`. '
                             u'Current state is: `{}`').format(
                         PullRequest.STATE_CREATED, pull_request.pull_request_state)
                     h.flash(msg, category='error')
                     return {'response': True,
                             'redirect_url': redirect_url}
 
                 self._update_commits(pull_request)
                 if force_refresh:
                     redirect_url = h.route_path(
                         'pullrequest_show', repo_name=self.db_repo_name,
                         pull_request_id=pull_request.pull_request_id,
                         _query={"force_refresh": 1})
             elif str2bool(self.request.POST.get('edit_pull_request', 'false')):
                 self._edit_pull_request(pull_request)
             else:
                 raise HTTPBadRequest()
 
             return {'response': True,
                     'redirect_url': redirect_url}
         raise HTTPForbidden()
 
     def _edit_pull_request(self, pull_request):
         _ = self.request.translate
 
         try:
             PullRequestModel().edit(
                 pull_request,
                 self.request.POST.get('title'),
                 self.request.POST.get('description'),
                 self.request.POST.get('description_renderer'),
                 self._rhodecode_user)
         except ValueError:
             msg = _(u'Cannot update closed pull requests.')
             h.flash(msg, category='error')
             return
         else:
             Session().commit()
 
         msg = _(u'Pull request title & description updated.')
         h.flash(msg, category='success')
         return
 
     def _update_commits(self, pull_request):
         _ = self.request.translate
 
         with pull_request.set_state(PullRequest.STATE_UPDATING):
             resp = PullRequestModel().update_commits(
                 pull_request, self._rhodecode_db_user)
 
         if resp.executed:
 
             if resp.target_changed and resp.source_changed:
                 changed = 'target and source repositories'
             elif resp.target_changed and not resp.source_changed:
                 changed = 'target repository'
             elif not resp.target_changed and resp.source_changed:
                 changed = 'source repository'
             else:
                 changed = 'nothing'
 
             msg = _(u'Pull request updated to "{source_commit_id}" with '
                     u'{count_added} added, {count_removed} removed commits. '
                     u'Source of changes: {change_source}')
             msg = msg.format(
                 source_commit_id=pull_request.source_ref_parts.commit_id,
                 count_added=len(resp.changes.added),
                 count_removed=len(resp.changes.removed),
                 change_source=changed)
             h.flash(msg, category='success')
 
             channel = '/repo${}$/pr/{}'.format(
                 pull_request.target_repo.repo_name, pull_request.pull_request_id)
             message = msg + (
                 ' - <a onclick="window.location.reload()">'
                 '<strong>{}</strong></a>'.format(_('Reload page')))
             channelstream.post_message(
                 channel, message, self._rhodecode_user.username,
                 registry=self.request.registry)
         else:
             msg = PullRequestModel.UPDATE_STATUS_MESSAGES[resp.reason]
             warning_reasons = [
                 UpdateFailureReason.NO_CHANGE,
                 UpdateFailureReason.WRONG_REF_TYPE,
             ]
             category = 'warning' if resp.reason in warning_reasons else 'error'
             h.flash(msg, category=category)
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_merge', request_method='POST',
         renderer='json_ext')
     def pull_request_merge(self):
         """
         Merge will perform a server-side merge of the specified
         pull request, if the pull request is approved and mergeable.
         After successful merging, the pull request is automatically
         closed, with a relevant comment.
         """
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
         _ = self.request.translate
 
         if pull_request.is_state_changing():
             log.debug('show: forbidden because pull request is in state %s',
                       pull_request.pull_request_state)
             msg = _(u'Cannot merge pull requests in state other than `{}`. '
                     u'Current state is: `{}`').format(PullRequest.STATE_CREATED,
                                                       pull_request.pull_request_state)
             h.flash(msg, category='error')
             raise HTTPFound(
                 h.route_path('pullrequest_show',
                              repo_name=pull_request.target_repo.repo_name,
                              pull_request_id=pull_request.pull_request_id))
 
         self.load_default_context()
 
         with pull_request.set_state(PullRequest.STATE_UPDATING):
             check = MergeCheck.validate(
                 pull_request, auth_user=self._rhodecode_user,
                 translator=self.request.translate)
         merge_possible = not check.failed
 
         for err_type, error_msg in check.errors:
             h.flash(error_msg, category=err_type)
 
         if merge_possible:
             log.debug("Pre-conditions checked, trying to merge.")
             extras = vcs_operation_context(
                 self.request.environ, repo_name=pull_request.target_repo.repo_name,
                 username=self._rhodecode_db_user.username, action='push',
                 scm=pull_request.target_repo.repo_type)
             with pull_request.set_state(PullRequest.STATE_UPDATING):
                 self._merge_pull_request(
                     pull_request, self._rhodecode_db_user, extras)
         else:
             log.debug("Pre-conditions failed, NOT merging.")
 
         raise HTTPFound(
             h.route_path('pullrequest_show',
                          repo_name=pull_request.target_repo.repo_name,
                          pull_request_id=pull_request.pull_request_id))
 
     def _merge_pull_request(self, pull_request, user, extras):
         _ = self.request.translate
         merge_resp = PullRequestModel().merge_repo(pull_request, user, extras=extras)
 
         if merge_resp.executed:
             log.debug("The merge was successful, closing the pull request.")
             PullRequestModel().close_pull_request(
                 pull_request.pull_request_id, user)
             Session().commit()
             msg = _('Pull request was successfully merged and closed.')
             h.flash(msg, category='success')
         else:
             log.debug(
                 "The merge was not successful. Merge response: %s", merge_resp)
             msg = merge_resp.merge_status_message
             h.flash(msg, category='error')
 
     def _update_reviewers(self, pull_request, review_members, reviewer_rules):
         _ = self.request.translate
 
         get_default_reviewers_data, validate_default_reviewers = \
             PullRequestModel().get_reviewer_functions()
 
         try:
             reviewers = validate_default_reviewers(review_members, reviewer_rules)
         except ValueError as e:
             log.error('Reviewers Validation: {}'.format(e))
             h.flash(e, category='error')
             return
 
         old_calculated_status = pull_request.calculated_review_status()
         PullRequestModel().update_reviewers(
             pull_request, reviewers, self._rhodecode_user)
         h.flash(_('Pull request reviewers updated.'), category='success')
         Session().commit()
 
         # trigger status changed if change in reviewers changes the status
         calculated_status = pull_request.calculated_review_status()
         if old_calculated_status != calculated_status:
             PullRequestModel().trigger_pull_request_hook(
                 pull_request, self._rhodecode_user, 'review_status_change',
                 data={'status': calculated_status})
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_delete', request_method='POST',
         renderer='json_ext')
     def pull_request_delete(self):
         _ = self.request.translate
 
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
         self.load_default_context()
 
         pr_closed = pull_request.is_closed()
         allowed_to_delete = PullRequestModel().check_user_delete(
             pull_request, self._rhodecode_user) and not pr_closed
 
         # only owner can delete it !
         if allowed_to_delete:
             PullRequestModel().delete(pull_request, self._rhodecode_user)
             Session().commit()
             h.flash(_('Successfully deleted pull request'),
                     category='success')
             raise HTTPFound(h.route_path('pullrequest_show_all',
                                          repo_name=self.db_repo_name))
 
         log.warning('user %s tried to delete pull request without access',
                     self._rhodecode_user)
         raise HTTPNotFound()
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_comment_create', request_method='POST',
         renderer='json_ext')
     def pull_request_comment_create(self):
         _ = self.request.translate
 
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
         pull_request_id = pull_request.pull_request_id
 
         if pull_request.is_closed():
             log.debug('comment: forbidden because pull request is closed')
             raise HTTPForbidden()
 
         allowed_to_comment = PullRequestModel().check_user_comment(
             pull_request, self._rhodecode_user)
         if not allowed_to_comment:
             log.debug(
                 'comment: forbidden because pull request is from forbidden repo')
             raise HTTPForbidden()
 
         c = self.load_default_context()
 
         status = self.request.POST.get('changeset_status', None)
         text = self.request.POST.get('text')
         comment_type = self.request.POST.get('comment_type')
         resolves_comment_id = self.request.POST.get('resolves_comment_id', None)
         close_pull_request = self.request.POST.get('close_pull_request')
 
         # the logic here should work like following, if we submit close
         # pr comment, use `close_pull_request_with_comment` function
         # else handle regular comment logic
 
         if close_pull_request:
             # only owner or admin or person with write permissions
             allowed_to_close = PullRequestModel().check_user_update(
                 pull_request, self._rhodecode_user)
             if not allowed_to_close:
                 log.debug('comment: forbidden because not allowed to close '
                           'pull request %s', pull_request_id)
                 raise HTTPForbidden()
 
             # This also triggers `review_status_change`
             comment, status = PullRequestModel().close_pull_request_with_comment(
                 pull_request, self._rhodecode_user, self.db_repo, message=text,
                 auth_user=self._rhodecode_user)
             Session().flush()
 
             PullRequestModel().trigger_pull_request_hook(
                 pull_request, self._rhodecode_user, 'comment',
                 data={'comment': comment})
 
         else:
             # regular comment case, could be inline, or one with status.
             # for that one we check also permissions
 
             allowed_to_change_status = PullRequestModel().check_user_change_status(
                 pull_request, self._rhodecode_user)
 
             if status and allowed_to_change_status:
                 message = (_('Status change %(transition_icon)s %(status)s')
                            % {'transition_icon': '>',
                               'status': ChangesetStatus.get_status_lbl(status)})
                 text = text or message
 
             comment = CommentsModel().create(
                 text=text,
                 repo=self.db_repo.repo_id,
                 user=self._rhodecode_user.user_id,
                 pull_request=pull_request,
                 f_path=self.request.POST.get('f_path'),
                 line_no=self.request.POST.get('line'),
                 status_change=(ChangesetStatus.get_status_lbl(status)
                                if status and allowed_to_change_status else None),
                 status_change_type=(status
                                     if status and allowed_to_change_status else None),
                 comment_type=comment_type,
                 resolves_comment_id=resolves_comment_id,
                 auth_user=self._rhodecode_user
             )
 
             if allowed_to_change_status:
                 # calculate old status before we change it
                 old_calculated_status = pull_request.calculated_review_status()
 
                 # get status if set !
                 if status:
                     ChangesetStatusModel().set_status(
                         self.db_repo.repo_id,
                         status,
                         self._rhodecode_user.user_id,
                         comment,
                         pull_request=pull_request
                     )
 
                 Session().flush()
                 # this is somehow required to get access to some relationship
                 # loaded on comment
                 Session().refresh(comment)
 
                 PullRequestModel().trigger_pull_request_hook(
                     pull_request, self._rhodecode_user, 'comment',
                     data={'comment': comment})
 
                 # we now calculate the status of pull request, and based on that
                 # calculation we set the commits status
                 calculated_status = pull_request.calculated_review_status()
                 if old_calculated_status != calculated_status:
                     PullRequestModel().trigger_pull_request_hook(
                         pull_request, self._rhodecode_user, 'review_status_change',
                         data={'status': calculated_status})
 
         Session().commit()
 
         data = {
             'target_id': h.safeid(h.safe_unicode(
                 self.request.POST.get('f_path'))),
         }
         if comment:
             c.co = comment
             rendered_comment = render(
                 'rhodecode:templates/changeset/changeset_comment_block.mako',
                 self._get_template_context(c), self.request)
 
             data.update(comment.get_dict())
             data.update({'rendered_text': rendered_comment})
 
         return data
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_comment_delete', request_method='POST',
         renderer='json_ext')
     def pull_request_comment_delete(self):
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id'])
 
         comment = ChangesetComment.get_or_404(
             self.request.matchdict['comment_id'])
         comment_id = comment.comment_id
 
         if comment.immutable:
             # don't allow deleting comments that are immutable
             raise HTTPForbidden()
 
         if pull_request.is_closed():
             log.debug('comment: forbidden because pull request is closed')
             raise HTTPForbidden()
 
         if not comment:
             log.debug('Comment with id:%s not found, skipping', comment_id)
             # comment already deleted in another call probably
             return True
 
         if comment.pull_request.is_closed():
             # don't allow deleting comments on closed pull request
             raise HTTPForbidden()
 
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(self.db_repo_name)
         super_admin = h.HasPermissionAny('hg.admin')()
         comment_owner = comment.author.user_id == self._rhodecode_user.user_id
         is_repo_comment = comment.repo.repo_name == self.db_repo_name
         comment_repo_admin = is_repo_admin and is_repo_comment
 
         if super_admin or comment_owner or comment_repo_admin:
             old_calculated_status = comment.pull_request.calculated_review_status()
             CommentsModel().delete(comment=comment, auth_user=self._rhodecode_user)
             Session().commit()
             calculated_status = comment.pull_request.calculated_review_status()
             if old_calculated_status != calculated_status:
                 PullRequestModel().trigger_pull_request_hook(
                     comment.pull_request, self._rhodecode_user, 'review_status_change',
                     data={'status': calculated_status})
             return True
         else:
             log.warning('No permissions for user %s to delete comment_id: %s',
                         self._rhodecode_db_user, comment_id)
             raise HTTPNotFound()
 
     @LoginRequired()
     @NotAnonymous()
     @HasRepoPermissionAnyDecorator(
         'repository.read', 'repository.write', 'repository.admin')
     @CSRFRequired()
     @view_config(
         route_name='pullrequest_comment_edit', request_method='POST',
         renderer='json_ext')
     def pull_request_comment_edit(self):
         self.load_default_context()
 
         pull_request = PullRequest.get_or_404(
             self.request.matchdict['pull_request_id']
         )
         comment = ChangesetComment.get_or_404(
             self.request.matchdict['comment_id']
         )
         comment_id = comment.comment_id
 
         if comment.immutable:
             # don't allow deleting comments that are immutable
             raise HTTPForbidden()
 
         if pull_request.is_closed():
             log.debug('comment: forbidden because pull request is closed')
             raise HTTPForbidden()
 
         if not comment:
             log.debug('Comment with id:%s not found, skipping', comment_id)
             # comment already deleted in another call probably
             return True
 
         if comment.pull_request.is_closed():
             # don't allow deleting comments on closed pull request
             raise HTTPForbidden()
 
         is_repo_admin = h.HasRepoPermissionAny('repository.admin')(self.db_repo_name)
         super_admin = h.HasPermissionAny('hg.admin')()
         comment_owner = comment.author.user_id == self._rhodecode_user.user_id
         is_repo_comment = comment.repo.repo_name == self.db_repo_name
         comment_repo_admin = is_repo_admin and is_repo_comment
 
         if super_admin or comment_owner or comment_repo_admin:
             text = self.request.POST.get('text')
             version = self.request.POST.get('version')
             if text == comment.text:
                 log.warning(
                     'Comment(PR): '
                     'Trying to create new version '
                     'with the same comment body {}'.format(
                         comment_id,
                     )
                 )
                 raise HTTPNotFound()
 
             if version.isdigit():
                 version = int(version)
             else:
                 log.warning(
                     'Comment(PR): Wrong version type {} {} '
                     'for comment {}'.format(
                         version,
                         type(version),
                         comment_id,
                     )
                 )
                 raise HTTPNotFound()
 
             try:
                 comment_history = CommentsModel().edit(
                     comment_id=comment_id,
                     text=text,
                     auth_user=self._rhodecode_user,
                     version=version,
                 )
             except CommentVersionMismatch:
                 raise HTTPConflict()
 
             if not comment_history:
                 raise HTTPNotFound()
 
             Session().commit()
 
             PullRequestModel().trigger_pull_request_hook(
                 pull_request, self._rhodecode_user, 'comment_edit',
                 data={'comment': comment})
 
             return {
                 'comment_history_id': comment_history.comment_history_id,
                 'comment_id': comment.comment_id,
                 'comment_version': comment_history.version,
                 'comment_author_username': comment_history.author.username,
                 'comment_author_gravatar': h.gravatar_url(comment_history.author.email, 16),
                 'comment_created_on': h.age_component(comment_history.created_on,
                                                       time_is_local=True),
             }
         else:
             log.warning('No permissions for user %s to edit comment_id: %s',
                         self._rhodecode_db_user, comment_id)
             raise HTTPNotFound()

rhodecode/apps/ssh_support/lib/backends/base.py

@@ -1,162 +1,162 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2016-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 import os
 import sys
 import json
 import logging
 
 from rhodecode.lib.hooks_daemon import prepare_callback_daemon
 from rhodecode.lib.vcs.conf import settings as vcs_settings
 from rhodecode.model.scm import ScmModel
 
 log = logging.getLogger(__name__)
 
 
 class VcsServer(object):
     _path = None  # set executable path for hg/git/svn binary
     backend = None  # set in child classes
     tunnel = None  # subprocess handling tunnel
     write_perms = ['repository.admin', 'repository.write']
     read_perms = ['repository.read', 'repository.admin', 'repository.write']
 
     def __init__(self, user, user_permissions, config, env):
         self.user = user
         self.user_permissions = user_permissions
         self.config = config
         self.env = env
         self.stdin = sys.stdin
 
         self.repo_name = None
         self.repo_mode = None
         self.store = ''
         self.ini_path = ''
 
     def _invalidate_cache(self, repo_name):
         """
         Set's cache for this repository for invalidation on next access
 
         :param repo_name: full repo name, also a cache key
         """
         ScmModel().mark_for_invalidation(repo_name)
 
     def has_write_perm(self):
         permission = self.user_permissions.get(self.repo_name)
         if permission in ['repository.write', 'repository.admin']:
             return True
 
         return False
 
     def _check_permissions(self, action):
         permission = self.user_permissions.get(self.repo_name)
         log.debug('permission for %s on %s are: %s',
                   self.user, self.repo_name, permission)
 
         if not permission:
             log.error('user `%s` permissions to repo:%s are empty. Forbidding access.',
                       self.user, self.repo_name)
             return -2
 
         if action == 'pull':
             if permission in self.read_perms:
                 log.info(
                     'READ Permissions for User "%s" detected to repo "%s"!',
                     self.user, self.repo_name)
                 return 0
         else:
             if permission in self.write_perms:
                 log.info(
-                    'WRITE+ Permissions for User "%s" detected to repo "%s"!',
+                    'WRITE, or Higher Permissions for User "%s" detected to repo "%s"!',
                     self.user, self.repo_name)
                 return 0
 
         log.error('Cannot properly fetch or verify user `%s` permissions. '
                   'Permissions: %s, vcs action: %s',
                   self.user, permission, action)
         return -2
 
     def update_environment(self, action, extras=None):
 
         scm_data = {
             'ip': os.environ['SSH_CLIENT'].split()[0],
             'username': self.user.username,
             'user_id': self.user.user_id,
             'action': action,
             'repository': self.repo_name,
             'scm': self.backend,
             'config': self.ini_path,
             'repo_store': self.store,
             'make_lock': None,
             'locked_by': [None, None],
             'server_url': None,
             'user_agent': 'ssh-user-agent',
             'hooks': ['push', 'pull'],
             'hooks_module': 'rhodecode.lib.hooks_daemon',
             'is_shadow_repo': False,
             'detect_force_push': False,
             'check_branch_perms': False,
 
             'SSH': True,
             'SSH_PERMISSIONS': self.user_permissions.get(self.repo_name),
         }
         if extras:
             scm_data.update(extras)
         os.putenv("RC_SCM_DATA", json.dumps(scm_data))
 
     def get_root_store(self):
         root_store = self.store
         if not root_store.endswith('/'):
             # always append trailing slash
             root_store = root_store + '/'
         return root_store
 
     def _handle_tunnel(self, extras):
         # pre-auth
         action = 'pull'
         exit_code = self._check_permissions(action)
         if exit_code:
             return exit_code, False
 
         req = self.env['request']
         server_url = req.host_url + req.script_name
         extras['server_url'] = server_url
 
         log.debug('Using %s binaries from path %s', self.backend, self._path)
         exit_code = self.tunnel.run(extras)
 
         return exit_code, action == "push"
 
     def run(self, tunnel_extras=None):
         tunnel_extras = tunnel_extras or {}
         extras = {}
         extras.update(tunnel_extras)
 
         callback_daemon, extras = prepare_callback_daemon(
             extras, protocol=vcs_settings.HOOKS_PROTOCOL,
             host=vcs_settings.HOOKS_HOST,
             use_direct_calls=False)
 
         with callback_daemon:
             try:
                 return self._handle_tunnel(extras)
             finally:
                 log.debug('Running cleanup with cache invalidation')
                 if self.repo_name:
                     self._invalidate_cache(self.repo_name)

rhodecode/i18n/rhodecode.pot

@@ -1,11328 +1,11487 b''
 # Translations template for rhodecode-enterprise-ce.
 # Copyright (C) 2020 RhodeCode GmbH
 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: rhodecode-enterprise-ce 4.19.0\n"
+"Project-Id-Version: rhodecode-enterprise-ce 4.20.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
-"POT-Creation-Date: 2020-05-22 09:45+0000\n"
+"POT-Creation-Date: 2020-07-20 11:46+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
 #: rhodecode/apps/admin/views/defaults.py:90
 msgid "Default settings updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/defaults.py:108
 msgid "Error occurred during update of default values"
 msgstr ""
 
 #: rhodecode/apps/admin/views/exception_tracker.py:156
 msgid "Removed {} Exceptions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/exception_tracker.py:173
 msgid "Removed Exception {}"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:121
 msgid "Application permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:142
 #: rhodecode/apps/admin/views/permissions.py:218
 #: rhodecode/apps/admin/views/permissions.py:320
 msgid "Error occurred during update of permissions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:198
 msgid "Object permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:300
 msgid "Global permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:485
 #: rhodecode/templates/admin/gists/gist_show.mako:50
 #: rhodecode/templates/admin/integrations/list.mako:172
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
 #: rhodecode/templates/base/issue_tracker_settings.mako:137
+#: rhodecode/templates/changeset/changeset_file_comment.mako:201
+#: rhodecode/templates/changeset/changeset_file_comment.mako:205
+#: rhodecode/templates/changeset/changeset_file_comment.mako:209
 #: rhodecode/templates/data_table/_dt_elements.mako:173
 #: rhodecode/templates/data_table/_dt_elements.mako:251
 #: rhodecode/templates/data_table/_dt_elements.mako:266
 #: rhodecode/templates/data_table/_dt_elements.mako:267
 #: rhodecode/templates/data_table/_dt_elements.mako:282
 #: rhodecode/templates/debug_style/buttons.html:128
-#: rhodecode/templates/files/files_add.mako:56
-#: rhodecode/templates/files/files_edit.mako:58
-#: rhodecode/templates/files/files_source.mako:29
-#: rhodecode/templates/files/files_source.mako:42
+#: rhodecode/templates/files/files_add.mako:55
+#: rhodecode/templates/files/files_edit.mako:57
+#: rhodecode/templates/files/files_source.mako:39
+#: rhodecode/templates/files/files_source.mako:52
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:74
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:302
 #: rhodecode/templates/user_group/profile.mako:8
 #: rhodecode/templates/users/user_profile.mako:8
 msgid "Edit"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:513
 msgid "Updated SSH keys file: {}"
 msgstr ""
 
 #: rhodecode/apps/admin/views/permissions.py:516
 msgid "SSH key support is disabled in .ini file"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:328
+#: rhodecode/apps/admin/views/repo_groups.py:342
 #, python-format
 msgid "Created repository group %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/repo_groups.py:346
+#: rhodecode/apps/admin/views/repo_groups.py:360
 #, python-format
 msgid "Error occurred during creation of repository group %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/sessions.py:92
 msgid "Cleaned up old sessions"
 msgstr ""
 
 #: rhodecode/apps/admin/views/sessions.py:97
 msgid "Failed to cleanup up old sessions"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:162
-#: rhodecode/apps/admin/views/settings.py:317
-#: rhodecode/apps/admin/views/settings.py:392
-#: rhodecode/apps/admin/views/settings.py:726
+#: rhodecode/apps/admin/views/settings.py:163
+#: rhodecode/apps/admin/views/settings.py:319
+#: rhodecode/apps/admin/views/settings.py:394
+#: rhodecode/apps/admin/views/settings.py:727
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
 msgid "Some form inputs contain invalid data."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:189
-#: rhodecode/apps/admin/views/settings.py:353
+#: rhodecode/apps/admin/views/settings.py:190
+#: rhodecode/apps/admin/views/settings.py:355
 msgid "Error occurred during updating application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:193
+#: rhodecode/apps/admin/views/settings.py:194
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:143
 msgid "Updated VCS settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:267
+#: rhodecode/apps/admin/views/settings.py:269
 #, python-format
 msgid "Repositories successfully rescanned added: %s ; removed: %s"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:349
+#: rhodecode/apps/admin/views/settings.py:351
 msgid "Updated application settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:431
+#: rhodecode/apps/admin/views/settings.py:433
 msgid "Updated visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:434
+#: rhodecode/apps/admin/views/settings.py:436
 msgid "Error occurred during updating visualisation settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:496
+#: rhodecode/apps/admin/views/settings.py:498
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127
 msgid "Invalid issue tracker pattern: {}"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:513
+#: rhodecode/apps/admin/views/settings.py:515
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136
 msgid "Updated issue tracker entries"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:533
+#: rhodecode/apps/admin/views/settings.py:535
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91
 msgid "Removed issue tracker entry."
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:571
+#: rhodecode/apps/admin/views/settings.py:573
 msgid "Please enter email address"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:588
+#: rhodecode/apps/admin/views/settings.py:589
 msgid "Send email task created"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:638
+#: rhodecode/apps/admin/views/settings.py:639
 msgid "Added new hook"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:653
+#: rhodecode/apps/admin/views/settings.py:654
 msgid "Updated hooks"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:657
+#: rhodecode/apps/admin/views/settings.py:658
 msgid "Error occurred during hook creation"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:750
+#: rhodecode/apps/admin/views/settings.py:751
 msgid "Error occurred during updating labs settings"
 msgstr ""
 
-#: rhodecode/apps/admin/views/settings.py:755
+#: rhodecode/apps/admin/views/settings.py:756
 msgid "Updated Labs settings"
 msgstr ""
 
 #: rhodecode/apps/admin/views/svn_config.py:46
 msgid "Apache configuration for Subversion generated at `{}`."
 msgstr ""
 
 #: rhodecode/apps/admin/views/svn_config.py:54
 msgid "Failed to generate the Apache configuration for Subversion."
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:79
 msgid "Note: please make sure this server can access `${url}` for the update link to work"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:90
 msgid "Update info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:92
 msgid "Check for updates"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:97
 msgid "RhodeCode Version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:98
 msgid "Latest version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:99
 msgid "RhodeCode Base URL"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:100
 msgid "RhodeCode Server IP"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:101
 msgid "RhodeCode Server ID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:102
 msgid "RhodeCode Configuration"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:103
 msgid "RhodeCode Certificate"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:104
 msgid "Workers"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:105
 msgid "Worker Type"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:109
 msgid "Database"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:110
 msgid "Database version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:114
 msgid "Platform"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:115
 msgid "Platform UUID"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:116
 msgid "Lang"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:117
 msgid "Python version"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:118
 msgid "Python path"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:122
 msgid "CPU"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:123
 msgid "Load"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:124
 msgid "Memory"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:125
 msgid "Uptime"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:129
 msgid "Ulimit"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:132
 msgid "Storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:133
 msgid "Storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:134
 msgid "Storage inodes"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:136
 msgid "Gist storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:137
 msgid "Gist storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:139
 msgid "Archive cache storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:140
 msgid "Archive cache info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:142
 msgid "Temp storage location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:143
 msgid "Temp storage info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:145
 msgid "Search info"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:146
 msgid "Search location"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:150
 msgid "VCS Backends"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:151
 #: rhodecode/templates/admin/settings/settings_system.mako:32
 msgid "VCS Server"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:152
 msgid "GIT"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:153
 msgid "HG"
 msgstr ""
 
 #: rhodecode/apps/admin/views/system_info.py:154
 msgid "SVN"
 msgstr ""
 
 #: rhodecode/apps/admin/views/user_groups.py:238
 #, python-format
 msgid "Created user group %(user_group_link)s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/user_groups.py:260
 #, python-format
 msgid "Error occurred during creation of user group %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:222
 #, python-format
 msgid "Created user %(user_link)s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:243
 #, python-format
 msgid "Error occurred during creation of user %s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:345
 msgid "User updated successfully"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:363
 #, python-format
 msgid "Error occurred during update of user %s"
 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: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: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: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:482
 msgid "Successfully deleted user `{}`"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:489
 msgid "An error occurred during deletion of user"
 msgstr ""
 
 #: 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: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:653
 msgid "User global permissions updated successfully"
 msgstr ""
 
 #: 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:694
 msgid "Force password change enabled for user"
 msgstr ""
 
 #: 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:723
 msgid "Force password change disabled for user"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:796
 #, python-format
 msgid "Linked repository group `%s` as personal"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:802
 #, python-format
 msgid "Created repository group `%s`"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:806
 #, python-format
 msgid "Repository group `%s` is already taken"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:811
 msgid "An error occurred during repository group creation for user"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:834
 #: rhodecode/apps/my_account/views/my_account.py:161
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:22
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:27
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:28
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:33
 msgid "Role"
 msgstr ""
 
 #: 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:921
 #: rhodecode/apps/my_account/views/my_account.py:241
 msgid "Auth token successfully deleted"
 msgstr ""
 
 #: 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: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:1041
 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:157
 msgid "Ssh key successfully deleted"
 msgstr ""
 
 #: 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:1093
 msgid "Email `{}` is already registered for another user."
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1097
 msgid "An error occurred during email saving"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1124
 msgid "Removed email address from user account"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1170
 #, python-format
 msgid "An error occurred during ip saving:%s"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1192
 msgid "An error occurred during ip saving"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1196
 #, python-format
 msgid "Added ips %s to user whitelist"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1226
 msgid "Removed ip address from user whitelist"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1291
 msgid "Groups successfully changed"
 msgstr ""
 
 #: rhodecode/apps/admin/views/users.py:1411
 msgid "Deleted {} cache keys"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51
 msgid "forever"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:58
 msgid "5 minutes"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:59
 msgid "1 hour"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:60
 msgid "1 day"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:61
 msgid "1 month"
 msgstr ""
 
-#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:46848
+#: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:47676
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
 #: rhodecode/public/js/src/rhodecode.js:625
 msgid "Lifetime"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:66
 msgid "Requires registered account"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:67
 msgid "Can be accessed by anonymous users"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:218
 msgid "Error occurred during gist creation"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:242
 #, python-format
 msgid "Deleted gist %s"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:330
 #: rhodecode/templates/admin/gists/gist_show.mako:76
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:44
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:49
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:55
 #: rhodecode/templates/data_table/_dt_elements.mako:341
 msgid "never"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:336
 #, python-format
 msgid "%(expiry)s - current value"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:381
 msgid "Successfully updated gist content"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:386
 msgid "Successfully updated gist data"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:389
 msgid "Error occurred during update of gist {}: {}"
 msgstr ""
 
 #: rhodecode/apps/gist/views.py:393
 #, python-format
 msgid "Error occurred during update of gist %s"
 msgstr ""
 
 #: rhodecode/apps/home/views.py:452
-#: rhodecode/apps/repository/views/repo_pull_requests.py:914
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:209
+#: rhodecode/apps/repository/views/repo_pull_requests.py:930
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:219
 #: rhodecode/templates/admin/repos/repo_add.mako:15
 #: rhodecode/templates/admin/repos/repo_add.mako:19
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
-#: rhodecode/templates/base/base.mako:107
-#: rhodecode/templates/base/base.mako:126
-#: rhodecode/templates/base/base.mako:1172
+#: rhodecode/templates/base/base.mako:112
+#: rhodecode/templates/base/base.mako:131
+#: rhodecode/templates/base/base.mako:1192
 msgid "Repositories"
 msgstr ""
 
 #: 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:208
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:218
 msgid "Repository Groups"
 msgstr ""
 
 #: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
 msgid "public journal"
 msgstr ""
 
 #: rhodecode/apps/journal/views.py:137 rhodecode/apps/journal/views.py:183
 msgid "journal"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403
 msgid "Bad captcha"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:330
 msgid "You have successfully registered with RhodeCode. You can log-in now."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:334
 msgid "Please use the {identity} button to log-in"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:372
 msgid "If such email exists, a password reset link was sent to it."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:385
 msgid "Password reset has been disabled."
 msgstr ""
 
 #: rhodecode/apps/login/views.py:474
 msgid "Given reset token is invalid"
 msgstr ""
 
 #: rhodecode/apps/login/views.py:482
 msgid "Your password reset was successful, a new password has been sent to your email"
 msgstr ""
 
 #: 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:143
 msgid "Successfully updated password"
 msgstr ""
 
 #: rhodecode/apps/my_account/views/my_account.py:305
 msgid "Error occurred during adding 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:540
 msgid "Position {} is defined twice. Please correct this error."
 msgstr ""
 
 #: rhodecode/apps/my_account/views/my_account.py:553
 msgid "Update Bookmarks"
 msgstr ""
 
 #: 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:707
 msgid "Your account was updated successfully"
 msgstr ""
 
 #: 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:85
 msgid "updated commit cache"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:105
 #, python-format
 msgid "Removed repository group `%s`"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:109
 #, python-format
 msgid "Error occurred during deletion of repository group %s"
 msgstr ""
 
 #: 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:99
 msgid "Repository Group permissions updated"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_settings.py:174
 msgid "Repository Group `{}` updated successfully"
 msgstr ""
 
 #: rhodecode/apps/repo_group/views/repo_group_settings.py:179
 #, python-format
 msgid "Error occurred during update of repository group %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_caches.py:80
 msgid "Cache invalidation successful"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_caches.py:84
 msgid "An error occurred during cache invalidation"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:66
 #: rhodecode/apps/repository/views/repo_compare.py:64
-#: rhodecode/apps/repository/views/repo_pull_requests.py:763
+#: rhodecode/apps/repository/views/repo_pull_requests.py:779
 msgid "There are no commits yet"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_changelog.py:71
-#: rhodecode/apps/repository/views/repo_files.py:185
 #: rhodecode/apps/repository/views/repo_files.py:205
 msgid "No such commit exists for this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:103
 #, python-format
 msgid "Created repository %s from %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:112
 #, python-format
 msgid "Forked repository %s as %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_checks.py:115
 #, python-format
 msgid "Created repository %s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:111
+#: rhodecode/apps/repository/views/repo_commits.py:112
 msgid "No such commit exists. Org exception: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:330
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1399
+#: rhodecode/apps/repository/views/repo_commits.py:331
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1415
 #, python-format
 msgid "Status change %(transition_icon)s %(status)s"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_commits.py:375
+#: rhodecode/apps/repository/views/repo_commits.py:376
 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:102
 msgid "Select commit"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:173
 msgid "Could not find the source repo: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:181
 msgid "Could not find the target repo: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:192
 msgid "The comparison of two different kinds of remote repos is not available"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:225
 msgid "Could not compare repos with different large file settings"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_compare.py:271
 #, python-format
 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_feed.py:68
 #, python-format
 msgid "Changes on %s repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_feed.py:69
 #, python-format
 msgid "%s %s feed"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:96
 #, python-format
 msgid "This repository has been locked by %s on %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:109
 msgid "Cannot modify file. Given commit `{}` is not head of a branch."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:127
 msgid "Branch `{}` changes forbidden by rule {}."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:175
 msgid "Click here to add a new file."
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:180
 #, python-format
 msgid "There are no files yet. %s"
 msgstr ""
 
+#: rhodecode/apps/repository/views/repo_files.py:185
+msgid "No such commit exists for this repository. Commit: {}"
+msgstr ""
+
 #: rhodecode/apps/repository/views/repo_files.py:341
 msgid "Downloads disabled"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:347
 msgid "Unknown archive type for: `{}`"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:353
 msgid "Unknown commit_id {}"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:356
 msgid "Empty repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:361
 msgid "No node at path {} for this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_files.py:410
 msgid "Unknown archive type"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:990
+#: rhodecode/apps/repository/views/repo_files.py:1005
 msgid "Changesets"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1011
+#: rhodecode/apps/repository/views/repo_files.py:1026
 #: rhodecode/apps/repository/views/repo_summary.py:264
 #: rhodecode/model/pull_request.py:1740 rhodecode/model/scm.py:995
 #: rhodecode/templates/base/vcs_settings.mako:235
 #: rhodecode/templates/summary/components.mako:10
 msgid "Branches"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1015
+#: rhodecode/apps/repository/views/repo_files.py:1030
 #: rhodecode/model/scm.py:1012 rhodecode/templates/base/vcs_settings.mako:260
 #: rhodecode/templates/summary/components.mako:34
 msgid "Tags"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1169
-#: rhodecode/apps/repository/views/repo_files.py:1197
+#: rhodecode/apps/repository/views/repo_files.py:1184
+#: rhodecode/apps/repository/views/repo_files.py:1212
 msgid "Deleted file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1218
+#: rhodecode/apps/repository/views/repo_files.py:1233
 msgid "Successfully deleted file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1222
-#: rhodecode/apps/repository/views/repo_files.py:1339
-#: rhodecode/apps/repository/views/repo_files.py:1470
-#: rhodecode/apps/repository/views/repo_files.py:1593
+#: rhodecode/apps/repository/views/repo_files.py:1237
+#: rhodecode/apps/repository/views/repo_files.py:1354
+#: rhodecode/apps/repository/views/repo_files.py:1485
+#: rhodecode/apps/repository/views/repo_files.py:1608
 msgid "Error occurred during commit"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1254
-#: rhodecode/apps/repository/views/repo_files.py:1285
+#: rhodecode/apps/repository/views/repo_files.py:1269
+#: rhodecode/apps/repository/views/repo_files.py:1300
 msgid "Edited file {} via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1308
+#: rhodecode/apps/repository/views/repo_files.py:1323
 msgid "No changes detected on {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1332
+#: rhodecode/apps/repository/views/repo_files.py:1347
 msgid "Successfully committed changes to file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1373
-#: rhodecode/apps/repository/views/repo_files.py:1414
+#: rhodecode/apps/repository/views/repo_files.py:1388
+#: rhodecode/apps/repository/views/repo_files.py:1429
 msgid "Added file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1430
+#: rhodecode/apps/repository/views/repo_files.py:1445
 msgid "No filename specified"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1455
+#: rhodecode/apps/repository/views/repo_files.py:1470
 msgid "Successfully committed new file `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1463
-#: rhodecode/apps/repository/views/repo_files.py:1575
+#: rhodecode/apps/repository/views/repo_files.py:1478
+#: rhodecode/apps/repository/views/repo_files.py:1590
 msgid "The location specified must be a relative path and must not contain .. in the path"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1520
+#: rhodecode/apps/repository/views/repo_files.py:1535
 msgid "Uploaded file via RhodeCode Enterprise"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1564
+#: rhodecode/apps/repository/views/repo_files.py:1579
 msgid "Successfully committed {} new files"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_files.py:1566
+#: rhodecode/apps/repository/views/repo_files.py:1581
 msgid "Successfully committed 1 new file"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_forks.py:146
 msgid "Compare fork"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_forks.py:251
 #, python-format
 msgid "An error occurred during repository forking %s"
 msgstr ""
 
 #: 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:92
 msgid "Repository access permissions updated"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_permissions.py:126
 msgid "Repository `{}` private mode set successfully"
 msgstr ""
 
 #: 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:287
+#: rhodecode/apps/repository/views/repo_pull_requests.py:291
 msgid "Pull Request state was force changed to `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:793
+#: rhodecode/apps/repository/views/repo_pull_requests.py:809
 msgid "Commit does not exist"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:945
+#: rhodecode/apps/repository/views/repo_pull_requests.py:961
 msgid "Error creating pull request: {}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:965
+#: rhodecode/apps/repository/views/repo_pull_requests.py:981
 msgid "source_repo or target repo not found"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:976
+#: rhodecode/apps/repository/views/repo_pull_requests.py:992
 msgid "Not Enough permissions to source repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:991
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1007
 msgid "Not Enough permissions to target repo `{}`."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1055
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1071
 msgid "Successfully opened new pull request"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1058
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1074
 msgid "Error occurred during creation of this pull request."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1090
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1145
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1106
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1161
 msgid "Cannot update closed pull requests."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1112
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1128
 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1151
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1167
 msgid "Pull request title & description updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1173
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1189
 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1187
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1203
 msgid "Reload page"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1222
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1238
 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`"
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1268
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1284
 msgid "Pull request was successfully merged and closed."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1292
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1308
 msgid "Pull request reviewers updated."
 msgstr ""
 
-#: rhodecode/apps/repository/views/repo_pull_requests.py:1325
+#: rhodecode/apps/repository/views/repo_pull_requests.py:1341
 msgid "Successfully deleted pull request"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:172
 msgid "Repository `{}` updated successfully"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:209
 msgid "Unlocked"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:214
 msgid "Locked"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:216
 #, python-format
 msgid "Repository has been %s"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:220
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:305
 msgid "An error occurred during unlocking"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings.py:264
 msgid "An error occurred during deletion of repository stats"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:114
 #, python-format
 msgid "Archived repository `%s`"
 msgstr ""
 
 #: 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:157
 #, python-format
 msgid "Detached %s forks"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:159
 #, python-format
 msgid "Deleted %s forks"
 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: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:200
 #, python-format
 msgid "An error occurred during deletion of `%s`"
 msgstr ""
 
 #: 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:229
 msgid "An error occurred during setting this repository in public journal"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:265
 msgid "Nothing"
 msgstr ""
 
 #: 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:275
 msgid "An error occurred during this operation"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:299
 msgid "Locked repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:302
 msgid "Unlocked repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_advanced.py:322
 msgid "installed updated hooks into this repository"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_fields.py:86
 msgid "An error occurred during creation of field"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_fields.py:108
 msgid "An error occurred during removal of field"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:86
 msgid "Error occurred during deleting issue tracker entry"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_remote.py:64
 msgid "Pulled from remote location"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_remote.py:67
 msgid "An error occurred during pull from remote location"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_settings_vcs.py:147
 msgid "Error occurred during updating repository VCS settings"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:240
 #: rhodecode/templates/admin/permissions/permissions.mako:42
 #: rhodecode/templates/summary/components.mako:8
 msgid "Branch"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:241
 #: rhodecode/templates/summary/components.mako:32
 msgid "Tag"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:242
 #: rhodecode/templates/summary/components.mako:44
 msgid "Bookmark"
 msgstr ""
 
 #: rhodecode/apps/repository/views/repo_summary.py:265
 msgid "Closed branches"
 msgstr ""
 
 #: rhodecode/apps/ssh_support/events.py:29
 msgid "RhodeCode SSH Key files changed."
 msgstr ""
 
 #: rhodecode/apps/svn_support/events.py:30
 msgid "Configuration for Apache mad_dav_svn changed."
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:188
 #, python-format
 msgid "Updated user group %s"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:224
 #, python-format
 msgid "Error occurred during update of user group %s"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:250
 msgid "Successfully deleted user group"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:255
 msgid "An error occurred during deletion of user group"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:359
 msgid "Target group cannot be the same"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:374
 msgid "User Group permissions updated"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:459
 msgid "User Group global permissions updated successfully"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:541
 msgid "User Group synchronization updated successfully"
 msgstr ""
 
 #: rhodecode/apps/user_group/views/__init__.py:545
 msgid "An error occurred during synchronization update"
 msgstr ""
 
 #: rhodecode/authentication/routes.py:61
 #: rhodecode/templates/admin/auth/plugin_settings.mako:14
 msgid "Authentication Plugins"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:36
 msgid "Enable or disable this authentication plugin."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
 #: 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
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:23
 msgid "Enabled"
 msgstr ""
 
 #: rhodecode/authentication/schema.py:44
 msgid ""
 "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n"
 "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)."
 msgstr ""
 
 #: rhodecode/authentication/schema.py:49
 msgid "Auth Cache TTL"
 msgstr ""
 
 #: rhodecode/authentication/views.py:92
 msgid "Errors exist when saving plugin settings. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/authentication/views.py:105 rhodecode/authentication/views.py:164
 msgid "Auth settings updated successfully."
 msgstr ""
 
 #: rhodecode/authentication/views.py:167
 msgid "Errors exist when saving plugin setting. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/authentication/views.py:175
 msgid "Error occurred during update of auth settings."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:60
 msgid "The FQDN or IP of the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:62
 msgid "Host"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:67
 msgid "The Port in use by the Atlassian CROWD Server"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:69
 #: rhodecode/authentication/plugins/auth_ldap.py:270
 msgid "Port"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:75
 msgid "The Application Name to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:77
 msgid "Application Name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:82
 msgid "The password to authenticate to CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:84
 msgid "Application Password"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:89
 msgid "A comma separated list of group names that identify users as RhodeCode Administrators"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:93
 msgid "Admin Groups"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_crowd.py:217
 msgid "CROWD"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:54
 msgid "Header to extract the user from"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:56
 msgid "Header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:61
 msgid "Header to extract the user from when main one fails"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:63
 msgid "Fallback header"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:68
 msgid "Perform cleaning of user, if passed user has @ in username then first part before @ is taken. If there's \\ in the username only the part after  \\ is taken"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:73
 msgid "Clean username"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_headers.py:99
 msgid "Headers"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:62
 msgid "The url of the Jasig CAS REST service"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:64
 msgid "URL"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_jasig_cas.py:93
 msgid "Jasig-CAS"
 msgstr ""
 
 #: 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:262
 msgid "LDAP Host"
 msgstr ""
 
 #: 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:279
 msgid "Connection timeout"
 msgstr ""
 
 #: 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 [e-mail]"
 msgstr ""
 
 #: 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:299
 msgid "Bind account password"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:304
 msgid "TLS Type"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:305
 msgid "Connection Security"
 msgstr ""
 
 #: 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:314
 msgid "Certificate Checks"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:320
 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: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:341
 msgid "Base DN"
 msgstr ""
 
 #: 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:351
 msgid "LDAP Search Filter"
 msgstr ""
 
 #: 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:358
 msgid "LDAP Search Scope"
 msgstr ""
 
 #: 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:366
 msgid "Login Attribute"
 msgstr ""
 
 #: 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: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:377
 msgid "Email Attribute"
 msgstr ""
 
 #: 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:385
 msgid "First Name Attribute"
 msgstr ""
 
 #: 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:393
 msgid "Last Name Attribute"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_ldap.py:425
 msgid "LDAP"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:60
 msgid "PAM service name to use for authentication."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:62
 msgid "PAM service name"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:67
 msgid "Regular expression for extracting user name/email etc. from Unix userinfo."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:70
 msgid "Gecos Regex"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_pam.py:99
 msgid "PAM"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:79
 msgid "RhodeCode Internal"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:200
 msgid "Allowed user types for authentication using this plugin."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:201
 msgid "User restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:209
 msgid "Allowed protocols for authentication using this plugin. VCS means GIT/HG/SVN. HTTP is web based login."
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_rhodecode.py:211
 #: rhodecode/authentication/plugins/auth_token.py:173
 msgid "Scope restriction"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:77
 msgid "Rhodecode Token"
 msgstr ""
 
 #: rhodecode/authentication/plugins/auth_token.py:172
 msgid "Choose operation scope restriction when authenticating."
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:79
+#: rhodecode/events/pullrequest.py:78
 msgid "pullrequest created"
 msgstr ""
 
-#: rhodecode/events/pullrequest.py:80
+#: rhodecode/events/pullrequest.py:79
 msgid "Event triggered after pull request was created"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:88
+msgid "pullrequest closed"
+msgstr ""
+
 #: rhodecode/events/pullrequest.py:89
-msgid "pullrequest closed"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:90
 msgid "Event triggered after pull request was closed"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:98
+msgid "pullrequest commits updated"
+msgstr ""
+
 #: rhodecode/events/pullrequest.py:99
-msgid "pullrequest commits updated"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:100
 msgid "Event triggered after pull requests was updated"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:108
+msgid "pullrequest review changed"
+msgstr ""
+
 #: rhodecode/events/pullrequest.py:109
-msgid "pullrequest review changed"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:110
 msgid "Event triggered after a review status of a pull requests has changed to other."
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:123
+msgid "pullrequest merged"
+msgstr ""
+
 #: rhodecode/events/pullrequest.py:124
-msgid "pullrequest merged"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:125
 msgid "Event triggered after a successful merge operation was executed on a pull request"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:134
+msgid "pullrequest commented"
+msgstr ""
+
 #: rhodecode/events/pullrequest.py:135
-msgid "pullrequest commented"
-msgstr ""
-
-#: rhodecode/events/pullrequest.py:136
 msgid "Event triggered after a comment was made on a code in the pull request"
 msgstr ""
 
+#: rhodecode/events/pullrequest.py:173
+msgid "pullrequest comment edited"
+msgstr ""
+
+#: rhodecode/events/pullrequest.py:174
+msgid "Event triggered after a comment was edited on a code in the pull request"
+msgstr ""
+
 #: rhodecode/events/repo.py:191
 msgid "repository commit comment"
 msgstr ""
 
 #: rhodecode/events/repo.py:192
 msgid "Event triggered after a comment was made on commit inside a repository"
 msgstr ""
 
-#: rhodecode/events/repo.py:224
+#: rhodecode/events/repo.py:226
+msgid "repository commit edit comment"
+msgstr ""
+
+#: rhodecode/events/repo.py:227
+msgid "Event triggered after a comment was edited on commit inside a repository"
+msgstr ""
+
+#: rhodecode/events/repo.py:260
 msgid "repository pre create"
 msgstr ""
 
-#: rhodecode/events/repo.py:225
+#: rhodecode/events/repo.py:261
 msgid "Event triggered before repository is created"
 msgstr ""
 
-#: rhodecode/events/repo.py:234
+#: rhodecode/events/repo.py:270
 msgid "repository created"
 msgstr ""
 
-#: rhodecode/events/repo.py:235
+#: rhodecode/events/repo.py:271
 msgid "Event triggered after repository was created"
 msgstr ""
 
-#: rhodecode/events/repo.py:244
+#: rhodecode/events/repo.py:280
 msgid "repository pre delete"
 msgstr ""
 
-#: rhodecode/events/repo.py:245
+#: rhodecode/events/repo.py:281
 msgid "Event triggered before a repository is deleted"
 msgstr ""
 
-#: rhodecode/events/repo.py:254
+#: rhodecode/events/repo.py:290
 msgid "repository deleted"
 msgstr ""
 
-#: rhodecode/events/repo.py:255
+#: rhodecode/events/repo.py:291
 msgid "Event triggered after repository was deleted"
 msgstr ""
 
-#: rhodecode/events/repo.py:295
+#: rhodecode/events/repo.py:331
 msgid "repository pre pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:296
+#: rhodecode/events/repo.py:332
 msgid "Event triggered before repository code is pulled"
 msgstr ""
 
-#: rhodecode/events/repo.py:305
+#: rhodecode/events/repo.py:341
 msgid "repository pull"
 msgstr ""
 
-#: rhodecode/events/repo.py:306
+#: rhodecode/events/repo.py:342
 msgid "Event triggered after repository code was pulled"
 msgstr ""
 
-#: rhodecode/events/repo.py:315
+#: rhodecode/events/repo.py:351
 msgid "repository pre push"
 msgstr ""
 
-#: rhodecode/events/repo.py:316
+#: rhodecode/events/repo.py:352
 msgid "Event triggered before the code is pushed to a repository"
 msgstr ""
 
-#: rhodecode/events/repo.py:328
+#: rhodecode/events/repo.py:364
 msgid "repository push"
 msgstr ""
 
-#: rhodecode/events/repo.py:329
+#: rhodecode/events/repo.py:365
 msgid "Event triggered after the code was pushed to a repository"
 msgstr ""
 
 #: rhodecode/events/repo_group.py:62
 msgid "repository group created"
 msgstr ""
 
 #: 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: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 ""
 
 #: rhodecode/events/user.py:52
 msgid "user pre create"
 msgstr ""
 
 #: rhodecode/events/user.py:66
 msgid "user post create"
 msgstr ""
 
 #: rhodecode/events/user.py:80
 msgid "user pre update"
 msgstr ""
 
 #: rhodecode/events/user.py:100
 msgid "user permissions change"
 msgstr ""
 
 #: rhodecode/forms/__init__.py:35
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:97
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:103
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73
 #: rhodecode/templates/admin/permissions/permissions_application.mako:60
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:227
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:201
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:207
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:251
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
 #: rhodecode/templates/admin/settings/settings_global.mako:141
 #: 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:207
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:101
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:217
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:107
 #: rhodecode/templates/admin/users/user_edit_emails.mako:66
 #: rhodecode/templates/admin/users/user_edit_ips.mako:76
 #: rhodecode/templates/admin/users/user_edit_profile.mako:155
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:72
-#: rhodecode/templates/base/default_perms_box.mako:89
+#: rhodecode/templates/base/default_perms_box.mako:102
 msgid "Reset"
 msgstr ""
 
-#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:37802
+#: rhodecode/forms/__init__.py:36 rhodecode/public/js/scripts.js:38311
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/utils/ajax.js:158
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
+#: rhodecode/public/js/src/rhodecode/utils/ajax.js:161
 #: rhodecode/templates/admin/gists/gist_show.mako:59
 #: rhodecode/templates/admin/integrations/list.mako:179
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:59
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:65
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:33
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:34
 #: rhodecode/templates/admin/notifications/notifications_data.mako:22
 #: 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:63
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:69
 #: rhodecode/templates/admin/users/user_edit_emails.mako:34
 #: rhodecode/templates/admin/users/user_edit_ips.mako:40
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35
 #: rhodecode/templates/base/issue_tracker_settings.mako:146
 #: rhodecode/templates/base/vcs_settings.mako:244
 #: rhodecode/templates/base/vcs_settings.mako:269
-#: rhodecode/templates/changeset/changeset_file_comment.mako:140
-#: rhodecode/templates/changeset/changeset_file_comment.mako:142
-#: rhodecode/templates/changeset/changeset_file_comment.mako:145
+#: rhodecode/templates/changeset/changeset_file_comment.mako:203
+#: rhodecode/templates/changeset/changeset_file_comment.mako:206
+#: rhodecode/templates/changeset/changeset_file_comment.mako:210
 #: rhodecode/templates/data_table/_dt_elements.mako:436
 #: rhodecode/templates/debug_style/buttons.html:132
-#: rhodecode/templates/files/files_source.mako:30
-#: rhodecode/templates/files/files_source.mako:37
-#: rhodecode/templates/files/files_source.mako:43
+#: rhodecode/templates/files/files_source.mako:40
+#: rhodecode/templates/files/files_source.mako:47
+#: rhodecode/templates/files/files_source.mako:53
 msgid "Delete"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:30
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:193
 msgid "Enable or disable this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:37
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:174
 msgid "Short name for this integration."
 msgstr ""
 
 #: rhodecode/integrations/schema.py:39
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:176
 msgid "Integration name"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:51
 msgid "Limit integrations to to work only on the direct children repositories of this repository group (no subgroups)"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:55
 msgid "Limit to childen repos only"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:63
 msgid "Limit integrations to to work only on root level repositories"
 msgstr ""
 
 #: rhodecode/integrations/schema.py:66
 msgid "Root repositories only"
 msgstr ""
 
 #: rhodecode/integrations/views.py:147
 msgid "{repo_name} repository"
 msgstr ""
 
 #: rhodecode/integrations/views.py:150
 msgid "{repo_group_name} repo group"
 msgstr ""
 
 #: rhodecode/integrations/views.py:153
 #: rhodecode/templates/admin/permissions/permissions.mako:36
 msgid "Global"
 msgstr ""
 
 #: rhodecode/integrations/views.py:157
 msgid "{name} integration"
 msgstr ""
 
 #: rhodecode/integrations/views.py:172
 msgid "Integration {integration_name} deleted successfully."
 msgstr ""
 
 #: rhodecode/integrations/views.py:305
 msgid "Errors exist when saving integration settings. Please check the form inputs."
 msgstr ""
 
 #: rhodecode/integrations/views.py:330
 msgid "Integration {integration_name} updated successfully."
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:157
 msgid "Recipients"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:158
 msgid "Email addresses to send push events to"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:163
 #: rhodecode/integrations/types/email.py:164
 msgid "Email address"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:175
 #: rhodecode/templates/register.mako:95
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:78
 #: rhodecode/templates/admin/users/user_add.mako:86
 #: rhodecode/templates/admin/users/user_edit_profile.mako:65
 #: rhodecode/templates/admin/users/users.mako:76
-#: rhodecode/templates/email_templates/user_registration.mako:50
+#: rhodecode/templates/email_templates/user_registration.mako:51
 #: rhodecode/templates/users/user_profile.mako:69
 msgid "Email"
 msgstr ""
 
 #: rhodecode/integrations/types/email.py:176
 msgid "Send repo push summaries to a list of recipients via email"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:63
 msgid "Yellow"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:64
 msgid "Red"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:65
 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:72
 msgid "Hipchat server URL"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:73
 msgid "Hipchat integration url."
 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:90
 msgid "Color"
 msgstr ""
 
 #: rhodecode/integrations/types/hipchat.py:91
 msgid "Background color of message."
 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:72
 msgid "Slack service URL"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:73
 msgid "This can be setup at the <a href=\"https://my.slack.com/services/new/incoming-webhook/\">slack app manager</a>"
 msgstr ""
 
 #: 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: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:74
 #: rhodecode/templates/admin/users/user_add.mako:35
 #: rhodecode/templates/admin/users/user_edit_profile.mako:39
 #: rhodecode/templates/admin/users/users.mako:74
 #: rhodecode/templates/debug_style/login.html:36
-#: rhodecode/templates/email_templates/user_registration.mako:42
+#: rhodecode/templates/email_templates/user_registration.mako:43
 #: rhodecode/templates/user_group/profile.mako:61
 #: rhodecode/templates/users/user_profile.mako:29
 msgid "Username"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:87
 msgid "Username to show notifications coming from."
 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:106
 msgid "Emoji"
 msgstr ""
 
 #: rhodecode/integrations/types/slack.py:107
 msgid "Emoji to use eg. :studio_microphone:"
 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:49
 msgid "Webhook URL"
 msgstr ""
 
 #: 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:70
 msgid "Secret Token"
 msgstr ""
 
 #: 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:82
 msgid "Optional username to authenticate the call."
 msgstr ""
 
 #: 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:102
 msgid "Custom Header Key"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:103
 msgid "Custom Header name to be set when calling endpoint."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:112
 msgid "Custom Header Value"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:113
 msgid "Custom Header value to be set when calling endpoint."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:122
 msgid "Call Method"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:123
 msgid "Select a HTTP method to use when calling the Webhook."
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:135
 msgid "Webhook"
 msgstr ""
 
 #: rhodecode/integrations/types/webhook.py:136
 msgid "send JSON data to a url endpoint"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:93
 msgid "[deleted] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:96 rhodecode/lib/action_parser.py:114
 msgid "[created] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:99
 msgid "[created] repository as fork"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:102 rhodecode/lib/action_parser.py:117
 msgid "[forked] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:105 rhodecode/lib/action_parser.py:120
 msgid "[updated] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:108
 msgid "[downloaded] archive from repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:111
 msgid "[delete] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:123
 msgid "[created] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:126
 msgid "[updated] user"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:129
 msgid "[created] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:132
 msgid "[updated] user group"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:135
 msgid "[commented] on commit in repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:138
 msgid "[commented] on pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:141
 msgid "[closed] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:144
 msgid "[merged] pull request for"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:147
 msgid "[pushed] into"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:150
 msgid "[committed via RhodeCode] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:153
 msgid "[pulled from remote] into repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:156
 msgid "[pulled] from"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:159
 msgid "[started following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:162
 msgid "[stopped following] repository"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:172
 #, python-format
 msgid "fork name %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:191
 #, python-format
 msgid "Pull request #%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:226
 #, python-format
 msgid "Show all combined commits %s->%s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:231
 msgid "compare view"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:238
 #, python-format
 msgid " and %(num)s more commits"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:293
 #, python-format
 msgid "Deleted branch: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:296
 #, python-format
 msgid "Created tag: %s"
 msgstr ""
 
 #: rhodecode/lib/action_parser.py:309
 msgid "Commit not found"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1760
+#: rhodecode/lib/auth.py:1769
 msgid "IP {} not allowed"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1852
+#: rhodecode/lib/auth.py:1861
 msgid "You need to be a registered user to perform this action"
 msgstr ""
 
-#: rhodecode/lib/auth.py:1896
+#: rhodecode/lib/auth.py:1905
 msgid "You need to be signed in to view this page"
 msgstr ""
 
 #: rhodecode/lib/diffs.py:903
 msgid "Click to select line"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1721
+#: rhodecode/lib/helpers.py:1803
 msgid ""
 "Example filter terms:\n"
 "     repository:vcs\n"
 "     username:marcin\n"
 "     username:(NOT marcin)\n"
 "     action:*push*\n"
 "     ip:127.0.0.1\n"
 "     date:20120101\n"
 "     date:[20120101100000 TO 20120102]\n"
 "\n"
 "Actions: {actions}\n"
 "\n"
 "Generate wildcards using '*' character:\n"
 "     \"repository:vcs*\" - search everything starting with 'vcs'\n"
 "     \"repository:*vcs*\" - search for repository containing 'vcs'\n"
 "\n"
 "Optional AND / OR operators in queries\n"
 "     \"repository:vcs OR repository:test\"\n"
 "     \"username:test AND repository:test*\"\n"
 msgstr ""
 
-#: rhodecode/lib/helpers.py:1745
+#: rhodecode/lib/helpers.py:1827
 #, python-format
 msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:542
 msgid "in ${ago}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:548
 msgid "${ago} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:557
 msgid "${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:559
 msgid "${val}, ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:561
 msgid "in ${val}, ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:563
 msgid "${val} and ${detail}"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:565
 msgid "${val} and ${detail} ago"
 msgstr ""
 
 #: rhodecode/lib/utils2.py:567
 msgid "in ${val} and ${detail}"
 msgstr ""
 
-#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22115
+#: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:22612
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
 msgid "just now"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:568
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:598
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:716
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:764
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:815
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:944
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:969
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2587
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2653
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2739
 #: 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_19_0_2.py:3079
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3079
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3110
 msgid "Repository no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:569
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:599
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:657
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:736
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:765
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:816
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2740
 #: 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_19_0_2.py:3080
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3080
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3111
 msgid "Repository read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:570
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:658
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:660
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:766
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:817
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2741
 #: 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_19_0_2.py:3081
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3081
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3112
 msgid "Repository write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:571
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:601
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:659
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:719
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:767
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:818
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:819
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2742
 #: 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_19_0_2.py:3082
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3082
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3113
 msgid "Repository admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:573
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:586
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:603
 msgid "Repositories Group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:574
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:604
 msgid "Repositories Group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:575
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:588
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:605
 msgid "Repositories Group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:576
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:589
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:606
 msgid "Repositories Group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:578
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:591
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:608
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:654
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:656
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:733
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:735
 msgid "RhodeCode Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:579
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:592
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:609
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:679
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:702
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:720
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:836
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:965
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:990
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2608
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2679
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2765
 #: 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_19_0_2.py:3105
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3105
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3136
 msgid "Repository creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:580
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:593
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:610
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:678
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:703
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:757
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:796
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2766
 #: 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_19_0_2.py:3106
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3106
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3137
 msgid "Repository creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:581
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:594
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:611
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:680
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:682
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:800
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:970
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2613
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2684
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2770
 #: 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_19_0_2.py:3110
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3110
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3141
 msgid "Repository forking disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:582
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:595
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:612
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:695
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:681
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:791
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:801
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:842
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2771
 #: 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_19_0_2.py:3111
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3111
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3142
 msgid "Repository forking enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:583
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:596
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:613
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:696
 msgid "Register disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:584
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:597
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:614
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:697
 msgid "Register new user with RhodeCode with manual activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:587
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:600
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:617
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:700
 msgid "Register new user with RhodeCode with auto activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:843
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:864
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:873
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:994
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1019
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1037
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1054
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1073
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1087
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1120
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1134
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1175
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1184
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1194
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1316
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1341
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3295
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3378
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3491
 #: 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_19_0_2.py:3890
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3859
-#: rhodecode/public/js/scripts.js:41391 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:350
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3935
+#: rhodecode/public/js/scripts.js:42219 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:352
 msgid "Not Reviewed"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:865
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:874
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:995
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1020
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1038
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1055
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1074
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1077
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1088
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1091
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1121
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1135
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1176
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1185
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3492
 #: 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_19_0_2.py:3891
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3860
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3936
 msgid "Approved"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:866
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:875
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:996
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1021
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1039
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1056
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1075
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1078
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1089
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1092
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1122
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1136
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1177
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1186
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3493
 #: 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_19_0_2.py:3892
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3861
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3937
 msgid "Rejected"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_4_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_1_5_0.py:867
 #: rhodecode/lib/dbmigrate/schema/db_1_5_2.py:876
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:997
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:1022
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:1023
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:1040
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:1057
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:1076
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:1079
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:1090
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:1093
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:1123
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:1137
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:1178
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:1187
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3494
 #: 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_19_0_2.py:3893
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3862
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3938
 msgid "Under Review"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:661
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:704
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:721
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:737
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:769
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:949
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2592
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2658
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2744
 #: 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_19_0_2.py:3084
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3084
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3115
 msgid "Repository group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:662
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:705
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:722
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:738
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:741
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:770
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:821
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2745
 #: 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_19_0_2.py:3085
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3085
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3116
 msgid "Repository group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:663
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:665
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:706
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:723
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:739
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:771
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:781
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:822
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2746
 #: 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_19_0_2.py:3086
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3086
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3117
 msgid "Repository group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_6_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:664
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:707
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:724
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:740
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:823
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:824
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2747
 #: 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_19_0_2.py:3087
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3087
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3118
 msgid "Repository group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:666
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:691
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:742
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:774
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:784
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:825
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:954
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:979
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2663
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2749
 #: 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_19_0_2.py:3089
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3089
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3120
 msgid "User group no access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:667
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:692
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:746
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:775
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:785
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:826
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2750
 #: 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_19_0_2.py:3090
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3090
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3121
 msgid "User group read access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:668
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:670
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:693
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:749
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:776
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:786
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:827
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2751
 #: 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_19_0_2.py:3091
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3091
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3122
 msgid "User group write access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:669
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:694
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:695
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:729
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:777
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:828
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:829
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2752
 #: 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_19_0_2.py:3092
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3092
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3123
 msgid "User group admin access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:671
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:673
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:696
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:752
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:779
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:789
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:830
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:837
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:984
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2673
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2759
 #: 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_19_0_2.py:3099
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3099
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3130
 msgid "Repository Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:672
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:697
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:698
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:715
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:732
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:780
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:790
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:831
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:832
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2760
 #: 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_19_0_2.py:3100
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3100
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3131
 msgid "Repository Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:674
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:676
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:699
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:717
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:734
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:750
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:753
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:782
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:792
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:833
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:962
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:987
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2676
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2762
 #: 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_19_0_2.py:3102
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3102
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3133
 msgid "User Group creation disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:675
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:677
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:700
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:701
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:718
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:751
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:754
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:783
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:834
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:835
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2763
 #: 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_19_0_2.py:3103
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3103
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3134
 msgid "User Group creation enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:683
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:708
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:726
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:743
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:764
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:793
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:803
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:844
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:973
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:998
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2616
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2687
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2773
 #: 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_19_0_2.py:3113
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3113
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3144
 msgid "Registration disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:684
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:686
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:709
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:727
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:744
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:762
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:767
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:794
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:804
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2774
 #: 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_19_0_2.py:3114
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3114
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3145
 msgid "User Registration with manual account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:685
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:710
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:711
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:728
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:745
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:763
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:795
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:805
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:847
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2775
 #: 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_19_0_2.py:3115
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3115
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3146
 msgid "User Registration with automatic account activation"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:687
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:689
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:712
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:730
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:747
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:765
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:768
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:770
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:807
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:848
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:855
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:977
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1002
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2624
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2695
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2781
 #: 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_19_0_2.py:3121
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3121
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3152
 #: rhodecode/model/permission.py:105
 msgid "Manual activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_1_7_0.py:688
 #: rhodecode/lib/dbmigrate/schema/db_1_8_0.py:690
 #: rhodecode/lib/dbmigrate/schema/db_2_0_0.py:713
 #: rhodecode/lib/dbmigrate/schema/db_2_0_1.py:714
 #: rhodecode/lib/dbmigrate/schema/db_2_0_2.py:731
 #: rhodecode/lib/dbmigrate/schema/db_2_1_0.py:748
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:766
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:769
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:771
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:808
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:849
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:850
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2782
 #: 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_19_0_2.py:3122
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3122
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3153
 #: rhodecode/model/permission.py:106
 msgid "Automatic activation of external account"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:755
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:758
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:760
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:787
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:797
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:838
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2767
 #: 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_19_0_2.py:3107
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3107
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3138
 msgid "Repository creation enabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_2_0.py:756
 #: rhodecode/lib/dbmigrate/schema/db_2_2_3.py:759
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_0.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:761
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:788
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:798
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:839
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:840
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2768
 #: 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_19_0_2.py:3108
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3108
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3139
 msgid "Repository creation disabled with write permission to a repository group"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_1.py:735
 #: rhodecode/lib/dbmigrate/schema/db_2_3_0_2.py:762
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:772
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:813
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:814
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:820
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:942
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:967
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2585
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2651
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2737
 #: 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_19_0_2.py:3077
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3077
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3108
 msgid "RhodeCode Super Administrator"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:810
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:851
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:858
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:980
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1005
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2627
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2698
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2784
 #: 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_19_0_2.py:3124
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3124
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3155
 msgid "Inherit object permissions from default user disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_0.py:811
 #: rhodecode/lib/dbmigrate/schema/db_3_0_0_1.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_0.py:852
 #: rhodecode/lib/dbmigrate/schema/db_3_1_0_1.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_2_0_0.py:853
 #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859
 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981
 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2785
 #: 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_19_0_2.py:3125
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3125
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3156
 msgid "Inherit object permissions from default user enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1118
 #: 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_19_0_2.py:1195
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1195
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1202
 msgid "all"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1119
 #: 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_19_0_2.py:1196
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1196
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1203
 msgid "http/web interface"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1120
 #: 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_19_0_2.py:1197
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1197
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1204
 msgid "vcs (git/hg/svn protocol)"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1121
 #: 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_19_0_2.py:1198
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1198
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1205
 msgid "api calls"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1122
 #: 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_19_0_2.py:1199
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1199
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1206
 msgid "feed access"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2348
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2414
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2488
 #: 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_19_0_2.py:2735
 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042
 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2735
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2766
 msgid "No parent"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2691
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2777
 #: 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_19_0_2.py:3117
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3117
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3148
 msgid "Password reset enabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2778
 #: 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_19_0_2.py:3118
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3118
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3149
 msgid "Password reset hidden"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2779
 #: 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_19_0_2.py:3119
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
-#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3119
+#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3150
 msgid "Password reset disabled"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2668
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2754
 #: 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/lib/dbmigrate/schema/db_4_19_0_0.py:3088
-#: rhodecode/model/db.py:3094
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3094
+#: rhodecode/model/db.py:3125
 msgid "Branch no permissions"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2755
 #: 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/lib/dbmigrate/schema/db_4_19_0_0.py:3089
-#: rhodecode/model/db.py:3095
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3095
+#: rhodecode/model/db.py:3126
 msgid "Branch access by web merge"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2756
 #: 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/lib/dbmigrate/schema/db_4_19_0_0.py:3090
-#: rhodecode/model/db.py:3096
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3096
+#: rhodecode/model/db.py:3127
 msgid "Branch access by push"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671
 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2757
 #: 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/lib/dbmigrate/schema/db_4_19_0_0.py:3091
-#: rhodecode/model/db.py:3097
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:3097
+#: rhodecode/model/db.py:3128
 msgid "Branch access by push with force"
 msgstr ""
 
 #: rhodecode/lib/dbmigrate/schema/db_4_19_0_0.py:1194
-#: rhodecode/model/db.py:1200
+#: rhodecode/lib/dbmigrate/schema/db_4_19_0_2.py:1200
+#: rhodecode/model/db.py:1207
 msgid "artifacts downloads"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:189
 msgid "Index Type"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:192
 msgid "File Index"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199
 msgid "Indexed documents"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200
 msgid "Last update"
 msgstr ""
 
 #: rhodecode/lib/index/whoosh.py:198
 msgid "Commit index"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:150
 msgid "This pull request can be automatically merged."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:152
 msgid "This pull request cannot be merged because of an unhandled exception. {exception}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:155
 msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}"
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:157
 msgid "This pull request could not be merged because push to target:`{target}@{merge_commit}` failed."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:160
 msgid "This pull request cannot be merged because the target `{target_ref.name}` is not a head."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:163
 msgid "This pull request cannot be merged because the source contains more branches than the target."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:166
 msgid "This pull request cannot be merged because the target `{target_ref.name}` has multiple heads: `{heads}`."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:169
 msgid "This pull request cannot be merged because the target repository is locked by {locked_by}."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:173
 msgid "This pull request cannot be merged because the target reference `{target_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:176
 msgid "This pull request cannot be merged because the source reference `{source_ref.name}` is missing."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:179
 msgid "This pull request cannot be merged because of conflicts related to sub repositories."
 msgstr ""
 
 #: rhodecode/lib/vcs/backends/base.py:184
 msgid "This pull request cannot be merged because the target or the source reference is missing."
 msgstr ""
 
 #: rhodecode/model/auth_token.py:53
 msgid "5 minutes {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:55
 msgid "1 hour {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:57
 msgid "1 day {end_date}"
 msgstr ""
 
 #: rhodecode/model/auth_token.py:59
 msgid "1 month {end_date}"
 msgstr ""
 
-#: rhodecode/model/comment.py:473
+#: rhodecode/model/comment.py:485
 msgid "made a comment"
 msgstr ""
 
-#: rhodecode/model/comment.py:474
+#: rhodecode/model/comment.py:486
 msgid "Show it now"
 msgstr ""
 
+#: rhodecode/model/db.py:1213
+msgid "Token for all actions."
+msgstr ""
+
+#: rhodecode/model/db.py:1214
+msgid "Token to access RhodeCode pages via web interface without login using `api_access_controllers_whitelist` functionality."
+msgstr ""
+
+#: rhodecode/model/db.py:1216
+msgid "Token to interact over git/hg/svn protocols. Requires auth_token authentication plugin to be active. <br/>Such Token should be used then instead of a password to interact with a repository, and additionally can be limited to single repository using repo scope."
+msgstr ""
+
+#: rhodecode/model/db.py:1221
+msgid "Token limited to api calls."
+msgstr ""
+
+#: rhodecode/model/db.py:1222
+msgid "Token to read RSS/ATOM feed."
+msgstr ""
+
+#: rhodecode/model/db.py:1223
+msgid "Token for artifacts downloads."
+msgstr ""
+
 #: rhodecode/model/forms.py:88
 msgid "Please enter a login"
 msgstr ""
 
 #: rhodecode/model/forms.py:89
 #, python-format
 msgid "Enter a value %(min)i characters long or more"
 msgstr ""
 
 #: rhodecode/model/forms.py:99
 msgid "Please enter a password"
 msgstr ""
 
 #: rhodecode/model/forms.py:100
 #, python-format
 msgid "Enter %(min)i characters or more"
 msgstr ""
 
-#: rhodecode/model/notification.py:246
+#: rhodecode/model/notification.py:248
 #, python-format
 msgid "%(user)s commented on commit %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:247
+#: rhodecode/model/notification.py:249
 #, python-format
 msgid "%(user)s commented on commit at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:250
+#: rhodecode/model/notification.py:252
 #, python-format
 msgid "%(user)s sent message %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:251
+#: rhodecode/model/notification.py:253
 #, python-format
 msgid "%(user)s sent message at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:254
+#: rhodecode/model/notification.py:256
 #, python-format
 msgid "%(user)s mentioned you %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:255
+#: rhodecode/model/notification.py:257
 #, python-format
 msgid "%(user)s mentioned you at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:258
+#: rhodecode/model/notification.py:260
 #, python-format
 msgid "%(user)s registered in RhodeCode %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:259
+#: rhodecode/model/notification.py:261
 #, python-format
 msgid "%(user)s registered in RhodeCode at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:262
+#: rhodecode/model/notification.py:264
 #, python-format
 msgid "%(user)s opened new pull request %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:263
+#: rhodecode/model/notification.py:265
 #, python-format
 msgid "%(user)s opened new pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:266
+#: rhodecode/model/notification.py:268
 #, python-format
 msgid "%(user)s updated pull request %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:267
+#: rhodecode/model/notification.py:269
 #, python-format
 msgid "%(user)s updated pull request at %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:270
+#: rhodecode/model/notification.py:272
 #, python-format
 msgid "%(user)s commented on pull request %(date_or_age)s"
 msgstr ""
 
-#: rhodecode/model/notification.py:271
+#: rhodecode/model/notification.py:273
 #, python-format
 msgid "%(user)s commented on pull request at %(date_or_age)s"
 msgstr ""
 
 #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
 #: rhodecode/model/permission.py:83
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:217
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:15
 msgid "None"
 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: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:13
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:17
-#: rhodecode/templates/changeset/changeset_file_comment.mako:272
-#: rhodecode/templates/changeset/changeset_file_comment.mako:323
+#: rhodecode/templates/changeset/changeset_file_comment.mako:337
+#: rhodecode/templates/changeset/changeset_file_comment.mako:388
 #: rhodecode/templates/data_table/_dt_elements.mako:450
 msgid "Write"
 msgstr ""
 
 #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
 #: rhodecode/model/permission.py:86
 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
 #: rhodecode/templates/admin/defaults/defaults.mako:12
 #: rhodecode/templates/admin/integrations/base.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:15
 #: rhodecode/templates/admin/integrations/form.mako:28
 #: rhodecode/templates/admin/integrations/global.mako:12
 #: rhodecode/templates/admin/integrations/list.mako:8
 #: rhodecode/templates/admin/integrations/list.mako:14
 #: rhodecode/templates/admin/integrations/new.mako:11
 #: rhodecode/templates/admin/permissions/permissions.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:12
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:14
 #: rhodecode/templates/admin/repos/repo_add.mako:13
 #: rhodecode/templates/admin/repos/repo_add.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:14
 #: 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:18
 #: rhodecode/templates/admin/users/user_add.mako:11
 #: rhodecode/templates/admin/users/user_edit.mako:12
-#: rhodecode/templates/base/base.mako:832
+#: rhodecode/templates/base/base.mako:839
 msgid "Admin"
 msgstr ""
 
 #: rhodecode/model/permission.py:89
 msgid "Protected/No Access"
 msgstr ""
 
 #: rhodecode/model/permission.py:90
 msgid "Web merge"
 msgstr ""
 
 #: rhodecode/model/permission.py:91
 msgid "Push"
 msgstr ""
 
 #: rhodecode/model/permission.py:92
 msgid "Force Push"
 msgstr ""
 
 #: 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 automatic account activation"
 msgstr ""
 
 #: rhodecode/model/permission.py:100
 msgid "Allow password recovery"
 msgstr ""
 
 #: rhodecode/model/permission.py:101
 msgid "Hide password recovery link"
 msgstr ""
 
 #: rhodecode/model/permission.py:102
 msgid "Disable password recovery"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:215
 msgid "Pull request update successful."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:217
 msgid "Pull request update failed because of an unknown error."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:219
 msgid "No update needed because the source and target have not changed."
 msgstr ""
 
 #: 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:224
 msgid "This pull request cannot be updated because the target reference is missing."
 msgstr ""
 
 #: 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:1518
 msgid "Server-side pull request merging is disabled."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1521
 msgid "This pull request is closed."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1535
 msgid "Pull request merging is not supported."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1552
 msgid "Target repository large files support is disabled."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1555
 msgid "Source repository large files support is disabled."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1739 rhodecode/model/scm.py:1004
 #: rhodecode/templates/admin/my_account/my_account.mako:32
-#: rhodecode/templates/base/base.mako:629
+#: rhodecode/templates/base/base.mako:636
 #: rhodecode/templates/summary/components.mako:46
 msgid "Bookmarks"
 msgstr ""
 
 #: 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:1939
 msgid "User `{}` not allowed to perform merge."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1957
 msgid "Target branch `{}` changes rejected by rule {}."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1971
 msgid "Pull request reviewer approval is pending."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1985
 msgid "Cannot merge, {} TODO still not resolved."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:1988
 msgid "Cannot merge, {} TODOs still not resolved."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:2043
 msgid "Merge strategy: rebase"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:2048
 msgid "Merge strategy: explicit merge commit"
 msgstr ""
 
 #: rhodecode/model/pull_request.py:2056
-msgid "Source branch will be closed after merge."
+msgid "Source branch will be closed before the merge."
 msgstr ""
 
 #: rhodecode/model/pull_request.py:2058
-msgid "Source branch will be deleted after merge."
+msgid "Source branch will be deleted after the merge."
 msgstr ""
 
 #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94
 msgid "Value cannot be an empty list"
 msgstr ""
 
 #: rhodecode/model/validators.py:140
 msgid "Pattern already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:161
 #, python-format
 msgid "Username \"%(username)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:163
 #, python-format
 msgid "Username \"%(username)s\" is forbidden"
 msgstr ""
 
 #: rhodecode/model/validators.py:165
 #: rhodecode/model/validation_schema/schemas/user_schema.py:71
 msgid "Username may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character or underscore"
 msgstr ""
 
 #: rhodecode/model/validators.py:196
 #, python-format
 msgid "Username %(username)s is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:197
 #, python-format
 msgid "Username %(username)s is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:222
 msgid "Invalid user group name"
 msgstr ""
 
 #: rhodecode/model/validators.py:223
 #, python-format
 msgid "User group `%(usergroup)s` already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:225
 msgid "user group name may only contain alphanumeric characters underscores, periods or dashes and must begin with alphanumeric character"
 msgstr ""
 
 #: rhodecode/model/validators.py:265
 msgid "Cannot assign this group as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:266
 #, python-format
 msgid "Group \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:267
 #, python-format
 msgid "Repository with name \"%(group_name)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:269
 msgid "no permission to store repository groupin this location"
 msgstr ""
 
 #: rhodecode/model/validators.py:271
 msgid "no permission to store repository group in root location"
 msgstr ""
 
 #: rhodecode/model/validators.py:388
 msgid "Invalid characters (non-ascii) in password"
 msgstr ""
 
 #: rhodecode/model/validators.py:407
 msgid "Passwords do not match"
 msgstr ""
 
 #: rhodecode/model/validators.py:427
 msgid "invalid password"
 msgstr ""
 
 #: rhodecode/model/validators.py:428
 msgid "invalid user name"
 msgstr ""
 
 #: rhodecode/model/validators.py:429
 msgid "Your account is disabled"
 msgstr ""
 
 #: rhodecode/model/validators.py:465
 #, python-format
 msgid "Repository name %(repo)s is disallowed"
 msgstr ""
 
 #: rhodecode/model/validators.py:467
 #, python-format
 msgid "Repository with name %(repo)s already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:469
 #, python-format
 msgid "Repository group with name \"%(repo)s\" already exists"
 msgstr ""
 
 #: rhodecode/model/validators.py:472
 #, python-format
 msgid "Repository with name %(repo)s exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:474
 #, python-format
 msgid "Repository group with name \"%(repo)s\" exists in group \"%(group)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:567
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:230
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:236
 msgid "Repository name cannot end with .git"
 msgstr ""
 
 #: rhodecode/model/validators.py:627
 #, python-format
 msgid "invalid clone url for %(rtype)s repository"
 msgstr ""
 
 #: rhodecode/model/validators.py:628
 #, python-format
 msgid "Invalid clone url, provide a valid clone url starting with one of %(allowed_prefixes)s"
 msgstr ""
 
 #: rhodecode/model/validators.py:660
 msgid "Fork have to be the same type as parent"
 msgstr ""
 
 #: rhodecode/model/validators.py:677
 msgid "You do not have the permission to create repositories in this group."
 msgstr ""
 
 #: rhodecode/model/validators.py:680
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:136
 msgid "You do not have the permission to store repositories in the root location."
 msgstr ""
 
 #: rhodecode/model/validators.py:740
 msgid "This username or user group name is not valid"
 msgstr ""
 
 #: rhodecode/model/validators.py:853
 msgid "This is not a valid path"
 msgstr ""
 
 #: rhodecode/model/validators.py:871
 #: rhodecode/model/validation_schema/schemas/user_schema.py:144
 #: rhodecode/model/validation_schema/schemas/user_schema.py:148
 msgid "This e-mail address is already taken"
 msgstr ""
 
 #: rhodecode/model/validators.py:893
 #, python-format
 msgid "e-mail \"%(email)s\" does not exist."
 msgstr ""
 
 #: rhodecode/model/validators.py:914
 #, python-format
 msgid "Revisions %(revs)s are already part of pull request or have set status"
 msgstr ""
 
 #: rhodecode/model/validators.py:947
 #: rhodecode/model/validation_schema/validators.py:41
 #: rhodecode/model/validation_schema/validators.py:54
 msgid "Please enter a valid IPv4 or IpV6 address"
 msgstr ""
 
 #: rhodecode/model/validators.py:948
 #, python-format
 msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)"
 msgstr ""
 
 #: rhodecode/model/validators.py:976
 msgid "Key name can only consist of letters, underscore, dash or numbers"
 msgstr ""
 
 #: rhodecode/model/validators.py:993
 #, python-format
 msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name"
 msgstr ""
 
 #: rhodecode/model/validators.py:996
 #, python-format
 msgid "The plugin \"%(plugin_id)s\" is missing an includeme function."
 msgstr ""
 
 #: rhodecode/model/validators.py:999
 #, python-format
 msgid "Can not load plugin \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1001
 #, python-format
 msgid "No plugin available with ID \"%(plugin_id)s\""
 msgstr ""
 
 #: rhodecode/model/validators.py:1069
 msgid "Url must start with http or /"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:62
 msgid "Invalid glob pattern"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:71
 msgid "Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:142
 msgid "invalid clone url for {repo_type} repository"
 msgstr ""
 
 #: rhodecode/model/validation_schema/validators.py:151
 msgid "Please enter a valid json object"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:42
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:89
 msgid "Gist with name {} already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/comment_schema.py:48
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:95
 msgid "Filename {} cannot be inside a directory"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/gist_schema.py:132
 msgid "Duplicated value for filename found: `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:36
 msgid "Pick a scope:"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:39
 msgid "Global (all repositories)"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:40
 msgid "Top level repositories only"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:79
 msgid "Only repo admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:86
 msgid "Only repogroup admins can create integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:91
 msgid "Only superadmins can create global integrations"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:181
 msgid "Scope of the integration. Recursive means the integration  runs on all repos of that group and children recursively."
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:184
 msgid "Integration scope"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:214
 msgid "General integration options"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/integration_schema.py:217
 msgid "{integration_type} settings"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:52
+msgid "Parent repository group `{}` does not exist"
+msgstr ""
+
 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:56
-msgid "Parent repository group `{}` does not exist"
-msgstr ""
-
-#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:58
+msgid "You do not have the permissions to store repository groups inside repository group `{}`"
+msgstr ""
+
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:59
 msgid "You do not have the permission to store repository groups in the root location."
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:118
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:125
 msgid "Repo group owner with id `{}` does not exists"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:215
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:143
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:221
 msgid "Repository with name `{}` already exists"
 msgstr ""
 
-#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141
-#: rhodecode/model/validation_schema/schemas/repo_schema.py:220
+#: rhodecode/model/validation_schema/schemas/repo_group_schema.py:148
+#: rhodecode/model/validation_schema/schemas/repo_schema.py:226
 msgid "Repository group with name `{}` already exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:60
 msgid "Repo owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:102
 msgid "Fork with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:105
 msgid "Cannot set fork of parameter of this repository to itself"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:130
 #: rhodecode/model/validation_schema/schemas/repo_schema.py:134
 msgid "Repository group `{}` does not exist"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:32
 msgid "Allowed in name are letters, numbers, and `-`, `_`, `.` Name must start with a letter or number. Got `{}`"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_group_schema.py:48
 msgid "User group owner with id `{}` does not exists"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:39
 msgid "Password is incorrect"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:62
 msgid "New password must be different to old password"
 msgstr ""
 
 #: rhodecode/model/validation_schema/schemas/user_schema.py:183
 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:20588 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+#: rhodecode/public/js/scripts.js:19
+msgid ": , "
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:20822 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
 msgid "No results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22050 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144
+#: rhodecode/public/js/scripts.js:22547 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:161
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
 msgid "{0} year"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22051 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
+#: rhodecode/public/js/scripts.js:22548 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:149
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
 msgid "{0} month"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22052 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
+#: rhodecode/public/js/scripts.js:22549 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:144
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
 msgid "{0} day"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22053 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
+#: rhodecode/public/js/scripts.js:22550 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
 msgid "{0} hour"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22054 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
+#: rhodecode/public/js/scripts.js:22551 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:148
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
 msgid "{0} min"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22055 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141
+#: rhodecode/public/js/scripts.js:22552 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:158
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
 msgid "{0} sec"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22075 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
+#: rhodecode/public/js/scripts.js:22572 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
 msgid "in {0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22083 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
+#: rhodecode/public/js/scripts.js:22580 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:141
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
 msgid "{0} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22095 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:146
+#: rhodecode/public/js/scripts.js:22592 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:163
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
 msgid "{0}, {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22097 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+#: rhodecode/public/js/scripts.js:22594 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
 msgid "in {0}, {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22101 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
+#: rhodecode/public/js/scripts.js:22598 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
 msgid "{0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22103 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
+#: rhodecode/public/js/scripts.js:22600 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
 msgid "{0} and {1} ago"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:22105 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+#: rhodecode/public/js/scripts.js:22602 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
 msgid "in {0} and {1}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37103 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
+#: rhodecode/public/js/scripts.js:37600 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
 msgid "Loading more results..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37106 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
+#: rhodecode/public/js/scripts.js:37603 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
 msgid "Searching..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37109 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/scripts.js:37606 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
 msgid "No matches found"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37112 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+#: rhodecode/public/js/scripts.js:37609 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
 msgid "Loading failed"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37116 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+#: rhodecode/public/js/scripts.js:37613 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
 msgid "One result is available, press enter to select it."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37118 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140
+#: rhodecode/public/js/scripts.js:37615 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:157
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
 msgid "{0} results are available, use up and down arrow keys to navigate."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37123 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+#: rhodecode/public/js/scripts.js:37620 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
 msgid "Please enter {0} or more character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37125 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
+#: rhodecode/public/js/scripts.js:37622 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
 msgid "Please enter {0} or more characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37130 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
+#: rhodecode/public/js/scripts.js:37627 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
 msgid "Please delete {0} character"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37132 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
+#: rhodecode/public/js/scripts.js:37629 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
 msgid "Please delete {0} characters"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37136 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
+#: rhodecode/public/js/scripts.js:37633 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
 msgid "You can only select {0} item"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37138 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
+#: rhodecode/public/js/scripts.js:37635 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
 msgid "You can only select {0} items"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:37780 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/utils/ajax.js:136
+#: rhodecode/public/js/scripts.js:38285 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
+#: rhodecode/public/js/src/rhodecode/utils/ajax.js:135
 msgid "Ajax Request Error"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38178 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
+#: rhodecode/public/js/scripts.js:38687 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133
 #: rhodecode/public/js/src/rhodecode/changelog.js:35
 msgid "showing {0} out of {1} commit"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38180 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
+#: rhodecode/public/js/scripts.js:38689 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134
 #: rhodecode/public/js/src/rhodecode/changelog.js:37
 msgid "showing {0} out of {1} commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38718 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
+#: rhodecode/public/js/scripts.js:39227 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
 #: rhodecode/public/js/src/rhodecode/codemirror.js:363
 msgid "Set status to Approved"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38738 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
+#: rhodecode/public/js/scripts.js:39247 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
 #: rhodecode/public/js/src/rhodecode/codemirror.js:383
 msgid "Set status to Rejected"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38757 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
+#: rhodecode/public/js/scripts.js:39266 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
 #: rhodecode/public/js/src/rhodecode/codemirror.js:402
 msgid "TODO comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:38777 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+#: rhodecode/public/js/scripts.js:39286 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
 #: rhodecode/public/js/src/rhodecode/codemirror.js:422
 msgid "Note Comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39078 rhodecode/public/js/scripts.js:39432
+#: rhodecode/public/js/scripts.js:39587 rhodecode/public/js/scripts.js:39962
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
 #: rhodecode/public/js/src/rhodecode/codemirror.js:723
-#: rhodecode/public/js/src/rhodecode/comments.js:233
+#: rhodecode/public/js/src/rhodecode/comments.js:254
 msgid "Status Review"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39093 rhodecode/public/js/scripts.js:39447
+#: rhodecode/public/js/scripts.js:39602 rhodecode/public/js/scripts.js:39977
 #: rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
 #: rhodecode/public/js/src/rhodecode/codemirror.js:738
-#: rhodecode/public/js/src/rhodecode/comments.js:248
+#: rhodecode/public/js/src/rhodecode/comments.js:269
 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39174 rhodecode/public/js/scripts.js:39642
-#: rhodecode/public/js/scripts.js:40669 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
+#: rhodecode/public/js/scripts.js:39683 rhodecode/public/js/scripts.js:40172
+#: rhodecode/public/js/scripts.js:41495 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
 #: rhodecode/public/js/src/rhodecode/codemirror.js:819
-#: rhodecode/public/js/src/rhodecode/comments.js:443
+#: rhodecode/public/js/src/rhodecode/comments.js:464
 #: rhodecode/public/js/src/rhodecode/files.js:499
-#: rhodecode/templates/files/files_browser_tree.mako:54
+#: rhodecode/templates/files/files_browser_tree.mako:57
 msgid "Loading ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39348 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
-#: rhodecode/public/js/src/rhodecode/comments.js:149
+#: rhodecode/public/js/scripts.js:39844 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/comments.js:136
+msgid "Updated Comment"
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:39868 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
+#: rhodecode/public/js/src/rhodecode/comments.js:160
 msgid "resolve comment"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39591 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
-#: rhodecode/public/js/src/rhodecode/comments.js:392
+#: rhodecode/public/js/scripts.js:40121 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
+#: rhodecode/public/js/src/rhodecode/comments.js:413
 msgid "Submitting..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39794 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/comments.js:595
+#: rhodecode/public/js/scripts.js:40403 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
+#: rhodecode/public/js/src/rhodecode/comments.js:695
 msgid "Yes, delete comment #{0}!"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:39849 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
-#: rhodecode/public/js/src/rhodecode/comments.js:650
+#: rhodecode/public/js/scripts.js:40458 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
+#: rhodecode/public/js/src/rhodecode/comments.js:750
 msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40015 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
-#: rhodecode/public/js/src/rhodecode/comments.js:816
+#: rhodecode/public/js/scripts.js:40667 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/src/rhodecode/comments.js:959
+msgid "Comment body was not changed."
+msgstr ""
+
+#: rhodecode/public/js/scripts.js:40840 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
+#: rhodecode/public/js/src/rhodecode/comments.js:1132
 msgid "Leave a comment on line {0}."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40140 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
-#: rhodecode/public/js/src/rhodecode/comments.js:941
+#: rhodecode/public/js/scripts.js:40966 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
+#: rhodecode/public/js/src/rhodecode/comments.js:1258
 msgid "TODO from comment {0} was fixed."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40418 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
+#: rhodecode/public/js/scripts.js:41244 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136
 #: rhodecode/public/js/src/rhodecode/files.js:248
 msgid "truncated result"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40420 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
+#: rhodecode/public/js/scripts.js:41246 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:137
 #: rhodecode/public/js/src/rhodecode/files.js:250
 msgid "truncated results"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40429 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
+#: rhodecode/public/js/scripts.js:41255 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
 #: rhodecode/public/js/src/rhodecode/files.js:259
 msgid "No matching files"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40487 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
+#: rhodecode/public/js/scripts.js:41313 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
 #: rhodecode/public/js/src/rhodecode/files.js:317
 msgid "Selection link"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40584 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/public/js/scripts.js:41410 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
 #: rhodecode/public/js/src/rhodecode/files.js:414
 msgid "All Authors"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40734 rhodecode/public/js/scripts.js:40737
+#: rhodecode/public/js/scripts.js:41560 rhodecode/public/js/scripts.js:41563
 #: rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
 #: rhodecode/public/js/src/rhodecode/files.js:564
 #: rhodecode/public/js/src/rhodecode/files.js:567
 msgid "File `{0}` has a newer version available, or has been removed. Click {1} to see the latest version."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40740 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41566 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
 #: rhodecode/public/js/src/rhodecode/files.js:570
 msgid "There is an existing path `{0}` at this commit."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40743 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:41569 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
 #: rhodecode/public/js/src/rhodecode/files.js:573
 msgid "There is a later version of file tree available. Click {0} to create a file at the latest tree."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40797 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
+#: rhodecode/public/js/scripts.js:41623 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
 #: rhodecode/public/js/src/rhodecode/followers.js:26
 msgid "Stopped watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40798 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+#: rhodecode/public/js/scripts.js:41624 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
 #: rhodecode/public/js/src/rhodecode/followers.js:27
-#: rhodecode/templates/base/base.mako:301
+#: rhodecode/templates/base/base.mako:308
 msgid "Watch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40801 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
+#: rhodecode/public/js/scripts.js:41627 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
 #: rhodecode/public/js/src/rhodecode/followers.js:30
 msgid "Started watching this repository"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:40802 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
+#: rhodecode/public/js/scripts.js:41628 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
 #: rhodecode/public/js/src/rhodecode/followers.js:31
-#: rhodecode/templates/base/base.mako:299
+#: rhodecode/templates/base/base.mako:306
 msgid "Unwatch"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41182 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:141
+#: rhodecode/public/js/scripts.js:42010 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:143
 msgid "All reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41191 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:150
+#: rhodecode/public/js/scripts.js:42019 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:152
 msgid "All individual reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41196 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:155
+#: rhodecode/public/js/scripts.js:42024 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:157
 msgid "At least {0} reviewer must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41202 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:161
+#: rhodecode/public/js/scripts.js:42030 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:163
 msgid "At least {0} reviewers must vote."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41218 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:177
+#: rhodecode/public/js/scripts.js:42046 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:179
 msgid "Reviewers picked from source code changes."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41225 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:184
+#: rhodecode/public/js/scripts.js:42053 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:186
 msgid "Adding new reviewers is forbidden."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41232 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:191
+#: rhodecode/public/js/scripts.js:42060 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:193
 msgid "Author is not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41246 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:205
+#: rhodecode/public/js/scripts.js:42074 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:207
 msgid "Commit Authors are not allowed to be a reviewer."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41268 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:227
+#: rhodecode/public/js/scripts.js:42096 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:229
 msgid "Loading diff ..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41307 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:266
+#: rhodecode/public/js/scripts.js:42135 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:268
 msgid "no commits"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41378 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:337
+#: rhodecode/public/js/scripts.js:42206 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:339
 msgid "User `{0}` not allowed to be a reviewer"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41384 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:343
+#: rhodecode/public/js/scripts.js:42212 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:345
 msgid "User `{0}` already in reviewers"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41487 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:446
+#: rhodecode/public/js/scripts.js:42315 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:448
 msgid "added manually by \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41491 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:450
+#: rhodecode/public/js/scripts.js:42319 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:452
 msgid "member of \"{0}\""
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41682 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:641
+#: rhodecode/public/js/scripts.js:42510 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:643
 msgid "Updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:41692 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
-#: rhodecode/public/js/src/rhodecode/pullrequests.js:651
+#: rhodecode/public/js/scripts.js:42520 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
+#: rhodecode/public/js/src/rhodecode/pullrequests.js:653
 msgid "Force updating..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46140 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:46968 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
 #: rhodecode/public/js/src/rhodecode/users.js:54
 msgid "Show this authentication token?"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46142 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:46970 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
 #: rhodecode/public/js/src/rhodecode/users.js:56
 msgid "Show"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46178 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/scripts.js:47006 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
 #: rhodecode/public/js/src/rhodecode/users.js:92
 msgid "Authentication Token"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46367 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+#: rhodecode/public/js/scripts.js:47195 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
 #: rhodecode/public/js/src/rhodecode.js:144
 msgid "file"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46511 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
+#: rhodecode/public/js/scripts.js:47339 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
 #: rhodecode/public/js/src/rhodecode.js:288
 msgid "Loading..."
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46884 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
+#: rhodecode/public/js/scripts.js:47712 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
 #: rhodecode/public/js/src/rhodecode.js:661
 msgid "date not in future"
 msgstr ""
 
-#: rhodecode/public/js/scripts.js:46892 rhodecode/public/js/scripts.min.js:1
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
+#: rhodecode/public/js/scripts.js:47720 rhodecode/public/js/scripts.min.js:1
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
 #: rhodecode/public/js/src/rhodecode.js:669
 msgid "Specified expiration date"
 msgstr ""
 
 #: 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:606
-#: rhodecode/templates/codeblocks/diffs.mako:610
+msgid "<strong>{0} file</strong> changed, "
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
+msgid "<strong>{0} files</strong> changed, "
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
+#: rhodecode/templates/codeblocks/diffs.mako:618
+#: rhodecode/templates/codeblocks/diffs.mako:622
 msgid "Add another comment"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
 msgid "Are you sure to close this pull request without merging?"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
 msgid "Changed files"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
 #: rhodecode/public/js/src/i18n_messages.js:5
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:288
 msgid "Close"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
 #: rhodecode/templates/codeblocks/diffs.mako:131
 msgid "Collapse all files"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
-msgid "Collapse {0} commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
-msgid "Collapse {0} commits"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
-msgid "Context file: "
+msgid "Collapse {0} commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
-msgid "Delete this comment?"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
-msgid "Diff to Commit "
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
-#: rhodecode/templates/codeblocks/diffs.mako:129
-msgid "Expand all files"
+msgid "Collapse {0} commits"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
-msgid "Expand {0} commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
-msgid "Expand {0} commits"
+msgid "Context file: "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
-msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
+msgid "Delete this comment?"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
-msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
+msgid "Diff to Commit "
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
-msgid "Follow"
+msgid "Error during search operation"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
+#: rhodecode/templates/codeblocks/diffs.mako:129
+msgid "Expand all files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
-msgid "Hide full context diff"
+msgid "Expand {0} commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
-msgid "Hide whitespace changes"
+msgid "Expand {0} commits"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
+msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
+msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
+msgid "Follow"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
+msgid "Hide full context diff"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
+msgid "Hide whitespace changes"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
 #: rhodecode/public/js/src/i18n_messages.js:4
 msgid "Invite reviewers to this discussion"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
-msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
-msgid "No bookmarks available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
-msgid "No branches available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
-msgid "No forks available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
-msgid "No gists available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
-msgid "No pull requests available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
-msgid "No repositories available yet."
+msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
-msgid "No repositories present."
+msgid "No bookmarks available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
-msgid "No repository groups available yet."
+msgid "No branches available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
-msgid "No repository groups present."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
-msgid "No ssh keys available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
-msgid "No tags available yet."
+msgid "No forks available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
+msgid "No gists available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
-msgid "No user groups available yet."
+msgid "No pull requests available yet."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
-msgid "No users available yet."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
-#: rhodecode/templates/commits/changelog.mako:78
-msgid "Open new pull request"
+msgid "No repositories available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
+msgid "No repositories present."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
+msgid "No repository groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
+msgid "No repository groups present."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
+msgid "No ssh keys available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
+msgid "No tags available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
+msgid "No user groups available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
+msgid "No users available yet."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
+#: rhodecode/templates/commits/changelog.mako:78
+msgid "Open new pull request"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
 msgid "Open new pull request for selected commit"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
+msgid "Please wait creating pull request..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
 msgid "Saving..."
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
 #: rhodecode/public/js/src/i18n_messages.js:6
 #: rhodecode/templates/admin/settings/settings_email.mako:50
 msgid "Send"
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
 msgid "Show at Commit "
 msgstr ""
 
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
-msgid "Show commit range {0} ... {1}"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
-msgid "Show full context diff"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
-#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40
-msgid "Show more"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
-msgid "Show selected commit __S"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
-msgid "Show selected commits __S ... __E"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
-msgid "Show whitespace changes"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
-msgid "Start following this repository"
-msgstr ""
-
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
-msgid "Stop following this repository"
+msgid "Show commit range {0} ... {1}"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
+msgid "Show full context diff"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
+#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:40
+msgid "Show more"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
-#: rhodecode/public/js/src/i18n_messages.js:7
-msgid "Switch to chat"
+msgid "Show selected commit __S"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
-#: rhodecode/public/js/src/i18n_messages.js:8
-msgid "Switch to comment"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
-msgid "There are currently no open pull requests requiring your participation."
+msgid "Show selected commits __S ... __E"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
+msgid "Show whitespace changes"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
-msgid "Toggle Wide Mode diff"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
-msgid "Unfollow"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
-#: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "activated"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
-msgid "disabled"
+msgid "Start following this repository"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
+msgid "Stop following this repository"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
+#: rhodecode/public/js/src/i18n_messages.js:7
+msgid "Switch to chat"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
+#: rhodecode/public/js/src/i18n_messages.js:8
+msgid "Switch to comment"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
+msgid "There are currently no open pull requests requiring your participation."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
-msgid "enabled"
+msgid "This pull requests will consist of <strong>{0} commit</strong>."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
+msgid "This pull requests will consist of <strong>{0} commits</strong>."
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
-msgid "files"
+msgid "Toggle Wide Mode diff"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
-msgid "go to numeric commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
-#: rhodecode/templates/index_base.mako:27
-#: rhodecode/templates/pullrequests/pullrequest.mako:136
-msgid "loading..."
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
+msgid "Unfollow"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
 #: rhodecode/templates/admin/auth/auth_settings.mako:69
-msgid "not active"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
-msgid "specify commit"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
-msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
+msgid "activated"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
+msgid "disabled"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
+msgid "enabled"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
-msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
+msgid "files"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
-msgid "{0} active out of {1} users"
+msgid "go to numeric commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
-msgid "{0} days"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
-msgid "{0} hours"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:133
-msgid "{0} months"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:134
-msgid "{0} of {1} repositories"
+#: rhodecode/templates/index_base.mako:27
+#: rhodecode/templates/pullrequests/pullrequest.mako:136
+msgid "loading..."
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
+#: rhodecode/templates/admin/auth/auth_settings.mako:69
+msgid "not active"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:135
-msgid "{0} of {1} repository groups"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:136
-msgid "{0} out of {1} ssh keys"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:137
-msgid "{0} out of {1} users"
+msgid "specify commit"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:138
-msgid "{0} repositories"
+msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:139
-msgid "{0} repository groups"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:142
-msgid "{0} user groups ({1} inactive)"
-msgstr ""
-
-#: rhodecode/public/js/rhodecode/i18n/js_translations.js:143
-msgid "{0} users ({1} inactive)"
+msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:140
+msgid "{0} active out of {1} users"
 msgstr ""
 
 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:145
+msgid "{0} days"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:147
+msgid "{0} hours"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:150
+msgid "{0} months"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:151
+msgid "{0} of {1} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:152
+msgid "{0} of {1} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:153
+msgid "{0} out of {1} ssh keys"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:154
+msgid "{0} out of {1} users"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:155
+msgid "{0} repositories"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:156
+msgid "{0} repository groups"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:159
+msgid "{0} user groups ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:160
+msgid "{0} users ({1} inactive)"
+msgstr ""
+
+#: rhodecode/public/js/rhodecode/i18n/js_translations.js:162
 msgid "{0} years"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/extensions/HelpDialog.js:19
 msgid "HelpDialog"
 msgstr ""
 
 #: rhodecode/public/js/src/math_jax/jax/output/HTML-CSS/autoload/mglyph.js:19
 msgid "MathML"
 msgstr ""
 
 #: rhodecode/templates/index.mako:5
 msgid "Dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:21
 msgid "No repositories or repositories groups exists here."
 msgstr ""
 
 #: 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
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:39
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:28
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:74
 #: 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:57
-#: rhodecode/templates/base/perms_summary.mako:168
-#: rhodecode/templates/base/perms_summary.mako:242
+#: rhodecode/templates/base/perms_summary.mako:173
+#: rhodecode/templates/base/perms_summary.mako:247
 #: rhodecode/templates/bookmarks/bookmarks.mako:57
 #: rhodecode/templates/branches/branches.mako:56
-#: rhodecode/templates/files/files_browser_tree.mako:13
+#: rhodecode/templates/files/files_browser_tree.mako:16
 #: rhodecode/templates/tags/tags.mako:57
 msgid "Name"
 msgstr ""
 
 #: rhodecode/templates/index_base.mako:89
 #: rhodecode/templates/index_base.mako:176
 #: rhodecode/templates/admin/gists/gist_index.mako:109
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:21
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:81
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:27
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:68
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:53
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:58
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:77
 #: rhodecode/templates/admin/repos/repo_add_base.mako:83
 #: 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:46
 #: rhodecode/templates/admin/user_groups/user_groups.mako:78
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:26
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:85
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:32
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:91
 #: rhodecode/templates/admin/users/user_edit_groups.mako:62
 #: rhodecode/templates/admin/users/user_edit_ips.mako:17
 #: rhodecode/templates/admin/users/user_edit_profile.mako:74
 #: 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:19
-#: rhodecode/templates/email_templates/pull_request_review.mako:43
-#: rhodecode/templates/email_templates/pull_request_review.mako:123
-#: rhodecode/templates/email_templates/pull_request_update.mako:43
-#: rhodecode/templates/email_templates/pull_request_update.mako:135
+#: rhodecode/templates/email_templates/pull_request_review.mako:45
+#: rhodecode/templates/email_templates/pull_request_review.mako:126
+#: rhodecode/templates/email_templates/pull_request_update.mako:45
+#: rhodecode/templates/email_templates/pull_request_update.mako:139
 #: rhodecode/templates/forks/fork.mako:56
 #: rhodecode/templates/forks/forks.mako:62
 #: rhodecode/templates/pullrequests/pullrequest.mako:50
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:562
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:560
 #: rhodecode/templates/summary/components.mako:159
 #: rhodecode/templates/user_group/profile.mako:25
 #: rhodecode/templates/users/user_profile.mako:59
 msgid "Description"
 msgstr ""
 
 #: 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: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
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:84
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
 #: 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:28
 #: rhodecode/templates/admin/user_groups/user_groups.mako:86
 #: 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: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:17
-#: rhodecode/templates/email_templates/commit_comment.mako:56
-#: rhodecode/templates/email_templates/commit_comment.mako:109
-#: rhodecode/templates/email_templates/commit_comment.mako:135
+#: rhodecode/templates/email_templates/commit_comment.mako:60
+#: rhodecode/templates/email_templates/commit_comment.mako:114
+#: rhodecode/templates/email_templates/commit_comment.mako:141
 #: rhodecode/templates/files/file_authors_box.mako:28
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:560
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:558
 #: rhodecode/templates/search/search_commit.mako:9
 #: rhodecode/templates/summary/components.mako:117
 #: rhodecode/templates/summary/components.mako:125
 #: rhodecode/templates/summary/summary_commits.mako:8
 #: rhodecode/templates/tags/tags.mako:64
 msgid "Commit"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:5
 #, python-format
 msgid "%s Repository group dashboard"
 msgstr ""
 
 #: rhodecode/templates/index_repo_group.mako:13
-#: rhodecode/templates/base/base.mako:804
-#: rhodecode/templates/base/base.mako:805
+#: rhodecode/templates/base/base.mako:811
+#: rhodecode/templates/base/base.mako:812
 msgid "Home"
 msgstr ""
 
 #: rhodecode/templates/login.mako:5 rhodecode/templates/login.mako:91
 #: rhodecode/templates/debug_style/login.html:60
 msgid "Sign In"
 msgstr ""
 
 #: rhodecode/templates/login.mako:39
 msgid "Sign In using username/password"
 msgstr ""
 
 #: rhodecode/templates/login.mako:53
 msgid "Forgot your password?"
 msgstr ""
 
 #: rhodecode/templates/login.mako:66
 msgid "Remember my indefinitely"
 msgstr ""
 
 #: rhodecode/templates/login.mako:68
 msgid "Remember me for {}"
 msgstr ""
 
 #: rhodecode/templates/login.mako:74
 msgid "Create a new account."
 msgstr ""
 
 #: rhodecode/templates/login.mako:81
 msgid "Password reset is disabled."
 msgstr ""
 
 #: rhodecode/templates/login.mako:82
 msgid "Please contact "
 msgstr ""
 
 #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39
-#: rhodecode/templates/base/base.mako:59
+#: rhodecode/templates/base/base.mako:61
 msgid "Support"
 msgstr ""
 
 #: rhodecode/templates/login.mako:85 rhodecode/templates/password_reset.mako:40
 msgid "or"
 msgstr ""
 
 #: rhodecode/templates/login.mako:87 rhodecode/templates/password_reset.mako:42
 msgid "an administrator if you need help."
 msgstr ""
 
 #: rhodecode/templates/login.mako:91
 msgid "Sign in to {}"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:5
 msgid "Reset Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:37
 msgid "Password reset is disabled. Please contact "
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:49
 msgid "Reset your Password"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:50
 msgid "Go to the login page to sign in."
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:54
 msgid "Email Address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:60
 msgid "Password reset link will be sent to matching email address"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:64
 #: rhodecode/templates/register.mako:104
 msgid "Captcha"
 msgstr ""
 
 #: rhodecode/templates/password_reset.mako:75
 msgid "Send password reset email"
 msgstr ""
 
 #: rhodecode/templates/register.mako:5
 msgid "Create an Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:38
 msgid "Create an account linked with {}"
 msgstr ""
 
 #: rhodecode/templates/register.mako:40
 msgid "Create an account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:43
 msgid "Go to the login page to sign in with an existing account."
 msgstr ""
 
 #: rhodecode/templates/register.mako:69
 msgid "Re-enter password"
 msgstr ""
 
 #: rhodecode/templates/register.mako:81
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:38
 #: rhodecode/templates/admin/users/user_add.mako:68
 #: rhodecode/templates/admin/users/user_edit_profile.mako:47
 #: rhodecode/templates/admin/users/users.mako:78
 msgid "First Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:88
 #: rhodecode/templates/admin/my_account/my_account_profile.mako:58
 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:47
 #: rhodecode/templates/admin/users/user_add.mako:77
 #: rhodecode/templates/admin/users/user_edit_profile.mako:56
 #: rhodecode/templates/admin/users/users.mako:80
 msgid "Last Name"
 msgstr ""
 
 #: rhodecode/templates/register.mako:116
 msgid "Account activation requires admin approval."
 msgstr ""
 
 #: rhodecode/templates/register.mako:123
 msgid "Create Account"
 msgstr ""
 
 #: rhodecode/templates/register.mako:123
 msgid "Create Account in {}"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:6
 msgid "Admin audit log entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:26
 msgid "Audit long entry"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:34
 #: rhodecode/templates/users/user.mako:4
 msgid "User"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:46
 #: rhodecode/templates/admin/admin_log_base.mako:11
 #: rhodecode/templates/bookmarks/bookmarks.mako:59
 #: rhodecode/templates/branches/branches.mako:58
 #: rhodecode/templates/tags/tags.mako:59
 msgid "Date"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:54
 #: rhodecode/templates/admin/admin_log_base.mako:12
 msgid "IP"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:63
 #: rhodecode/templates/admin/admin_log_base.mako:8
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:25
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:31
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86
 #: 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:75
 #: rhodecode/templates/admin/user_groups/user_groups.mako:88
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:30
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
 #: rhodecode/templates/admin/users/user_edit_groups.mako:76
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:18
 #: rhodecode/templates/admin/users/users.mako:91
 #: rhodecode/templates/forks/forks.mako:69
 msgid "Action"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:81
 #: rhodecode/templates/admin/admin_log_base.mako:9
 msgid "Action Data"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:89
 #: rhodecode/templates/admin/admin_log_base.mako:47
 msgid "data not available for v1 entries type"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_log_entry.mako:95
 #: rhodecode/templates/admin/admin_log_base.mako:10
 #: rhodecode/templates/admin/defaults/defaults.mako:32
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
-#: rhodecode/templates/base/base.mako:649
-#: rhodecode/templates/base/base.mako:651
-#: rhodecode/templates/base/base.mako:653
+#: rhodecode/templates/base/base.mako:656
+#: rhodecode/templates/base/base.mako:658
+#: rhodecode/templates/base/base.mako:660
 #: rhodecode/templates/search/search_commit.mako:8
 #: rhodecode/templates/search/search_path.mako:7
 msgid "Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:5
-#: rhodecode/templates/base/base.mako:106
+#: rhodecode/templates/base/base.mako:111
 msgid "Admin audit logs"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:25
 msgid "filter..."
 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:18
 #: rhodecode/templates/journal/journal.mako:13
 msgid "filter"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_audit_logs.mako:27
 #: rhodecode/templates/admin/repos/repo_edit.mako:91
 #: rhodecode/templates/admin/users/user_edit.mako:48
 msgid "Audit logs"
 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:21
 #: rhodecode/templates/journal/journal.mako:16
 msgid "Example Queries"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:6
 msgid "Uid"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:42
 msgid "toggle"
 msgstr ""
 
 #: rhodecode/templates/admin/admin_log_base.mako:68
 msgid "No actions yet"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:5
 #: rhodecode/templates/admin/settings/settings.mako:5
 msgid "Settings administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:26
 msgid "Administration area"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:30
 msgid "Repositories under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:34
 #: rhodecode/templates/admin/repos/repo_add.mako:22
 #: rhodecode/templates/admin/repos/repos.mako:31
 msgid "Add Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:39
 msgid "Repository groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:43
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:31
 msgid "Add Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:48
 msgid "User groups under administration"
 msgstr ""
 
 #: rhodecode/templates/admin/main.mako:52
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:15
 #: rhodecode/templates/admin/user_groups/user_groups.mako:31
 msgid "Add User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:5
 #: rhodecode/templates/admin/auth/plugin_settings.mako:5
 msgid "Authentication Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:42
 msgid "Enabled and Available Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:48
 msgid "Ordered Activated Plugins"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:53
 msgid ""
 "List of plugins, separated by commas.\n"
 "The order of the plugins is also the order in which RhodeCode Enterprise will try to authenticate a user."
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:60
 msgid "Activate"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:61
 msgid "Plugin Name"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:62
+#: rhodecode/templates/base/base.mako:62
 msgid "Documentation"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:63
 msgid "Plugin ID"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/auth_settings.mako:85
 #: rhodecode/templates/admin/auth/plugin_settings.mako:96
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109
 #: rhodecode/templates/admin/permissions/permissions_application.mako:59
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:216
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:226
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:77
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:84
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:200
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:206
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:250
 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:206
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:216
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:106
 #: rhodecode/templates/admin/users/user_edit_groups.mako:30
 #: rhodecode/templates/admin/users/user_edit_profile.mako:154
-#: rhodecode/templates/base/default_perms_box.mako:88
+#: rhodecode/templates/base/default_perms_box.mako:101
 msgid "Save"
 msgstr ""
 
 #: rhodecode/templates/admin/auth/plugin_settings.mako:46
 msgid "Plugin"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults.mako:5
 #: rhodecode/templates/admin/defaults/defaults.mako:14
 msgid "Repositories defaults"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:3
 msgid "Default Settings For New Repositories"
 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: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:113
 msgid "Private Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
 #: 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 ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:34
 msgid "Enable Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:38
 msgid "Enable a statistics window on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:44
 msgid "Enable Downloads"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:48
 msgid "Enable the download option on the repository summary page."
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:54
 msgid "Enable Locking"
 msgstr ""
 
 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:58
 msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:5
 msgid "Edit Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:33
 #: rhodecode/templates/admin/gists/gist_new.mako:34
 msgid "Gist lifetime"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:36
 msgid "Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:40
 #: rhodecode/templates/admin/gists/gist_new.mako:40
 msgid "Gist description ..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:54
 #: rhodecode/templates/admin/gists/gist_new.mako:48
-#: rhodecode/templates/files/files_add.mako:67
-#: rhodecode/templates/files/files_edit.mako:69
+#: rhodecode/templates/files/files_add.mako:66
+#: rhodecode/templates/files/files_edit.mako:68
 msgid "plain"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:99
 msgid "Update Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:100
 #: rhodecode/templates/base/issue_tracker_settings.mako:150
-#: rhodecode/templates/changeset/changeset_file_comment.mako:395
+#: rhodecode/templates/changeset/changeset_file_comment.mako:460
 #: rhodecode/templates/codeblocks/diffs.mako:88
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75
 msgid "Cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_edit.mako:123
 #, python-format
 msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:6
 msgid "Private Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:8
 msgid "Public Gists for user {}"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:10
 msgid "Public Gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:30
 msgid "All gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:32
 msgid "All public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:34
 msgid "My gists"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:35
 msgid "My private"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:36
 msgid "My public"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:43
 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
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:25
 #: rhodecode/templates/admin/repos/repos.mako:25
 #: rhodecode/templates/admin/user_groups/user_groups.mako:25
 #: rhodecode/templates/admin/users/users.mako:26
 #: rhodecode/templates/bookmarks/bookmarks.mako:33
 #: rhodecode/templates/branches/branches.mako:33
 #: rhodecode/templates/journal/journal.mako:12
 #: rhodecode/templates/pullrequests/pullrequests.mako:53
 #: rhodecode/templates/tags/tags.mako:33
 msgid "quick filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:103
 #: 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:16
-#: rhodecode/templates/files/files_browser_tree.mako:17
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:559
+#: rhodecode/templates/files/files_browser_tree.mako:20
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:557
 #: rhodecode/templates/pullrequests/pullrequests.mako:98
 #: rhodecode/templates/search/search_commit.mako:18
 #: rhodecode/templates/summary/summary_commits.mako:11
 #: rhodecode/templates/tags/tags.mako:61
 msgid "Author"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:111
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9
 #: 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:16
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51
 msgid "Created on"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_index.mako:113
 msgid "Expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:5
-#: rhodecode/templates/base/base.mako:568
+#: rhodecode/templates/base/base.mako:575
 msgid "New Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:31
 msgid "Gist id"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:32
 msgid "Auto generated"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:37
 msgid "Private Gist access level"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:47
 msgid "name gist file..."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:61
 msgid "Create Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:69
 #: rhodecode/templates/admin/gists/gist_new.mako:70
 #: rhodecode/templates/data_table/_dt_elements.mako:352
 msgid "Private Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:70
 msgid "Private Gists are not listed and only accessible through their secret url."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:73
 #: rhodecode/templates/admin/gists/gist_new.mako:74
 #: rhodecode/templates/data_table/_dt_elements.mako:350
 msgid "Public Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_new.mako:74
 msgid "Public Gists are accessible to anyone and listed in Gists page."
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:14
 #: rhodecode/templates/admin/gists/gist_show.mako:21
 msgid "Gist"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:41
 msgid "Copy the url"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:47
-#: rhodecode/templates/files/files_source.mako:106
+#: rhodecode/templates/files/files_source.mako:116
 msgid "Copy content"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:52
 msgid "Show as Raw"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:73
 msgid "created"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:74
 msgid "expires"
 msgstr ""
 
 #: rhodecode/templates/admin/gists/gist_show.mako:95
-#: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:128
+#: rhodecode/templates/files/files_delete.mako:57
+#: rhodecode/templates/files/files_source.mako:138
 msgid "Show as raw"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:14
 msgid "Integrations Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/base.mako:23
 #: rhodecode/templates/admin/integrations/form.mako:8
 #: rhodecode/templates/admin/integrations/form.mako:21
 #: rhodecode/templates/admin/integrations/form.mako:32
 #: rhodecode/templates/admin/integrations/global.mako:14
 #: rhodecode/templates/admin/integrations/list.mako:21
 #: rhodecode/templates/admin/integrations/list.mako:25
 #: rhodecode/templates/admin/integrations/list.mako:29
 #: rhodecode/templates/admin/integrations/list.mako:36
 #: rhodecode/templates/admin/integrations/new.mako:15
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33
 #: rhodecode/templates/admin/repos/repo_edit.mako:74
-#: rhodecode/templates/base/base.mako:113
+#: rhodecode/templates/base/base.mako:118
 msgid "Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:30
 #: rhodecode/templates/admin/integrations/list.mako:16
 #: rhodecode/templates/admin/integrations/new.mako:7
 #: rhodecode/templates/admin/integrations/new.mako:9
 #: rhodecode/templates/admin/integrations/new.mako:13
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:30
 #: rhodecode/templates/admin/repos/repo_edit.mako:15
 #: 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
+#: rhodecode/templates/base/base.mako:120
 msgid "Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/form.mako:60
 #, python-format
 msgid "Create New %(integration_type)s Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/global.mako:5
 msgid "Integrations administration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:44
 msgid "Current Integrations for Repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:46
 msgid "Repository Group Integrations: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:48
 msgid "Current Integrations"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:65
 #: rhodecode/templates/admin/integrations/new.mako:18
 msgid "Create new integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:74
 msgid "Scope"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:75
 #: rhodecode/templates/compare/compare_diff.mako:84
 msgid "Actions"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:85
 msgid "No {type} integrations for repo {repo} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:87
 msgid "No {type} integrations for repogroup {repogroup} exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:89
 msgid "No {type} integrations exist yet."
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:103
 msgid "Create one"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:132
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:19
 msgid "repo"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:136
 msgid "repogroup"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:138
 msgid "child repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:140
 msgid "cascade to all"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:145
 msgid "top level repos only"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:147
 msgid "global"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/list.mako:153
 msgid "unknown integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:23
 msgid "Create New Integration for repository: {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:25
 msgid "Create New Integration for repository group: {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:27
 msgid "Create New Global Integration"
 msgstr ""
 
 #: rhodecode/templates/admin/integrations/new.mako:55
 msgid "No description available"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:5
-#: rhodecode/templates/base/base.mako:613
+#: rhodecode/templates/base/base.mako:620
 msgid "My account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:12
 msgid "My Account"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:29
-#: rhodecode/templates/email_templates/user_registration.mako:54
+#: rhodecode/templates/email_templates/user_registration.mako:55
 msgid "Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:30
 #: rhodecode/templates/admin/users/user_edit.mako:45
 #: rhodecode/templates/debug_style/index.html:55
 msgid "Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:33
 msgid "Auth Tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:34
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
 #: 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:7
 msgid "SSH Keys"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:35
 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5
 msgid "User Group Membership"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:40
 msgid "External Identities"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:43
 msgid "Owned Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:44
 msgid "Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:45
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
-#: rhodecode/templates/base/base.mako:376
-#: rhodecode/templates/base/base.mako:617
+#: rhodecode/templates/base/base.mako:383
+#: rhodecode/templates/base/base.mako:624
 msgid "Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:46
 #: rhodecode/templates/admin/permissions/permissions.mako:14
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
-#: rhodecode/templates/base/base.mako:111
+#: rhodecode/templates/base/base.mako:116
 msgid "Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account.mako:47
 msgid "Live Notifications"
 msgstr ""
 
 #: 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:14
 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
-msgid "Authentication tokens can be used to interact with the API, or VCS-over-http. Each token can have a role. Token with a role can be used only in given context, e.g. VCS tokens can be used together with the authtoken auth plugin for git/hg/svn operations only."
-msgstr ""
-
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:20
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:25
+msgid "Available roles"
+msgstr ""
+
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:26
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:31
 msgid "Token"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:23
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:28
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:29
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:34
 msgid "Repository Scope"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:24
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:29
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:30
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:35
 msgid "Expiration"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:66
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:70
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:76
 msgid "No additional auth tokens specified"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:78
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:84
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88
 msgid "New authentication token"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:92
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:96
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:98
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:102
 msgid "Repository scope works only with tokens with VCS type."
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:96
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:102
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:100
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:106
 #: rhodecode/templates/admin/users/user_edit_emails.mako:65
 #: rhodecode/templates/admin/users/user_edit_ips.mako:75
 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:71
 msgid "Add"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:129
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:134
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:135
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:140
 msgid "Select or enter expiration date"
 msgstr ""
 
-#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:164
-#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:169
+#: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:170
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:175
 msgid "repository scope"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:7
 msgid "Position"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:17
 msgid "Bookmark title (max 30 characters, optional)"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24
 msgid "Clear"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30
 msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34
 msgid "Redirect URL"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44
 msgid "Repository template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50
 msgid "Repository group template"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56
 msgid "Template Repository or Repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66
 msgid "Available as ${repo_url}  e.g. Redirect url: ${repo_url}/changelog"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68
 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70
 msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}."
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80
 msgid "Your Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85
 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. "
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87
 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141
 msgid "repository"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192
 msgid "repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:5
 msgid "Account Emails"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_emails.mako:17
 #: rhodecode/templates/admin/users/user_edit_emails.mako:19
 msgid "Primary"
 msgstr ""
 
 #: 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:52
 #: 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 ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:4
 msgid "Your Live Notification Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:16
 msgid "Notifications Status"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:40
 msgid "Test Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_password.mako:3
 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: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: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:65
 msgid "Change your avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:13
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:40
 msgid "All"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:14
 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:67
 msgid "Target Repo"
 msgstr ""
 
 #: 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:85
 #: rhodecode/templates/admin/settings/settings_global.mako:9
-#: rhodecode/templates/email_templates/pull_request_review.mako:41
-#: rhodecode/templates/email_templates/pull_request_update.mako:41
+#: rhodecode/templates/email_templates/pull_request_review.mako:43
+#: rhodecode/templates/email_templates/pull_request_update.mako:43
 #: rhodecode/templates/pullrequests/pullrequest.mako:38
 #: rhodecode/templates/pullrequests/pullrequests.mako:96
 msgid "Title"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:103
 #: rhodecode/templates/pullrequests/pullrequests.mako:102
 msgid "Last Update"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_repos.mako:3
 msgid "Repositories You Own"
 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: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:17
 msgid "Accessed on"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16
 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: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: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: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: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: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:51
 #: rhodecode/templates/admin/user_groups/user_group_add.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: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"
 msgstr ""
 
 #: rhodecode/templates/admin/my_account/my_account_watched.mako:3
 msgid "Your Watched Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:5
 msgid "My notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:26
 msgid "Mark as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_data.mako:42
 msgid "No notifications here yet"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show.mako:14
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:5
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:14
 msgid "Show notification"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:12
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:5
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:20
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:12
 msgid "My Notifications"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show.mako:42
 #: rhodecode/templates/debug_style/email_plain_rendered.mako:38
 msgid "Subject"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:25
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:29
 msgid "Mark all as read"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:39
 msgid "Unread"
 msgstr ""
 
 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
 #: rhodecode/templates/changeset/changeset.mako:172
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:671
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:670
 msgid "Comments"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:5
 msgid "Permissions Administration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:33
 msgid "Application"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:39
 msgid "Object"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:45
 msgid "IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:48
 msgid "AuthToken Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions.mako:54
 msgid "Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:3
 msgid "System Wide Application Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:12
 msgid "Anonymous Access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:18
 #, python-format
 msgid "Allow access to RhodeCode Enterprise without requiring users to login. Anonymous users get the %s permission settings."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:24
 msgid "Registration"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:33
 msgid "Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:42
 msgid "Registration Page Message"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:46
 msgid "Custom message to be displayed on the registration page. HTML syntax is supported."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_application.mako:52
 msgid "External Authentication Account Activation"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:5
 msgid "View whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_auth_token_access.mako:36
 msgid "List of views available for usage in whitelist access"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:3
 msgid "Default Permissions for Branches."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_branch.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:67
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6
 #: rhodecode/templates/admin/settings/settings_automation.mako:6
 #: rhodecode/templates/artifacts/artifact_list.mako:24
 msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:5
 msgid "Default IP Whitelist For All Users"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:9
 #: 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: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:49
 msgid "All IP addresses are allowed"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:52
 #: 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:68
 msgid "Description..."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ips.mako:57
 msgid ""
 "Enter a comma separated list of IP Addresses like 127.0.0.1,\n"
 "or use an IP Address with a mask 127.0.0.1/24, to create a network range.\n"
 "To specify multiple addresses in a range, use the 127.0.0.1-127.0.0.10 syntax"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:3
 msgid "Default Permissions for Repositories, User Groups and Repository Groups."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:7
 msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:9
 msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value."
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:23
 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:24
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:38
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:52
 msgid "Overwrite Existing Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:37
 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:45
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14
 msgid "User Groups"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_objects.mako:51
 msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_perms.mako:1
 msgid "Default User Permissions Overview"
 msgstr ""
 
 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:7
 msgid "Update SSH keys file"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5
 msgid "Add repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13
-#: rhodecode/templates/base/base.mako:108
-#: rhodecode/templates/base/base.mako:129
+#: rhodecode/templates/base/base.mako:113
+#: rhodecode/templates/base/base.mako:134
 msgid "Repository groups"
 msgstr ""
 
 #: 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:19
 msgid "Group name"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:44
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25
 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
-#: rhodecode/templates/base/base.mako:662
+#: rhodecode/templates/base/base.mako:669
 #: rhodecode/templates/data_table/_dt_elements.mako:217
 #: rhodecode/templates/forks/fork.mako:41
 msgid "Repository group"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:60
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:50
+#: rhodecode/templates/admin/repos/repo_add_base.mako:49
+msgid "Select my personal group ({})"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:65
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:64
 #: rhodecode/templates/admin/repos/repo_add_base.mako:90
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:179
 #: 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_add.mako:67
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:66
 #: rhodecode/templates/admin/repos/repo_add_base.mako:92
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:181
 #: 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/repo_groups/repo_group_add.mako:79
 #: rhodecode/templates/admin/repos/repo_add_base.mako:104
 msgid "Copy Parent Group Permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78
-#: rhodecode/templates/admin/repos/repo_add_base.mako:108
-msgid "Copy permissions from parent repository group."
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:83
+#: rhodecode/templates/admin/repos/repo_add_base.mako:108
+msgid "Copy permissions from parent repository group."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_add.mako:88
 msgid "Create Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5
 #, python-format
 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 ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:7
 msgid "Repository Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:10
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:8
 msgid "Updated on"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11
 msgid "Cached Commit source"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
 msgid "Cached Commit id"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
 msgid "Cached Commit date"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
 msgid "Cached Commit data"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17
 msgid "Is Personal Group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19
 msgid "Total repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:20
 msgid "Top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:22
 msgid "Children groups"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28
 msgid "Repository Group Advanced: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:38
 msgid "Delete repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:67
 #, python-format
 msgid "Confirm to delete this group: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68
 msgid "Delete this repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:5
 msgid "Repository Group Permissions: {}"
 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: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: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:40
 msgid "owner"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:66
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:119
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:92
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:72
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:125
 msgid "permission for other logged in and anonymous users"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94
 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:74
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:122
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127
 msgid "permission for other logged in users"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:73
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:99
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:127
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133
+msgid "This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually."
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:100
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:133
 msgid "inactive duplicate"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:82
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:167
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:115
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:164
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:87
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:177
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:121
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:170
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:88
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:172
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:93
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:182
 msgid "Remove"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:130
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:140
 msgid "delegated admin"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:162
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:159
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:167
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:172
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:165
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:177
 msgid "members"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191
-#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:198
-msgid "Add user/user group"
-msgstr ""
-
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:197
+#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:208
+msgid "Add user/user group"
+msgstr ""
+
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:214
 msgid "Apply to children"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:210
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:220
 msgid "Both"
 msgstr ""
 
-#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:211
+#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:221
 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:6
 msgid "Repository Group Settings: {}"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:31
 msgid "Optional select a parent group to move this repository group into."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:49
 msgid "Change owner of this repository group."
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5
 msgid "Repository groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
 msgid "Number of top level repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add.mako:5
 msgid "Add repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:9
 msgid "Repository name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:14
 msgid "Import Existing Repository ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
-#: rhodecode/templates/base/base.mako:323
+#: rhodecode/templates/base/base.mako:330
 msgid "Clone from"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_add_base.mako:49
-#: rhodecode/templates/forks/fork.mako:47
-#, python-format
-msgid "Select my personal group (%(repo_group_name)s)"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_add_base.mako:52
 #: rhodecode/templates/forks/fork.mako:50
 msgid "Optionally select a group to put this repository into."
 msgstr ""
 
 #: 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: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 ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:5
 msgid "{} Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:12
 msgid "Creating repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_creating.mako:26
 #, python-format
 msgid "Repository \"%(repo_name)s\" is being created, you will be redirected when this process is finished.repo_name"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:8
 msgid "{} repository settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:48
 msgid "Branch Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:54
 msgid "VCS"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:57
 msgid "Extra Fields"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:60
 msgid "Issue Tracker"
 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:7
 msgid "Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:67
 msgid "Remote sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:71
 msgid "Statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:78
 msgid "Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:82
 msgid "Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:85
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3
 msgid "Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit.mako:88
 msgid "Strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:5
 msgid "Repository ID"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
 msgid "Attached scoped tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13
 msgid "Pull requests source"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14
 msgid "Pull requests target"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15
 msgid "Attached Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21
 #, python-format
 msgid "Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31
 msgid "Fork Reference"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37
 #, python-format
 msgid "This repository is a fork of %(repo_link)s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
 msgid "Set"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:46
 msgid "Manually set this repository as a fork of another from the list"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
 msgid "Public Journal Visibility"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62
 msgid "Remove from Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66
 msgid "Add to Public Journal"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:71
 msgid "All actions made on this repository will be visible to everyone following the public journal."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80
 msgid "Locking state"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89
 msgid "This Repository is not currently locked."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:99
 msgid "Unlock repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:107
 msgid "Lock repository"
 msgstr ""
 
 #: 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:123
 msgid "Hooks"
 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:132
 msgid "PRE HOOK"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:137
 msgid "POST HOOK"
 msgstr ""
 
 #: 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:149
 msgid "Confirm to reinstall hooks for this repository."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:150
 msgid "Update Hooks"
 msgstr ""
 
 #: 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:173
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:176
 msgid "Archive this repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:178
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:183
 msgid "Archiving the repository will make it entirely read-only. The repository cannot be committed to.It is hidden from the search results and dashboard. "
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:190
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:195
 msgid "Delete repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:201
-msgid "Detach forks"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:206
+msgid "Detach forks"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:211
 msgid "Delete forks"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:216
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221
 msgid "Consider to archive this repository instead."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:229
-msgid "Delete this repository"
-msgstr ""
-
 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:234
+msgid "Delete this repository"
+msgstr ""
+
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:239
 msgid "This repository will be renamed in a special way in order to make it inaccessible to RhodeCode Enterprise and its VCS systems. If you need to fully delete it from the file system, please do it manually, or with rhodecode-cleanup-repos command available in rhodecode-tools."
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273
 msgid "Change repository"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:268
+#: rhodecode/templates/admin/repos/repo_edit_advanced.mako:273
 msgid "Pick repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:7
 msgid "Repository Audit Logs"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14
 #: rhodecode/templates/admin/users/user_edit_audit.mako:17
 msgid "audit filter..."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_automation.mako:3
 msgid "Repo Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3
 msgid "Invalidate Cache for Repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:7
 msgid "Manually invalidate the repository cache. On the next access a repository cache will be recreated."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:10
 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:23
 msgid "Invalidate repository cache"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:36
 msgid "Invalidation keys"
 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:49
 msgid "State UID"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:50
 msgid "Namespace"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:69
 msgid "Cache keys"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:93
 msgid "Region"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:110
 msgid "Shadow Repositories"
 msgstr ""
 
 #: 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:133
 msgid "Diff Caches"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:141
 msgid "Cached diff name"
 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 ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:3
 msgid "Custom extra fields for this repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:10
 msgid "Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:24
 #, python-format
 msgid "Confirm to delete this field: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:40
 msgid "New Field Key"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:48
 msgid "New Field Label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:51
 msgid "Enter short label"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:57
 msgid "New Field Description"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:60
 msgid "Enter a full description for the field"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:73
 msgid "Extra fields are disabled. You can enable them from the Admin/Settings/Visual page."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:9
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:9
 msgid "Inherit from global settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:14
 msgid "Select to inherit global patterns for issue tracker."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:24
 msgid "Inherited Issue Tracker Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31
 #: rhodecode/templates/base/issue_tracker_settings.mako:79
-#: rhodecode/templates/base/perms_summary.mako:169
+#: rhodecode/templates/base/perms_summary.mako:174
 msgid "Pattern"
 msgstr ""
 
 #: 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:33
 msgid "Prefix"
 msgstr ""
 
 #: 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:95
 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:24
 msgid "Test Patterns"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:8
 msgid "Perform maintenance tasks for this repo"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:10
 msgid "Following tasks will be performed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:17
 msgid "Maintenance can be automated by such api call. Can be called periodically in crontab etc."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:25
 msgid "No maintenance tasks for this repo available"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:34
 msgid "Run Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:49
 msgid "Performing Maintenance"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5
 msgid "Repository Access Permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
 msgid "private repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60
 msgid "only users/user groups explicitly added here will have access"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:62
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:118
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:124
 msgid "Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:63
 msgid "un-set private mode"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:103
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
 msgid "used by {} branch rule, requires write+ permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:105
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:111
 msgid "used by {} branch rules, requires write+ permissions"
 msgstr ""
 
-#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:119
+#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:125
 msgid "set private mode"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
 msgid "Repository Branch Permissions."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3
 msgid "Remote Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:7
 msgid "Manually pull/push changes from/to external URLs."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:11
 msgid "Pull url"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:16
 msgid "This repository does not have any pull url set."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:17
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:60
 msgid "Set remote url."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_remote.mako:26
 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:44
 msgid "Pull changes from remote location"
 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 ""
 
 #: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:3
 msgid "Default Reviewer Rules"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:6
 #, python-format
 msgid "Settings for Repository: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "permalink id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:22
 msgid "what is that ?"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:24
 msgid "URL by id"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:25
 msgid ""
 "In case this repository is renamed or moved into another group the repository url changes.\n"
 "                               Using above url guarantees that this repository will always be accessible under such url.\n"
 "                               Useful for CI systems, or any other cases that you need to hardcode the url into 3rd party service."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:41
 #, python-format
 msgid "Select my personal group (`%(repo_group_name)s`)"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:44
 msgid "Optional select a group to put this repository into."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:52
 msgid "Remote pull uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102
-#: rhodecode/templates/base/perms_summary.mako:111
-#: rhodecode/templates/base/perms_summary.mako:228
-#: rhodecode/templates/base/perms_summary.mako:306
-#: rhodecode/templates/base/perms_summary.mako:308
+#: rhodecode/templates/base/perms_summary.mako:116
+#: rhodecode/templates/base/perms_summary.mako:233
+#: rhodecode/templates/base/perms_summary.mako:311
+#: rhodecode/templates/base/perms_summary.mako:313
 #: rhodecode/templates/debug_style/form-elements.html:45
 msgid "edit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:66
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:108
 msgid "enter new value, or leave empty to remove"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:76
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:118
 msgid "cancel"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:87
 msgid "http[s] url where from repository was imported. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:88
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:130
 msgid "This field is stored encrypted inside Database, a format of http://user:[e-mail]/repo_name can be used and will be hidden from display."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:94
 msgid "Remote push uri"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:129
 msgid "http[s] url to sync data back. This field can used for doing {sync_link}."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
 msgid "Landing commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
 msgid "The default commit for file pages, downloads, full text search index, and README generation."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:164
 msgid "Change owner of this repository."
 msgstr ""
 
 #: 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:204
-#: rhodecode/templates/summary/components.mako:238
+#: rhodecode/templates/summary/components.mako:263
 msgid "Enable statistics"
 msgstr ""
 
 #: 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:214
 #: rhodecode/templates/summary/components.mako:184
 msgid "Enable downloads"
 msgstr ""
 
 #: 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:224
 msgid "Enable automatic locking"
 msgstr ""
 
 #: 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 ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:3
 msgid "Repository statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:11
 msgid "Processed commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:12
 msgid "Processed progress"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Reset statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_statistics.mako:15
 msgid "Confirm to remove current statistics"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:3
 msgid "Strip commits from repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:7
 #, python-format
 msgid "Please provide up to %d commits commits to strip"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:9
 msgid "In the first step commits will be verified for existance in the repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:10
 msgid "In the second step, correct commits will be available for stripping"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:16
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:52
 msgid "Enter full 40 character commit sha"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:18
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:54
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:95
 msgid "Add another commit"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:27
 msgid "Check commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:33
 msgid "Sorry this functionality is not available for SVN repository"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114
 msgid "Checking commits"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:142
 msgid " commit verified positive"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:154
 msgid " commit verified negative"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:179
 msgid " commit striped successfully"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:182
 msgid " commit strip failed"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:13
 msgid "Select to inherit global vcs settings."
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:43
 #: rhodecode/templates/admin/settings/settings_global.mako:140
 #: rhodecode/templates/admin/settings/settings_labs.mako:48
 #: rhodecode/templates/admin/settings/settings_vcs.mako:13
 #: rhodecode/templates/admin/settings/settings_visual.mako:214
 msgid "Save settings"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:5
 msgid "Repositories administration"
 msgstr ""
 
 #: rhodecode/templates/admin/repos/repos.mako:110
 msgid "State"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_automation.mako:3
 msgid "Admin Automation"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:3
 msgid "Email Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:8
 msgid "Email prefix"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:9
 msgid "Email from"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:11
 msgid "SMTP server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:12
 msgid "SMTP username"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:13
 msgid "SMTP password"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:14
 msgid "SMTP port"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:16
 msgid "SMTP use TLS"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:17
 msgid "SMTP use SSL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:28
 msgid "You can adjust those settings in [DEFAULT] section of .ini file located at"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:36
 msgid "Test Email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:42
 msgid "enter valid email"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_email.mako:46
 msgid "Send an auto-generated email from this server to above email..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions.mako:3
 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: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:40
 msgid "Delete This Exception"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3
 msgid "Exceptions Tracker "
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7
 msgid "There is {} stored exception."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9
 msgid "There are total {} stored exceptions."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:12
 msgid "Store directory"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:23
 msgid "Delete All `{}`"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:25
 msgid "Delete All"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
 msgid "Exceptions Tracker - Showing the last {} Exceptions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:5
 msgid "Branding"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:16
 msgid "Set a custom title for your RhodeCode instance (limited to 40 characters)."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:20
 msgid "HTTP[S] authentication realm"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:27
 msgid "Set a custom text that is shown as authentication message to clients trying to connect."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:36
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:83
 msgid "Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:41
 msgid "Create Personal Repository Group"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:44
 msgid "Always create Personal Repository Groups for new users."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:45
 msgid "When creating new users from add user form or API you can still turn this off via a checkbox or flag"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:49
 msgid "Personal Repo Group Pattern"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:55
 msgid "Pattern used to create Personal Repository Groups. Prefix can be other existing repository group path[s], eg. /u/${username}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:56
 msgid "Available variables are currently ${username} and ${user_id}"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:64
 msgid "Registration Captcha"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:68
 msgid "Google reCaptcha v2 site key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:75
 msgid "Site key for reCaptcha v2 system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:80
 msgid "Google reCaptcha v2 secret key."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:87
 msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:95
 msgid "Custom Header Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:100
 #: rhodecode/templates/admin/settings/settings_global.mako:124
 #: rhodecode/templates/debug_style/form-elements-small.html:59
 #: rhodecode/templates/debug_style/form-elements.html:57
 #: rhodecode/templates/debug_style/form-elements.html:82
 #: rhodecode/templates/debug_style/form-elements.html:225
 #: rhodecode/templates/debug_style/form-elements.html:381
 #: rhodecode/templates/debug_style/form-elements.html:407
 #: rhodecode/templates/debug_style/form-elements.html:515
 #: rhodecode/templates/debug_style/form-elements.html:519
 #: rhodecode/templates/debug_style/form-elements.html:537
 #: rhodecode/templates/debug_style/form-elements.html:581
 #: rhodecode/templates/debug_style/form-inline.html:38
 #: rhodecode/templates/debug_style/form-inline.html:139
 #: rhodecode/templates/debug_style/form-inline.html:147
 #: rhodecode/templates/debug_style/form-vertical.html:60
 #: rhodecode/templates/debug_style/forms.html:37
 #: rhodecode/templates/debug_style/forms.html:60
 #: rhodecode/templates/debug_style/forms.html:78
 #: rhodecode/templates/debug_style/forms.html:96
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:44
 msgid "Templates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:103
 #: rhodecode/templates/admin/settings/settings_global.mako:127
 #: rhodecode/templates/debug_style/form-elements-small.html:62
 #: rhodecode/templates/debug_style/form-elements.html:60
 #: rhodecode/templates/debug_style/form-elements.html:85
 #: rhodecode/templates/debug_style/form-elements.html:228
 #: rhodecode/templates/debug_style/form-elements.html:384
 #: rhodecode/templates/debug_style/form-elements.html:410
 #: rhodecode/templates/debug_style/form-elements.html:518
 #: rhodecode/templates/debug_style/form-elements.html:522
 #: rhodecode/templates/debug_style/form-elements.html:540
 #: rhodecode/templates/debug_style/form-elements.html:584
 #: rhodecode/templates/debug_style/form-inline.html:41
 #: rhodecode/templates/debug_style/form-inline.html:142
 #: rhodecode/templates/debug_style/form-inline.html:150
 #: rhodecode/templates/debug_style/form-vertical.html:63
 #: rhodecode/templates/debug_style/forms.html:40
 #: rhodecode/templates/debug_style/forms.html:63
 #: rhodecode/templates/debug_style/forms.html:81
 #: rhodecode/templates/debug_style/forms.html:99
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:47
 msgid "Server Announcement"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:104
 msgid "Flash message filtering"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:105
 msgid "Custom logos"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:111
 msgid "Custom js/css code added at the end of the <head/> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:112
 msgid "Use <script/> or <style/> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:119
 msgid "Custom Footer Code"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:133
 msgid "Custom js/css code added at the end of the <body> tag."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_global.mako:134
 msgid "Use <script> or <style> tags to define custom scripting or styling."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:3
 msgid "Built in Mercurial hooks - read only"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:19
 msgid "Hooks can be used to trigger actions on certain events such as push / pull. They can trigger Python functions or external applications."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_hooks.mako:27
 msgid "Custom hooks"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:3
 msgid "Labs Settings"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_labs.mako:10
 msgid "There are no Labs settings currently"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:5
 msgid "Import New Groups or Repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:10
 msgid "Destroy old data"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:12
 msgid "In case a repository or a group was deleted from the filesystem and it still exists in the database, check this option to remove obsolete data from the database."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:16
 msgid "Invalidate cache for all repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:18
 msgid "Each cache data for repositories will be cleaned with this option selected. Use this to reload data and clear cache keys."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_mapping.mako:21
 msgid "Rescan Filesystem"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_open_source.mako:11
 msgid "Licenses of Third Party Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:3
 #: rhodecode/templates/admin/settings/settings_system.mako:3
 msgid "Checking for updates..."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:9
 msgid "Gunicorn process management"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:11
 msgid "start auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_process_management.mako:12
 msgid "stop auto refresh"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_search.mako:3
 msgid "RhodeCode Full Text Search"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:3
 msgid "User Sessions Configuration"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:8
 msgid "Session type"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:9
 msgid "Session expiration period"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:11
 msgid "Total sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:12
 msgid "Expired sessions ({} days)"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:28
 msgid "Cleanup Old Sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:34
 msgid "Cleanup user sessions that were not active during chosen time frame."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:35
 msgid "After performing this action users whose session will be removed will be required to log in again."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:36
 msgid "Picking `All` will log-out you, and all users in the system."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:55
 msgid "Confirm to cleanup user sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_sessions.mako:56
 msgid "Cleanup sessions"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:9
 msgid "System Info"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:11
 msgid "create summary snapshot"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_system.mako:46
 msgid "Python Packages"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:5
 #: rhodecode/templates/base/vcs_settings.mako:10
 msgid "General"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:10
 msgid "Use repository extra fields"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:12
 msgid "Allows storing additional customized fields per repository."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:17
 msgid "Show RhodeCode version"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:19
 msgid "Shows or hides a version number of RhodeCode displayed in the footer."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:26
 msgid "Gravatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:31
 msgid "Use Gravatars based avatars"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:33
 msgid "Use gravatar.com as avatar system for RhodeCode accounts. If this is disabled avatars are generated based on initials and email."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:36
 msgid "Gravatar URL"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:44
 msgid ""
 "Gravatar url allows you to use other avatar server application.\n"
 "                                            Following variables of the URL will be replaced accordingly.\n"
 "                                            {scheme}    'http' or 'https' sent from running RhodeCode server,\n"
 "                                            {email}     user email,\n"
 "                                            {md5email}  md5 hash of the user email (like at gravatar.com),\n"
 "                                            {size}      size of the image that is expected from the server application,\n"
 "                                            {netloc}    network location/server host of running RhodeCode server"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:59
 msgid "Meta-Tagging"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:64
 msgid "Stylify recognised meta tags"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:66
 msgid "Parses meta tags from repository or repository group description fields and turns them into colored tags."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:77
 msgid "Dashboard Items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:81
 msgid "Main page dashboard items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:87
 msgid "Number of items displayed in the main page dashboard before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:91
 msgid "Admin pages items"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:97
 msgid "Number of items displayed in the admin pages grids before pagination is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:106
 msgid "Commit ID Style"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:110
 msgid "Commit sha length"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:117
 msgid ""
 "Number of chars to show in commit sha displayed in web interface.\n"
 "                                                By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                                length of the sha after the `r123:` part."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Show commit ID numeric reference"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:125
 msgid "Commit show revision number"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:127
 msgid ""
 "Show revision number in commit sha displayed in web interface.\n"
 "                                        By default it's shown as r123:9043a6a4c226 this value defines the\n"
 "                                        if the `r123:` part is shown."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:136
 #: rhodecode/templates/debug_style/index.html:64
 msgid "Icons"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:141
 msgid "Show public repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:147
 msgid "Show private repo icon on repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:149
 msgid "Show public/private icons next to repositories names."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:156
 msgid "Markup Renderer"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:163
 msgid "Default renderer used to render comments, pull request descriptions and other description elements. After change old entries will still work correctly."
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:170
 msgid "Clone URL templates"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:181
 msgid ""
 "Schema of clone url construction eg. '{scheme}://{user}@{netloc}/{repo}', available vars:\n"
 "                       {scheme} 'http' or 'https' sent from running RhodeCode server,\n"
 "                       {user}   current user username,\n"
 "                       {sys_user} current system user running this process, Useful for ssh,\n"
 "                       {hostname} hostname of this server running RhodeCode,\n"
 "                       {netloc} network location/server host of running RhodeCode server,\n"
 "                       {repo}   full repository name,\n"
 "                       {repoid} ID of repository, can be used to contruct clone-by-id"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:196
 msgid "Custom Support Link"
 msgstr ""
 
 #: rhodecode/templates/admin/settings/settings_visual.mako:204
 #, python-format
 msgid ""
 "Custom url for the support link located at the bottom.\n"
 "                    The default is set to %(default_url)s. In case there's a need\n"
 "                    to change the support link to internal issue tracker, it should be done here.\n"
 "                    "
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:5
 msgid "Add user group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:13
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:14
-#: rhodecode/templates/base/base.mako:110
-#: rhodecode/templates/base/base.mako:132
+#: rhodecode/templates/base/base.mako:115
+#: rhodecode/templates/base/base.mako:137
 msgid "User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:46
 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:50
 msgid "Short, optional description for this user group."
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_add.mako:59
 msgid "Create User Group"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:5
 msgid "{} user group settings"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
 #: rhodecode/templates/admin/users/user_edit.mako:43
 msgid "Global permissions"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:38
 #: rhodecode/templates/admin/users/user_edit.mako:44
 msgid "Permissions summary"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5
 msgid "User Group ID"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9
 #: rhodecode/templates/admin/user_groups/user_groups.mako:80
 #: rhodecode/templates/debug_style/form-elements.html:509
 #: rhodecode/templates/user_group/profile.mako:55
 msgid "Members"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:10
 msgid "Automatic member sync"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:12
 msgid "Assigned to repositories"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:13
 msgid "Assigned to repo groups"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:15
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:19
 msgid "Assigned to review rules"
 msgstr ""
 
 #: 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:42
 msgid "This group is set to be automatically synchronised."
 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:56
 msgid "Disable synchronization"
 msgstr ""
 
 #: 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: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:77
 msgid "Delete User Group"
 msgstr ""
 
 #: 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:85
 msgid "Delete This User Group"
 msgstr ""
 
 #: 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:64
 msgid "Add members"
 msgstr ""
 
 #: 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:8
 msgid "User groups administration"
 msgstr ""
 
 #: rhodecode/templates/admin/user_groups/user_groups.mako:82
 msgid "Sync"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:5
 msgid "Add user"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:13
 #: rhodecode/templates/admin/users/user_edit.mako:14
-#: rhodecode/templates/base/base.mako:109
+#: rhodecode/templates/base/base.mako:114
 msgid "Users"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:15
 #: rhodecode/templates/admin/users/users.mako:31
 msgid "Add User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:53
 msgid "Password confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:59
 msgid "Generate password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:106
 msgid "Password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:110
 msgid "Force user to change his password on the next login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:116
 msgid "Add personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:121
 msgid "New group will be created at: `/{path}`"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:122
 msgid "User will be automatically set as this group owner."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:128
 msgid "Create User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_add.mako:139
 msgid "generated password:"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:5
 msgid "{} user settings"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:31
-msgid "This user is set as disabled"
+msgid "This user is set as non-active and disabled."
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:39
 #: rhodecode/templates/admin/users/user_edit_profile.mako:7
 #: rhodecode/templates/users/user_profile.mako:6
 msgid "User Profile"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:40
 msgid "Auth tokens"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:46
 msgid "Ip Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit.mako:47
 msgid "User Groups Management"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:5
 msgid "User ID"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:7
 msgid "Source of Record"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:9
 msgid "Last login"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:10
 #: rhodecode/templates/admin/users/users.mako:83
 #: rhodecode/templates/forks/forks.mako:67
 msgid "Last activity"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:16
 msgid "Owned Artifacts"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:18
 msgid "Reviewer of pull requests"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:21
 msgid "Member of User groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:22
 msgid "Force password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:49
 msgid "Force Password Reset"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:55
 msgid "Disable forced password reset"
 msgstr ""
 
 #: 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:67
 msgid "Confirm to enable forced password change"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:68
 msgid "Enable forced password reset"
 msgstr ""
 
 #: 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: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:94
 #, python-format
 msgid "New group will be created at: `/%(path)s`"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:99
 msgid "Create personal repository group"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:108
 msgid "Delete User"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:119
 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:131
 msgid "Detach repository groups"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:143
 msgid "Detach user groups"
 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:180
 msgid "New owner for detached objects"
 msgstr ""
 
 #: 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:190
 msgid "The delete option will delete the user and all his owned objects!"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_advanced.mako:205
 msgid "Delete this user"
 msgstr ""
 
 #: 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_auth_tokens.mako:62
+#: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:68
 #, python-format
 msgid "Confirm to remove this auth token: %s"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Invalidate user cache"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_caches.mako:36
 msgid "Confirm to invalidate user cache"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_emails.mako:7
 msgid "Additional Email Addresses"
 msgstr ""
 
 #: 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:58
 msgid "New email address"
 msgstr ""
 
 #: 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:7
 msgid "Custom IP Whitelist"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:15
 msgid "IP Address"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:16
 msgid "IP Range"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ips.mako:25
 #, python-format
 msgid "Inherited from %s"
 msgstr ""
 
 #: 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:31
 msgid "Change the avatar at"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:94
 msgid "New Password"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:102
 msgid "New Password Confirmation"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:118
 #: rhodecode/templates/admin/users/users.mako:87
-#: rhodecode/templates/base/perms_summary.mako:145
+#: rhodecode/templates/base/perms_summary.mako:150
 msgid "Super-admin"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_profile.mako:126
 msgid "Authentication type"
 msgstr ""
 
 #: 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: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: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: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:7
 msgid "New SSH Key generation"
 msgstr ""
 
 #: 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: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:16
 msgid "Private key"
 msgstr ""
 
 #: 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: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:47
 msgid "Confirmation required on the next screen"
 msgstr ""
 
 #: rhodecode/templates/admin/users/user_edit_ssh_keys_generate.mako:51
 msgid "SSH key generator has been disabled."
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:5
 msgid "Users administration"
 msgstr ""
 
 #: rhodecode/templates/admin/users/users.mako:89
 msgid "Auth type"
 msgstr ""
 
 #: rhodecode/templates/artifacts/artifact_list.mako:5
 msgid "{} Artifacts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:66
+#: rhodecode/templates/base/base.mako:71
 msgid "RhodeCode instance id: {}"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:94
+#: rhodecode/templates/base/base.mako:99
 msgid "Super-admin Panel"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:96
+#: rhodecode/templates/base/base.mako:101
 msgid "Delegated Admin Panel"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:112
+#: rhodecode/templates/base/base.mako:117
 msgid "Authentication"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:114
+#: rhodecode/templates/base/base.mako:119
 msgid "Defaults"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:154
-#: rhodecode/templates/base/base.mako:194
+#: rhodecode/templates/base/base.mako:159
+#: rhodecode/templates/base/base.mako:199
 #: rhodecode/templates/changeset/changeset.mako:154
 #: rhodecode/templates/files/files_source_header.mako:57
 #: rhodecode/templates/files/files_tree_header.mako:44
-#: rhodecode/templates/summary/components.mako:250
+#: rhodecode/templates/summary/components.mako:275
 msgid "Show More"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:295
-#: rhodecode/templates/base/base.mako:306
+#: rhodecode/templates/base/base.mako:302
+#: rhodecode/templates/base/base.mako:313
 msgid "RSS Feed"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:297
+#: rhodecode/templates/base/base.mako:304
 msgid "Watch this Repository and actions on it in your personalized journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:315
+#: rhodecode/templates/base/base.mako:322
 msgid "Fork of"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:332
+#: rhodecode/templates/base/base.mako:339
 #, python-format
 msgid "Repository locked by %(user)s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:337
+#: rhodecode/templates/base/base.mako:344
 msgid "Repository not locked. Pull repository to lock it."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:353
+#: rhodecode/templates/base/base.mako:360
 msgid "This repository has been archived. It is now read-only."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:366
+#: rhodecode/templates/base/base.mako:373
 #: rhodecode/templates/data_table/_dt_elements.mako:58
 #: rhodecode/templates/data_table/_dt_elements.mako:59
 #: rhodecode/templates/data_table/_dt_elements.mako:207
 msgid "Summary"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:367
+#: rhodecode/templates/base/base.mako:374
 #: rhodecode/templates/data_table/_dt_elements.mako:63
 #: rhodecode/templates/data_table/_dt_elements.mako:64
 #: rhodecode/templates/files/file_authors_box.mako:30
 #: rhodecode/templates/search/search.mako:99
 #: rhodecode/templates/summary/components.mako:119
 #: rhodecode/templates/summary/components.mako:127
 msgid "Commits"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:368
+#: rhodecode/templates/base/base.mako:375
 #: rhodecode/templates/data_table/_dt_elements.mako:68
 #: rhodecode/templates/data_table/_dt_elements.mako:69
 #: rhodecode/templates/files/files.mako:15
 #: rhodecode/templates/search/search.mako:99
 msgid "Files"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:369
+#: rhodecode/templates/base/base.mako:376
 #: rhodecode/templates/bookmarks/bookmarks.mako:66
 #: rhodecode/templates/branches/branches.mako:65
 #: rhodecode/templates/tags/tags.mako:66
 msgid "Compare"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:374
+#: rhodecode/templates/base/base.mako:381
 #, python-format
 msgid "Show Pull Requests for %s"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:385
+#: rhodecode/templates/base/base.mako:392
 msgid "Artifacts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:391
+#: rhodecode/templates/base/base.mako:398
 msgid "Repository Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:397
-msgid "Options"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:402
-msgid "Unlock Repository"
-msgstr ""
-
 #: rhodecode/templates/base/base.mako:404
+msgid "Options"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:409
+msgid "Unlock Repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:411
 msgid "Lock Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:457
+#: rhodecode/templates/base/base.mako:464
 msgid "Group Home"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:461
+#: rhodecode/templates/base/base.mako:468
 msgid "You have admin right to this group, and can edit it"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:461
+#: rhodecode/templates/base/base.mako:468
 msgid "Group Settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:504
-msgid "Create"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:512
+#: rhodecode/templates/base/base.mako:519
 msgid "This Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:514
+#: rhodecode/templates/base/base.mako:521
 msgid "Create Pull Request"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:518
-msgid "Fork this repository"
-msgstr ""
-
 #: rhodecode/templates/base/base.mako:525
+msgid "Fork this repository"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:532
 msgid "This Repository Group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:529
-#: rhodecode/templates/base/base.mako:545
-#: rhodecode/templates/base/base.mako:557
+#: rhodecode/templates/base/base.mako:536
+#: rhodecode/templates/base/base.mako:552
+#: rhodecode/templates/base/base.mako:564
 msgid "New Repository"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:535
-#: rhodecode/templates/base/base.mako:549
-#: rhodecode/templates/base/base.mako:563
+#: rhodecode/templates/base/base.mako:542
+#: rhodecode/templates/base/base.mako:556
+#: rhodecode/templates/base/base.mako:570
 msgid "New Repository Group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:590
+#: rhodecode/templates/base/base.mako:597
 msgid "Sign in"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:615
+#: rhodecode/templates/base/base.mako:622
 msgid "My personal group"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:621
+#: rhodecode/templates/base/base.mako:628
 #: rhodecode/templates/debug_style/alerts.html:5
 #: rhodecode/templates/debug_style/buttons.html:5
 #: rhodecode/templates/debug_style/code-block.html:6
 #: rhodecode/templates/debug_style/collapsable-content.html:5
 #: rhodecode/templates/debug_style/emails.html:5
 #: rhodecode/templates/debug_style/form-elements-small.html:5
 #: rhodecode/templates/debug_style/form-elements.html:5
 #: rhodecode/templates/debug_style/form-inline.html:5
 #: rhodecode/templates/debug_style/form-vertical.html:5
 #: rhodecode/templates/debug_style/forms.html:5
 #: rhodecode/templates/debug_style/icons.html:5
 #: rhodecode/templates/debug_style/index.html:12
 #: rhodecode/templates/debug_style/labels.html:5
 #: rhodecode/templates/debug_style/layout-form-sidebar.html:5
 #: rhodecode/templates/debug_style/login.html:6
 #: rhodecode/templates/debug_style/panels.html:5
 #: rhodecode/templates/debug_style/tables-wide.html:5
 #: rhodecode/templates/debug_style/tables.html:5
 #: rhodecode/templates/debug_style/typography.html:5
 msgid "Style"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:622
+#: rhodecode/templates/base/base.mako:629
 msgid "[Style]"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:639
+#: rhodecode/templates/base/base.mako:646
 msgid "No Bookmarks yet."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:677
+#: rhodecode/templates/base/base.mako:684
 msgid "Sign Out"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:725
+#: rhodecode/templates/base/base.mako:732
 msgid "dismiss"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:766
+#: rhodecode/templates/base/base.mako:773
 msgid "search / go to..."
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:811
+#: rhodecode/templates/base/base.mako:818
 msgid "Show activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:812
+#: rhodecode/templates/base/base.mako:819
 #: rhodecode/templates/journal/journal.mako:4
 #: rhodecode/templates/journal/journal.mako:14
 msgid "Journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:817
+#: rhodecode/templates/base/base.mako:824
 msgid "Show Public activity journal"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:818
-msgid "Public journal"
-msgstr ""
-
-#: rhodecode/templates/base/base.mako:824
-msgid "Show Gists"
-msgstr ""
-
 #: rhodecode/templates/base/base.mako:825
-msgid "Gists"
+msgid "Public journal"
 msgstr ""
 
 #: rhodecode/templates/base/base.mako:831
+msgid "Show Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:832
+msgid "Gists"
+msgstr ""
+
+#: rhodecode/templates/base/base.mako:838
 msgid "Admin settings"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:1135
+#: rhodecode/templates/base/base.mako:1155
 msgid "Keyboard shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/base.mako:1143
+#: rhodecode/templates/base/base.mako:1163
 msgid "Site-wide shortcuts"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:14
+#: rhodecode/templates/base/default_perms_box.mako:19
 msgid "Inherited Permissions"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:15
+#: rhodecode/templates/base/default_perms_box.mako:25
 msgid "Custom Permissions"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:17
+#: rhodecode/templates/base/default_perms_box.mako:29
 msgid "Default Global Permissions"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:23
+#: rhodecode/templates/base/default_perms_box.mako:36
 msgid "The following options configure the default permissions each user or group will inherit. You can override these permissions for each individual user or user group using individual permissions settings."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:27
+#: rhodecode/templates/base/default_perms_box.mako:40
 msgid "Repository Creation"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:32
+#: rhodecode/templates/base/default_perms_box.mako:45
 msgid "Permission to create root level repositories. When disabled, users can still create repositories inside their own repository groups."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:37
+#: rhodecode/templates/base/default_perms_box.mako:50
 msgid "Repository Creation With Group Write Access"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:42
+#: rhodecode/templates/base/default_perms_box.mako:55
 msgid "Write permission given on a repository group will allow creating repositories inside that group."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:47
+#: rhodecode/templates/base/default_perms_box.mako:60
 msgid "Repository Forking"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:52
+#: rhodecode/templates/base/default_perms_box.mako:65
 msgid "Permission to create root level repository forks. When disabled, users can still fork repositories inside their own repository groups."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:57
+#: rhodecode/templates/base/default_perms_box.mako:70
 msgid "Repository Group Creation"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:62
+#: rhodecode/templates/base/default_perms_box.mako:75
 msgid "Permission to create root level repository groups. When disabled, repository group admins can still create repository subgroups within their repository groups."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:67
+#: rhodecode/templates/base/default_perms_box.mako:80
 msgid "User Group Creation"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:72
+#: rhodecode/templates/base/default_perms_box.mako:85
 msgid "Permission to allow user group creation."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:78
+#: rhodecode/templates/base/default_perms_box.mako:91
 msgid "Inherit Permissions From The Default User"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:83
+#: rhodecode/templates/base/default_perms_box.mako:96
 msgid "Inherit default permissions from the default user. Turn off this option to force explicit permissions for users, even if they are more restrictive than the default user permissions."
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:102
+#: rhodecode/templates/base/default_perms_box.mako:115
 msgid "Inherit from default settings"
 msgstr ""
 
-#: rhodecode/templates/base/default_perms_box.mako:107
+#: rhodecode/templates/base/default_perms_box.mako:120
 #, python-format
 msgid ""
 "Select to inherit permissions from %s permissions settings, including default IP address whitelist and inheritance of \n"
 "permission by members of user groups."
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:81
 msgid "Extra Prefix"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:92
 msgid "show examples"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:160
 msgid "Add new"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:168
 msgid "New Entry"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:172
 msgid "Confirm to remove this pattern:"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:293
-#: rhodecode/templates/changeset/changeset_file_comment.mako:275
-#: rhodecode/templates/changeset/changeset_file_comment.mako:326
+#: rhodecode/templates/changeset/changeset_file_comment.mako:340
+#: rhodecode/templates/changeset/changeset_file_comment.mako:391
 #: rhodecode/templates/data_table/_dt_elements.mako:453
-#: rhodecode/templates/files/files_add.mako:60
-#: rhodecode/templates/files/files_edit.mako:62
+#: rhodecode/templates/files/files_add.mako:59
+#: rhodecode/templates/files/files_edit.mako:61
 msgid "Preview"
 msgstr ""
 
 #: rhodecode/templates/base/issue_tracker_settings.mako:294
 msgid "Test Pattern Preview"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:26
+#: rhodecode/templates/base/perms_summary.mako:31
 msgid "in JSON format"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:35
-#: rhodecode/templates/base/perms_summary.mako:43
+#: rhodecode/templates/base/perms_summary.mako:40
+#: rhodecode/templates/base/perms_summary.mako:48
 msgid "show"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:36
-#: rhodecode/templates/base/perms_summary.mako:44
+#: rhodecode/templates/base/perms_summary.mako:41
+#: rhodecode/templates/base/perms_summary.mako:49
 msgid "none"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:37
+#: rhodecode/templates/base/perms_summary.mako:42
 #: rhodecode/templates/commits/changelog_elements.mako:102
 #: rhodecode/templates/files/base.mako:26
 msgid "merge"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:38
+#: rhodecode/templates/base/perms_summary.mako:43
 msgid "push"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:39
+#: rhodecode/templates/base/perms_summary.mako:44
 msgid "push force"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:45
+#: rhodecode/templates/base/perms_summary.mako:50
 msgid "read"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:46
+#: rhodecode/templates/base/perms_summary.mako:51
 msgid "write"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:47
+#: rhodecode/templates/base/perms_summary.mako:52
 msgid "admin"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:55
+#: rhodecode/templates/base/perms_summary.mako:60
 msgid "No permissions defined"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:63
-#: rhodecode/templates/base/perms_summary.mako:170
-#: rhodecode/templates/base/perms_summary.mako:243
+#: rhodecode/templates/base/perms_summary.mako:68
+#: rhodecode/templates/base/perms_summary.mako:175
+#: rhodecode/templates/base/perms_summary.mako:248
 msgid "Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:65
-#: rhodecode/templates/base/perms_summary.mako:245
+#: rhodecode/templates/base/perms_summary.mako:70
+#: rhodecode/templates/base/perms_summary.mako:250
 msgid "Edit Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:119
-#: rhodecode/templates/base/perms_summary.mako:128
+#: rhodecode/templates/base/perms_summary.mako:124
+#: rhodecode/templates/base/perms_summary.mako:133
 msgid "edit global"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:136
+#: rhodecode/templates/base/perms_summary.mako:141
 msgid "Repository default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:139
+#: rhodecode/templates/base/perms_summary.mako:144
 msgid "Repository group default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:142
+#: rhodecode/templates/base/perms_summary.mako:147
 msgid "User group default permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:148
+#: rhodecode/templates/base/perms_summary.mako:153
 msgid "Inherit permissions"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:151
+#: rhodecode/templates/base/perms_summary.mako:156
 msgid "Create repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:154
+#: rhodecode/templates/base/perms_summary.mako:159
 msgid "Fork repositories"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:157
+#: rhodecode/templates/base/perms_summary.mako:162
 msgid "Create repository groups"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:160
+#: rhodecode/templates/base/perms_summary.mako:165
 msgid "Create user groups"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:172
+#: rhodecode/templates/base/perms_summary.mako:177
 msgid "Edit Branch Permission"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:286
+#: rhodecode/templates/base/perms_summary.mako:291
 msgid "overridden by"
 msgstr ""
 
-#: rhodecode/templates/base/perms_summary.mako:321
+#: rhodecode/templates/base/perms_summary.mako:326
 msgid "No matching permission defined"
 msgstr ""
 
 #: rhodecode/templates/base/root.mako:156
 msgid "Please enable JavaScript to use RhodeCode Enterprise"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:16
 msgid "Require SSL for vcs operations"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:19
 msgid "Activate to set RhodeCode to require SSL for pushing or pulling. If SSL certificate is missing it will return a HTTP Error 406: Not Acceptable."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:29
 msgid "Main Storage Location"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:37
 msgid "Click to unlock. You must restart RhodeCode in order to make this setting take effect."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:41
 msgid "Repository location change is disabled. You can enable this by changing the `allow_repo_location_change` inside .ini file."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:48
 msgid "Filesystem location where repositories should be stored. After changing this value a restart and rescan of the repository folder are required."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:57
 msgid "Internal Hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:63
 msgid "Show repository size after push"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:67
 msgid "Trigger a hook that calculates repository size after each push."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:71
 msgid "Execute pre/post push hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:74
 msgid "Execute Built in pre/post push hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:78
 msgid "Execute pre/post pull hooks"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:81
 msgid "Execute Built in pre/post pull hooks. This also executes rcextensions hooks."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:91
 msgid "Mercurial Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:96
 msgid "Enable largefiles extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:100
 msgid "Enable Largefiles extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:102
 msgid "Enable Largefiles extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:113
 msgid "Filesystem location where Mercurial largefile objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repositories as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:119
 msgid "Set repository as publishing"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:122
 msgid "When this is enabled all commits in the repository are seen as public commits by clients."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:127
 msgid "Enable hgsubversion extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:130
 msgid "Requires hgsubversion library to be installed. Allows cloning remote SVN repositories and migrates them to Mercurial type."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:136
 msgid "Enable Evolve and Topic extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:140
 msgid "Enable Evolve and Topic extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:142
 msgid "Enable Evolve and Topic extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:153
 msgid "Git Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:158
 msgid "Enable lfs extension"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:162
 msgid "Enable lfs extensions for all repositories."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:164
 msgid "Enable lfs extensions for this repository."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:175
 msgid "Filesystem location where Git lfs objects should be stored."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:186
 msgid "Global Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:192
 msgid "Proxy subversion HTTP requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:196
 msgid "Subversion HTTP Support. Enables communication with SVN over HTTP protocol."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:197
 msgid "SVN Protocol setup Documentation"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:203
 msgid "Subversion HTTP Server URL"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:209
 msgid "Generate Apache Config"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:221
 msgid "Subversion Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:226
 msgid "Repository patterns"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:230
 msgid "Patterns for identifying SVN branches and tags. For recursive search, use \"*\". Eg.: \"/branches/*\""
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:294
 msgid "Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:299
 msgid "Enable server-side merge for pull requests"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:302
 msgid "Note: when this feature is enabled, it only runs hooks defined in the rcextension package. Custom hooks added on the Admin -> Settings -> Hooks page will not be run when pull requests are automatically merged from the web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:306
 msgid "Invalidate and relocate inline comments during update"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:309
 msgid "During the update of a pull request, the position of inline comments will be updated and outdated inline comments will be hidden."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:318
 msgid "Diff cache"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:323
 msgid "Enable caching diffs for pull requests cache and commits"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:332
 msgid "Mercurial Pull Request Settings"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:338
 msgid "Use rebase as merge strategy"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:341
 msgid "Use rebase instead of creating a merge commit when merging via web interface."
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:346
 msgid "Close branch before merging it"
 msgstr ""
 
 #: rhodecode/templates/base/vcs_settings.mako:349
 msgid "Close branch before merging it into destination branch. No effect when rebase strategy is use."
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:5
 #, python-format
 msgid "%s Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:28
 msgid "Compare Selected Bookmarks"
 msgstr ""
 
 #: rhodecode/templates/bookmarks/bookmarks.mako:34
 msgid "bookmarks"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:5
 #, python-format
 msgid "%s Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:28
 msgid "Compare Selected Branches"
 msgstr ""
 
 #: rhodecode/templates/branches/branches.mako:34
 msgid "branches"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:9
 msgid "{} Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:78
 #: rhodecode/templates/commits/changelog_elements.mako:56
 #: rhodecode/templates/files/files_source_header.mako:48
 #: rhodecode/templates/files/files_tree_header.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:43
 msgid "Copy the full commit id"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:83
 msgid "Commit phase"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:90
 #: rhodecode/templates/changeset/changeset.mako:97
 msgid "Evolve State"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:91
 msgid "obsolete"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:98
 msgid "hidden"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:117
 msgid "Commit navigation"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:120
 msgid "Parent Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:120
 msgid "parent"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:124
 msgid "Child Commit"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:124
 msgid "child"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:132
 msgid "Diff options"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:136
 msgid "Raw Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:140
 msgid "Patch Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:144
 msgid "Download Diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:224
 msgid "No Child Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset.mako:263
 msgid "No Parent Commits"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:33
+#: rhodecode/templates/changeset/changeset_file_comment.mako:41
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:401
 msgid "Resolved by comment #{}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:40
-msgid "Click to resolve this comment"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:70
-#: rhodecode/templates/changeset/changeset_file_comment.mako:72
-msgid "pull request !{}"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:77
-msgid "Status change on commit"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:85
-#: rhodecode/templates/compare/compare_diff.mako:139
-#: rhodecode/templates/email_templates/commit_comment.mako:53
-msgid "Commit status"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:94
-msgid "Pull request author"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:95
-msgid "author"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:103
-#: rhodecode/templates/changeset/changeset_file_comment.mako:119
-msgid "Outdated comment from pull request version v{0}, latest v{1}"
+#: rhodecode/templates/changeset/changeset_file_comment.mako:49
+msgid "Click to create resolution comment."
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:58
+msgid "This comment resolves TODO #{}"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:90
+msgid "Status from pull request."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_file_comment.mako:107
-#: rhodecode/templates/changeset/changeset_file_comment.mako:122
+msgid "Pull request author"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:108
+msgid "author"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:163
+#: rhodecode/templates/changeset/changeset_file_comment.mako:179
+msgid "Outdated comment from pull request version v{0}, latest v{1}"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:167
+#: rhodecode/templates/changeset/changeset_file_comment.mako:183
 msgid "Comment from pull request version v{0}, latest v{1}"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:149
-#: rhodecode/templates/changeset/changeset_file_comment.mako:152
-msgid "Prev"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:150
-#: rhodecode/templates/changeset/changeset_file_comment.mako:153
-msgid "Next"
-msgstr ""
-
-#: rhodecode/templates/changeset/changeset_file_comment.mako:192
+#: rhodecode/templates/changeset/changeset_file_comment.mako:205
+#: rhodecode/templates/changeset/changeset_file_comment.mako:206
+#: rhodecode/templates/changeset/changeset_file_comment.mako:209
+#: rhodecode/templates/changeset/changeset_file_comment.mako:210
+msgid "Action unavailable"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:214
+msgid "Jump to the previous outdated comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:215
+msgid "Jump to the next outdated comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:217
+msgid "Jump to the previous comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:218
+msgid "Jump to the next comment"
+msgstr ""
+
+#: rhodecode/templates/changeset/changeset_file_comment.mako:257
 msgid "Leave a comment on this Pull Request."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:194
+#: rhodecode/templates/changeset/changeset_file_comment.mako:259
 msgid "Leave a comment on {} commits in this range."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:196
+#: rhodecode/templates/changeset/changeset_file_comment.mako:261
 msgid "Leave a comment on this Commit."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:283
+#: rhodecode/templates/changeset/changeset_file_comment.mako:348
 #: rhodecode/templates/codeblocks/diffs.mako:83
 msgid "You need to be logged in to leave comments."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:284
+#: rhodecode/templates/changeset/changeset_file_comment.mako:349
 #: rhodecode/templates/codeblocks/diffs.mako:83
 msgid "Login now"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:331
+#: rhodecode/templates/changeset/changeset_file_comment.mako:396
 msgid "Mark as"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:354
+#: rhodecode/templates/changeset/changeset_file_comment.mako:419
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Drag'n Drop files here or"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:354
+#: rhodecode/templates/changeset/changeset_file_comment.mako:419
 #: rhodecode/templates/files/files_upload.mako:86
 msgid "Choose your files"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:357
+#: rhodecode/templates/changeset/changeset_file_comment.mako:422
 msgid "uploading..."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:388
+#: rhodecode/templates/changeset/changeset_file_comment.mako:453
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:124
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Comment"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:407
+#: rhodecode/templates/changeset/changeset_file_comment.mako:472
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:39
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:103
 #: rhodecode/templates/pullrequests/pullrequests.mako:31
 msgid "Closed"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:416
+#: rhodecode/templates/changeset/changeset_file_comment.mako:481
 msgid "Comments parsed using {} syntax."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:417
+#: rhodecode/templates/changeset/changeset_file_comment.mako:482
 msgid "Use @username inside this text to send notification to this RhodeCode user"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:418
+#: rhodecode/templates/changeset/changeset_file_comment.mako:483
 msgid "and"
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:419
+#: rhodecode/templates/changeset/changeset_file_comment.mako:484
 msgid "Start typing with / for certain actions to be triggered via text box."
 msgstr ""
 
-#: rhodecode/templates/changeset/changeset_file_comment.mako:420
+#: rhodecode/templates/changeset/changeset_file_comment.mako:485
 msgid "actions supported."
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:5
 #, python-format
 msgid "%s Commits"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:33
 msgid "Commit Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:42
 msgid "Range"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:60
 msgid "Diff Option"
 msgstr ""
 
 #: rhodecode/templates/changeset/changeset_range.mako:71
 msgid "Show combined diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 msgid "The requested commit is too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: 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:208
-#: rhodecode/templates/codeblocks/diffs.mako:272
+#: rhodecode/templates/codeblocks/diffs.mako:283
 msgid "Showing a big diff might take some time and resources, continue?"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:7
 #: 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:208
-#: rhodecode/templates/codeblocks/diffs.mako:272
+#: rhodecode/templates/codeblocks/diffs.mako:283
 msgid "Show full diff"
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:10
 msgid "The requested file is too big and its content is not shown."
 msgstr ""
 
 #: rhodecode/templates/changeset/diff_block.mako:25
 #: rhodecode/templates/changeset/diff_block.mako:46
 msgid "Diff was truncated. File content available only in full diff."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:141
 msgid "not available in this view"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:150
 msgid "{} unresolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:153
 msgid "0 unresolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:156
 msgid "{} Resolved"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:170
 msgid "0 General"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:178
 msgid "0 Inline"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:189
 #: rhodecode/templates/codeblocks/diffs.mako:194
 msgid "{} Outdated"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:191
 msgid "show outdated"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:192
 msgid "hide outdated"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:207
 msgid "The requested changes are too big and content was truncated."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:231
 msgid "Some changes may be hidden"
 msgstr ""
 
 #: rhodecode/templates/codeblocks/diffs.mako:233
 msgid "No files"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:272
+#: rhodecode/templates/codeblocks/diffs.mako:283
 msgid "The requested commit or file is too big and content was truncated."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:279
+#: rhodecode/templates/codeblocks/diffs.mako:290
 #, python-format
 msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:281
+#: rhodecode/templates/codeblocks/diffs.mako:292
 msgid "Show them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:284
+#: rhodecode/templates/codeblocks/diffs.mako:295
 msgid "Hide them"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:320
-#: rhodecode/templates/codeblocks/diffs.mako:339
+#: rhodecode/templates/codeblocks/diffs.mako:332
+#: rhodecode/templates/codeblocks/diffs.mako:351
 msgid "Unmatched/outdated inline comments below"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:345
+#: rhodecode/templates/codeblocks/diffs.mako:357
 msgid "Unmatched/outdated comments below"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:419
+#: rhodecode/templates/codeblocks/diffs.mako:431
 msgid "This file was removed from diff during updates to this pull-request."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:420
+#: rhodecode/templates/codeblocks/diffs.mako:432
 msgid "There are still outdated/unresolved comments attached to it."
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:487
+#: rhodecode/templates/codeblocks/diffs.mako:499
 msgid "Copy file path"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:554
-#: rhodecode/templates/codeblocks/diffs.mako:572
+#: rhodecode/templates/codeblocks/diffs.mako:566
+#: rhodecode/templates/codeblocks/diffs.mako:584
 #, python-format
 msgid "Show file at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:556
-#: rhodecode/templates/codeblocks/diffs.mako:563
+#: rhodecode/templates/codeblocks/diffs.mako:568
+#: rhodecode/templates/codeblocks/diffs.mako:575
 msgid "Show file before"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:561
-#: rhodecode/templates/codeblocks/diffs.mako:579
+#: rhodecode/templates/codeblocks/diffs.mako:573
+#: rhodecode/templates/codeblocks/diffs.mako:591
 #, python-format
 msgid "File not present at commit: %(commit_id)s"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:574
-#: rhodecode/templates/codeblocks/diffs.mako:581
+#: rhodecode/templates/codeblocks/diffs.mako:586
+#: rhodecode/templates/codeblocks/diffs.mako:593
 msgid "Show file after"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:588
+#: rhodecode/templates/codeblocks/diffs.mako:600
 msgid "Show comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:588
+#: rhodecode/templates/codeblocks/diffs.mako:600
 msgid "Hide comments"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:658
-#: rhodecode/templates/codeblocks/diffs.mako:701
-#: rhodecode/templates/codeblocks/diffs.mako:757
-msgid "comments including outdated"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:660
-#: rhodecode/templates/codeblocks/diffs.mako:703
-#: rhodecode/templates/codeblocks/diffs.mako:759
-msgid "comments"
-msgstr ""
-
-#: rhodecode/templates/codeblocks/diffs.mako:828
+#: rhodecode/templates/codeblocks/diffs.mako:691
+#: rhodecode/templates/codeblocks/diffs.mako:734
+#: rhodecode/templates/codeblocks/diffs.mako:796
+msgid "comments including outdated: {}. Click here to display them."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:693
+#: rhodecode/templates/codeblocks/diffs.mako:736
+#: rhodecode/templates/codeblocks/diffs.mako:798
+msgid "comments: {}. Click to toggle them."
+msgstr ""
+
+#: rhodecode/templates/codeblocks/diffs.mako:867
 msgid "Toggle wide diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:836
+#: rhodecode/templates/codeblocks/diffs.mako:875
 msgid "View diff as side by side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:838
+#: rhodecode/templates/codeblocks/diffs.mako:877
 msgid "Side by Side"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:843
+#: rhodecode/templates/codeblocks/diffs.mako:882
 msgid "View diff as unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:844
+#: rhodecode/templates/codeblocks/diffs.mako:883
 msgid "Unified"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:849
+#: rhodecode/templates/codeblocks/diffs.mako:888
 msgid "Turn off: Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:852
-#: rhodecode/templates/codeblocks/diffs.mako:859
+#: rhodecode/templates/codeblocks/diffs.mako:891
+#: rhodecode/templates/codeblocks/diffs.mako:898
 msgid "Range Diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:856
+#: rhodecode/templates/codeblocks/diffs.mako:895
 msgid "Show the diff as commit range"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:900
+#: rhodecode/templates/codeblocks/diffs.mako:960
 msgid "Disabled on range diff"
 msgstr ""
 
-#: rhodecode/templates/codeblocks/diffs.mako:1131
+#: rhodecode/templates/codeblocks/diffs.mako:1267
 msgid "..."
 msgstr ""
 
 #: rhodecode/templates/codeblocks/source.mako:22
 msgid "view annotation from before this change"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:6
 #, python-format
 msgid "%s Changelog"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:38
 msgid "Clear filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:45
 msgid "Hide obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:47
 msgid "Show obsolete/hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:50
 msgid "Show hidden"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:59
 #: rhodecode/templates/compare/compare_diff.mako:93
 #, python-format
 msgid "Compare fork with %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:69
 #, python-format
 msgid "Compare fork with Parent (%s)"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:107
 msgid "Clear selection"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:110
 msgid "Select second commit"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:116
 msgid "Commit Message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:118
 #: rhodecode/templates/summary/summary_commits.mako:10
 msgid "Age"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:121
 #: rhodecode/templates/summary/summary_commits.mako:12
 msgid "Refs"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:262
 msgid "Branch filter"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog.mako:323
 msgid "There are no changes yet"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:8
 msgid "load previous"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:35
 #: rhodecode/templates/summary/summary_commits.mako:27
 #, python-format
 msgid ""
 "Commit status: %s\n"
 "Click to open associated pull request #%s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:39
 #: rhodecode/templates/summary/summary_commits.mako:31
 msgid "Commit status: {}"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:45
 #: rhodecode/templates/summary/summary_commits.mako:37
 msgid "Commit status: Not Reviewed"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:63
 msgid "{} commit phase"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:69
 msgid "Obsolete Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:74
 msgid "Hidden Evolve State"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:80
 #: rhodecode/templates/compare/compare_commits.mako:46
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:597
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:595
 #: rhodecode/templates/search/search_commit.mako:34
 msgid "Expand commit message"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:108
 #: 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: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:42
 #: rhodecode/templates/summary/summary_commits.mako:71
 #, python-format
 msgid "Tag %s"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:135
 #: rhodecode/templates/summary/summary_commits.mako:87
 msgid "Commit has comments"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_elements.mako:150
 msgid "load next"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:33
 msgid "Show File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:38
 msgid "Diff File"
 msgstr ""
 
 #: rhodecode/templates/commits/changelog_file_history.mako:46
 msgid "Show Full History"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:5
 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
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:556
 msgid "Time"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_commits.mako:64
 msgid "No commits in this compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:7
 #: rhodecode/templates/compare/compare_diff.mako:9
 #, python-format
 msgid "%s Compare"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:38
 #: rhodecode/templates/compare/compare_diff.mako:90
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:119
 msgid "Compare Commits"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:40
 msgid "for file"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:56
 msgid "Target"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:70
-#: rhodecode/templates/files/files_source.mako:100
+#: rhodecode/templates/files/files_source.mako:110
 msgid "Source"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:102
 msgid "Compare with origin"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:108
 #: rhodecode/templates/compare/compare_diff.mako:114
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:116
 #: rhodecode/templates/compare/compare_diff.mako:126
 msgid "Action unavailable in current view"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:107
 #: rhodecode/templates/compare/compare_diff.mako:115
 #: rhodecode/templates/compare/compare_diff.mako:120
 msgid "Swap"
 msgstr ""
 
 #: rhodecode/templates/compare/compare_diff.mako:110
 msgid "Compare commits, branches, bookmarks or tags."
 msgstr ""
 
+#: rhodecode/templates/compare/compare_diff.mako:139
+#: rhodecode/templates/email_templates/commit_comment.mako:57
+msgid "Commit status"
+msgstr ""
+
 #: rhodecode/templates/data_table/_dt_elements.mako:73
 #: rhodecode/templates/data_table/_dt_elements.mako:74
 msgid "Fork"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:95
 msgid "Mercurial repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:97
 msgid "Git repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:99
 msgid "Subversion repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:106
 msgid "Public repository"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:116
 msgid "This repository is being created in a background task"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:117
 msgid "creating..."
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:149
 msgid "No commits yet"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:156
 #: rhodecode/templates/data_table/_dt_elements.mako:158
 #, python-format
 msgid "Subscribe to %s rss feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:164
 #: rhodecode/templates/data_table/_dt_elements.mako:166
 #, python-format
 msgid "Subscribe to %s atom feed"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:191
 msgid "Creating"
 msgstr ""
 
 #: 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:236
 msgid "personal"
 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:429
 msgid "Info"
 msgstr ""
 
 #: rhodecode/templates/data_table/_dt_elements.mako:470
 #, python-format
 msgid "Parsed using %s syntax"
 msgstr ""
 
 #: rhodecode/templates/debug_style/buttons.html:131
 msgid "Confirm to remove this field: Field"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:107
 msgid "Default"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:513
 #: rhodecode/templates/debug_style/form-elements.html:565
 #: rhodecode/templates/debug_style/forms.html:236
 msgid "Chosen group members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:525
 #: rhodecode/templates/debug_style/form-elements.html:569
 #: rhodecode/templates/debug_style/forms.html:240
 msgid "Remove all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:535
 #: rhodecode/templates/debug_style/form-elements.html:579
 #: rhodecode/templates/debug_style/forms.html:250
 msgid "Available members"
 msgstr ""
 
 #: rhodecode/templates/debug_style/form-elements.html:543
 #: rhodecode/templates/debug_style/form-elements.html:587
 #: rhodecode/templates/debug_style/forms.html:258
 msgid "Add all elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:119
 msgid "Some text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:122
 #: rhodecode/templates/debug_style/forms.html:255
 msgid "Variable Item"
 msgstr ""
 
 #: rhodecode/templates/debug_style/forms.html:252
 msgid "Some example text..."
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:5
 msgid "Debug Style"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:54
 msgid "Index"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:56
 msgid "Typography"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:57
 msgid "Forms"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:58
 msgid "Buttons"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:59
 msgid "Labels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:60
 msgid "Alerts"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:61
 msgid "Tables"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:62
 msgid "Tables wide"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:63
 msgid "Collapsable Content"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:65
 msgid "Layout form with sidebar"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:66
 msgid "Login"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:67
 msgid "Login 2"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:68
 msgid "Code blocks"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:71
 msgid "Panels"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:74
 msgid "Form elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:75
 msgid "Form elements small"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:76
 msgid "Form inline elements"
 msgstr ""
 
 #: rhodecode/templates/debug_style/index.html:77
 msgid "Form vertical"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:28
 msgid "Sign in to your account"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:46
 msgid "(Forgot password?)"
 msgstr ""
 
 #: rhodecode/templates/debug_style/login.html:56
 msgid "Don't have an account ?"
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:75
-#: rhodecode/templates/email_templates/base.mako:597
+#: rhodecode/templates/email_templates/base.mako:72
+#: rhodecode/templates/email_templates/base.mako:633
 msgid "This is a notification from RhodeCode."
 msgstr ""
 
-#: rhodecode/templates/email_templates/base.mako:577
+#: rhodecode/templates/email_templates/base.mako:613
 msgid "RhodeCode"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:23
-#: rhodecode/templates/email_templates/commit_comment.mako:26
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-#: rhodecode/templates/email_templates/pull_request_comment.mako:24
-#: rhodecode/templates/email_templates/pull_request_comment.mako:27
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-msgid "[mention]"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:23
-msgid "{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:23
-#: rhodecode/templates/email_templates/commit_comment.mako:26
-#: rhodecode/templates/email_templates/commit_comment.mako:28
-msgid "in the `{repo_name}` repository"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:26
-msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`"
+#: rhodecode/templates/email_templates/commit_comment.mako:24
+msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}` in the `{repo_name}` repository"
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:28
-msgid "{user} left a {comment_type} on commit `{commit_id}`"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:50
-#: rhodecode/templates/email_templates/pull_request_comment.mako:60
+msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:31
+msgid "{mention_prefix}{user} left a {comment_type} on commit `{commit_id}` in the `{repo_name}` repository"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:54
+#: rhodecode/templates/email_templates/pull_request_comment.mako:63
 msgid "Comment link"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:53
-#: rhodecode/templates/email_templates/commit_comment.mako:129
+#: rhodecode/templates/email_templates/commit_comment.mako:57
+#: rhodecode/templates/email_templates/commit_comment.mako:135
 msgid "Status was changed to"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:58
-#: rhodecode/templates/email_templates/commit_comment.mako:141
+#: rhodecode/templates/email_templates/commit_comment.mako:62
+#: rhodecode/templates/email_templates/commit_comment.mako:147
 #: rhodecode/templates/search/search_commit.mako:12
 #: rhodecode/templates/summary/summary_commits.mako:9
 msgid "Commit message"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:61
-#: rhodecode/templates/email_templates/pull_request_comment.mako:74
+#: rhodecode/templates/email_templates/commit_comment.mako:65
+#: rhodecode/templates/email_templates/pull_request_comment.mako:77
 msgid "File: {comment_file} on line {comment_line}"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:65
-#: rhodecode/templates/email_templates/commit_comment.mako:155
-#: rhodecode/templates/email_templates/pull_request_comment.mako:78
-#: rhodecode/templates/email_templates/pull_request_comment.mako:186
+#: rhodecode/templates/email_templates/commit_comment.mako:69
+#: rhodecode/templates/email_templates/commit_comment.mako:161
+#: rhodecode/templates/email_templates/pull_request_comment.mako:81
+#: rhodecode/templates/email_templates/pull_request_comment.mako:191
 msgid "`TODO` number"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:67
-#: rhodecode/templates/email_templates/commit_comment.mako:157
-#: rhodecode/templates/email_templates/pull_request_comment.mako:80
-#: rhodecode/templates/email_templates/pull_request_comment.mako:188
+#: rhodecode/templates/email_templates/commit_comment.mako:71
+#: rhodecode/templates/email_templates/commit_comment.mako:163
+#: rhodecode/templates/email_templates/pull_request_comment.mako:83
+#: rhodecode/templates/email_templates/pull_request_comment.mako:193
 msgid "`Note` number"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:99
-#: rhodecode/templates/email_templates/pull_request_comment.mako:120
-msgid "left a"
-msgstr ""
-
-#: rhodecode/templates/email_templates/commit_comment.mako:102
-msgid "{comment_type} on file `{comment_file}` in commit."
-msgstr ""
-
 #: rhodecode/templates/email_templates/commit_comment.mako:104
-msgid "{comment_type} on commit."
+#: rhodecode/templates/email_templates/pull_request_comment.mako:124
+msgid "left a"
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:107
+msgid "{comment_type} on file `{comment_file}` in commit."
 msgstr ""
 
 #: rhodecode/templates/email_templates/commit_comment.mako:109
+msgid "{comment_type} on commit."
+msgstr ""
+
+#: rhodecode/templates/email_templates/commit_comment.mako:114
 msgid "of repository"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:127
+#: rhodecode/templates/email_templates/commit_comment.mako:133
 msgid "Commit Status"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:147
-#: rhodecode/templates/email_templates/pull_request_comment.mako:178
+#: rhodecode/templates/email_templates/commit_comment.mako:153
+#: rhodecode/templates/email_templates/pull_request_comment.mako:183
 #: rhodecode/templates/search/search_path.mako:9
 msgid "File"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:148
-#: rhodecode/templates/email_templates/pull_request_comment.mako:179
+#: rhodecode/templates/email_templates/commit_comment.mako:154
+#: rhodecode/templates/email_templates/pull_request_comment.mako:184
 msgid "`{comment_file}` on line {comment_line}"
 msgstr ""
 
-#: rhodecode/templates/email_templates/commit_comment.mako:167
-#: rhodecode/templates/email_templates/pull_request_comment.mako:198
+#: rhodecode/templates/email_templates/commit_comment.mako:173
+#: rhodecode/templates/email_templates/pull_request_comment.mako:203
 msgid "Reply"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
-msgid "{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:27
-msgid "[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:29
-msgid "{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:62
+msgid "{mention_prefix}{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:28
+msgid "{mention_prefix}[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:31
+msgid "{mention_prefix}{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:65
 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:24
 msgid "Pull Request"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:64
-#: rhodecode/templates/email_templates/pull_request_review.mako:39
-#: rhodecode/templates/email_templates/pull_request_update.mako:39
-msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}"
-msgstr ""
-
 #: rhodecode/templates/email_templates/pull_request_comment.mako:67
-msgid "{user} submitted pull request !{pr_id} status: *{status}*"
+#: rhodecode/templates/email_templates/pull_request_review.mako:41
+#: rhodecode/templates/email_templates/pull_request_update.mako:41
+msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}"
 msgstr ""
 
 #: rhodecode/templates/email_templates/pull_request_comment.mako:70
+msgid "{user} submitted pull request !{pr_id} status: *{status}*"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:73
 msgid "{user} submitted pull request !{pr_id} status: *{status} and closed*"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:123
+#: rhodecode/templates/email_templates/pull_request_comment.mako:127
 msgid "{comment_type} on file `{comment_file}` in pull request."
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:125
+#: rhodecode/templates/email_templates/pull_request_comment.mako:129
 msgid "{comment_type} on pull request."
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:130
-#: rhodecode/templates/email_templates/pull_request_comment.mako:159
-#: rhodecode/templates/email_templates/pull_request_review.mako:89
-#: rhodecode/templates/email_templates/pull_request_review.mako:105
-#: rhodecode/templates/email_templates/pull_request_update.mako:101
-#: rhodecode/templates/email_templates/pull_request_update.mako:117
+#: rhodecode/templates/email_templates/pull_request_comment.mako:134
+#: rhodecode/templates/email_templates/pull_request_comment.mako:164
+#: rhodecode/templates/email_templates/pull_request_review.mako:91
+#: rhodecode/templates/email_templates/pull_request_review.mako:108
+#: rhodecode/templates/email_templates/pull_request_update.mako:104
+#: rhodecode/templates/email_templates/pull_request_update.mako:121
 msgid "Pull request"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:148
-msgid "Review Status"
-msgstr ""
-
-#: rhodecode/templates/email_templates/pull_request_comment.mako:151
-msgid "Closed pull request with status"
-msgstr ""
-
 #: rhodecode/templates/email_templates/pull_request_comment.mako:153
+msgid "Review Status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:156
+msgid "Closed pull request with status"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_comment.mako:158
 msgid "Submitted review status"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:168
-#: rhodecode/templates/email_templates/pull_request_review.mako:114
-#: rhodecode/templates/email_templates/pull_request_update.mako:126
+#: rhodecode/templates/email_templates/pull_request_comment.mako:173
+#: rhodecode/templates/email_templates/pull_request_review.mako:117
+#: rhodecode/templates/email_templates/pull_request_update.mako:130
 msgid "Commit Flow"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_comment.mako:170
-#: rhodecode/templates/email_templates/pull_request_comment.mako:172
-#: rhodecode/templates/email_templates/pull_request_review.mako:116
-#: rhodecode/templates/email_templates/pull_request_review.mako:118
-#: rhodecode/templates/email_templates/pull_request_update.mako:128
-#: rhodecode/templates/email_templates/pull_request_update.mako:130
+#: rhodecode/templates/email_templates/pull_request_comment.mako:175
+#: rhodecode/templates/email_templates/pull_request_comment.mako:177
+#: rhodecode/templates/email_templates/pull_request_review.mako:119
+#: rhodecode/templates/email_templates/pull_request_review.mako:121
+#: rhodecode/templates/email_templates/pull_request_update.mako:132
+#: rhodecode/templates/email_templates/pull_request_update.mako:134
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:128
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:137
 msgid "of"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_review.mako:15
+#: rhodecode/templates/email_templates/pull_request_review.mako:14
 msgid "{user} requested a pull request review. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_review.mako:37
-#: rhodecode/templates/email_templates/pull_request_update.mako:37
+#: rhodecode/templates/email_templates/pull_request_review.mako:39
+#: rhodecode/templates/email_templates/pull_request_update.mako:39
 msgid "Pull Request link"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_review.mako:83
-msgid "requested a"
-msgstr ""
-
 #: rhodecode/templates/email_templates/pull_request_review.mako:85
+msgid "requested a"
+msgstr ""
+
+#: rhodecode/templates/email_templates/pull_request_review.mako:87
 msgid "pull request review."
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_update.mako:15
+#: rhodecode/templates/email_templates/pull_request_update.mako:14
 msgid "{updating_user} updated pull request. !{pr_id}: \"{pr_title}\""
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_update.mako:95
+#: rhodecode/templates/email_templates/pull_request_update.mako:98
 msgid "updated"
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_update.mako:97
+#: rhodecode/templates/email_templates/pull_request_update.mako:100
 msgid "pull request."
 msgstr ""
 
-#: rhodecode/templates/email_templates/pull_request_update.mako:139
+#: rhodecode/templates/email_templates/pull_request_update.mako:143
 msgid "Changes"
 msgstr ""
 
 #: rhodecode/templates/email_templates/test.mako:5
 msgid "hello \"world\""
 msgstr ""
 
-#: rhodecode/templates/email_templates/test.mako:22
+#: rhodecode/templates/email_templates/test.mako:18
 msgid "Translation String"
 msgstr ""
 
 #: rhodecode/templates/email_templates/user_registration.mako:28
 msgid "New user {user} has registered on {date}"
 msgstr ""
 
-#: rhodecode/templates/email_templates/user_registration.mako:46
+#: rhodecode/templates/email_templates/user_registration.mako:47
 msgid "Full Name"
 msgstr ""
 
 #: 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:66
 msgid "Support Page"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:3
 #, python-format
 msgid "%(user)s commited on %(date)s UTC"
 msgstr ""
 
 #: rhodecode/templates/feed/atom_feed_entry.mako:30
 msgid "Commit was too big and was cut off..."
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:18
 msgid "Load All Authors"
 msgstr ""
 
 #: rhodecode/templates/files/file_authors_box.mako:20
 msgid "last author"
 msgstr ""
 
 #: rhodecode/templates/files/files.mako:4
 #: rhodecode/templates/files/files_pjax.mako:2
 msgid "{} Files"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:4
 msgid "{} Files Add"
 msgstr ""
 
 #: rhodecode/templates/files/files_add.mako:25
 msgid "Add new file"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:44
-#: rhodecode/templates/files/files_edit.mako:45
+#: rhodecode/templates/files/files_add.mako:43
+#: rhodecode/templates/files/files_edit.mako:44
 msgid "Filename e.g example.py, or docs/readme.md"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:64
-#: rhodecode/templates/files/files_edit.mako:66
+#: rhodecode/templates/files/files_add.mako:63
+#: rhodecode/templates/files/files_edit.mako:65
 msgid "Line wraps on"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:64
-#: rhodecode/templates/files/files_edit.mako:66
+#: rhodecode/templates/files/files_add.mako:63
+#: rhodecode/templates/files/files_edit.mako:65
 msgid "line wraps off"
 msgstr ""
 
-#: rhodecode/templates/files/files_add.mako:87
-#: rhodecode/templates/files/files_delete.mako:72
-#: rhodecode/templates/files/files_edit.mako:89
+#: rhodecode/templates/files/files_add.mako:86
+#: rhodecode/templates/files/files_delete.mako:71
+#: rhodecode/templates/files/files_edit.mako:88
 #: rhodecode/templates/files/files_upload.mako:102
 msgid "Commit changes"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:9
 msgid "Previous commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_browser.mako:15
 msgid "Next commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:22
-msgid "Upload File"
-msgstr ""
-
-#: rhodecode/templates/files/files_browser.mako:25
+#: rhodecode/templates/files/files_browser.mako:24
 msgid "Add File"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:35
+#: rhodecode/templates/files/files_browser.mako:27
+msgid "more options"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.mako:36
+msgid "Upload File"
+msgstr ""
+
+#: rhodecode/templates/files/files_browser.mako:51
 msgid "Download full tree ZIP"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:39
+#: rhodecode/templates/files/files_browser.mako:55
 msgid "Download this tree ZIP"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser.mako:67
+#: rhodecode/templates/files/files_browser.mako:83
 #: rhodecode/templates/summary/summary.mako:37
 #, python-format
 msgid "Readme file from commit %s:%s"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:14
+#: rhodecode/templates/files/files_browser_tree.mako:17
 #: rhodecode/templates/search/search_path.mako:12
 msgid "Size"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:15
+#: rhodecode/templates/files/files_browser_tree.mako:18
 msgid "Modified"
 msgstr ""
 
-#: rhodecode/templates/files/files_browser_tree.mako:16
+#: rhodecode/templates/files/files_browser_tree.mako:19
 msgid "Last Commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:4
 msgid "{} Files Delete"
 msgstr ""
 
 #: rhodecode/templates/files/files_delete.mako:25
 msgid "Delete file"
 msgstr ""
 
-#: rhodecode/templates/files/files_delete.mako:53
+#: rhodecode/templates/files/files_delete.mako:52
 #, python-format
 msgid "Binary file (%s)"
 msgstr ""
 
-#: rhodecode/templates/files/files_delete.mako:58
-#: rhodecode/templates/files/files_source.mako:128
+#: rhodecode/templates/files/files_delete.mako:57
+#: rhodecode/templates/files/files_source.mako:138
 msgid "File size {} is bigger then allowed limit {}. "
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:4
 msgid "{} Files Edit"
 msgstr ""
 
 #: rhodecode/templates/files/files_edit.mako:25
 msgid "Edit file"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:16
+#: rhodecode/templates/files/files_source.mako:26
 msgid "Download largefile"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:20
+#: rhodecode/templates/files/files_source.mako:30
 msgid "Download file"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:29
+#: rhodecode/templates/files/files_source.mako:39
 msgid "Editing binary files not allowed"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:33
-msgid "Edit on branch: "
-msgstr ""
-
-#: rhodecode/templates/files/files_source.mako:42
-msgid "Editing files allowed only when on branch head commit"
-msgstr ""
-
 #: rhodecode/templates/files/files_source.mako:43
+msgid "Edit on branch: "
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:52
+msgid "Editing files allowed only when on branch head commit"
+msgstr ""
+
+#: rhodecode/templates/files/files_source.mako:53
 msgid "Deleting files allowed only when on branch head commit"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:65
+#: rhodecode/templates/files/files_source.mako:75
 msgid "lines"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:73
+#: rhodecode/templates/files/files_source.mako:83
 msgid "This file is a pointer to large binary file"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:73
+#: rhodecode/templates/files/files_source.mako:83
 msgid "LargeFile"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:96
+#: rhodecode/templates/files/files_source.mako:106
 msgid "History"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:102
+#: rhodecode/templates/files/files_source.mako:112
 msgid "Annotation"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:104
+#: rhodecode/templates/files/files_source.mako:114
 msgid "Raw"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:107
+#: rhodecode/templates/files/files_source.mako:117
 msgid "Copy permalink"
 msgstr ""
 
-#: rhodecode/templates/files/files_source.mako:123
+#: rhodecode/templates/files/files_source.mako:133
 msgid "Binary file ({})"
 msgstr ""
 
 #: rhodecode/templates/files/files_source_header.mako:33
 msgid "File last commit"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:4
 msgid "{} Files Upload"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:36
 msgid "Uploading..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:38
 msgid "Uploaded"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:52
 msgid "Upload new file"
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:109
 msgid "Committing..."
 msgstr ""
 
 #: rhodecode/templates/files/files_upload.mako:110
 msgid "Please wait while the files are being uploaded"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:5
 #, python-format
 msgid "Fork repository %s"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:30
 #: rhodecode/templates/forks/forks.mako:60
 msgid "Fork name"
 msgstr ""
 
+#: rhodecode/templates/forks/fork.mako:47
+#, python-format
+msgid "Select my personal group (%(repo_group_name)s)"
+msgstr ""
+
 #: rhodecode/templates/forks/fork.mako:78
 msgid "Copy permissions"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:82
 msgid "Copy permissions from parent repository."
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:88
 msgid "Private"
 msgstr ""
 
 #: rhodecode/templates/forks/fork.mako:97
 msgid "Fork this Repository"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:5
 #, python-format
 msgid "%s Forks"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:28
 msgid "Create new fork"
 msgstr ""
 
 #: rhodecode/templates/forks/forks.mako:64
 msgid "Forked"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:25
 msgid "ATOM journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal.mako:26
 msgid "RSS journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/journal_data.mako:45
 msgid "No entries yet"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:4
 #: rhodecode/templates/journal/public_journal.mako:12
 msgid "Public Journal"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:21
 msgid "ATOM public journal feed"
 msgstr ""
 
 #: rhodecode/templates/journal/public_journal.mako:22
 msgid "RSS public journal feed"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:5
 #: rhodecode/templates/pullrequests/pullrequest.mako:28
 msgid "New pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:60
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:118
 msgid "Commit flow"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:68
 msgid "Source repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:86
 msgid "Loading refs..."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:97
 msgid "Submit Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:111
 msgid "Author of this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:125
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:286
 msgid "Reviewer rules"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:135
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:300
 msgid "Pull request reviewers"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:146
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:344
 msgid "Add reviewer or reviewer group"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:317
 msgid "Show detailed compare."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:324
 msgid "There are no commits to merge."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest.mako:418
 #: rhodecode/templates/pullrequests/pullrequest.mako:444
 msgid "Select commit reference"
 msgstr ""
 
 #: 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 ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:12
 msgid "Merge is not currently possible because of below failed checks."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
 msgid "Close with status {}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:66
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "Merge and close Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:70
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:75
 msgid "refresh checks"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
 msgid "You are not allowed to merge this pull request."
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:78
 msgid "Login to Merge this Pull Request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:6
 msgid "{} Pull Request !{}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:52
 msgid "Last updated on"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:53
 msgid "by"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:62
 msgid "Update title & description"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:68
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
 msgid "Delete pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
 msgid "Not allowed to delete this pull request"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:81
 msgid "Rendered using {} renderer"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:95
 msgid "Review status"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:151
 msgid "Common ancestor"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:155
 msgid "not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:167
 msgid "Pull changes from source"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:168
 msgid "Copy the pull url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
 msgid "Clone repository in its merged state using shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
 msgid "Clone from shadow repository"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:181
 #: rhodecode/templates/summary/components.mako:78
 msgid "Copy the clone url"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:185
 msgid "Shadow repository data not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:201
 msgid "Versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:213
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:215
 msgid "show versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:214
 msgid "hide versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:239
 msgid "Your review status at this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:244
 msgid "Comments from pull request version v{0}"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:262
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:266
 msgid "select versions to show changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:263
 msgid "show changes between versions"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:264
 msgid "show pull request for this version"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:273
 msgid "Pull request versions not available"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:349
 msgid "Save Changes"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:386
 msgid "unresolved TODOs unavailable in this view"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:422
 msgid "No unresolved TODOs"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:440
 msgid "Cannot show diff when pull request state is changing. Current progress state"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:458
 msgid "Missing requirements:"
 msgstr ""
 
 #: 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:467
 msgid "Missing commits"
 msgstr ""
 
 #: 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: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:470
-msgid "Consider doing a {force_refresh_url} in case you think this is an error."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:479
-msgid "There are new changes for {}:{} in source repository, please consider updating this pull request."
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:491
+msgid "Consider doing a `force update commits` in case you think this is an error."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:478
+msgid "There are new changes for `{}:{}` in source repository, please consider updating this pull request."
+msgstr ""
+
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:489
 #, python-format
 msgid "Showing changes at v%d, commenting is disabled."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:514
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:536
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:512
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:534
 msgid "Update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:517
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:515
 msgid "more update options"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:525
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:523
 msgid "Force update commits"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:528
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:526
 msgid "Update commits and force refresh this pull request."
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:536
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:534
 msgid "Update is disabled for current view"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:547
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:545
 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
 msgstr ""
 
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:551
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:549
 msgid "commits added: {}, removed: {}"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:567
+msgid "Commit added in displayed changes"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:569
-msgid "Commit added in displayed changes"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:571
 msgid "Commit removed in displayed changes"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:678
+msgid "there is {num} general comment from older versions"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:679
-msgid "there is {num} general comment from older versions"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:680
 msgid "show it"
 msgstr ""
 
+#: rhodecode/templates/pullrequests/pullrequest_show.mako:681
+msgid "there are {num} general comments from older versions"
+msgstr ""
+
 #: rhodecode/templates/pullrequests/pullrequest_show.mako:682
-msgid "there are {num} general comments from older versions"
-msgstr ""
-
-#: rhodecode/templates/pullrequests/pullrequest_show.mako:683
 msgid "show them"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:4
 msgid "{} Pull Requests"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:27
 msgid "Opened"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:28
 msgid "Opened by me"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:29
 msgid "Awaiting review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:30
 msgid "Awaiting my review"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:32
 msgid "From this repo"
 msgstr ""
 
 #: rhodecode/templates/pullrequests/pullrequests.mako:40
 msgid "Open new Pull Request"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:6
 #: rhodecode/templates/search/search.mako:19
 msgid "Search inside repository {repo_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:8
 #: rhodecode/templates/search/search.mako:21
 msgid "Search inside repository group {repo_group_name}"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:10
 #: rhodecode/templates/search/search.mako:23
 msgid "Search inside all accessible repositories"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:99
 msgid "File path"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:102
 msgid "Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:108
 #: rhodecode/templates/search/search.mako:110
 #: rhodecode/templates/search/search.mako:112
 msgid "Global Search"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:138
 msgid "sort"
 msgstr ""
 
 #: rhodecode/templates/search/search.mako:157
 msgid "Query Language examples"
 msgstr ""
 
 #: rhodecode/templates/search/search_commit.mako:15
 msgid "Commit date"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:7
 msgid "No content matched"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:12
 msgid "more matches in this file"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:112
 msgid "Narrow to this repository group"
 msgstr ""
 
 #: rhodecode/templates/search/search_content.mako:119
 msgid "Narrow to this repository"
 msgstr ""
 
 #: rhodecode/templates/search/search_path.mako:15
 msgid "Lines"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:20
 msgid "Closed Branch"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:83
 msgid "Copy the clone by id url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:88
 msgid "Copy the clone by ssh url"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "SVN Protocol is disabled. To enable it, see the"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:92
 msgid "documentation here"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:135
 msgid "Number of Repository Forks"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:172
 msgid "Downloads"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:177
 msgid "There are no downloads yet"
 msgstr ""
 
 #: rhodecode/templates/summary/components.mako:181
 msgid "Downloads are disabled for this repository"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:203
+#: rhodecode/templates/summary/components.mako:196
+msgid "more download options"
+msgstr ""
+
+#: rhodecode/templates/summary/components.mako:228
 msgid "Repository size"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:215
+#: rhodecode/templates/summary/components.mako:240
 msgid "Calculating Repository Size..."
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:226
+#: rhodecode/templates/summary/components.mako:251
 msgid "Code Statistics"
 msgstr ""
 
-#: rhodecode/templates/summary/components.mako:235
+#: rhodecode/templates/summary/components.mako:260
 msgid "Statistics are disabled for this repository"
 msgstr ""
 
 #: rhodecode/templates/summary/summary.mako:21
 msgid "Quick start"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:5
 msgid "{} Summary"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:13
 #, python-format
 msgid "%s ATOM feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_base.mako:14
 #, python-format
 msgid "%s RSS feed"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:117
 msgid "Add or upload files directly via RhodeCode:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:119
 msgid "Add New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:122
 msgid "Upload New File"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:128
 msgid "Push new repo:"
 msgstr ""
 
 #: rhodecode/templates/summary/summary_commits.mako:151
 msgid "Existing repository?"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:5
 #, python-format
 msgid "%s Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:28
 msgid "Compare Selected Tags"
 msgstr ""
 
 #: rhodecode/templates/tags/tags.mako:34
 msgid "tags"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:6
 msgid "User Group Profile"
 msgstr ""
 
 #: rhodecode/templates/user_group/profile.mako:15
 msgid "Group Name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:39
 msgid "First name"
 msgstr ""
 
 #: rhodecode/templates/users/user_profile.mako:49
 msgid "Last name"
 msgstr ""
 
 #: rhodecode/tests/lib/test_ext_json.py:162
 msgid "hello"
 msgstr ""
 

rhodecode/lib/utils.py

@@ -1,800 +1,800 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 Utilities library for RhodeCode
 """
 
 import datetime
 import decorator
 import json
 import logging
 import os
 import re
 import sys
 import shutil
 import socket
 import tempfile
 import traceback
 import tarfile
 import warnings
 import hashlib
 from os.path import join as jn
 
 import paste
 import pkg_resources
 from webhelpers2.text import collapse, remove_formatting
 from mako import exceptions
 from pyramid.threadlocal import get_current_registry
 from rhodecode.lib.request import Request
 
 from rhodecode.lib.vcs.backends.base import Config
 from rhodecode.lib.vcs.exceptions import VCSError
 from rhodecode.lib.vcs.utils.helpers import get_scm, get_scm_backend
 from rhodecode.lib.utils2 import (
     safe_str, safe_unicode, get_current_rhodecode_user, md5, sha1)
 from rhodecode.model import meta
 from rhodecode.model.db import (
     Repository, User, RhodeCodeUi, UserLog, RepoGroup, UserGroup)
 from rhodecode.model.meta import Session
 
 
 log = logging.getLogger(__name__)
 
 REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}__.*')
 
 # String which contains characters that are not allowed in slug names for
 # repositories or repository groups. It is properly escaped to use it in
 # regular expressions.
 SLUG_BAD_CHARS = re.escape('`?=[]\;\'"<>,/~!@#$%^&*()+{}|:')
 
 # Regex that matches forbidden characters in repo/group slugs.
 SLUG_BAD_CHAR_RE = re.compile('[{}]'.format(SLUG_BAD_CHARS))
 
 # Regex that matches allowed characters in repo/group slugs.
 SLUG_GOOD_CHAR_RE = re.compile('[^{}]'.format(SLUG_BAD_CHARS))
 
 # Regex that matches whole repo/group slugs.
 SLUG_RE = re.compile('[^{}]+'.format(SLUG_BAD_CHARS))
 
 _license_cache = None
 
 
 def repo_name_slug(value):
     """
     Return slug of name of repository
     This function is called on each creation/modification
     of repository to prevent bad names in repo
     """
     replacement_char = '-'
 
     slug = remove_formatting(value)
     slug = SLUG_BAD_CHAR_RE.sub('', slug)
     slug = re.sub('[\s]+', '-', slug)
     slug = collapse(slug, replacement_char)
     return slug
 
 
 #==============================================================================
 # PERM DECORATOR HELPERS FOR EXTRACTING NAMES FOR PERM CHECKS
 #==============================================================================
 def get_repo_slug(request):
     _repo = ''
 
     if hasattr(request, 'db_repo'):
         # if our requests has set db reference use it for name, this
         # translates the example.com/_<id> into proper repo names
         _repo = request.db_repo.repo_name
     elif getattr(request, 'matchdict', None):
         # pyramid
         _repo = request.matchdict.get('repo_name')
 
     if _repo:
         _repo = _repo.rstrip('/')
     return _repo
 
 
 def get_repo_group_slug(request):
     _group = ''
     if hasattr(request, 'db_repo_group'):
         # if our requests has set db reference use it for name, this
         # translates the example.com/_<id> into proper repo group names
         _group = request.db_repo_group.group_name
     elif getattr(request, 'matchdict', None):
         # pyramid
         _group = request.matchdict.get('repo_group_name')
 
     if _group:
         _group = _group.rstrip('/')
     return _group
 
 
 def get_user_group_slug(request):
     _user_group = ''
 
     if hasattr(request, 'db_user_group'):
         _user_group = request.db_user_group.users_group_name
     elif getattr(request, 'matchdict', None):
         # pyramid
         _user_group = request.matchdict.get('user_group_id')
         _user_group_name = request.matchdict.get('user_group_name')
         try:
             if _user_group:
                 _user_group = UserGroup.get(_user_group)
             elif _user_group_name:
                 _user_group = UserGroup.get_by_group_name(_user_group_name)
 
             if _user_group:
                 _user_group = _user_group.users_group_name
         except Exception:
             log.exception('Failed to get user group by id and name')
             # catch all failures here
             return None
 
     return _user_group
 
 
 def get_filesystem_repos(path, recursive=False, skip_removed_repos=True):
     """
     Scans given path for repos and return (name,(type,path)) tuple
 
     :param path: path to scan for repositories
     :param recursive: recursive search and return names with subdirs in front
     """
 
     # remove ending slash for better results
     path = path.rstrip(os.sep)
     log.debug('now scanning in %s location recursive:%s...', path, recursive)
 
     def _get_repos(p):
         dirpaths = _get_dirpaths(p)
         if not _is_dir_writable(p):
             log.warning('repo path without write access: %s', p)
 
         for dirpath in dirpaths:
             if os.path.isfile(os.path.join(p, dirpath)):
                 continue
             cur_path = os.path.join(p, dirpath)
 
             # skip removed repos
             if skip_removed_repos and REMOVED_REPO_PAT.match(dirpath):
                 continue
 
             #skip .<somethin> dirs
             if dirpath.startswith('.'):
                 continue
 
             try:
                 scm_info = get_scm(cur_path)
                 yield scm_info[1].split(path, 1)[-1].lstrip(os.sep), scm_info
             except VCSError:
                 if not recursive:
                     continue
                 #check if this dir containts other repos for recursive scan
                 rec_path = os.path.join(p, dirpath)
                 if os.path.isdir(rec_path):
                     for inner_scm in _get_repos(rec_path):
                         yield inner_scm
 
     return _get_repos(path)
 
 
 def _get_dirpaths(p):
     try:
         # OS-independable way of checking if we have at least read-only
         # access or not.
         dirpaths = os.listdir(p)
     except OSError:
         log.warning('ignoring repo path without read access: %s', p)
         return []
 
     # os.listpath has a tweak: If a unicode is passed into it, then it tries to
     # decode paths and suddenly returns unicode objects itself. The items it
     # cannot decode are returned as strings and cause issues.
     #
     # Those paths are ignored here until a solid solution for path handling has
     # been built.
     expected_type = type(p)
 
     def _has_correct_type(item):
         if type(item) is not expected_type:
             log.error(
                 u"Ignoring path %s since it cannot be decoded into unicode.",
                 # Using "repr" to make sure that we see the byte value in case
                 # of support.
                 repr(item))
             return False
         return True
 
     dirpaths = [item for item in dirpaths if _has_correct_type(item)]
 
     return dirpaths
 
 
 def _is_dir_writable(path):
     """
     Probe if `path` is writable.
 
     Due to trouble on Cygwin / Windows, this is actually probing if it is
     possible to create a file inside of `path`, stat does not produce reliable
     results in this case.
     """
     try:
         with tempfile.TemporaryFile(dir=path):
             pass
     except OSError:
         return False
     return True
 
 
 def is_valid_repo(repo_name, base_path, expect_scm=None, explicit_scm=None, config=None):
     """
     Returns True if given path is a valid repository False otherwise.
     If expect_scm param is given also, compare if given scm is the same
     as expected from scm parameter. If explicit_scm is given don't try to
     detect the scm, just use the given one to check if repo is valid
 
     :param repo_name:
     :param base_path:
     :param expect_scm:
     :param explicit_scm:
     :param config:
 
     :return True: if given path is a valid repository
     """
     full_path = os.path.join(safe_str(base_path), safe_str(repo_name))
     log.debug('Checking if `%s` is a valid path for repository. '
               'Explicit type: %s', repo_name, explicit_scm)
 
     try:
         if explicit_scm:
             detected_scms = [get_scm_backend(explicit_scm)(
                 full_path, config=config).alias]
         else:
             detected_scms = get_scm(full_path)
 
         if expect_scm:
             return detected_scms[0] == expect_scm
         log.debug('path: %s is an vcs object:%s', full_path, detected_scms)
         return True
     except VCSError:
         log.debug('path: %s is not a valid repo !', full_path)
         return False
 
 
 def is_valid_repo_group(repo_group_name, base_path, skip_path_check=False):
     """
     Returns True if given path is a repository group, False otherwise
 
     :param repo_name:
     :param base_path:
     """
     full_path = os.path.join(safe_str(base_path), safe_str(repo_group_name))
     log.debug('Checking if `%s` is a valid path for repository group',
               repo_group_name)
 
     # check if it's not a repo
     if is_valid_repo(repo_group_name, base_path):
         log.debug('Repo called %s exist, it is not a valid repo group', repo_group_name)
         return False
 
     try:
         # we need to check bare git repos at higher level
         # since we might match branches/hooks/info/objects or possible
         # other things inside bare git repo
         maybe_repo = os.path.dirname(full_path)
         if maybe_repo == base_path:
             # skip root level repo check, we know root location CANNOT BE a repo group
             return False
 
         scm_ = get_scm(maybe_repo)
         log.debug('path: %s is a vcs object:%s, not valid repo group', full_path, scm_)
         return False
     except VCSError:
         pass
 
     # check if it's a valid path
     if skip_path_check or os.path.isdir(full_path):
         log.debug('path: %s is a valid repo group !', full_path)
         return True
 
     log.debug('path: %s is not a valid repo group !', full_path)
     return False
 
 
 def ask_ok(prompt, retries=4, complaint='[y]es or [n]o please!'):
     while True:
         ok = raw_input(prompt)
         if ok.lower() in ('y', 'ye', 'yes'):
             return True
         if ok.lower() in ('n', 'no', 'nop', 'nope'):
             return False
         retries = retries - 1
         if retries < 0:
             raise IOError
         print(complaint)
 
 # propagated from mercurial documentation
 ui_sections = [
     'alias', 'auth',
     'decode/encode', 'defaults',
     'diff', 'email',
     'extensions', 'format',
     'merge-patterns', 'merge-tools',
     'hooks', 'http_proxy',
     'smtp', 'patch',
     'paths', 'profiling',
     'server', 'trusted',
     'ui', 'web', ]
 
 
 def config_data_from_db(clear_session=True, repo=None):
     """
     Read the configuration data from the database and return configuration
     tuples.
     """
     from rhodecode.model.settings import VcsSettingsModel
 
     config = []
 
     sa = meta.Session()
     settings_model = VcsSettingsModel(repo=repo, sa=sa)
 
     ui_settings = settings_model.get_ui_settings()
 
     ui_data = []
     for setting in ui_settings:
         if setting.active:
             ui_data.append((setting.section, setting.key, setting.value))
             config.append((
                 safe_str(setting.section), safe_str(setting.key),
                 safe_str(setting.value)))
         if setting.key == 'push_ssl':
             # force set push_ssl requirement to False, rhodecode
             # handles that
             config.append((
                 safe_str(setting.section), safe_str(setting.key), False))
     log.debug(
         'settings ui from db@repo[%s]: %s',
         repo,
         ','.join(map(lambda s: '[{}] {}={}'.format(*s), ui_data)))
     if clear_session:
         meta.Session.remove()
 
     # TODO: mikhail: probably it makes no sense to re-read hooks information.
     # It's already there and activated/deactivated
     skip_entries = []
     enabled_hook_classes = get_enabled_hook_classes(ui_settings)
     if 'pull' not in enabled_hook_classes:
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRE_PULL))
     if 'push' not in enabled_hook_classes:
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRE_PUSH))
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PRETX_PUSH))
         skip_entries.append(('hooks', RhodeCodeUi.HOOK_PUSH_KEY))
 
     config = [entry for entry in config if entry[:2] not in skip_entries]
 
     return config
 
 
 def make_db_config(clear_session=True, repo=None):
     """
     Create a :class:`Config` instance based on the values in the database.
     """
     config = Config()
     config_data = config_data_from_db(clear_session=clear_session, repo=repo)
     for section, option, value in config_data:
         config.set(section, option, value)
     return config
 
 
 def get_enabled_hook_classes(ui_settings):
     """
     Return the enabled hook classes.
 
     :param ui_settings: List of ui_settings as returned
         by :meth:`VcsSettingsModel.get_ui_settings`
 
     :return: a list with the enabled hook classes. The order is not guaranteed.
     :rtype: list
     """
     enabled_hooks = []
     active_hook_keys = [
         key for section, key, value, active in ui_settings
         if section == 'hooks' and active]
 
     hook_names = {
         RhodeCodeUi.HOOK_PUSH: 'push',
         RhodeCodeUi.HOOK_PULL: 'pull',
         RhodeCodeUi.HOOK_REPO_SIZE: 'repo_size'
     }
 
     for key in active_hook_keys:
         hook = hook_names.get(key)
         if hook:
             enabled_hooks.append(hook)
 
     return enabled_hooks
 
 
 def set_rhodecode_config(config):
     """
     Updates pyramid config with new settings from database
 
     :param config:
     """
     from rhodecode.model.settings import SettingsModel
     app_settings = SettingsModel().get_all_settings()
 
     for k, v in app_settings.items():
         config[k] = v
 
 
 def get_rhodecode_realm():
     """
     Return the rhodecode realm from database.
     """
     from rhodecode.model.settings import SettingsModel
     realm = SettingsModel().get_setting_by_name('realm')
     return safe_str(realm.app_settings_value)
 
 
 def get_rhodecode_base_path():
     """
     Returns the base path. The base path is the filesystem path which points
     to the repository store.
     """
     from rhodecode.model.settings import SettingsModel
     paths_ui = SettingsModel().get_ui_by_section_and_key('paths', '/')
     return safe_str(paths_ui.ui_value)
 
 
 def map_groups(path):
     """
     Given a full path to a repository, create all nested groups that this
     repo is inside. This function creates parent-child relationships between
     groups and creates default perms for all new groups.
 
     :param paths: full path to repository
     """
     from rhodecode.model.repo_group import RepoGroupModel
     sa = meta.Session()
     groups = path.split(Repository.NAME_SEP)
     parent = None
     group = None
 
     # last element is repo in nested groups structure
     groups = groups[:-1]
     rgm = RepoGroupModel(sa)
     owner = User.get_first_super_admin()
     for lvl, group_name in enumerate(groups):
         group_name = '/'.join(groups[:lvl] + [group_name])
         group = RepoGroup.get_by_group_name(group_name)
         desc = '%s group' % group_name
 
         # skip folders that are now removed repos
         if REMOVED_REPO_PAT.match(group_name):
             break
 
         if group is None:
             log.debug('creating group level: %s group_name: %s',
                        lvl, group_name)
             group = RepoGroup(group_name, parent)
             group.group_description = desc
             group.user = owner
             sa.add(group)
             perm_obj = rgm._create_default_perms(group)
             sa.add(perm_obj)
             sa.flush()
 
         parent = group
     return group
 
 
 def repo2db_mapper(initial_repo_list, remove_obsolete=False):
     """
     maps all repos given in initial_repo_list, non existing repositories
     are created, if remove_obsolete is True it also checks for db entries
     that are not in initial_repo_list and removes them.
 
     :param initial_repo_list: list of repositories found by scanning methods
     :param remove_obsolete: check for obsolete entries in database
     """
     from rhodecode.model.repo import RepoModel
     from rhodecode.model.repo_group import RepoGroupModel
     from rhodecode.model.settings import SettingsModel
 
     sa = meta.Session()
     repo_model = RepoModel()
     user = User.get_first_super_admin()
     added = []
 
     # creation defaults
     defs = SettingsModel().get_default_repo_settings(strip_prefix=True)
     enable_statistics = defs.get('repo_enable_statistics')
     enable_locking = defs.get('repo_enable_locking')
     enable_downloads = defs.get('repo_enable_downloads')
     private = defs.get('repo_private')
 
     for name, repo in initial_repo_list.items():
         group = map_groups(name)
         unicode_name = safe_unicode(name)
         db_repo = repo_model.get_by_repo_name(unicode_name)
         # found repo that is on filesystem not in RhodeCode database
         if not db_repo:
             log.info('repository %s not found, creating now', name)
             added.append(name)
             desc = (repo.description
                     if repo.description != 'unknown'
                     else '%s repository' % name)
 
             db_repo = repo_model._create_repo(
                 repo_name=name,
                 repo_type=repo.alias,
                 description=desc,
                 repo_group=getattr(group, 'group_id', None),
                 owner=user,
                 enable_locking=enable_locking,
                 enable_downloads=enable_downloads,
                 enable_statistics=enable_statistics,
                 private=private,
                 state=Repository.STATE_CREATED
             )
             sa.commit()
             # we added that repo just now, and make sure we updated server info
             if db_repo.repo_type == 'git':
                 git_repo = db_repo.scm_instance()
                 # update repository server-info
                 log.debug('Running update server info')
                 git_repo._update_server_info()
 
             db_repo.update_commit_cache()
 
         config = db_repo._config
         config.set('extensions', 'largefiles', '')
         repo = db_repo.scm_instance(config=config)
         repo.install_hooks()
 
     removed = []
     if remove_obsolete:
         # remove from database those repositories that are not in the filesystem
         for repo in sa.query(Repository).all():
             if repo.repo_name not in initial_repo_list.keys():
                 log.debug("Removing non-existing repository found in db `%s`",
                           repo.repo_name)
                 try:
                     RepoModel(sa).delete(repo, forks='detach', fs_remove=False)
                     sa.commit()
                     removed.append(repo.repo_name)
                 except Exception:
                     # don't hold further removals on error
                     log.error(traceback.format_exc())
                     sa.rollback()
 
         def splitter(full_repo_name):
             _parts = full_repo_name.rsplit(RepoGroup.url_sep(), 1)
             gr_name = None
             if len(_parts) == 2:
                 gr_name = _parts[0]
             return gr_name
 
         initial_repo_group_list = [splitter(x) for x in
                                    initial_repo_list.keys() if splitter(x)]
 
         # remove from database those repository groups that are not in the
         # filesystem due to parent child relationships we need to delete them
         # in a specific order of most nested first
         all_groups = [x.group_name for x in sa.query(RepoGroup).all()]
         nested_sort = lambda gr: len(gr.split('/'))
         for group_name in sorted(all_groups, key=nested_sort, reverse=True):
             if group_name not in initial_repo_group_list:
                 repo_group = RepoGroup.get_by_group_name(group_name)
                 if (repo_group.children.all() or
                     not RepoGroupModel().check_exist_filesystem(
                         group_name=group_name, exc_on_failure=False)):
                     continue
 
                 log.info(
                     'Removing non-existing repository group found in db `%s`',
                     group_name)
                 try:
                     RepoGroupModel(sa).delete(group_name, fs_remove=False)
                     sa.commit()
                     removed.append(group_name)
                 except Exception:
                     # don't hold further removals on error
                     log.exception(
                         'Unable to remove repository group `%s`',
                         group_name)
                     sa.rollback()
                     raise
 
     return added, removed
 
 
 def load_rcextensions(root_path):
     import rhodecode
     from rhodecode.config import conf
 
     path = os.path.join(root_path)
     sys.path.append(path)
 
     try:
         rcextensions = __import__('rcextensions')
     except ImportError:
         if os.path.isdir(os.path.join(path, 'rcextensions')):
             log.warn('Unable to load rcextensions from %s', path)
         rcextensions = None
 
     if rcextensions:
-        log.debug('Found rcextensions module loaded %s...', rcextensions)
+        log.info('Loaded rcextensions from %s...', rcextensions)
         rhodecode.EXTENSIONS = rcextensions
 
         # Additional mappings that are not present in the pygments lexers
         conf.LANGUAGES_EXTENSIONS_MAP.update(
             getattr(rhodecode.EXTENSIONS, 'EXTRA_MAPPINGS', {}))
 
 
 def get_custom_lexer(extension):
     """
     returns a custom lexer if it is defined in rcextensions module, or None
     if there's no custom lexer defined
     """
     import rhodecode
     from pygments import lexers
 
     # custom override made by RhodeCode
     if extension in ['mako']:
         return lexers.get_lexer_by_name('html+mako')
 
     # check if we didn't define this extension as other lexer
     extensions = rhodecode.EXTENSIONS and getattr(rhodecode.EXTENSIONS, 'EXTRA_LEXERS', None)
     if extensions and extension in rhodecode.EXTENSIONS.EXTRA_LEXERS:
         _lexer_name = rhodecode.EXTENSIONS.EXTRA_LEXERS[extension]
         return lexers.get_lexer_by_name(_lexer_name)
 
 
 #==============================================================================
 # TEST FUNCTIONS AND CREATORS
 #==============================================================================
 def create_test_index(repo_location, config):
     """
     Makes default test index.
     """
     import rc_testdata
 
     rc_testdata.extract_search_index(
         'vcs_search_index', os.path.dirname(config['search.location']))
 
 
 def create_test_directory(test_path):
     """
     Create test directory if it doesn't exist.
     """
     if not os.path.isdir(test_path):
         log.debug('Creating testdir %s', test_path)
         os.makedirs(test_path)
 
 
 def create_test_database(test_path, config):
     """
     Makes a fresh database.
     """
     from rhodecode.lib.db_manage import DbManage
 
     # PART ONE create db
     dbconf = config['sqlalchemy.db1.url']
     log.debug('making test db %s', dbconf)
 
     dbmanage = DbManage(log_sql=False, dbconf=dbconf, root=config['here'],
                         tests=True, cli_args={'force_ask': True})
     dbmanage.create_tables(override=True)
     dbmanage.set_db_version()
     # for tests dynamically set new root paths based on generated content
     dbmanage.create_settings(dbmanage.config_prompt(test_path))
     dbmanage.create_default_user()
     dbmanage.create_test_admin_and_users()
     dbmanage.create_permissions()
     dbmanage.populate_default_permissions()
     Session().commit()
 
 
 def create_test_repositories(test_path, config):
     """
     Creates test repositories in the temporary directory. Repositories are
     extracted from archives within the rc_testdata package.
     """
     import rc_testdata
     from rhodecode.tests import HG_REPO, GIT_REPO, SVN_REPO
 
     log.debug('making test vcs repositories')
 
     idx_path = config['search.location']
     data_path = config['cache_dir']
 
     # clean index and data
     if idx_path and os.path.exists(idx_path):
         log.debug('remove %s', idx_path)
         shutil.rmtree(idx_path)
 
     if data_path and os.path.exists(data_path):
         log.debug('remove %s', data_path)
         shutil.rmtree(data_path)
 
     rc_testdata.extract_hg_dump('vcs_test_hg', jn(test_path, HG_REPO))
     rc_testdata.extract_git_dump('vcs_test_git', jn(test_path, GIT_REPO))
 
     # Note: Subversion is in the process of being integrated with the system,
     # until we have a properly packed version of the test svn repository, this
     # tries to copy over the repo from a package "rc_testdata"
     svn_repo_path = rc_testdata.get_svn_repo_archive()
     with tarfile.open(svn_repo_path) as tar:
         tar.extractall(jn(test_path, SVN_REPO))
 
 
 def password_changed(auth_user, session):
     # Never report password change in case of default user or anonymous user.
     if auth_user.username == User.DEFAULT_USER or auth_user.user_id is None:
         return False
 
     password_hash = md5(auth_user.password) if auth_user.password else None
     rhodecode_user = session.get('rhodecode_user', {})
     session_password_hash = rhodecode_user.get('password', '')
     return password_hash != session_password_hash
 
 
 def read_opensource_licenses():
     global _license_cache
 
     if not _license_cache:
         licenses = pkg_resources.resource_string(
             'rhodecode', 'config/licenses.json')
         _license_cache = json.loads(licenses)
 
     return _license_cache
 
 
 def generate_platform_uuid():
     """
     Generates platform UUID based on it's name
     """
     import platform
 
     try:
         uuid_list = [platform.platform()]
         return hashlib.sha256(':'.join(uuid_list)).hexdigest()
     except Exception as e:
         log.error('Failed to generate host uuid: %s', e)
         return 'UNDEFINED'
 
 
 def send_test_email(recipients, email_body='TEST EMAIL'):
     """
     Simple code for generating test emails.
     Usage::
 
         from rhodecode.lib import utils
         utils.send_test_email()
     """
     from rhodecode.lib.celerylib import tasks, run_task
 
     email_body = email_body_plaintext = email_body
     subject = 'SUBJECT FROM: {}'.format(socket.gethostname())
     tasks.send_email(recipients, subject, email_body_plaintext, email_body)

rhodecode/lib/utils2.py

@@ -1,1104 +1,1070 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 """
 Some simple helper functions
 """
 
 import collections
 import datetime
 import dateutil.relativedelta
 import hashlib
 import logging
 import re
 import sys
 import time
 import urllib
 import urlobject
 import uuid
 import getpass
 from functools import update_wrapper, partial
 
 import pygments.lexers
 import sqlalchemy
 import sqlalchemy.engine.url
 import sqlalchemy.exc
 import sqlalchemy.sql
 import webob
 import pyramid.threadlocal
 from pyramid import compat
 from pyramid.settings import asbool
 
 import rhodecode
 from rhodecode.translation import _, _pluralize
 
 
 def md5(s):
     return hashlib.md5(s).hexdigest()
 
 
 def md5_safe(s):
     return md5(safe_str(s))
 
 
 def sha1(s):
     return hashlib.sha1(s).hexdigest()
 
 
 def sha1_safe(s):
     return sha1(safe_str(s))
 
 
 def __get_lem(extra_mapping=None):
     """
     Get language extension map based on what's inside pygments lexers
     """
     d = collections.defaultdict(lambda: [])
 
     def __clean(s):
         s = s.lstrip('*')
         s = s.lstrip('.')
 
         if s.find('[') != -1:
             exts = []
             start, stop = s.find('['), s.find(']')
 
             for suffix in s[start + 1:stop]:
                 exts.append(s[:s.find('[')] + suffix)
             return [e.lower() for e in exts]
         else:
             return [s.lower()]
 
     for lx, t in sorted(pygments.lexers.LEXERS.items()):
         m = map(__clean, t[-2])
         if m:
             m = reduce(lambda x, y: x + y, m)
             for ext in m:
                 desc = lx.replace('Lexer', '')
                 d[ext].append(desc)
 
     data = dict(d)
 
     extra_mapping = extra_mapping or {}
     if extra_mapping:
         for k, v in extra_mapping.items():
             if k not in data:
                 # register new mapping2lexer
                 data[k] = [v]
 
     return data
 
 
 def str2bool(_str):
     """
     returns True/False value from given string, it tries to translate the
     string into boolean
 
     :param _str: string value to translate into boolean
     :rtype: boolean
     :returns: boolean from given string
     """
     if _str is None:
         return False
     if _str in (True, False):
         return _str
     _str = str(_str).strip().lower()
     return _str in ('t', 'true', 'y', 'yes', 'on', '1')
 
 
 def aslist(obj, sep=None, strip=True):
     """
     Returns given string separated by sep as list
 
     :param obj:
     :param sep:
     :param strip:
     """
     if isinstance(obj, (basestring,)):
         lst = obj.split(sep)
         if strip:
             lst = [v.strip() for v in lst]
         return lst
     elif isinstance(obj, (list, tuple)):
         return obj
     elif obj is None:
         return []
     else:
         return [obj]
 
 
 def convert_line_endings(line, mode):
     """
     Converts a given line  "line end" accordingly to given mode
 
     Available modes are::
         0 - Unix
         1 - Mac
         2 - DOS
 
     :param line: given line to convert
     :param mode: mode to convert to
     :rtype: str
     :return: converted line according to mode
     """
     if mode == 0:
         line = line.replace('\r\n', '\n')
         line = line.replace('\r', '\n')
     elif mode == 1:
         line = line.replace('\r\n', '\r')
         line = line.replace('\n', '\r')
     elif mode == 2:
         line = re.sub('\r(?!\n)|(?<!\r)\n', '\r\n', line)
     return line
 
 
 def detect_mode(line, default):
     """
     Detects line break for given line, if line break couldn't be found
     given default value is returned
 
     :param line: str line
     :param default: default
     :rtype: int
     :return: value of line end on of 0 - Unix, 1 - Mac, 2 - DOS
     """
     if line.endswith('\r\n'):
         return 2
     elif line.endswith('\n'):
         return 0
     elif line.endswith('\r'):
         return 1
     else:
         return default
 
 
 def safe_int(val, default=None):
     """
     Returns int() of val if val is not convertable to int use default
     instead
 
     :param val:
     :param default:
     """
 
     try:
         val = int(val)
     except (ValueError, TypeError):
         val = default
 
     return val
 
 
 def safe_unicode(str_, from_encoding=None, use_chardet=False):
     """
     safe unicode function. Does few trick to turn str_ into unicode
 
     In case of UnicodeDecode error, we try to return it with encoding detected
     by chardet library if it fails fallback to unicode with errors replaced
 
     :param str_: string to decode
     :rtype: unicode
     :returns: unicode object
     """
     if isinstance(str_, unicode):
         return str_
 
     if not from_encoding:
         DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding',
                                                         'utf8'), sep=',')
         from_encoding = DEFAULT_ENCODINGS
 
     if not isinstance(from_encoding, (list, tuple)):
         from_encoding = [from_encoding]
 
     try:
         return unicode(str_)
     except UnicodeDecodeError:
         pass
 
     for enc in from_encoding:
         try:
             return unicode(str_, enc)
         except UnicodeDecodeError:
             pass
 
     if use_chardet:
         try:
             import chardet
             encoding = chardet.detect(str_)['encoding']
             if encoding is None:
                 raise Exception()
             return str_.decode(encoding)
         except (ImportError, UnicodeDecodeError, Exception):
             return unicode(str_, from_encoding[0], 'replace')
     else:
         return unicode(str_, from_encoding[0], 'replace')
 
 def safe_str(unicode_, to_encoding=None, use_chardet=False):
     """
     safe str function. Does few trick to turn unicode_ into string
 
     In case of UnicodeEncodeError, we try to return it with encoding detected
     by chardet library if it fails fallback to string with errors replaced
 
     :param unicode_: unicode to encode
     :rtype: str
     :returns: str object
     """
 
     # if it's not basestr cast to str
     if not isinstance(unicode_, compat.string_types):
         return str(unicode_)
 
     if isinstance(unicode_, str):
         return unicode_
 
     if not to_encoding:
         DEFAULT_ENCODINGS = aslist(rhodecode.CONFIG.get('default_encoding',
                                                         'utf8'), sep=',')
         to_encoding = DEFAULT_ENCODINGS
 
     if not isinstance(to_encoding, (list, tuple)):
         to_encoding = [to_encoding]
 
     for enc in to_encoding:
         try:
             return unicode_.encode(enc)
         except UnicodeEncodeError:
             pass
 
     if use_chardet:
         try:
             import chardet
             encoding = chardet.detect(unicode_)['encoding']
             if encoding is None:
                 raise UnicodeEncodeError()
 
             return unicode_.encode(encoding)
         except (ImportError, UnicodeEncodeError):
             return unicode_.encode(to_encoding[0], 'replace')
     else:
         return unicode_.encode(to_encoding[0], 'replace')
 
 
 def remove_suffix(s, suffix):
     if s.endswith(suffix):
         s = s[:-1 * len(suffix)]
     return s
 
 
 def remove_prefix(s, prefix):
     if s.startswith(prefix):
         s = s[len(prefix):]
     return s
 
 
 def find_calling_context(ignore_modules=None):
     """
     Look through the calling stack and return the frame which called
     this function and is part of core module ( ie. rhodecode.* )
 
     :param ignore_modules: list of modules to ignore eg. ['rhodecode.lib']
     """
 
     ignore_modules = ignore_modules or []
 
     f = sys._getframe(2)
     while f.f_back is not None:
         name = f.f_globals.get('__name__')
         if name and name.startswith(__name__.split('.')[0]):
             if name not in ignore_modules:
                 return f
         f = f.f_back
     return None
 
 
 def ping_connection(connection, branch):
     if branch:
         # "branch" refers to a sub-connection of a connection,
         # we don't want to bother pinging on these.
         return
 
     # turn off "close with result".  This flag is only used with
     # "connectionless" execution, otherwise will be False in any case
     save_should_close_with_result = connection.should_close_with_result
     connection.should_close_with_result = False
 
     try:
         # run a SELECT 1.   use a core select() so that
         # the SELECT of a scalar value without a table is
         # appropriately formatted for the backend
         connection.scalar(sqlalchemy.sql.select([1]))
     except sqlalchemy.exc.DBAPIError as err:
         # catch SQLAlchemy's DBAPIError, which is a wrapper
         # for the DBAPI's exception.  It includes a .connection_invalidated
         # attribute which specifies if this connection is a "disconnect"
         # condition, which is based on inspection of the original exception
         # by the dialect in use.
         if err.connection_invalidated:
             # run the same SELECT again - the connection will re-validate
             # itself and establish a new connection.  The disconnect detection
             # here also causes the whole connection pool to be invalidated
             # so that all stale connections are discarded.
             connection.scalar(sqlalchemy.sql.select([1]))
         else:
             raise
     finally:
         # restore "close with result"
         connection.should_close_with_result = save_should_close_with_result
 
 
 def engine_from_config(configuration, prefix='sqlalchemy.', **kwargs):
     """Custom engine_from_config functions."""
     log = logging.getLogger('sqlalchemy.engine')
     use_ping_connection = asbool(configuration.pop('sqlalchemy.db1.ping_connection', None))
     debug = asbool(configuration.pop('sqlalchemy.db1.debug_query', None))
 
     engine = sqlalchemy.engine_from_config(configuration, prefix, **kwargs)
 
     def color_sql(sql):
         color_seq = '\033[1;33m'  # This is yellow: code 33
         normal = '\x1b[0m'
         return ''.join([color_seq, sql, normal])
 
     if use_ping_connection:
         log.debug('Adding ping_connection on the engine config.')
         sqlalchemy.event.listen(engine, "engine_connect", ping_connection)
 
     if debug:
         # attach events only for debug configuration
         def before_cursor_execute(conn, cursor, statement,
                                   parameters, context, executemany):
             setattr(conn, 'query_start_time', time.time())
             log.info(color_sql(">>>>> STARTING QUERY >>>>>"))
             calling_context = find_calling_context(ignore_modules=[
                 'rhodecode.lib.caching_query',
                 'rhodecode.model.settings',
             ])
             if calling_context:
                 log.info(color_sql('call context %s:%s' % (
                     calling_context.f_code.co_filename,
                     calling_context.f_lineno,
                 )))
 
         def after_cursor_execute(conn, cursor, statement,
                                  parameters, context, executemany):
             delattr(conn, 'query_start_time')
 
         sqlalchemy.event.listen(engine, "before_cursor_execute", before_cursor_execute)
         sqlalchemy.event.listen(engine, "after_cursor_execute", after_cursor_execute)
 
     return engine
 
 
 def get_encryption_key(config):
     secret = config.get('rhodecode.encrypted_values.secret')
     default = config['beaker.session.secret']
     return secret or default
 
 
 def age(prevdate, now=None, show_short_version=False, show_suffix=True,
         short_format=False):
     """
     Turns a datetime into an age string.
     If show_short_version is True, this generates a shorter string with
     an approximate age; ex. '1 day ago', rather than '1 day and 23 hours ago'.
 
     * IMPORTANT*
     Code of this function is written in special way so it's easier to
     backport it to javascript. If you mean to update it, please also update
     `jquery.timeago-extension.js` file
 
     :param prevdate: datetime object
     :param now: get current time, if not define we use
         `datetime.datetime.now()`
     :param show_short_version: if it should approximate the date and
         return a shorter string
     :param show_suffix:
     :param short_format: show short format, eg 2D instead of 2 days
     :rtype: unicode
     :returns: unicode words describing age
     """
 
     def _get_relative_delta(now, prevdate):
         base = dateutil.relativedelta.relativedelta(now, prevdate)
         return {
             'year': base.years,
             'month': base.months,
             'day': base.days,
             'hour': base.hours,
             'minute': base.minutes,
             'second': base.seconds,
         }
 
     def _is_leap_year(year):
         return year % 4 == 0 and (year % 100 != 0 or year % 400 == 0)
 
     def get_month(prevdate):
         return prevdate.month
 
     def get_year(prevdate):
         return prevdate.year
 
     now = now or datetime.datetime.now()
     order = ['year', 'month', 'day', 'hour', 'minute', 'second']
     deltas = {}
     future = False
 
     if prevdate > now:
         now_old = now
         now = prevdate
         prevdate = now_old
         future = True
     if future:
         prevdate = prevdate.replace(microsecond=0)
     # Get date parts deltas
     for part in order:
         rel_delta = _get_relative_delta(now, prevdate)
         deltas[part] = rel_delta[part]
 
     # Fix negative offsets (there is 1 second between 10:59:59 and 11:00:00,
     # not 1 hour, -59 minutes and -59 seconds)
     offsets = [[5, 60], [4, 60], [3, 24]]
     for element in offsets:  # seconds, minutes, hours
         num = element[0]
         length = element[1]
 
         part = order[num]
         carry_part = order[num - 1]
 
         if deltas[part] < 0:
             deltas[part] += length
             deltas[carry_part] -= 1
 
     # Same thing for days except that the increment depends on the (variable)
     # number of days in the month
     month_lengths = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
     if deltas['day'] < 0:
         if get_month(prevdate) == 2 and _is_leap_year(get_year(prevdate)):
             deltas['day'] += 29
         else:
             deltas['day'] += month_lengths[get_month(prevdate) - 1]
 
         deltas['month'] -= 1
 
     if deltas['month'] < 0:
         deltas['month'] += 12
         deltas['year'] -= 1
 
     # Format the result
     if short_format:
         fmt_funcs = {
             'year': lambda d: u'%dy' % d,
             'month': lambda d: u'%dm' % d,
             'day': lambda d: u'%dd' % d,
             'hour': lambda d: u'%dh' % d,
             'minute': lambda d: u'%dmin' % d,
             'second': lambda d: u'%dsec' % d,
         }
     else:
         fmt_funcs = {
             'year': lambda d: _pluralize(u'${num} year', u'${num} years', d, mapping={'num': d}).interpolate(),
             'month': lambda d: _pluralize(u'${num} month', u'${num} months', d, mapping={'num': d}).interpolate(),
             'day': lambda d: _pluralize(u'${num} day', u'${num} days', d, mapping={'num': d}).interpolate(),
             'hour': lambda d: _pluralize(u'${num} hour', u'${num} hours', d, mapping={'num': d}).interpolate(),
             'minute': lambda d: _pluralize(u'${num} minute', u'${num} minutes', d, mapping={'num': d}).interpolate(),
             'second': lambda d: _pluralize(u'${num} second', u'${num} seconds', d, mapping={'num': d}).interpolate(),
         }
 
     i = 0
     for part in order:
         value = deltas[part]
         if value != 0:
 
             if i < 5:
                 sub_part = order[i + 1]
                 sub_value = deltas[sub_part]
             else:
                 sub_value = 0
 
             if sub_value == 0 or show_short_version:
                 _val = fmt_funcs[part](value)
                 if future:
                     if show_suffix:
                         return _(u'in ${ago}', mapping={'ago': _val})
                     else:
                         return _(_val)
 
                 else:
                     if show_suffix:
                         return _(u'${ago} ago', mapping={'ago': _val})
                     else:
                         return _(_val)
 
             val = fmt_funcs[part](value)
             val_detail = fmt_funcs[sub_part](sub_value)
             mapping = {'val': val, 'detail': val_detail}
 
             if short_format:
                 datetime_tmpl = _(u'${val}, ${detail}', mapping=mapping)
                 if show_suffix:
                     datetime_tmpl = _(u'${val}, ${detail} ago', mapping=mapping)
                     if future:
                         datetime_tmpl = _(u'in ${val}, ${detail}', mapping=mapping)
             else:
                 datetime_tmpl = _(u'${val} and ${detail}', mapping=mapping)
                 if show_suffix:
                     datetime_tmpl = _(u'${val} and ${detail} ago', mapping=mapping)
                     if future:
                         datetime_tmpl = _(u'in ${val} and ${detail}', mapping=mapping)
 
             return datetime_tmpl
         i += 1
     return _(u'just now')
 
 
 def age_from_seconds(seconds):
     seconds = safe_int(seconds) or 0
     prevdate = time_to_datetime(time.time() + seconds)
     return age(prevdate, show_suffix=False, show_short_version=True)
 
 
 def cleaned_uri(uri):
     """
     Quotes '[' and ']' from uri if there is only one of them.
         according to RFC3986 we cannot use such chars in uri
     :param uri:
     :return: uri without this chars
     """
     return urllib.quote(uri, safe='@$:/')
 
 
-def uri_filter(uri):
-    """
-    Removes user:password from given url string
-
-    :param uri:
-    :rtype: unicode
-    :returns: filtered list of strings
-    """
-    if not uri:
-        return ''
-
-    proto = ''
-
-    for pat in ('https://', 'http://'):
-        if uri.startswith(pat):
-            uri = uri[len(pat):]
-            proto = pat
-            break
-
-    # remove passwords and username
-    uri = uri[uri.find('@') + 1:]
-
-    # get the port
-    cred_pos = uri.find(':')
-    if cred_pos == -1:
-        host, port = uri, None
-    else:
-        host, port = uri[:cred_pos], uri[cred_pos + 1:]
-
-    return filter(None, [proto, host, port])
-
-
 def credentials_filter(uri):
     """
     Returns a url with removed credentials
 
     :param uri:
     """
+    import urlobject
+    url_obj = urlobject.URLObject(cleaned_uri(uri))
+    url_obj = url_obj.without_password().without_username()
 
-    uri = uri_filter(uri)
-    # check if we have port
-    if len(uri) > 2 and uri[2]:
-        uri[2] = ':' + uri[2]
-
-    return ''.join(uri)
+    return url_obj
 
 
 def get_host_info(request):
     """
     Generate host info, to obtain full url e.g https://server.com
     use this
     `{scheme}://{netloc}`
     """
     if not request:
         return {}
 
     qualified_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualified_home_url)
     decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
 
     return {
         'scheme': parsed_url.scheme,
         'netloc': parsed_url.netloc+decoded_path,
         'hostname': parsed_url.hostname,
     }
 
 
 def get_clone_url(request, uri_tmpl, repo_name, repo_id, repo_type, **override):
     qualified_home_url = request.route_url('home')
     parsed_url = urlobject.URLObject(qualified_home_url)
     decoded_path = safe_unicode(urllib.unquote(parsed_url.path.rstrip('/')))
 
     args = {
         'scheme': parsed_url.scheme,
         'user': '',
         'sys_user': getpass.getuser(),
         # path if we use proxy-prefix
         'netloc': parsed_url.netloc+decoded_path,
         'hostname': parsed_url.hostname,
         'prefix': decoded_path,
         'repo': repo_name,
         'repoid': str(repo_id),
         'repo_type': repo_type
     }
     args.update(override)
     args['user'] = urllib.quote(safe_str(args['user']))
 
     for k, v in args.items():
         uri_tmpl = uri_tmpl.replace('{%s}' % k, v)
 
     # special case for SVN clone url
     if repo_type == 'svn':
         uri_tmpl = uri_tmpl.replace('ssh://', 'svn+ssh://')
 
     # remove leading @ sign if it's present. Case of empty user
     url_obj = urlobject.URLObject(uri_tmpl)
     url = url_obj.with_netloc(url_obj.netloc.lstrip('@'))
 
     return safe_unicode(url)
 
 
 def get_commit_safe(repo, commit_id=None, commit_idx=None, pre_load=None,
                     maybe_unreachable=False):
     """
     Safe version of get_commit if this commit doesn't exists for a
     repository it returns a Dummy one instead
 
     :param repo: repository instance
     :param commit_id: commit id as str
     :param commit_idx: numeric commit index
     :param pre_load: optional list of commit attributes to load
     :param maybe_unreachable: translate unreachable commits on git repos
     """
     # TODO(skreft): remove these circular imports
     from rhodecode.lib.vcs.backends.base import BaseRepository, EmptyCommit
     from rhodecode.lib.vcs.exceptions import RepositoryError
     if not isinstance(repo, BaseRepository):
         raise Exception('You must pass an Repository '
                         'object as first argument got %s', type(repo))
 
     try:
         commit = repo.get_commit(
             commit_id=commit_id, commit_idx=commit_idx, pre_load=pre_load,
             maybe_unreachable=maybe_unreachable)
     except (RepositoryError, LookupError):
         commit = EmptyCommit()
     return commit
 
 
 def datetime_to_time(dt):
     if dt:
         return time.mktime(dt.timetuple())
 
 
 def time_to_datetime(tm):
     if tm:
         if isinstance(tm, compat.string_types):
             try:
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.fromtimestamp(tm)
 
 
 def time_to_utcdatetime(tm):
     if tm:
         if isinstance(tm, compat.string_types):
             try:
                 tm = float(tm)
             except ValueError:
                 return
         return datetime.datetime.utcfromtimestamp(tm)
 
 
 MENTIONS_REGEX = re.compile(
     # ^@ or @ without any special chars in front
     r'(?:^@|[^a-zA-Z0-9\-\_\.]@)'
     # main body starts with letter, then can be . - _
     r'([a-zA-Z0-9]{1}[a-zA-Z0-9\-\_\.]+)',
     re.VERBOSE | re.MULTILINE)
 
 
 def extract_mentioned_users(s):
     """
     Returns unique usernames from given string s that have @mention
 
     :param s: string to get mentions
     """
     usrs = set()
     for username in MENTIONS_REGEX.findall(s):
         usrs.add(username)
 
     return sorted(list(usrs), key=lambda k: k.lower())
 
 
 class AttributeDictBase(dict):
     def __getstate__(self):
         odict = self.__dict__  # get attribute dictionary
         return odict
 
     def __setstate__(self, dict):
         self.__dict__ = dict
 
     __setattr__ = dict.__setitem__
     __delattr__ = dict.__delitem__
 
 
 class StrictAttributeDict(AttributeDictBase):
     """
     Strict Version of Attribute dict which raises an Attribute error when
     requested attribute is not set
     """
     def __getattr__(self, attr):
         try:
             return self[attr]
         except KeyError:
             raise AttributeError('%s object has no attribute %s' % (
                 self.__class__, attr))
 
 
 class AttributeDict(AttributeDictBase):
     def __getattr__(self, attr):
         return self.get(attr, None)
 
 
 
 class OrderedDefaultDict(collections.OrderedDict, collections.defaultdict):
     def __init__(self, default_factory=None, *args, **kwargs):
         # in python3 you can omit the args to super
         super(OrderedDefaultDict, self).__init__(*args, **kwargs)
         self.default_factory = default_factory
 
 
 def fix_PATH(os_=None):
     """
     Get current active python path, and append it to PATH variable to fix
     issues of subprocess calls and different python versions
     """
     if os_ is None:
         import os
     else:
         os = os_
 
     cur_path = os.path.split(sys.executable)[0]
     if not os.environ['PATH'].startswith(cur_path):
         os.environ['PATH'] = '%s:%s' % (cur_path, os.environ['PATH'])
 
 
 def obfuscate_url_pw(engine):
     _url = engine or ''
     try:
         _url = sqlalchemy.engine.url.make_url(engine)
         if _url.password:
             _url.password = 'XXXXX'
     except Exception:
         pass
     return unicode(_url)
 
 
 def get_server_url(environ):
     req = webob.Request(environ)
     return req.host_url + req.script_name
 
 
 def unique_id(hexlen=32):
     alphabet = "23456789ABCDEFGHJKLMNPQRSTUVWXYZabcdefghjklmnpqrstuvwxyz"
     return suuid(truncate_to=hexlen, alphabet=alphabet)
 
 
 def suuid(url=None, truncate_to=22, alphabet=None):
     """
     Generate and return a short URL safe UUID.
 
     If the url parameter is provided, set the namespace to the provided
     URL and generate a UUID.
 
     :param url to get the uuid for
     :truncate_to: truncate the basic 22 UUID to shorter version
 
     The IDs won't be universally unique any longer, but the probability of
     a collision will still be very low.
     """
     # Define our alphabet.
     _ALPHABET = alphabet or "23456789ABCDEFGHJKLMNPQRSTUVWXYZ"
 
     # If no URL is given, generate a random UUID.
     if url is None:
         unique_id = uuid.uuid4().int
     else:
         unique_id = uuid.uuid3(uuid.NAMESPACE_URL, url).int
 
     alphabet_length = len(_ALPHABET)
     output = []
     while unique_id > 0:
         digit = unique_id % alphabet_length
         output.append(_ALPHABET[digit])
         unique_id = int(unique_id / alphabet_length)
     return "".join(output)[:truncate_to]
 
 
 def get_current_rhodecode_user(request=None):
     """
     Gets rhodecode user from request
     """
     pyramid_request = request or pyramid.threadlocal.get_current_request()
 
     # web case
     if pyramid_request and hasattr(pyramid_request, 'user'):
         return pyramid_request.user
 
     # api case
     if pyramid_request and hasattr(pyramid_request, 'rpc_user'):
         return pyramid_request.rpc_user
 
     return None
 
 
 def action_logger_generic(action, namespace=''):
     """
     A generic logger for actions useful to the system overview, tries to find
     an acting user for the context of the call otherwise reports unknown user
 
     :param action: logging message eg 'comment 5 deleted'
     :param type: string
 
     :param namespace: namespace of the logging message eg. 'repo.comments'
     :param type: string
 
     """
 
     logger_name = 'rhodecode.actions'
 
     if namespace:
         logger_name += '.' + namespace
 
     log = logging.getLogger(logger_name)
 
     # get a user if we can
     user = get_current_rhodecode_user()
 
     logfunc = log.info
 
     if not user:
         user = '<unknown user>'
         logfunc = log.warning
 
     logfunc('Logging action by {}: {}'.format(user, action))
 
 
 def escape_split(text, sep=',', maxsplit=-1):
     r"""
     Allows for escaping of the separator: e.g. arg='foo\, bar'
 
     It should be noted that the way bash et. al. do command line parsing, those
     single quotes are required.
     """
     escaped_sep = r'\%s' % sep
 
     if escaped_sep not in text:
         return text.split(sep, maxsplit)
 
     before, _mid, after = text.partition(escaped_sep)
     startlist = before.split(sep, maxsplit)  # a regular split is fine here
     unfinished = startlist[-1]
     startlist = startlist[:-1]
 
     # recurse because there may be more escaped separators
     endlist = escape_split(after, sep, maxsplit)
 
     # finish building the escaped value. we use endlist[0] becaue the first
     # part of the string sent in recursion is the rest of the escaped value.
     unfinished += sep + endlist[0]
 
     return startlist + [unfinished] + endlist[1:]  # put together all the parts
 
 
 class OptionalAttr(object):
     """
     Special Optional Option that defines other attribute. Example::
 
         def test(apiuser, userid=Optional(OAttr('apiuser')):
             user = Optional.extract(userid)
             # calls
 
     """
 
     def __init__(self, attr_name):
         self.attr_name = attr_name
 
     def __repr__(self):
         return '<OptionalAttr:%s>' % self.attr_name
 
     def __call__(self):
         return self
 
 
 # alias
 OAttr = OptionalAttr
 
 
 class Optional(object):
     """
     Defines an optional parameter::
 
         param = param.getval() if isinstance(param, Optional) else param
         param = param() if isinstance(param, Optional) else param
 
     is equivalent of::
 
         param = Optional.extract(param)
 
     """
 
     def __init__(self, type_):
         self.type_ = type_
 
     def __repr__(self):
         return '<Optional:%s>' % self.type_.__repr__()
 
     def __call__(self):
         return self.getval()
 
     def getval(self):
         """
         returns value from this Optional instance
         """
         if isinstance(self.type_, OAttr):
             # use params name
             return self.type_.attr_name
         return self.type_
 
     @classmethod
     def extract(cls, val):
         """
         Extracts value from Optional() instance
 
         :param val:
         :return: original value if it's not Optional instance else
             value of instance
         """
         if isinstance(val, cls):
             return val.getval()
         return val
 
 
 def glob2re(pat):
     """
     Translate a shell PATTERN to a regular expression.
 
     There is no way to quote meta-characters.
     """
 
     i, n = 0, len(pat)
     res = ''
     while i < n:
         c = pat[i]
         i = i+1
         if c == '*':
             #res = res + '.*'
             res = res + '[^/]*'
         elif c == '?':
             #res = res + '.'
             res = res + '[^/]'
         elif c == '[':
             j = i
             if j < n and pat[j] == '!':
                 j = j+1
             if j < n and pat[j] == ']':
                 j = j+1
             while j < n and pat[j] != ']':
                 j = j+1
             if j >= n:
                 res = res + '\\['
             else:
                 stuff = pat[i:j].replace('\\','\\\\')
                 i = j+1
                 if stuff[0] == '!':
                     stuff = '^' + stuff[1:]
                 elif stuff[0] == '^':
                     stuff = '\\' + stuff
                 res = '%s[%s]' % (res, stuff)
         else:
             res = res + re.escape(c)
     return res + '\Z(?ms)'
 
 
 def parse_byte_string(size_str):
     match = re.match(r'(\d+)(MB|KB)', size_str, re.IGNORECASE)
     if not match:
         raise ValueError('Given size:%s is invalid, please make sure '
                          'to use format of <num>(MB|KB)' % size_str)
 
     _parts = match.groups()
     num, type_ = _parts
     return long(num) * {'mb': 1024*1024, 'kb': 1024}[type_.lower()]
 
 
 class CachedProperty(object):
     """
     Lazy Attributes. With option to invalidate the cache by running a method
 
     class Foo():
 
         @CachedProperty
         def heavy_func():
             return 'super-calculation'
 
     foo = Foo()
     foo.heavy_func() # first computions
     foo.heavy_func() # fetch from cache
     foo._invalidate_prop_cache('heavy_func')
     # at this point calling foo.heavy_func() will be re-computed
     """
 
     def __init__(self, func, func_name=None):
 
         if func_name is None:
             func_name = func.__name__
         self.data = (func, func_name)
         update_wrapper(self, func)
 
     def __get__(self, inst, class_):
         if inst is None:
             return self
 
         func, func_name = self.data
         value = func(inst)
         inst.__dict__[func_name] = value
         if '_invalidate_prop_cache' not in inst.__dict__:
             inst.__dict__['_invalidate_prop_cache'] = partial(
                 self._invalidate_prop_cache, inst)
         return value
 
     def _invalidate_prop_cache(self, inst, name):
         inst.__dict__.pop(name, None)

rhodecode/model/notification.py

@@ -1,427 +1,435 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2011-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 """
 Model for notifications
 """
 
 import logging
 import traceback
 
 import premailer
 from pyramid.threadlocal import get_current_request
 from sqlalchemy.sql.expression import false, true
 
 import rhodecode
 from rhodecode.lib import helpers as h
 from rhodecode.model import BaseModel
 from rhodecode.model.db import Notification, User, UserNotification
 from rhodecode.model.meta import Session
 from rhodecode.translation import TranslationString
 
 log = logging.getLogger(__name__)
 
 
 class NotificationModel(BaseModel):
 
     cls = Notification
 
     def __get_notification(self, notification):
         if isinstance(notification, Notification):
             return notification
         elif isinstance(notification, (int, long)):
             return Notification.get(notification)
         else:
             if notification:
                 raise Exception('notification must be int, long or Instance'
                                 ' of Notification got %s' % type(notification))
 
     def create(
             self, created_by, notification_subject, notification_body,
             notification_type=Notification.TYPE_MESSAGE, recipients=None,
             mention_recipients=None, with_email=True, email_kwargs=None):
         """
 
         Creates notification of given type
 
         :param created_by: int, str or User instance. User who created this
             notification
         :param notification_subject: subject of notification itself
         :param notification_body: body of notification text
         :param notification_type: type of notification, based on that we
             pick templates
 
         :param recipients: list of int, str or User objects, when None
             is given send to all admins
         :param mention_recipients: list of int, str or User objects,
             that were mentioned
         :param with_email: send email with this notification
         :param email_kwargs: dict with arguments to generate email
         """
 
         from rhodecode.lib.celerylib import tasks, run_task
 
         if recipients and not getattr(recipients, '__iter__', False):
             raise Exception('recipients must be an iterable object')
 
         created_by_obj = self._get_user(created_by)
         # default MAIN body if not given
         email_kwargs = email_kwargs or {'body': notification_body}
         mention_recipients = mention_recipients or set()
 
         if not created_by_obj:
             raise Exception('unknown user %s' % created_by)
 
         if recipients is None:
             # recipients is None means to all admins
             recipients_objs = User.query().filter(User.admin == true()).all()
             log.debug('sending notifications %s to admins: %s',
                       notification_type, recipients_objs)
         else:
             recipients_objs = set()
             for u in recipients:
                 obj = self._get_user(u)
                 if obj:
                     recipients_objs.add(obj)
                 else:  # we didn't find this user, log the error and carry on
                     log.error('cannot notify unknown user %r', u)
 
             if not recipients_objs:
                 raise Exception('no valid recipients specified')
 
             log.debug('sending notifications %s to %s',
                       notification_type, recipients_objs)
 
         # add mentioned users into recipients
         final_recipients = set(recipients_objs).union(mention_recipients)
 
         notification = Notification.create(
             created_by=created_by_obj, subject=notification_subject,
             body=notification_body, recipients=final_recipients,
             type_=notification_type
         )
 
         if not with_email:  # skip sending email, and just create notification
             return notification
 
         # don't send email to person who created this comment
         rec_objs = set(recipients_objs).difference({created_by_obj})
 
         # now notify all recipients in question
 
         for recipient in rec_objs.union(mention_recipients):
             # inject current recipient
             email_kwargs['recipient'] = recipient
             email_kwargs['mention'] = recipient in mention_recipients
             (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
                 notification_type, **email_kwargs)
 
             extra_headers = None
             if 'thread_ids' in email_kwargs:
                 extra_headers = {'thread_ids': email_kwargs.pop('thread_ids')}
 
             log.debug('Creating notification email task for user:`%s`', recipient)
             task = run_task(
                 tasks.send_email, recipient.email, subject,
                 email_body_plaintext, email_body, extra_headers=extra_headers)
             log.debug('Created email task: %s', task)
 
         return notification
 
     def delete(self, user, notification):
         # we don't want to remove actual notification just the assignment
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                     .filter(UserNotification.user == user)\
                     .filter(UserNotification.notification == notification)\
                     .one()
                 Session().delete(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def get_for_user(self, user, filter_=None):
         """
         Get mentions for given user, filter them if filter dict is given
         """
         user = self._get_user(user)
 
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .join((
                 Notification, UserNotification.notification_id ==
                 Notification.notification_id))
         if filter_ == ['all']:
             q = q  # no filter
         elif filter_ == ['unread']:
             q = q.filter(UserNotification.read == false())
         elif filter_:
             q = q.filter(Notification.type_.in_(filter_))
 
         return q
 
     def mark_read(self, user, notification):
         try:
             notification = self.__get_notification(notification)
             user = self._get_user(user)
             if notification and user:
                 obj = UserNotification.query()\
                     .filter(UserNotification.user == user)\
                     .filter(UserNotification.notification == notification)\
                     .one()
                 obj.read = True
                 Session().add(obj)
                 return True
         except Exception:
             log.error(traceback.format_exc())
             raise
 
     def mark_all_read_for_user(self, user, filter_=None):
         user = self._get_user(user)
         q = UserNotification.query()\
             .filter(UserNotification.user == user)\
             .filter(UserNotification.read == false())\
             .join((
                 Notification, UserNotification.notification_id ==
                 Notification.notification_id))
         if filter_ == ['unread']:
             q = q.filter(UserNotification.read == false())
         elif filter_:
             q = q.filter(Notification.type_.in_(filter_))
 
         # this is a little inefficient but sqlalchemy doesn't support
         # update on joined tables :(
         for obj in q.all():
             obj.read = True
             Session().add(obj)
 
     def get_unread_cnt_for_user(self, user):
         user = self._get_user(user)
         return UserNotification.query()\
             .filter(UserNotification.read == false())\
             .filter(UserNotification.user == user).count()
 
     def get_unread_for_user(self, user):
         user = self._get_user(user)
         return [x.notification for x in UserNotification.query()
                 .filter(UserNotification.read == false())
                 .filter(UserNotification.user == user).all()]
 
     def get_user_notification(self, user, notification):
         user = self._get_user(user)
         notification = self.__get_notification(notification)
 
         return UserNotification.query()\
             .filter(UserNotification.notification == notification)\
             .filter(UserNotification.user == user).scalar()
 
     def make_description(self, notification, translate, show_age=True):
         """
         Creates a human readable description based on properties
         of notification object
         """
         _ = translate
         _map = {
             notification.TYPE_CHANGESET_COMMENT: [
                 _('%(user)s commented on commit %(date_or_age)s'),
                 _('%(user)s commented on commit at %(date_or_age)s'),
                 ],
             notification.TYPE_MESSAGE: [
                 _('%(user)s sent message %(date_or_age)s'),
                 _('%(user)s sent message at %(date_or_age)s'),
                 ],
             notification.TYPE_MENTION: [
                 _('%(user)s mentioned you %(date_or_age)s'),
                 _('%(user)s mentioned you at %(date_or_age)s'),
                 ],
             notification.TYPE_REGISTRATION: [
                 _('%(user)s registered in RhodeCode %(date_or_age)s'),
                 _('%(user)s registered in RhodeCode at %(date_or_age)s'),
                 ],
             notification.TYPE_PULL_REQUEST: [
                 _('%(user)s opened new pull request %(date_or_age)s'),
                 _('%(user)s opened new pull request at %(date_or_age)s'),
                 ],
             notification.TYPE_PULL_REQUEST_UPDATE: [
                 _('%(user)s updated pull request %(date_or_age)s'),
                 _('%(user)s updated pull request at %(date_or_age)s'),
             ],
             notification.TYPE_PULL_REQUEST_COMMENT: [
                 _('%(user)s commented on pull request %(date_or_age)s'),
                 _('%(user)s commented on pull request at %(date_or_age)s'),
                 ],
         }
 
         templates = _map[notification.type_]
 
         if show_age:
             template = templates[0]
             date_or_age = h.age(notification.created_on)
             if translate:
                 date_or_age = translate(date_or_age)
 
             if isinstance(date_or_age, TranslationString):
                 date_or_age = date_or_age.interpolate()
 
         else:
             template = templates[1]
             date_or_age = h.format_date(notification.created_on)
 
         return template % {
             'user': notification.created_by_user.username,
             'date_or_age': date_or_age,
         }
 
 
 # Templates for Titles, that could be overwritten by rcextensions
 # Title of email for pull-request update
 EMAIL_PR_UPDATE_SUBJECT_TEMPLATE = ''
 # Title of email for request for pull request review
 EMAIL_PR_REVIEW_SUBJECT_TEMPLATE = ''
 
 # Title of email for general comment on pull request
 EMAIL_PR_COMMENT_SUBJECT_TEMPLATE = ''
 # Title of email for general comment which includes status change on pull request
 EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE = ''
 # Title of email for inline comment on a file in pull request
 EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE = ''
 
 # Title of email for general comment on commit
 EMAIL_COMMENT_SUBJECT_TEMPLATE = ''
 # Title of email for general comment which includes status change on commit
 EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE = ''
 # Title of email for inline comment on a file in commit
 EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE = ''
 
 
 class EmailNotificationModel(BaseModel):
     TYPE_COMMIT_COMMENT = Notification.TYPE_CHANGESET_COMMENT
     TYPE_REGISTRATION = Notification.TYPE_REGISTRATION
     TYPE_PULL_REQUEST = Notification.TYPE_PULL_REQUEST
     TYPE_PULL_REQUEST_COMMENT = Notification.TYPE_PULL_REQUEST_COMMENT
     TYPE_PULL_REQUEST_UPDATE = Notification.TYPE_PULL_REQUEST_UPDATE
     TYPE_MAIN = Notification.TYPE_MESSAGE
 
     TYPE_PASSWORD_RESET = 'password_reset'
     TYPE_PASSWORD_RESET_CONFIRMATION = 'password_reset_confirmation'
     TYPE_EMAIL_TEST = 'email_test'
     TYPE_EMAIL_EXCEPTION = 'exception'
     TYPE_TEST = 'test'
 
     email_types = {
         TYPE_MAIN:
             'rhodecode:templates/email_templates/main.mako',
         TYPE_TEST:
             'rhodecode:templates/email_templates/test.mako',
         TYPE_EMAIL_EXCEPTION:
             'rhodecode:templates/email_templates/exception_tracker.mako',
         TYPE_EMAIL_TEST:
             'rhodecode:templates/email_templates/email_test.mako',
         TYPE_REGISTRATION:
             'rhodecode:templates/email_templates/user_registration.mako',
         TYPE_PASSWORD_RESET:
             'rhodecode:templates/email_templates/password_reset.mako',
         TYPE_PASSWORD_RESET_CONFIRMATION:
             'rhodecode:templates/email_templates/password_reset_confirmation.mako',
         TYPE_COMMIT_COMMENT:
             'rhodecode:templates/email_templates/commit_comment.mako',
         TYPE_PULL_REQUEST:
             'rhodecode:templates/email_templates/pull_request_review.mako',
         TYPE_PULL_REQUEST_COMMENT:
             'rhodecode:templates/email_templates/pull_request_comment.mako',
         TYPE_PULL_REQUEST_UPDATE:
             'rhodecode:templates/email_templates/pull_request_update.mako',
     }
 
     premailer_instance = premailer.Premailer(
         cssutils_logging_level=logging.ERROR,
         cssutils_logging_handler=logging.getLogger().handlers[0]
         if logging.getLogger().handlers else None,
     )
 
     def __init__(self):
         """
         Example usage::
 
             (subject, email_body, email_body_plaintext) = EmailNotificationModel().render_email(
                 EmailNotificationModel.TYPE_TEST, **email_kwargs)
 
         """
         super(EmailNotificationModel, self).__init__()
         self.rhodecode_instance_name = rhodecode.CONFIG.get('rhodecode_title')
 
     def _update_kwargs_for_render(self, kwargs):
         """
         Inject params required for Mako rendering
 
         :param kwargs:
         """
 
         kwargs['rhodecode_instance_name'] = self.rhodecode_instance_name
         kwargs['rhodecode_version'] = rhodecode.__version__
         instance_url = h.route_url('home')
         _kwargs = {
             'instance_url': instance_url,
-            'whitespace_filter': self.whitespace_filter
+            'whitespace_filter': self.whitespace_filter,
+            'email_pr_update_subject_template': EMAIL_PR_UPDATE_SUBJECT_TEMPLATE,
+            'email_pr_review_subject_template': EMAIL_PR_REVIEW_SUBJECT_TEMPLATE,
+            'email_pr_comment_subject_template': EMAIL_PR_COMMENT_SUBJECT_TEMPLATE,
+            'email_pr_comment_status_change_subject_template': EMAIL_PR_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
+            'email_pr_comment_file_subject_template': EMAIL_PR_COMMENT_FILE_SUBJECT_TEMPLATE,
+            'email_comment_subject_template': EMAIL_COMMENT_SUBJECT_TEMPLATE,
+            'email_comment_status_change_subject_template': EMAIL_COMMENT_STATUS_CHANGE_SUBJECT_TEMPLATE,
+            'email_comment_file_subject_template': EMAIL_COMMENT_FILE_SUBJECT_TEMPLATE,
         }
         _kwargs.update(kwargs)
         return _kwargs
 
     def whitespace_filter(self, text):
         return text.replace('\n', '').replace('\t', '')
 
     def get_renderer(self, type_, request):
         template_name = self.email_types[type_]
         return request.get_partial_renderer(template_name)
 
     def render_email(self, type_, **kwargs):
         """
         renders template for email, and returns a tuple of
         (subject, email_headers, email_html_body, email_plaintext_body)
         """
         # translator and helpers inject
         _kwargs = self._update_kwargs_for_render(kwargs)
         request = get_current_request()
         email_template = self.get_renderer(type_, request=request)
 
         subject = email_template.render('subject', **_kwargs)
 
         try:
             body_plaintext = email_template.render('body_plaintext', **_kwargs)
         except AttributeError:
             # it's not defined in template, ok we can skip it
             body_plaintext = ''
 
         # render WHOLE template
         body = email_template.render(None, **_kwargs)
 
         try:
             # Inline CSS styles and conversion
             body = self.premailer_instance.transform(body)
         except Exception:
             log.exception('Failed to parse body with premailer')
             pass
 
         return subject, body, body_plaintext

rhodecode/model/permission.py

@@ -1,598 +1,598 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 """
 permissions model for RhodeCode
 """
 import collections
 import logging
 import traceback
 
 from sqlalchemy.exc import DatabaseError
 
 from rhodecode import events
 from rhodecode.model import BaseModel
 from rhodecode.model.db import (
     User, Permission, UserToPerm, UserRepoToPerm, UserRepoGroupToPerm,
     UserUserGroupToPerm, UserGroup, UserGroupToPerm, UserToRepoBranchPermission)
 from rhodecode.lib.utils2 import str2bool, safe_int
 
 log = logging.getLogger(__name__)
 
 
 class PermissionModel(BaseModel):
     """
     Permissions model for RhodeCode
     """
 
     cls = Permission
     global_perms = {
         'default_repo_create': None,
         # special case for create repos on write access to group
         'default_repo_create_on_write': None,
         'default_repo_group_create': None,
         'default_user_group_create': None,
         'default_fork_create': None,
         'default_inherit_default_permissions': None,
         'default_register': None,
         'default_password_reset': None,
         'default_extern_activate': None,
 
         # object permissions below
         'default_repo_perm': None,
         'default_group_perm': None,
         'default_user_group_perm': None,
 
         # branch
         'default_branch_perm': None,
     }
 
     def set_global_permission_choices(self, c_obj, gettext_translator):
         _ = gettext_translator
 
         c_obj.repo_perms_choices = [
             ('repository.none', _('None'),),
             ('repository.read', _('Read'),),
             ('repository.write', _('Write'),),
             ('repository.admin', _('Admin'),)]
 
         c_obj.group_perms_choices = [
             ('group.none', _('None'),),
             ('group.read', _('Read'),),
             ('group.write', _('Write'),),
             ('group.admin', _('Admin'),)]
 
         c_obj.user_group_perms_choices = [
             ('usergroup.none', _('None'),),
             ('usergroup.read', _('Read'),),
             ('usergroup.write', _('Write'),),
             ('usergroup.admin', _('Admin'),)]
 
         c_obj.branch_perms_choices = [
             ('branch.none', _('Protected/No Access'),),
             ('branch.merge', _('Web merge'),),
             ('branch.push', _('Push'),),
             ('branch.push_force', _('Force Push'),)]
 
         c_obj.register_choices = [
             ('hg.register.none', _('Disabled')),
             ('hg.register.manual_activate', _('Allowed with manual account activation')),
             ('hg.register.auto_activate', _('Allowed with automatic account activation')),]
 
         c_obj.password_reset_choices = [
             ('hg.password_reset.enabled', _('Allow password recovery')),
             ('hg.password_reset.hidden', _('Hide password recovery link')),
             ('hg.password_reset.disabled', _('Disable password recovery')),]
 
         c_obj.extern_activate_choices = [
             ('hg.extern_activate.manual', _('Manual activation of external account')),
             ('hg.extern_activate.auto', _('Automatic activation of external account')),]
 
         c_obj.repo_create_choices = [
             ('hg.create.none', _('Disabled')),
             ('hg.create.repository', _('Enabled'))]
 
         c_obj.repo_create_on_write_choices = [
             ('hg.create.write_on_repogroup.false', _('Disabled')),
             ('hg.create.write_on_repogroup.true', _('Enabled'))]
 
         c_obj.user_group_create_choices = [
             ('hg.usergroup.create.false', _('Disabled')),
             ('hg.usergroup.create.true', _('Enabled'))]
 
         c_obj.repo_group_create_choices = [
             ('hg.repogroup.create.false', _('Disabled')),
             ('hg.repogroup.create.true', _('Enabled'))]
 
         c_obj.fork_choices = [
             ('hg.fork.none', _('Disabled')),
             ('hg.fork.repository', _('Enabled'))]
 
         c_obj.inherit_default_permission_choices = [
             ('hg.inherit_default_perms.false', _('Disabled')),
             ('hg.inherit_default_perms.true', _('Enabled'))]
 
     def get_default_perms(self, object_perms, suffix):
         defaults = {}
         for perm in object_perms:
             # perms
             if perm.permission.permission_name.startswith('repository.'):
                 defaults['default_repo_perm' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('group.'):
                 defaults['default_group_perm' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('usergroup.'):
                 defaults['default_user_group_perm' + suffix] = perm.permission.permission_name
 
             # branch
             if perm.permission.permission_name.startswith('branch.'):
                 defaults['default_branch_perm' + suffix] = perm.permission.permission_name
 
             # creation of objects
             if perm.permission.permission_name.startswith('hg.create.write_on_repogroup'):
                 defaults['default_repo_create_on_write' + suffix] = perm.permission.permission_name
 
             elif perm.permission.permission_name.startswith('hg.create.'):
                 defaults['default_repo_create' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.fork.'):
                 defaults['default_fork_create' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.inherit_default_perms.'):
                 defaults['default_inherit_default_permissions' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.repogroup.'):
                 defaults['default_repo_group_create' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.usergroup.'):
                 defaults['default_user_group_create' + suffix] = perm.permission.permission_name
 
             # registration and external account activation
             if perm.permission.permission_name.startswith('hg.register.'):
                 defaults['default_register' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.password_reset.'):
                 defaults['default_password_reset' + suffix] = perm.permission.permission_name
 
             if perm.permission.permission_name.startswith('hg.extern_activate.'):
                 defaults['default_extern_activate' + suffix] = perm.permission.permission_name
 
         return defaults
 
     def _make_new_user_perm(self, user, perm_name):
         log.debug('Creating new user permission:%s', perm_name)
         new = UserToPerm()
         new.user = user
         new.permission = Permission.get_by_key(perm_name)
         return new
 
     def _make_new_user_group_perm(self, user_group, perm_name):
         log.debug('Creating new user group permission:%s', perm_name)
         new = UserGroupToPerm()
         new.users_group = user_group
         new.permission = Permission.get_by_key(perm_name)
         return new
 
     def _keep_perm(self, perm_name, keep_fields):
         def get_pat(field_name):
             return {
                 # global perms
                 'default_repo_create': 'hg.create.',
                 # special case for create repos on write access to group
                 'default_repo_create_on_write': 'hg.create.write_on_repogroup.',
                 'default_repo_group_create': 'hg.repogroup.create.',
                 'default_user_group_create': 'hg.usergroup.create.',
                 'default_fork_create': 'hg.fork.',
                 'default_inherit_default_permissions': 'hg.inherit_default_perms.',
 
                 # application perms
                 'default_register': 'hg.register.',
                 'default_password_reset': 'hg.password_reset.',
                 'default_extern_activate': 'hg.extern_activate.',
 
                 # object permissions below
                 'default_repo_perm': 'repository.',
                 'default_group_perm': 'group.',
                 'default_user_group_perm': 'usergroup.',
                 # branch
                 'default_branch_perm': 'branch.',
 
             }[field_name]
         for field in keep_fields:
             pat = get_pat(field)
             if perm_name.startswith(pat):
                 return True
         return False
 
     def _clear_object_perm(self, object_perms, preserve=None):
         preserve = preserve or []
         _deleted = []
         for perm in object_perms:
             perm_name = perm.permission.permission_name
             if not self._keep_perm(perm_name, keep_fields=preserve):
                 _deleted.append(perm_name)
                 self.sa.delete(perm)
         return _deleted
 
     def _clear_user_perms(self, user_id, preserve=None):
         perms = self.sa.query(UserToPerm)\
             .filter(UserToPerm.user_id == user_id)\
             .all()
         return self._clear_object_perm(perms, preserve=preserve)
 
     def _clear_user_group_perms(self, user_group_id, preserve=None):
         perms = self.sa.query(UserGroupToPerm)\
             .filter(UserGroupToPerm.users_group_id == user_group_id)\
             .all()
         return self._clear_object_perm(perms, preserve=preserve)
 
     def _set_new_object_perms(self, obj_type, object, form_result, preserve=None):
         # clear current entries, to make this function idempotent
         # it will fix even if we define more permissions or permissions
         # are somehow missing
         preserve = preserve or []
         _global_perms = self.global_perms.copy()
         if obj_type not in ['user', 'user_group']:
             raise ValueError("obj_type must be on of 'user' or 'user_group'")
         global_perms = len(_global_perms)
         default_user_perms = len(Permission.DEFAULT_USER_PERMISSIONS)
         if global_perms != default_user_perms:
             raise Exception(
                 'Inconsistent permissions definition. Got {} vs {}'.format(
                     global_perms, default_user_perms))
 
         if obj_type == 'user':
             self._clear_user_perms(object.user_id, preserve)
         if obj_type == 'user_group':
             self._clear_user_group_perms(object.users_group_id, preserve)
 
         # now kill the keys that we want to preserve from the form.
         for key in preserve:
             del _global_perms[key]
 
         for k in _global_perms.copy():
             _global_perms[k] = form_result[k]
 
         # at that stage we validate all are passed inside form_result
         for _perm_key, perm_value in _global_perms.items():
             if perm_value is None:
                 raise ValueError('Missing permission for %s' % (_perm_key,))
 
             if obj_type == 'user':
                 p = self._make_new_user_perm(object, perm_value)
                 self.sa.add(p)
             if obj_type == 'user_group':
                 p = self._make_new_user_group_perm(object, perm_value)
                 self.sa.add(p)
 
     def _set_new_user_perms(self, user, form_result, preserve=None):
         return self._set_new_object_perms(
             'user', user, form_result, preserve)
 
     def _set_new_user_group_perms(self, user_group, form_result, preserve=None):
         return self._set_new_object_perms(
             'user_group', user_group, form_result, preserve)
 
     def set_new_user_perms(self, user, form_result):
         # calculate what to preserve from what is given in form_result
         preserve = set(self.global_perms.keys()).difference(set(form_result.keys()))
         return self._set_new_user_perms(user, form_result, preserve)
 
     def set_new_user_group_perms(self, user_group, form_result):
         # calculate what to preserve from what is given in form_result
         preserve = set(self.global_perms.keys()).difference(set(form_result.keys()))
         return self._set_new_user_group_perms(user_group, form_result, preserve)
 
     def create_permissions(self):
         """
         Create permissions for whole system
         """
         for p in Permission.PERMS:
             if not Permission.get_by_key(p[0]):
                 new_perm = Permission()
                 new_perm.permission_name = p[0]
                 new_perm.permission_longname = p[0]  # translation err with p[1]
                 self.sa.add(new_perm)
 
     def _create_default_object_permission(self, obj_type, obj, obj_perms,
                                           force=False):
         if obj_type not in ['user', 'user_group']:
             raise ValueError("obj_type must be on of 'user' or 'user_group'")
 
         def _get_group(perm_name):
             return '.'.join(perm_name.split('.')[:1])
 
         defined_perms_groups = map(
             _get_group, (x.permission.permission_name for x in obj_perms))
         log.debug('GOT ALREADY DEFINED:%s', obj_perms)
 
         if force:
             self._clear_object_perm(obj_perms)
             self.sa.commit()
             defined_perms_groups = []
         # for every default permission that needs to be created, we check if
         # it's group is already defined, if it's not we create default perm
         for perm_name in Permission.DEFAULT_USER_PERMISSIONS:
             gr = _get_group(perm_name)
             if gr not in defined_perms_groups:
                 log.debug('GR:%s not found, creating permission %s',
                           gr, perm_name)
                 if obj_type == 'user':
                     new_perm = self._make_new_user_perm(obj, perm_name)
                     self.sa.add(new_perm)
                 if obj_type == 'user_group':
                     new_perm = self._make_new_user_group_perm(obj, perm_name)
                     self.sa.add(new_perm)
 
     def create_default_user_permissions(self, user, force=False):
         """
         Creates only missing default permissions for user, if force is set it
         resets the default permissions for that user
 
         :param user:
         :param force:
         """
         user = self._get_user(user)
         obj_perms = UserToPerm.query().filter(UserToPerm.user == user).all()
         return self._create_default_object_permission(
             'user', user, obj_perms, force)
 
     def create_default_user_group_permissions(self, user_group, force=False):
         """
         Creates only missing default permissions for user group, if force is
         set it resets the default permissions for that user group
 
         :param user_group:
         :param force:
         """
         user_group = self._get_user_group(user_group)
         obj_perms = UserToPerm.query().filter(UserGroupToPerm.users_group == user_group).all()
         return self._create_default_object_permission(
             'user_group', user_group, obj_perms, force)
 
     def update_application_permissions(self, form_result):
         if 'perm_user_id' in form_result:
             perm_user = User.get(safe_int(form_result['perm_user_id']))
         else:
             # used mostly to do lookup for default user
             perm_user = User.get_by_username(form_result['perm_user_name'])
 
         try:
             # stage 1 set anonymous access
             if perm_user.username == User.DEFAULT_USER:
                 perm_user.active = str2bool(form_result['anonymous'])
                 self.sa.add(perm_user)
 
             # stage 2 reset defaults and set them from form data
             self._set_new_user_perms(perm_user, form_result, preserve=[
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
                 'default_branch_perm',
 
                 'default_repo_group_create',
                 'default_user_group_create',
                 'default_repo_create_on_write',
                 'default_repo_create',
                 'default_fork_create',
                 'default_inherit_default_permissions',])
 
             self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def update_user_permissions(self, form_result):
         if 'perm_user_id' in form_result:
             perm_user = User.get(safe_int(form_result['perm_user_id']))
         else:
             # used mostly to do lookup for default user
             perm_user = User.get_by_username(form_result['perm_user_name'])
         try:
             # stage 2 reset defaults and set them from form data
             self._set_new_user_perms(perm_user, form_result, preserve=[
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
                 'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
                 'default_extern_activate'])
             self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def update_user_group_permissions(self, form_result):
         if 'perm_user_group_id' in form_result:
             perm_user_group = UserGroup.get(safe_int(form_result['perm_user_group_id']))
         else:
             # used mostly to do lookup for default user
             perm_user_group = UserGroup.get_by_group_name(form_result['perm_user_group_name'])
         try:
             # stage 2 reset defaults and set them from form data
             self._set_new_user_group_perms(perm_user_group, form_result, preserve=[
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
                 'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
                 'default_extern_activate'])
             self.sa.commit()
         except (DatabaseError,):
             log.error(traceback.format_exc())
             self.sa.rollback()
             raise
 
     def update_object_permissions(self, form_result):
         if 'perm_user_id' in form_result:
             perm_user = User.get(safe_int(form_result['perm_user_id']))
         else:
             # used mostly to do lookup for default user
             perm_user = User.get_by_username(form_result['perm_user_name'])
         try:
 
             # stage 2 reset defaults and set them from form data
             self._set_new_user_perms(perm_user, form_result, preserve=[
                 'default_repo_group_create',
                 'default_user_group_create',
                 'default_repo_create_on_write',
                 'default_repo_create',
                 'default_fork_create',
                 'default_inherit_default_permissions',
                 'default_branch_perm',
 
                 'default_register',
                 'default_password_reset',
                 'default_extern_activate'])
 
             # overwrite default repo permissions
             if form_result['overwrite_default_repo']:
                 _def_name = form_result['default_repo_perm'].split('repository.')[-1]
                 _def = Permission.get_by_key('repository.' + _def_name)
                 for r2p in self.sa.query(UserRepoToPerm)\
                                .filter(UserRepoToPerm.user == perm_user)\
                                .all():
                     # don't reset PRIVATE repositories
                     if not r2p.repository.private:
                         r2p.permission = _def
                         self.sa.add(r2p)
 
             # overwrite default repo group permissions
             if form_result['overwrite_default_group']:
                 _def_name = form_result['default_group_perm'].split('group.')[-1]
                 _def = Permission.get_by_key('group.' + _def_name)
                 for g2p in self.sa.query(UserRepoGroupToPerm)\
                                .filter(UserRepoGroupToPerm.user == perm_user)\
                                .all():
                     g2p.permission = _def
                     self.sa.add(g2p)
 
             # overwrite default user group permissions
             if form_result['overwrite_default_user_group']:
                 _def_name = form_result['default_user_group_perm'].split('usergroup.')[-1]
                 # user groups
                 _def = Permission.get_by_key('usergroup.' + _def_name)
                 for g2p in self.sa.query(UserUserGroupToPerm)\
                                .filter(UserUserGroupToPerm.user == perm_user)\
                                .all():
                     g2p.permission = _def
                     self.sa.add(g2p)
 
             # COMMIT
             self.sa.commit()
         except (DatabaseError,):
             log.exception('Failed to set default object permissions')
             self.sa.rollback()
             raise
 
     def update_branch_permissions(self, form_result):
         if 'perm_user_id' in form_result:
             perm_user = User.get(safe_int(form_result['perm_user_id']))
         else:
             # used mostly to do lookup for default user
             perm_user = User.get_by_username(form_result['perm_user_name'])
         try:
 
             # stage 2 reset defaults and set them from form data
             self._set_new_user_perms(perm_user, form_result, preserve=[
                 'default_repo_perm',
                 'default_group_perm',
                 'default_user_group_perm',
 
                 'default_repo_group_create',
                 'default_user_group_create',
                 'default_repo_create_on_write',
                 'default_repo_create',
                 'default_fork_create',
                 'default_inherit_default_permissions',
 
                 'default_register',
                 'default_password_reset',
                 'default_extern_activate'])
 
             # overwrite default branch permissions
             if form_result['overwrite_default_branch']:
                 _def_name = \
                     form_result['default_branch_perm'].split('branch.')[-1]
 
                 _def = Permission.get_by_key('branch.' + _def_name)
 
                 user_perms = UserToRepoBranchPermission.query()\
                     .join(UserToRepoBranchPermission.user_repo_to_perm)\
                     .filter(UserRepoToPerm.user == perm_user).all()
 
                 for g2p in user_perms:
                     g2p.permission = _def
                     self.sa.add(g2p)
 
             # COMMIT
             self.sa.commit()
         except (DatabaseError,):
             log.exception('Failed to set default branch permissions')
             self.sa.rollback()
             raise
 
     def get_users_with_repo_write(self, db_repo):
         write_plus = ['repository.write', 'repository.admin']
         default_user_id = User.get_default_user_id()
         user_write_permissions = collections.OrderedDict()
 
-        # write+ and DEFAULT user for inheritance
+        # write or higher and DEFAULT user for inheritance
         for perm in db_repo.permissions():
             if perm.permission in write_plus or perm.user_id == default_user_id:
                 user_write_permissions[perm.user_id] = perm
         return user_write_permissions
 
     def get_user_groups_with_repo_write(self, db_repo):
         write_plus = ['repository.write', 'repository.admin']
         user_group_write_permissions = collections.OrderedDict()
 
-        # write+ and DEFAULT user for inheritance
+        # write or higher and DEFAULT user for inheritance
         for p in db_repo.permission_user_groups():
             if p.permission in write_plus:
                 user_group_write_permissions[p.users_group_id] = p
         return user_group_write_permissions
 
     def trigger_permission_flush(self, affected_user_ids=None):
         affected_user_ids or User.get_all_user_ids()
         events.trigger(events.UserPermissionsChange(affected_user_ids))
 
     def flush_user_permission_caches(self, changes, affected_user_ids=None):
         affected_user_ids = affected_user_ids or []
 
         for change in changes['added'] + changes['updated'] + changes['deleted']:
             if change['type'] == 'user':
                 affected_user_ids.append(change['id'])
             if change['type'] == 'user_group':
                 user_group = UserGroup.get(safe_int(change['id']))
                 if user_group:
                     group_members_ids = [x.user_id for x in user_group.members]
                     affected_user_ids.extend(group_members_ids)
 
         self.trigger_permission_flush(affected_user_ids)
 
         return affected_user_ids

rhodecode/public/js/rhodecode/i18n/be.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/de.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'Keine Treffer gefunden',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Nicht Begutachtet',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Bitte {0} Zeichen löschen',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/en.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/es.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Not Reviewed',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Open new pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Selection link',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Stop following this repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Submitting...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'files',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/fr.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Pas encore relue',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Nouvelle requête de pull',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Lien vers la sélection',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Arrêter de suivre ce dépôt',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Envoi…',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'Désactivé',
     'enabled': 'Activé',
     'file': 'file',
     'files': 'Fichiers',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'Spécifier un commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} jours',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} heures',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} mois',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} années',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/it.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'Nessuna corrispondenza',
     'No matching files': 'Nessuna corrispondenza tra i file',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'Nessun risultato',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Non Revisionato',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Apri una richiesta PULL',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Collegamento selezione',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Smetti di seguire il repository',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Inoltro...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Smetti di seguire',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabilitato',
     'enabled': 'abilitato',
     'file': 'file',
     'files': 'i file',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/ja.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'まだブックマークがありません。',
     'No branches available yet.': 'まだブランチがありません。',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'まだ Gist がありません。',
     'No matches found': '一致するものが見つかりません',
     'No matching files': 'マッチするファイルはありません',
     'No pull requests available yet.': 'まだプルリクエストがありません。',
     'No repositories available yet.': 'まだリポジトリがありません。',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'まだリポジトリグループがありません。',
     'No repository groups present.': 'No repository groups present.',
     'No results': '結果がありません',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'まだタグがありません。',
     'No user groups available yet.': 'まだユーザーグループがありません。',
     'No users available yet.': 'まだユーザーがいません。',
     'Not Reviewed': '未レビュー',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': '1 件の結果があります。 Enter で選択できます。',
     'Open new pull request': '新しいプルリクエストを作成',
     'Open new pull request for selected commit': '選択したコミットから新しいプルリクエストを作成',
     'Please delete {0} character': '{0} 文字削除してください',
     '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...': '検索中...',
     'Selection link': 'セレクション・リンク',
     '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': 'このリポジトリのフォローする',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'ステータスレビュー',
     'Stop following this repository': 'このリポジトリのフォローをやめる',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '送信中...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'アンフォロー',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '無効',
     'enabled': '有効',
     'file': 'ファイル',
     'files': 'ファイル',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': '省略された結果',
     'truncated results': '省略された結果',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} 前',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} 日',
     '{0} days': '{0} days',
     '{0} hour': '{0} 時間',
     '{0} hours': '{0} hours',
     '{0} min': '{0} 分',
     '{0} month': '{0} ヶ月',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
     '{0} sec': '{0} 秒',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} 年',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/js_translations.js

@@ -1,163 +1,165 b''
 // AUTO GENERATED FILE FOR Babel JS-GETTEXT EXTRACTORS, DO NOT CHANGE
 _gettext('(from usergroup {0})');
 _gettext('<strong>{0} file</strong> changed, ');
 _gettext('<strong>{0} files</strong> 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');
 _gettext('Collapse all files');
 _gettext('Collapse {0} commit');
 _gettext('Collapse {0} commits');
+_gettext('Comment body was not changed.');
 _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 <a href="{2}">refreshing</a> 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');
 _gettext('Hide whitespace changes');
 _gettext('Invite reviewers to this discussion');
 _gettext('Leave a comment on line {0}.');
 _gettext('Leave a comment, or click resolve button to resolve TODO comment #{0}');
 _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...');
 _gettext('No bookmarks available yet.');
 _gettext('No branches available yet.');
 _gettext('No forks available yet.');
 _gettext('No gists available yet.');
 _gettext('No matches found');
 _gettext('No matching files');
 _gettext('No pull requests available yet.');
 _gettext('No repositories available yet.');
 _gettext('No repositories present.');
 _gettext('No repository groups available yet.');
 _gettext('No repository groups present.');
 _gettext('No results');
 _gettext('No ssh keys available yet.');
 _gettext('No tags available yet.');
 _gettext('No user groups available yet.');
 _gettext('No users available yet.');
 _gettext('Not Reviewed');
 _gettext('Note Comment');
 _gettext('One result is available, press enter to select it.');
 _gettext('Open new pull request');
 _gettext('Open new pull request for selected commit');
 _gettext('Please delete {0} character');
 _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...');
 _gettext('Selection link');
 _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');
 _gettext('Started watching this repository');
 _gettext('Status Review');
 _gettext('Stop following this repository');
 _gettext('Stopped watching this repository');
 _gettext('Submitting...');
 _gettext('Switch to chat');
 _gettext('Switch to comment');
 _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 <strong>{0} commit</strong>.');
 _gettext('This pull requests will consist of <strong>{0} commits</strong>.');
 _gettext('Toggle Wide Mode diff');
 _gettext('Unfollow');
 _gettext('Unwatch');
+_gettext('Updated Comment');
 _gettext('Updating...');
 _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');
 _gettext('added manually by "{0}"');
 _gettext('date not in future');
 _gettext('disabled');
 _gettext('enabled');
 _gettext('file');
 _gettext('files');
 _gettext('go to numeric commit');
 _gettext('in {0}');
 _gettext('in {0} and {1}');
 _gettext('in {0}, {1}');
 _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');
 _gettext('showing {0} out of {1} commits');
 _gettext('specify commit');
 _gettext('truncated result');
 _gettext('truncated results');
 _gettext('{0} ({1} inactive) of {2} user groups ({3} inactive)');
 _gettext('{0} ({1} inactive) of {2} users ({3} inactive)');
 _gettext('{0} active out of {1} users');
 _gettext('{0} ago');
 _gettext('{0} and {1}');
 _gettext('{0} and {1} ago');
 _gettext('{0} day');
 _gettext('{0} days');
 _gettext('{0} hour');
 _gettext('{0} hours');
 _gettext('{0} min');
 _gettext('{0} month');
 _gettext('{0} months');
 _gettext('{0} of {1} repositories');
 _gettext('{0} of {1} repository groups');
 _gettext('{0} out of {1} ssh keys');
 _gettext('{0} out of {1} users');
 _gettext('{0} repositories');
 _gettext('{0} repository groups');
 _gettext('{0} results are available, use up and down arrow keys to navigate.');
 _gettext('{0} sec');
 _gettext('{0} user groups ({1} inactive)');
 _gettext('{0} users ({1} inactive)');
 _gettext('{0} year');
 _gettext('{0} years');
 _gettext('{0}, {1} ago');

rhodecode/public/js/rhodecode/i18n/pl.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Nie ma plików pasujących',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Brak Korekty',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Otwórz nową prośbę o połączenie gałęzi',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Wybór linku',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Zakończyć obserwację tego repozytorium',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Przesyłanie...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Nie obserwuj',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'disabled',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'pliki',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} aktywnych z {1} użytkowników',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/pt.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Nenhum arquivo encontrado',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Não Revisado',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Crie novo pull request',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Link da seleção',
     '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',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Parar de seguir este repositório',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Enviando...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Parar de seguir',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'desabilitado',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'arquivos',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/ru.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'Нет совпадений',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': 'Не просмотрено',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': 'Создать новый pull запрос',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': 'Ссылка выбора',
     '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': 'Наблюдать за репозиторием',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': 'Отменить наблюдение за репозиторием',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': 'Применение...',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Не наблюдать',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': 'отключено',
     'enabled': 'enabled',
     'file': 'file',
     'files': 'файлы',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/public/js/rhodecode/i18n/zh.js

@@ -1,170 +1,172 b''
 /* This file is automatically generated. DO NOT change it manually.
  * If this file needs to be modified, edit
  * rhodecode/utils/file_generation/js_i18n_data.py
  * and run the script invoke -r scripts/ generate.js-i18n .
  */
 //JS translations map
 var _TM = {
     '(from usergroup {0})': '(from usergroup {0})',
     '<strong>{0} file</strong> changed, ': '<strong>{0} file</strong> changed, ',
     '<strong>{0} files</strong> changed, ': '<strong>{0} files</strong> 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',
     'Collapse all files': 'Collapse all files',
     'Collapse {0} commit': 'Collapse {0} commit',
     'Collapse {0} commits': 'Collapse {0} commits',
+    'Comment body was not changed.': 'Comment body was not changed.',
     '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 <a href="{2}">refreshing</a> this page.': 'Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> 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',
     'Hide whitespace changes': 'Hide whitespace changes',
     'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
     'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
     'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
     '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...',
     'No bookmarks available yet.': 'No bookmarks available yet.',
     'No branches available yet.': 'No branches available yet.',
     'No forks available yet.': 'No forks available yet.',
     'No gists available yet.': 'No gists available yet.',
     'No matches found': 'No matches found',
     'No matching files': 'No matching files',
     'No pull requests available yet.': 'No pull requests available yet.',
     'No repositories available yet.': 'No repositories available yet.',
     'No repositories present.': 'No repositories present.',
     'No repository groups available yet.': 'No repository groups available yet.',
     'No repository groups present.': 'No repository groups present.',
     'No results': 'No results',
     'No ssh keys available yet.': 'No ssh keys available yet.',
     'No tags available yet.': 'No tags available yet.',
     'No user groups available yet.': 'No user groups available yet.',
     'No users available yet.': 'No users available yet.',
     'Not Reviewed': '未检视',
     'Note Comment': 'Note Comment',
     'One result is available, press enter to select it.': 'One result is available, press enter to select it.',
     'Open new pull request': '新建拉取请求',
     'Open new pull request for selected commit': 'Open new pull request for selected commit',
     'Please delete {0} character': 'Please delete {0} character',
     '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...',
     'Selection link': '选择链接',
     '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': '开始关注该版本库',
     'Started watching this repository': 'Started watching this repository',
     'Status Review': 'Status Review',
     'Stop following this repository': '停止关注该版本库',
     'Stopped watching this repository': 'Stopped watching this repository',
     'Submitting...': '提交中……',
     'Switch to chat': 'Switch to chat',
     'Switch to comment': 'Switch to comment',
     '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 <strong>{0} commit</strong>.': 'This pull requests will consist of <strong>{0} commit</strong>.',
     'This pull requests will consist of <strong>{0} commits</strong>.': 'This pull requests will consist of <strong>{0} commits</strong>.',
     'Toggle Wide Mode diff': 'Toggle Wide Mode diff',
     'Unfollow': 'Unfollow',
     'Unwatch': 'Unwatch',
+    'Updated Comment': 'Updated Comment',
     'Updating...': 'Updating...',
     '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',
     'added manually by "{0}"': 'added manually by "{0}"',
     'date not in future': 'date not in future',
     'disabled': '禁用',
     'enabled': 'enabled',
     'file': 'file',
     'files': '文件',
     'go to numeric commit': 'go to numeric commit',
     'in {0}': 'in {0}',
     'in {0} and {1}': 'in {0} and {1}',
     'in {0}, {1}': 'in {0}, {1}',
     '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',
     'showing {0} out of {1} commits': 'showing {0} out of {1} commits',
     'specify commit': 'specify commit',
     'truncated result': 'truncated result',
     'truncated results': 'truncated results',
     '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)',
     '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)',
     '{0} active out of {1} users': '{0} active out of {1} users',
     '{0} ago': '{0} ago',
     '{0} and {1}': '{0} and {1}',
     '{0} and {1} ago': '{0} and {1} ago',
     '{0} day': '{0} day',
     '{0} days': '{0} days',
     '{0} hour': '{0} hour',
     '{0} hours': '{0} hours',
     '{0} min': '{0} min',
     '{0} month': '{0} month',
     '{0} months': '{0} months',
     '{0} of {1} repositories': '{0} of {1} repositories',
     '{0} of {1} repository groups': '{0} of {1} repository groups',
     '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
     '{0} out of {1} users': '{0} out of {1} users',
     '{0} repositories': '{0} repositories',
     '{0} repository groups': '{0} repository groups',
     '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
     '{0} sec': '{0} sec',
     '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)',
     '{0} users ({1} inactive)': '{0} users ({1} inactive)',
     '{0} year': '{0} year',
     '{0} years': '{0} years',
     '{0}, {1} ago': '{0}, {1} ago'
 };
  No newline at end of file

rhodecode/templates/admin/repos/repo_edit_permissions.mako

@@ -1,245 +1,245 b''
 <%namespace name="base" file="/base/base.mako"/>
 
 <div class="panel panel-default">
     <div class="panel-heading">
         <h3 class="panel-title">${_('Repository Access Permissions')}</h3>
     </div>
     <div class="panel-body">
         ${h.secure_form(h.route_path('edit_repo_perms', repo_name=c.repo_name), request=request)}
         <table id="permissions_manage" class="rctable permissions">
             <tr>
                 <th class="td-radio">${_('None')}</th>
                 <th class="td-radio">${_('Read')}</th>
                 <th class="td-radio">${_('Write')}</th>
                 <th class="td-radio">${_('Admin')}</th>
                 <th class="td-owner">${_('User/User Group')}</th>
                 <th class="td-action"></th>
                 <th class="td-action"></th>
             </tr>
             ## USERS
             %for _user in c.rhodecode_db_repo.permissions():
                 %if getattr(_user, 'admin_row', None) or getattr(_user, 'owner_row', None):
                     <tr class="perm_admin_row">
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.none', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.read', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.write', disabled="disabled")}</td>
                         <td class="td-radio">${h.radio('admin_perm_%s' % _user.user_id,'repository.admin', 'repository.admin', disabled="disabled")}</td>
                         <td class="td-user">
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             ${h.link_to_user(_user.username)}
                             %if getattr(_user, 'admin_row', None):
                                 (${_('super-admin')})
                             %endif
                             %if getattr(_user, 'owner_row', None):
                                 (${_('owner')})
                             %endif
                         </td>
                         <td></td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
                                 <div class="menu_items_container" style="display: none;">
                                 <ul class="menu_items">
                                   <li>
                                      ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
                                   </li>
                                 </ul>
                                 </div>
                             % endif
                         </td>
                     </tr>
                 %elif _user.username == h.DEFAULT_USER and c.rhodecode_db_repo.private:
                     <tr>
                         <td colspan="4">
                             <span class="private_repo_msg">
                             <strong title="${h.tooltip(_user.permission)}">${_('private repository')}</strong>
                             </span>
                         </td>
                         <td class="private_repo_msg">
                             ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
                             ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
                         <td class="td-action">
                             <span class="noselect tooltip btn btn-link btn-default" onclick="setPrivateRepo(this, false); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
                             ${_('un-set private mode')}
                             </span>
                         </td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
                                 <div class="menu_items_container" style="display: none;">
                                 <ul class="menu_items">
                                   <li>
                                      ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
                                   </li>
                                 </ul>
                                 </div>
                             % endif
                         </td>
                     </tr>
                 %else:
                     <% used_by_n_rules = len(getattr(_user, 'branch_rules', None) or []) %>
                     <tr>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.none', checked=_user.permission=='repository.none', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.read', checked=_user.permission=='repository.read', disabled="disabled" if (used_by_n_rules and _user.username != h.DEFAULT_USER) else None)}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.write', checked=_user.permission=='repository.write')}</td>
                         <td class="td-radio">${h.radio('u_perm_%s' % _user.user_id,'repository.admin', checked=_user.permission=='repository.admin')}</td>
                         <td class="td-user">
                             ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
                             <span class="user">
                                 % if _user.username == h.DEFAULT_USER:
                                     ${h.DEFAULT_USER}
                                     % if _user.active:
                                         <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
                                     % else:
                                         <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
                                     % endif
                                 % else:
                                     % if getattr(_user, 'duplicate_perm', None):
                                         <span class="user-perm-duplicate">
                                             ${h.link_to_user(_user.username)}
                                             <span class="tooltip" title="${_('This entry is a duplicate, most probably left-over from previously set permission. This user has a higher permission set, so this entry is inactive. Please revoke this permission manually.')}">(${_('inactive duplicate')})
                                             </span>
                                         </span>
                                     % else:
                                         ${h.link_to_user(_user.username)}
                                     % endif
 
                                     %if getattr(_user, 'branch_rules', None):
                                         % if used_by_n_rules == 1:
-                                            (${_('used by {} branch rule, requires write+ permissions').format(used_by_n_rules)})
+                                            (${_('used by {} branch rule, requires write or higher permissions').format(used_by_n_rules)})
                                         % else:
-                                            (${_('used by {} branch rules, requires write+ permissions').format(used_by_n_rules)})
+                                            (${_('used by {} branch rules, requires write or higher permissions').format(used_by_n_rules)})
                                         % endif
                                     %endif
                                 % endif
                             </span>
                         </td>
                         <td class="td-action">
                           %if _user.username != h.DEFAULT_USER and getattr(_user, 'branch_rules', None) is None:
                             <span class="btn btn-link btn-danger revoke_perm"
                                   member="${_user.user_id}" member_type="user">
                             ${_('Remove')}
                             </span>
                           %elif _user.username == h.DEFAULT_USER:
                             <span class="noselect tooltip btn btn-link btn-default" onclick="setPrivateRepo(this, true); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
                             ${_('set private mode')}
                             </span>
                           %endif
                         </td>
                         <td class="quick_repo_menu">
                             % if c.rhodecode_user.is_admin:
                                 <i class="icon-more"></i>
                                 <div class="menu_items_container" style="display: none;">
                                 <ul class="menu_items">
                                   <li>
                                      % if _user.username == h.DEFAULT_USER:
                                         ${h.link_to('show permissions', h.route_path('admin_permissions_overview', _anchor='repositories-permissions'))}
                                     % else:
                                         ${h.link_to('show permissions', h.route_path('edit_user_perms_summary', user_id=_user.user_id, _anchor='repositories-permissions'))}
                                     % endif
                                   </li>
                                 </ul>
                                 </div>
                             % endif
                         </td>
                     </tr>
                 %endif
             %endfor
 
             ## USER GROUPS
             %for _user_group in c.rhodecode_db_repo.permission_user_groups(with_members=True):
                 <tr>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.none', checked=_user_group.permission=='repository.none')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.read', checked=_user_group.permission=='repository.read')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.write', checked=_user_group.permission=='repository.write')}</td>
                     <td class="td-radio">${h.radio('g_perm_%s' % _user_group.users_group_id,'repository.admin', checked=_user_group.permission=='repository.admin')}</td>
                     <td class="td-componentname">
                         ${base.user_group_icon(_user_group, tooltip=True)}
                         %if c.is_super_admin:
                          <a href="${h.route_path('edit_user_group',user_group_id=_user_group.users_group_id)}">
                              ${_user_group.users_group_name}
                          </a>
                         %else:
                          ${h.link_to_group(_user_group.users_group_name)}
                         %endif
                         (${_('members')}: ${len(_user_group.members)})
                     </td>
                     <td class="td-action">
                         <span class="btn btn-link btn-danger revoke_perm"
                               member="${_user_group.users_group_id}" member_type="user_group">
                         ${_('Remove')}
                         </span>
                     </td>
                     <td class="quick_repo_menu">
                         % if c.rhodecode_user.is_admin:
                             <i class="icon-more"></i>
                             <div class="menu_items_container" style="display: none;">
                             <ul class="menu_items">
                               <li>
                                  ${h.link_to('show permissions', h.route_path('edit_user_group_perms_summary', user_group_id=_user_group.users_group_id, _anchor='repositories-permissions'))}
                               </li>
                             </ul>
                             </div>
                         % endif
                     </td>
                 </tr>
             %endfor
             <tr class="new_members" id="add_perm_input"></tr>
 
             <tr>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td></td>
                 <td>
                     <span id="add_perm" class="link">
                         ${_('Add user/user group')}
                     </span>
                 </td>
                 <td></td>
             </tr>
 
         </table>
 
         <div class="buttons">
           ${h.submit('save',_('Save'),class_="btn btn-primary")}
           ${h.reset('reset',_('Reset'),class_="btn btn-danger")}
         </div>
         ${h.end_form()}
     </div>
 </div>
 
 <script type="text/javascript">
     $('#add_perm').on('click', function(e){
         addNewPermInput($(this), 'repository');
     });
     $('.revoke_perm').on('click', function(e){
         markRevokePermInput($(this), 'repository');
     });
     quick_repo_menu();
 
     var setPrivateRepo = function (elem, private) {
         var $elem = $(elem)
         if ($elem.hasClass('disabled')) {
             return
         }
         $elem.addClass('disabled');
         $elem.css({"opacity": 0.3})
 
         var postData = {
             'csrf_token': CSRF_TOKEN,
             'private': private
         };
 
         var success = function(o) {
             var defaultUrl = pyroutes.url('edit_repo_perms', {"repo_name": templateContext.repo_name});
             window.location = o.redirect_url || defaultUrl;
         };
 
         ajaxPOST(
             pyroutes.url('edit_repo_perms_set_private', {"repo_name": templateContext.repo_name}),
             postData,
             success);
     }
 </script>

rhodecode/templates/pullrequests/pullrequest_show.mako

@@ -1,921 +1,921 b''
 <%inherit file="/base/base.mako"/>
 <%namespace name="base" file="/base/base.mako"/>
 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
 
 <%def name="title()">
     ${_('{} Pull Request !{}').format(c.repo_name, c.pull_request.pull_request_id)}
     %if c.rhodecode_name:
         &middot; ${h.branding(c.rhodecode_name)}
     %endif
 </%def>
 
 <%def name="breadcrumbs_links()">
 
 </%def>
 
 <%def name="menu_bar_nav()">
     ${self.menu_items(active='repositories')}
 </%def>
 
 <%def name="menu_bar_subnav()">
     ${self.repo_menu(active='showpullrequest')}
 </%def>
 
 <%def name="main()">
 
 <script type="text/javascript">
     // TODO: marcink switch this to pyroutes
     AJAX_COMMENT_DELETE_URL = "${h.route_path('pullrequest_comment_delete',repo_name=c.repo_name,pull_request_id=c.pull_request.pull_request_id,comment_id='__COMMENT_ID__')}";
     templateContext.pull_request_data.pull_request_id = ${c.pull_request.pull_request_id};
 </script>
 
 <div class="box">
 
   <div class="box pr-summary">
 
     <div class="summary-details block-left">
         <div id="pr-title">
             % if c.pull_request.is_closed():
                 <span class="pr-title-closed-tag tag">${_('Closed')}</span>
             % endif
             <input class="pr-title-input large disabled" disabled="disabled" name="pullrequest_title" type="text" value="${c.pull_request.title}">
         </div>
         <div id="pr-title-edit" class="input" style="display: none;">
             <input class="pr-title-input large" id="pr-title-input" name="pullrequest_title" type="text" value="${c.pull_request.title}">
         </div>
 
     <% summary = lambda n:{False:'summary-short'}.get(n) %>
     <div class="pr-details-title">
         <div class="pull-left">
             <a href="${h.route_path('pull_requests_global', pull_request_id=c.pull_request.pull_request_id)}">${_('Pull request !{}').format(c.pull_request.pull_request_id)}</a>
             ${_('Created on')}
             <span class="tooltip" title="${_('Last updated on')} ${h.format_date(c.pull_request.updated_on)}">${h.format_date(c.pull_request.created_on)},</span>
             <span class="pr-details-title-author-pref">${_('by')}</span>
         </div>
 
         <div class="pull-left">
             ${self.gravatar_with_user(c.pull_request.author.email, 16, tooltip=True)}
         </div>
 
         %if c.allowed_to_update:
           <div class="pull-right">
               <div id="edit_pull_request" class="action_button pr-save" style="display: none;">${_('Update title & description')}</div>
               <div id="delete_pullrequest" class="action_button pr-save ${('' if c.allowed_to_delete else 'disabled' )}" style="display: none;">
                   % if c.allowed_to_delete:
                       ${h.secure_form(h.route_path('pullrequest_delete', repo_name=c.pull_request.target_repo.repo_name, pull_request_id=c.pull_request.pull_request_id), request=request)}
                           <input class="btn btn-link btn-danger no-margin" id="remove_${c.pull_request.pull_request_id}" name="remove_${c.pull_request.pull_request_id}"
                                  onclick="submitConfirm(event, this, _gettext('Confirm to delete this pull request'), _gettext('Delete'), '${'!{}'.format(c.pull_request.pull_request_id)}')"
                                  type="submit" value="${_('Delete pull request')}">
                       ${h.end_form()}
                   % else:
                     <span class="tooltip" title="${_('Not allowed to delete this pull request')}">${_('Delete pull request')}</span>
                   % endif
               </div>
               <div id="open_edit_pullrequest" class="action_button">${_('Edit')}</div>
               <div id="close_edit_pullrequest" class="action_button" style="display: none;">${_('Cancel')}</div>
           </div>
 
         %endif
     </div>
 
     <div id="pr-desc" class="input" title="${_('Rendered using {} renderer').format(c.renderer)}">
         ${h.render(c.pull_request.description, renderer=c.renderer, repo_name=c.repo_name)}
     </div>
 
     <div id="pr-desc-edit" class="input textarea" style="display: none;">
         <input id="pr-renderer-input" type="hidden" name="description_renderer" value="${c.visual.default_renderer}">
         ${dt.markup_form('pr-description-input', form_text=c.pull_request.description)}
     </div>
 
     <div id="summary" class="fields pr-details-content">
 
        ## review
        <div class="field">
         <div class="label-pr-detail">
             <label>${_('Review status')}:</label>
         </div>
         <div class="input">
           %if c.pull_request_review_status:
           <div class="tag status-tag-${c.pull_request_review_status}">
             <i class="icon-circle review-status-${c.pull_request_review_status}"></i>
             <span class="changeset-status-lbl">
               %if c.pull_request.is_closed():
                   ${_('Closed')},
               %endif
 
               ${h.commit_status_lbl(c.pull_request_review_status)}
 
             </span>
           </div>
             - ${_ungettext('calculated based on {} reviewer vote', 'calculated based on {} reviewers votes', len(c.pull_request_reviewers)).format(len(c.pull_request_reviewers))}
           %endif
         </div>
        </div>
 
        ## source
        <div class="field">
         <div class="label-pr-detail">
             <label>${_('Commit flow')}:</label>
         </div>
         <div class="input">
             <div class="pr-commit-flow">
                 ## Source
                 %if c.pull_request.source_ref_parts.type == 'branch':
                     <a href="${h.route_path('repo_commits', repo_name=c.pull_request.source_repo.repo_name, _query=dict(branch=c.pull_request.source_ref_parts.name))}"><code class="pr-source-info">${c.pull_request.source_ref_parts.type}:${c.pull_request.source_ref_parts.name}</code></a>
                 %else:
                     <code class="pr-source-info">${'{}:{}'.format(c.pull_request.source_ref_parts.type, c.pull_request.source_ref_parts.name)}</code>
                 %endif
                 ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.source_repo.repo_name)}">${c.pull_request.source_repo.repo_name}</a>
                 &rarr;
                 ## Target
                 %if c.pull_request.target_ref_parts.type == 'branch':
                     <a href="${h.route_path('repo_commits', repo_name=c.pull_request.target_repo.repo_name, _query=dict(branch=c.pull_request.target_ref_parts.name))}"><code class="pr-target-info">${c.pull_request.target_ref_parts.type}:${c.pull_request.target_ref_parts.name}</code></a>
                 %else:
                     <code class="pr-target-info">${'{}:{}'.format(c.pull_request.target_ref_parts.type, c.pull_request.target_ref_parts.name)}</code>
                 %endif
 
                 ${_('of')} <a href="${h.route_path('repo_summary', repo_name=c.pull_request.target_repo.repo_name)}">${c.pull_request.target_repo.repo_name}</a>
 
                 <a class="source-details-action" href="#expand-source-details" onclick="return versionController.toggleElement(this, '.source-details')" data-toggle-on='<i class="icon-angle-down">more details</i>' data-toggle-off='<i class="icon-angle-up">less details</i>'>
                     <i class="icon-angle-down">more details</i>
                 </a>
 
             </div>
 
             <div class="source-details" style="display: none">
 
                 <ul>
 
                     ## common ancestor
                     <li>
                         ${_('Common ancestor')}:
                         % if c.ancestor_commit:
                             <a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=c.ancestor_commit.raw_id)}">${h.show_id(c.ancestor_commit)}</a>
                         % else:
                             ${_('not available')}
                         % endif
                     </li>
 
                     ## pull url
                     <li>
                         %if h.is_hg(c.pull_request.source_repo):
                             <% clone_url = 'hg pull -r {} {}'.format(h.short_id(c.source_ref), c.pull_request.source_repo.clone_url()) %>
                         %elif h.is_git(c.pull_request.source_repo):
                             <% clone_url = 'git pull {} {}'.format(c.pull_request.source_repo.clone_url(), c.pull_request.source_ref_parts.name) %>
                         %endif
 
                         <span>${_('Pull changes from source')}</span>: <input type="text" class="input-monospace pr-pullinfo" value="${clone_url}" readonly="readonly">
                         <i class="tooltip icon-clipboard clipboard-action pull-right pr-pullinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the pull url')}"></i>
                     </li>
 
                     ## Shadow repo
                     <li>
                         % if not c.pull_request.is_closed() and c.pull_request.shadow_merge_ref:
                             %if h.is_hg(c.pull_request.target_repo):
                                 <% clone_url = 'hg clone --update {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                             %elif h.is_git(c.pull_request.target_repo):
                                 <% clone_url = 'git clone --branch {} {} pull-request-{}'.format(c.pull_request.shadow_merge_ref.name, c.shadow_clone_url, c.pull_request.pull_request_id) %>
                             %endif
 
                             <span class="tooltip" title="${_('Clone repository in its merged state using shadow repository')}">${_('Clone from shadow repository')}</span>: <input type="text" class="input-monospace pr-mergeinfo" value="${clone_url}" readonly="readonly">
                             <i class="tooltip icon-clipboard clipboard-action pull-right pr-mergeinfo-copy" data-clipboard-text="${clone_url}" title="${_('Copy the clone url')}"></i>
 
                         % else:
                             <div class="">
                                 ${_('Shadow repository data not available')}.
                             </div>
                         % endif
                     </li>
 
                 </ul>
 
             </div>
 
         </div>
 
        </div>
 
        ## versions
        <div class="field">
            <div class="label-pr-detail">
                <label>${_('Versions')}:</label>
            </div>
 
            <% outdated_comm_count_ver = len(c.inline_versions[None]['outdated']) %>
            <% general_outdated_comm_count_ver = len(c.comment_versions[None]['outdated']) %>
 
            <div class="pr-versions">
            % if c.show_version_changes:
                <% outdated_comm_count_ver = len(c.inline_versions[c.at_version_num]['outdated']) %>
                <% general_outdated_comm_count_ver = len(c.comment_versions[c.at_version_num]['outdated']) %>
                ${_ungettext('{} version available for this pull request, ', '{} versions available for this pull request, ', len(c.versions)).format(len(c.versions))}
                <a id="show-pr-versions" onclick="return versionController.toggleVersionView(this)" href="#show-pr-versions"
                     data-toggle-on="${_('show versions')}."
                     data-toggle-off="${_('hide versions')}.">
                     ${_('show versions')}.
                </a>
                <table>
                    ## SHOW ALL VERSIONS OF PR
                    <% ver_pr = None %>
 
                    % for data in reversed(list(enumerate(c.versions, 1))):
                        <% ver_pos = data[0] %>
                        <% ver = data[1] %>
                        <% ver_pr = ver.pull_request_version_id %>
                        <% display_row = '' if c.at_version and (c.at_version_num == ver_pr or c.from_version_num == ver_pr) else 'none' %>
 
                        <tr class="version-pr" style="display: ${display_row}">
                            <td>
                                 <code>
                                     <a href="${request.current_route_path(_query=dict(version=ver_pr or 'latest'))}">v${ver_pos}</a>
                                 </code>
                            </td>
                            <td>
                                <input ${('checked="checked"' if c.from_version_num == ver_pr else '')} class="compare-radio-button" type="radio" name="ver_source" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
                                <input ${('checked="checked"' if c.at_version_num == ver_pr else '')} class="compare-radio-button" type="radio" name="ver_target" value="${ver_pr or 'latest'}" data-ver-pos="${ver_pos}"/>
                            </td>
                            <td>
                             <% review_status = c.review_versions[ver_pr].status if ver_pr in c.review_versions else 'not_reviewed' %>
                             <i class="tooltip icon-circle review-status-${review_status}" title="${_('Your review status at this version')}"></i>
 
                            </td>
                            <td>
                                % if c.at_version_num != ver_pr:
                                 <i class="tooltip icon-comment" title="${_('Comments from pull request version v{0}').format(ver_pos)}"></i>
                                 <code>
                                    General:${len(c.comment_versions[ver_pr]['at'])} / Inline:${len(c.inline_versions[ver_pr]['at'])}
                                 </code>
                                % endif
                            </td>
                            <td>
                                ##<code>${ver.source_ref_parts.commit_id[:6]}</code>
                            </td>
                            <td>
                                <code>${h.age_component(ver.updated_on, time_is_local=True, tooltip=False)}</code>
                            </td>
                        </tr>
                    % endfor
 
                    <tr>
                        <td colspan="6">
                            <button id="show-version-diff" onclick="return versionController.showVersionDiff()" class="btn btn-sm" style="display: none"
                                    data-label-text-locked="${_('select versions to show changes')}"
                                    data-label-text-diff="${_('show changes between versions')}"
                                    data-label-text-show="${_('show pull request for this version')}"
                            >
                                ${_('select versions to show changes')}
                            </button>
                        </td>
                    </tr>
                </table>
            % else:
                <div>
                ${_('Pull request versions not available')}.
                </div>
            % endif
            </div>
        </div>
 
     </div>
 
   </div>
 
     ## REVIEW RULES
     <div id="review_rules" style="display: none" class="reviewers-title block-right">
         <div class="pr-details-title">
             ${_('Reviewer rules')}
           %if c.allowed_to_update:
             <span id="close_edit_reviewers" class="block-right action_button last-item" style="display: none;">${_('Close')}</span>
           %endif
         </div>
         <div class="pr-reviewer-rules">
             ## review rules will be appended here, by default reviewers logic
         </div>
         <input id="review_data" type="hidden" name="review_data" value="">
     </div>
 
     ## REVIEWERS
     <div class="reviewers-title first-panel block-right">
       <div class="pr-details-title">
           ${_('Pull request reviewers')}
           %if c.allowed_to_update:
             <span id="open_edit_reviewers" class="block-right action_button last-item">${_('Edit')}</span>
           %endif
       </div>
     </div>
     <div id="reviewers" class="block-right pr-details-content reviewers">
 
         ## members redering block
         <input type="hidden" name="__start__" value="review_members:sequence">
         <ul id="review_members" class="group_members">
 
         % for review_obj, member, reasons, mandatory, status in c.pull_request_reviewers:
             <script>
                 var member = ${h.json.dumps(h.reviewer_as_json(member, reasons=reasons, mandatory=mandatory, user_group=review_obj.rule_user_group_data()))|n};
                 var status = "${(status[0][1].status if status else 'not_reviewed')}";
                 var status_lbl = "${h.commit_status_lbl(status[0][1].status if status else 'not_reviewed')}";
                 var allowed_to_update = ${h.json.dumps(c.allowed_to_update)};
 
                 var entry = renderTemplate('reviewMemberEntry', {
                     'member': member,
                     'mandatory': member.mandatory,
                     'reasons': member.reasons,
                     'allowed_to_update': allowed_to_update,
                     'review_status': status,
                     'review_status_label': status_lbl,
                     'user_group': member.user_group,
                     'create': false
                 });
                 $('#review_members').append(entry)
             </script>
 
         % endfor
 
         </ul>
 
         <input type="hidden" name="__end__" value="review_members:sequence">
         ## end members redering block
 
         %if not c.pull_request.is_closed():
             <div id="add_reviewer" class="ac" style="display: none;">
             %if c.allowed_to_update:
                 % if not c.forbid_adding_reviewers:
                     <div id="add_reviewer_input" class="reviewer_ac">
                        ${h.text('user', class_='ac-input', placeholder=_('Add reviewer or reviewer group'))}
                        <div id="reviewers_container"></div>
                     </div>
                 % endif
                 <div class="pull-right">
                     <button id="update_pull_request" class="btn btn-small no-margin">${_('Save Changes')}</button>
                 </div>
             %endif
             </div>
         %endif
     </div>
 
     ## TODOs will be listed here
     <div class="reviewers-title block-right">
       <div class="pr-details-title">
           ## Only show unresolved, that is only what matters
           TODO Comments - ${len(c.unresolved_comments)} / ${(len(c.unresolved_comments) + len(c.resolved_comments))}
 
           % if not c.at_version:
               % if c.resolved_comments:
                   <span class="block-right action_button last-item noselect" onclick="$('.unresolved-todo-text').toggle(); return versionController.toggleElement(this, '.unresolved-todo');" data-toggle-on="Show resolved" data-toggle-off="Hide resolved">Show resolved</span>
               % else:
                   <span class="block-right last-item noselect">Show resolved</span>
               % endif
           % endif
       </div>
     </div>
     <div class="block-right pr-details-content reviewers">
 
         <table class="todo-table">
               <%
                 def sorter(entry):
                     user_id = entry.author.user_id
                     resolved = '1' if entry.resolved else '0'
                     if user_id == c.rhodecode_user.user_id:
                         # own comments first
                         user_id = 0
                     return '{}_{}_{}'.format(resolved, user_id, str(entry.comment_id).zfill(100))
               %>
 
           % if c.at_version:
               <tr>
                 <td class="unresolved-todo-text">${_('unresolved TODOs unavailable in this view')}.</td>
               </tr>
           % else:
               % for todo_comment in sorted(c.unresolved_comments + c.resolved_comments, key=sorter):
                   <% resolved = todo_comment.resolved %>
                   % if inline:
                       <% outdated_at_ver = todo_comment.outdated_at_version(getattr(c, 'at_version_num', None)) %>
                   % else:
                       <% outdated_at_ver = todo_comment.older_than_version(getattr(c, 'at_version_num', None)) %>
                   % endif
 
                   <tr ${('class="unresolved-todo" style="display: none"' if resolved else '') |n}>
 
                       <td class="td-todo-number">
                           % if resolved:
                               <a class="permalink todo-resolved tooltip" title="${_('Resolved by comment #{}').format(todo_comment.resolved.comment_id)}" href="#comment-${todo_comment.comment_id}" onclick="return Rhodecode.comments.scrollToComment($('#comment-${todo_comment.comment_id}'), 0, ${h.json.dumps(outdated_at_ver)})">
                               <i class="icon-flag-filled"></i> ${todo_comment.comment_id}</a>
                           % else:
                               <a class="permalink" href="#comment-${todo_comment.comment_id}" onclick="return Rhodecode.comments.scrollToComment($('#comment-${todo_comment.comment_id}'), 0, ${h.json.dumps(outdated_at_ver)})">
                               <i class="icon-flag-filled"></i> ${todo_comment.comment_id}</a>
                           % endif
                       </td>
                       <td class="td-todo-gravatar">
                           ${base.gravatar(todo_comment.author.email, 16, user=todo_comment.author, tooltip=True, extra_class=['no-margin'])}
                       </td>
                       <td class="todo-comment-text-wrapper">
                           <div class="todo-comment-text">
                             <code>${h.chop_at_smart(todo_comment.text, '\n', suffix_if_chopped='...')}</code>
                           </div>
                       </td>
 
                   </tr>
               % endfor
 
               % if len(c.unresolved_comments) == 0:
                   <tr>
                     <td class="unresolved-todo-text">${_('No unresolved TODOs')}.</td>
                   </tr>
               % endif
 
           % endif
 
         </table>
 
     </div>
   </div>
 
   </div>
 
   <div class="box">
 
   % if c.state_progressing:
 
     <h2 style="text-align: center">
         ${_('Cannot show diff when pull request state is changing. Current progress state')}: <span class="tag tag-merge-state-${c.pull_request.state}">${c.pull_request.state}</span>
 
         % if c.is_super_admin:
         <br/>
         If you think this is an error try <a href="${h.current_route_path(request, force_state='created')}">forced state reset</a> to <span class="tag tag-merge-state-created">created</span> state.
         % endif
     </h2>
 
   % else:
 
       ## Diffs rendered here
       <div class="table" >
           <div id="changeset_compare_view_content">
               ##CS
               % if c.missing_requirements:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing requirements:')}</strong>
                       ${_('These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled.')}
                     </div>
                   </div>
                 </div>
               % elif c.missing_commits:
                 <div class="box">
                   <div class="alert alert-warning">
                     <div>
                       <strong>${_('Missing commits')}:</strong>
-                        ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}
-                        ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}
-                        ${_('Consider doing a {force_refresh_url} in case you think this is an error.').format(force_refresh_url=h.link_to('force refresh', h.current_route_path(request, force_refresh='1')))|n}
+                        ${_('This pull request cannot be displayed, because one or more commits no longer exist in the source repository.')}<br/>
+                        ${_('Please update this pull request, push the commits back into the source repository, or consider closing this pull request.')}<br/>
+                        ${_('Consider doing a `force update commits` in case you think this is an error.')}
                     </div>
                   </div>
                 </div>
               % elif c.pr_merge_source_commit.changed and not c.pull_request.is_closed():
                 <div class="box">
                   <div class="alert alert-info">
                     <div>
                         <strong>${_('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)}</strong>
                     </div>
                   </div>
                 </div>
               % endif
 
               <div class="compare_view_commits_title">
                   % if not c.compare_mode:
 
                     % if c.at_version_pos:
                         <h4>
                         ${_('Showing changes at v%d, commenting is disabled.') % c.at_version_pos}
                         </h4>
                     % endif
 
                     <div class="pull-left">
                       <div class="btn-group">
                           <a class="${('collapsed' if c.collapse_all_commits else '')}" href="#expand-commits" onclick="toggleCommitExpand(this); return false" data-toggle-commits-cnt=${len(c.commit_ranges)} >
                               % if c.collapse_all_commits:
                                 <i class="icon-plus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Expand {} commit', 'Expand {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % else:
                                 <i class="icon-minus-squared-alt icon-no-margin"></i>
                                 ${_ungettext('Collapse {} commit', 'Collapse {} commits', len(c.commit_ranges)).format(len(c.commit_ranges))}
                               % endif
                           </a>
                       </div>
                     </div>
 
                     <div class="pull-right">
                         % if c.allowed_to_update and not c.pull_request.is_closed():
 
                             <div class="btn-group btn-group-actions">
                                 <a id="update_commits" class="btn btn-primary no-margin" onclick="updateController.updateCommits(this); return false">
                                     ${_('Update commits')}
                                 </a>
 
                                 <a id="update_commits_switcher" class="tooltip btn btn-primary btn-more-option" data-toggle="dropdown" aria-pressed="false" role="button" title="${_('more update options')}">
                                     <i class="icon-down"></i>
                                 </a>
 
                                 <div class="btn-action-switcher-container right-align" id="update-commits-switcher">
                                     <ul class="btn-action-switcher" role="menu" style="min-width: 300px;">
                                         <li>
                                             <a href="#forceUpdate" onclick="updateController.forceUpdateCommits(this); return false">
                                                 ${_('Force update commits')}
                                             </a>
                                             <div class="action-help-block">
                                                ${_('Update commits and force refresh this pull request.')}
                                             </div>
                                         </li>
                                     </ul>
                                 </div>
                             </div>
 
                         % else:
                           <a class="tooltip btn disabled pull-right" disabled="disabled" title="${_('Update is disabled for current view')}">${_('Update commits')}</a>
                         % endif
 
                     </div>
                   % endif
               </div>
 
               % if not c.missing_commits:
                 % if c.compare_mode:
                     % if c.at_version:
                     <h4>
                         ${_('Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled').format(ver_from=c.from_version_pos, ver_to=c.at_version_pos if c.at_version_pos else 'latest')}:
                     </h4>
 
                     <div class="subtitle-compare">
                         ${_('commits added: {}, removed: {}').format(len(c.commit_changes_summary.added), len(c.commit_changes_summary.removed))}
                     </div>
 
                     <div class="container">
                         <table class="rctable compare_view_commits">
                             <tr>
                                 <th></th>
                                 <th>${_('Time')}</th>
                                 <th>${_('Author')}</th>
                                 <th>${_('Commit')}</th>
                                 <th></th>
                                 <th>${_('Description')}</th>
                             </tr>
 
                             % for c_type, commit in c.commit_changes:
                               % if c_type in ['a', 'r']:
                                 <%
                                     if c_type == 'a':
                                         cc_title = _('Commit added in displayed changes')
                                     elif c_type == 'r':
                                         cc_title = _('Commit removed in displayed changes')
                                     else:
                                         cc_title = ''
                                 %>
                                 <tr id="row-${commit.raw_id}" commit_id="${commit.raw_id}" class="compare_select">
                                 <td>
                                     <div class="commit-change-indicator color-${c_type}-border">
                                       <div class="commit-change-content color-${c_type} tooltip" title="${h.tooltip(cc_title)}">
                                         ${c_type.upper()}
                                       </div>
                                     </div>
                                 </td>
                                 <td class="td-time">
                                     ${h.age_component(commit.date)}
                                 </td>
                                 <td class="td-user">
                                     ${base.gravatar_with_user(commit.author, 16, tooltip=True)}
                                 </td>
                                 <td class="td-hash">
                                     <code>
                                         <a href="${h.route_path('repo_commit', repo_name=c.target_repo.repo_name, commit_id=commit.raw_id)}">
                                             r${commit.idx}:${h.short_id(commit.raw_id)}
                                         </a>
                                         ${h.hidden('revisions', commit.raw_id)}
                                     </code>
                                 </td>
                                 <td class="td-message expand_commit" data-commit-id="${commit.raw_id}" title="${_( 'Expand commit message')}" onclick="commitsController.expandCommit(this); return false">
                                     <i class="icon-expand-linked"></i>
                                 </td>
                                 <td class="mid td-description">
                                     <div class="log-container truncate-wrap">
                                         <div class="message truncate" id="c-${commit.raw_id}" data-message-raw="${commit.message}">${h.urlify_commit_message(commit.message, c.repo_name)}</div>
                                     </div>
                                 </td>
                             </tr>
                               % endif
                             % endfor
                         </table>
                     </div>
 
                     % endif
 
                 % else:
                     <%include file="/compare/compare_commits.mako" />
                 % endif
 
                 <div class="cs_files">
                     <%namespace name="cbdiffs" file="/codeblocks/diffs.mako"/>
                     % if c.at_version:
                         <% c.inline_cnt = len(c.inline_versions[c.at_version_num]['display']) %>
                         <% c.comments = c.comment_versions[c.at_version_num]['display'] %>
                     % else:
                         <% c.inline_cnt = len(c.inline_versions[c.at_version_num]['until']) %>
                         <% c.comments = c.comment_versions[c.at_version_num]['until'] %>
                     % endif
 
                     <%
                         pr_menu_data = {
                             'outdated_comm_count_ver': outdated_comm_count_ver,
                             'pull_request': c.pull_request
                         }
                     %>
 
                     ${cbdiffs.render_diffset_menu(c.diffset, range_diff_on=c.range_diff_on, pull_request_menu=pr_menu_data)}
 
                     % if c.range_diff_on:
                         % for commit in c.commit_ranges:
                             ${cbdiffs.render_diffset(
                               c.changes[commit.raw_id],
                               commit=commit, use_comments=True,
                               collapse_when_files_over=5,
                               disable_new_comments=True,
                               deleted_files_comments=c.deleted_files_comments,
                               inline_comments=c.inline_comments,
                               pull_request_menu=pr_menu_data, show_todos=False)}
                         % endfor
                     % else:
                         ${cbdiffs.render_diffset(
                           c.diffset, use_comments=True,
                           collapse_when_files_over=30,
                           disable_new_comments=not c.allowed_to_comment,
                           deleted_files_comments=c.deleted_files_comments,
                           inline_comments=c.inline_comments,
                           pull_request_menu=pr_menu_data, show_todos=False)}
                     % endif
 
                 </div>
               % else:
                   ## skipping commits we need to clear the view for missing commits
                   <div style="clear:both;"></div>
               % endif
 
           </div>
       </div>
 
       ## template for inline comment form
       <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/>
 
       ## comments heading with count
       <div class="comments-heading">
         <i class="icon-comment"></i>
         ${_('Comments')} ${len(c.comments)}
       </div>
 
       ## render general comments
       <div id="comment-tr-show">
         % if general_outdated_comm_count_ver:
         <div class="info-box">
             % if general_outdated_comm_count_ver == 1:
                 ${_('there is {num} general comment from older versions').format(num=general_outdated_comm_count_ver)},
                 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show it')}</a>
             % else:
                 ${_('there are {num} general comments from older versions').format(num=general_outdated_comm_count_ver)},
                 <a href="#show-hidden-comments" onclick="$('.comment-general.comment-outdated').show(); $(this).parent().hide(); return false;">${_('show them')}</a>
             % endif
         </div>
         % endif
       </div>
 
       ${comment.generate_comments(c.comments, include_pull_request=True, is_pull_request=True)}
 
       % if not c.pull_request.is_closed():
         ## main comment form and it status
         ${comment.comments(h.route_path('pullrequest_comment_create', repo_name=c.repo_name,
                                         pull_request_id=c.pull_request.pull_request_id),
                            c.pull_request_review_status,
                            is_pull_request=True, change_status=c.allowed_to_change_status)}
 
         ## merge status, and merge action
         <div class="pull-request-merge">
             <%include file="/pullrequests/pullrequest_merge_checks.mako"/>
         </div>
 
       %endif
 
    % endif
   </div>
 
   <script type="text/javascript">
 
       versionController = new VersionController();
       versionController.init();
 
       reviewersController = new ReviewersController();
       commitsController = new CommitsController();
 
       updateController = new UpdatePrController();
 
       $(function () {
 
           // custom code mirror
           var codeMirrorInstance = $('#pr-description-input').get(0).MarkupForm.cm;
 
           var PRDetails = {
               editButton: $('#open_edit_pullrequest'),
               closeButton: $('#close_edit_pullrequest'),
               deleteButton: $('#delete_pullrequest'),
               viewFields: $('#pr-desc, #pr-title'),
               editFields: $('#pr-desc-edit, #pr-title-edit, .pr-save'),
 
               init: function () {
                   var that = this;
                   this.editButton.on('click', function (e) {
                       that.edit();
                   });
                   this.closeButton.on('click', function (e) {
                       that.view();
                   });
               },
 
               edit: function (event) {
                   this.viewFields.hide();
                   this.editButton.hide();
                   this.deleteButton.hide();
                   this.closeButton.show();
                   this.editFields.show();
                   codeMirrorInstance.refresh();
               },
 
               view: function (event) {
                   this.editButton.show();
                   this.deleteButton.show();
                   this.editFields.hide();
                   this.closeButton.hide();
                   this.viewFields.show();
               }
           };
 
           var ReviewersPanel = {
               editButton: $('#open_edit_reviewers'),
               closeButton: $('#close_edit_reviewers'),
               addButton: $('#add_reviewer'),
               removeButtons: $('.reviewer_member_remove,.reviewer_member_mandatory_remove'),
 
               init: function () {
                   var self = this;
                   this.editButton.on('click', function (e) {
                       self.edit();
                   });
                   this.closeButton.on('click', function (e) {
                       self.close();
                   });
               },
 
               edit: function (event) {
                   this.editButton.hide();
                   this.closeButton.show();
                   this.addButton.show();
                   this.removeButtons.css('visibility', 'visible');
                   // review rules
                   reviewersController.loadReviewRules(
                       ${c.pull_request.reviewer_data_json | n});
               },
 
               close: function (event) {
                   this.editButton.show();
                   this.closeButton.hide();
                   this.addButton.hide();
                   this.removeButtons.css('visibility', 'hidden');
                   // hide review rules
                   reviewersController.hideReviewRules()
               }
           };
 
           PRDetails.init();
           ReviewersPanel.init();
 
           showOutdated = function (self) {
               $('.comment-inline.comment-outdated').show();
               $('.filediff-outdated').show();
               $('.showOutdatedComments').hide();
               $('.hideOutdatedComments').show();
           };
 
           hideOutdated = function (self) {
               $('.comment-inline.comment-outdated').hide();
               $('.filediff-outdated').hide();
               $('.hideOutdatedComments').hide();
               $('.showOutdatedComments').show();
           };
 
           refreshMergeChecks = function () {
               var loadUrl = "${request.current_route_path(_query=dict(merge_checks=1))}";
               $('.pull-request-merge').css('opacity', 0.3);
               $('.action-buttons-extra').css('opacity', 0.3);
 
               $('.pull-request-merge').load(
                       loadUrl, function () {
                           $('.pull-request-merge').css('opacity', 1);
 
                           $('.action-buttons-extra').css('opacity', 1);
                       }
               );
           };
 
           closePullRequest = function (status) {
               if (!confirm(_gettext('Are you sure to close this pull request without merging?'))) {
                   return false;
               }
               // inject closing flag
               $('.action-buttons-extra').append('<input type="hidden" class="close-pr-input" id="close_pull_request" value="1">');
               $(generalCommentForm.statusChange).select2("val", status).trigger('change');
               $(generalCommentForm.submitForm).submit();
           };
 
           $('#show-outdated-comments').on('click', function (e) {
               var button = $(this);
               var outdated = $('.comment-outdated');
 
               if (button.html() === "(Show)") {
                   button.html("(Hide)");
                   outdated.show();
               } else {
                   button.html("(Show)");
                   outdated.hide();
               }
           });
 
           $('.show-inline-comments').on('change', function (e) {
               var show = 'none';
               var target = e.currentTarget;
               if (target.checked) {
                   show = ''
               }
               var boxid = $(target).attr('id_for');
               var comments = $('#{0} .inline-comments'.format(boxid));
               var fn_display = function (idx) {
                   $(this).css('display', show);
               };
               $(comments).each(fn_display);
               var btns = $('#{0} .inline-comments-button'.format(boxid));
               $(btns).each(fn_display);
           });
 
           $('#merge_pull_request_form').submit(function () {
               if (!$('#merge_pull_request').attr('disabled')) {
                   $('#merge_pull_request').attr('disabled', 'disabled');
               }
               return true;
           });
 
           $('#edit_pull_request').on('click', function (e) {
               var title = $('#pr-title-input').val();
               var description = codeMirrorInstance.getValue();
               var renderer = $('#pr-renderer-input').val();
               editPullRequest(
                       "${c.repo_name}", "${c.pull_request.pull_request_id}",
                       title, description, renderer);
           });
 
           $('#update_pull_request').on('click', function (e) {
               $(this).attr('disabled', 'disabled');
               $(this).addClass('disabled');
               $(this).html(_gettext('Saving...'));
               reviewersController.updateReviewers(
                       "${c.repo_name}", "${c.pull_request.pull_request_id}");
           });
 
 
           // fixing issue with caches on firefox
           $('#update_commits').removeAttr("disabled");
 
           $('.show-inline-comments').on('click', function (e) {
               var boxid = $(this).attr('data-comment-id');
               var button = $(this);
 
               if (button.hasClass("comments-visible")) {
                   $('#{0} .inline-comments'.format(boxid)).each(function (index) {
                       $(this).hide();
                   });
                   button.removeClass("comments-visible");
               } else {
                   $('#{0} .inline-comments'.format(boxid)).each(function (index) {
                       $(this).show();
                   });
                   button.addClass("comments-visible");
               }
           });
 
           // register submit callback on commentForm form to track TODOs
           window.commentFormGlobalSubmitSuccessCallback = function () {
               refreshMergeChecks();
           };
 
           ReviewerAutoComplete('#user');
 
       })
 
   </script>
 
 </div>
 
 </%def>

rhodecode/tests/lib/test_libs.py

@@ -1,746 +1,739 b''
 # -*- coding: utf-8 -*-
 
 # Copyright (C) 2010-2020 RhodeCode GmbH
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License, version 3
 # (only), as published by the Free Software Foundation.
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 # This program is dual-licensed. If you wish to learn more about the
 # RhodeCode Enterprise Edition, including its added features, Support services,
 # and proprietary license terms, please see https://rhodecode.com/licenses/
 
 
 """
 Package for testing various lib/helper functions in rhodecode
 """
 
 import datetime
 import string
 import mock
 import pytest
 
 from rhodecode.tests import no_newline_id_generator
 from rhodecode.tests.utils import run_test_concurrently
 
 from rhodecode.lib import rc_cache
 from rhodecode.lib.helpers import InitialsGravatar
 from rhodecode.lib.utils2 import AttributeDict
 
 from rhodecode.model.db import Repository, CacheKey
 
 
-def _urls_for_proto(proto):
-    return [
-        ('%s://127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
-         '%s://127.0.0.1' % proto),
-        ('%s://marcink@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
-         '%s://127.0.0.1' % proto),
-        ('%s://marcink:pass@127.0.0.1' % proto, ['%s://' % proto, '127.0.0.1'],
-         '%s://127.0.0.1' % proto),
-        ('%s://127.0.0.1:8080' % proto, ['%s://' % proto, '127.0.0.1', '8080'],
-         '%s://127.0.0.1:8080' % proto),
-        ('%s://domain.org' % proto, ['%s://' % proto, 'domain.org'],
-         '%s://domain.org' % proto),
-        ('%s://user:[e-mail]:8080' % proto,
-         ['%s://' % proto, 'domain.org', '8080'],
-         '%s://domain.org:8080' % proto),
+TEST_URLS = [
+        ('127.0.0.1', '127.0.0.1'),
+        ('marcink@127.0.0.1', '127.0.0.1'),
+        ('marcink:pass@127.0.0.1', '127.0.0.1'),
+        ('[e-mail]:pass@127.0.0.1', '127.0.0.1'),
+
+        ('127.0.0.1:8080', '127.0.0.1:8080'),
+        ('marcink@127.0.0.1:8080', '127.0.0.1:8080'),
+        ('marcink:pass@127.0.0.1:8080', '127.0.0.1:8080'),
+        ('[e-mail]:pass@127.0.0.1:8080', '127.0.0.1:8080'),
+
+        ('domain.org', 'domain.org'),
+        ('user:[e-mail]:8080', 'domain.org:8080'),
+        ('[e-mail]:[e-mail]:8080', 'domain.org:8080'),
     ]
 
-TEST_URLS = _urls_for_proto('http') + _urls_for_proto('https')
 
-
[e-mail]("test_url, expected, expected_creds", TEST_URLS)
-def test_uri_filter(test_url, expected, expected_creds):
-    from rhodecode.lib.utils2 import uri_filter
-    assert uri_filter(test_url) == expected
-
-
[e-mail]("test_url, expected, expected_creds", TEST_URLS)
-def test_credentials_filter(test_url, expected, expected_creds):
[e-mail]("protocol", ['http://', 'https://'])
[e-mail]("test_url, expected", TEST_URLS)
+def test_credentials_filter(protocol, test_url, expected):
     from rhodecode.lib.utils2 import credentials_filter
-    assert credentials_filter(test_url) == expected_creds
+    test_url = protocol + test_url
+    assert credentials_filter(test_url) == protocol + expected
 
 
 @pytest.mark.parametrize("str_bool, expected", [
     ('t', True),
     ('true', True),
     ('y', True),
     ('yes', True),
     ('on', True),
     ('1', True),
     ('Y', True),
     ('yeS', True),
     ('Y', True),
     ('TRUE', True),
     ('T', True),
     ('False', False),
     ('F', False),
     ('FALSE', False),
     ('0', False),
     ('-1', False),
     ('', False)
 ])
 def test_str2bool(str_bool, expected):
     from rhodecode.lib.utils2 import str2bool
     assert str2bool(str_bool) == expected
 
 
 @pytest.mark.parametrize("text, expected", reduce(lambda a1,a2:a1+a2, [
 [
 (pref+"", []),
 (pref+"Hi there @marcink", ['marcink']),
 (pref+"Hi there @marcink and @bob", ['bob', 'marcink']),
 (pref+"Hi there @marcink\n", ['marcink']),
 (pref+"Hi there @marcink and @bob\n", ['bob', 'marcink']),
 (pref+"Hi there [e-mail]", []),
 (pref+"Hi there @john.malcovic and @bob\n", ['bob', 'john.malcovic']),
 (pref+"This needs to be reviewed: (@marcink,@john)", ["john", "marcink"]),
 (pref+"This needs to be reviewed: (@marcink, @john)", ["john", "marcink"]),
 (pref+"This needs to be reviewed: [@marcink,@john]", ["john", "marcink"]),
 (pref+"This needs to be reviewed: (@marcink @john)", ["john", "marcink"]),
 (pref+"@john @mary, please review", ["john", "mary"]),
 (pref+"@john,@mary, please review", ["john", "mary"]),
 (pref+"Hej @123, @22john,@mary, please review", ['123', '22john', 'mary']),
 (pref+"@first hi there @marcink here's my email [e-mail] "
  "@lukaszb check @one_more22 it pls @ ttwelve @D[] @one@two@three ", ['first', 'lukaszb', 'marcink', 'one', 'one_more22']),
 (pref+"@MARCIN    @maRCiN @2one_more22 @john please see this http://org.pl", ['2one_more22', 'john', 'MARCIN', 'maRCiN']),
 (pref+"@marian.user just do it @marco-polo and next extract @marco_polo", ['marco-polo', 'marco_polo', 'marian.user']),
 (pref+"user.dot  hej ! not-needed [e-mail]", []),
 (pref+"\n@marcin", ['marcin']),
 ]
 for pref in ['', '\n', 'hi !', '\t', '\n\n']]), ids=no_newline_id_generator)
 def test_mention_extractor(text, expected):
     from rhodecode.lib.utils2 import extract_mentioned_users
     got = extract_mentioned_users(text)
     assert sorted(got, key=lambda x: x.lower()) == got
     assert set(expected) == set(got)
 
 @pytest.mark.parametrize("age_args, expected, kw", [
     ({}, u'just now', {}),
     ({'seconds': -1}, u'1 second ago', {}),
     ({'seconds': -60 * 2}, u'2 minutes ago', {}),
     ({'hours': -1}, u'1 hour ago', {}),
     ({'hours': -24}, u'1 day ago', {}),
     ({'hours': -24 * 5}, u'5 days ago', {}),
     ({'months': -1}, u'1 month ago', {}),
     ({'months': -1, 'days': -2}, u'1 month and 2 days ago', {}),
     ({'years': -1, 'months': -1}, u'1 year and 1 month ago', {}),
     ({}, u'just now', {'short_format': True}),
     ({'seconds': -1}, u'1sec ago', {'short_format': True}),
     ({'seconds': -60 * 2}, u'2min ago', {'short_format': True}),
     ({'hours': -1}, u'1h ago', {'short_format': True}),
     ({'hours': -24}, u'1d ago', {'short_format': True}),
     ({'hours': -24 * 5}, u'5d ago', {'short_format': True}),
     ({'months': -1}, u'1m ago', {'short_format': True}),
     ({'months': -1, 'days': -2}, u'1m, 2d ago', {'short_format': True}),
     ({'years': -1, 'months': -1}, u'1y, 1m ago', {'short_format': True}),
 ])
 def test_age(age_args, expected, kw, baseapp):
     from rhodecode.lib.utils2 import age
     from dateutil import relativedelta
     n = datetime.datetime(year=2012, month=5, day=17)
     delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
 
     def translate(elem):
         return elem.interpolate()
 
     assert translate(age(n + delt(**age_args), now=n, **kw)) == expected
 
 
 @pytest.mark.parametrize("age_args, expected, kw", [
     ({}, u'just now', {}),
     ({'seconds': 1}, u'in 1 second', {}),
     ({'seconds': 60 * 2}, u'in 2 minutes', {}),
     ({'hours': 1}, u'in 1 hour', {}),
     ({'hours': 24}, u'in 1 day', {}),
     ({'hours': 24 * 5}, u'in 5 days', {}),
     ({'months': 1}, u'in 1 month', {}),
     ({'months': 1, 'days': 1}, u'in 1 month and 1 day', {}),
     ({'years': 1, 'months': 1}, u'in 1 year and 1 month', {}),
     ({}, u'just now', {'short_format': True}),
     ({'seconds': 1}, u'in 1sec', {'short_format': True}),
     ({'seconds': 60 * 2}, u'in 2min', {'short_format': True}),
     ({'hours': 1}, u'in 1h', {'short_format': True}),
     ({'hours': 24}, u'in 1d', {'short_format': True}),
     ({'hours': 24 * 5}, u'in 5d', {'short_format': True}),
     ({'months': 1}, u'in 1m', {'short_format': True}),
     ({'months': 1, 'days': 1}, u'in 1m, 1d', {'short_format': True}),
     ({'years': 1, 'months': 1}, u'in 1y, 1m', {'short_format': True}),
 ])
 def test_age_in_future(age_args, expected, kw, baseapp):
     from rhodecode.lib.utils2 import age
     from dateutil import relativedelta
     n = datetime.datetime(year=2012, month=5, day=17)
     delt = lambda *args, **kwargs: relativedelta.relativedelta(*args, **kwargs)
 
     def translate(elem):
         return elem.interpolate()
 
     assert translate(age(n + delt(**age_args), now=n, **kw)) == expected
 
 
 @pytest.mark.parametrize("sample, expected_tags", [
     # entry
     ((
              ""
      ),
      [
 
      ]),
     # entry
     ((
         "hello world [stale]"
      ),
      [
          ('state', '[stale]'),
      ]),
     # entry
     ((
          "hello world [v2.0.0] [v1.0.0]"
      ),
      [
          ('generic', '[v2.0.0]'),
          ('generic', '[v1.0.0]'),
      ]),
     # entry
     ((
              "he[ll]o wo[rl]d"
      ),
      [
          ('label', '[ll]'),
          ('label', '[rl]'),
      ]),
     # entry
     ((
         "hello world [stale]\n[featured]\n[stale] [dead] [dev]"
      ),
      [
          ('state', '[stale]'),
          ('state', '[featured]'),
          ('state', '[stale]'),
          ('state', '[dead]'),
          ('state', '[dev]'),
      ]),
     # entry
     ((
         "hello world \n\n [stale] \n [url =&gt; [name](http://rc.com)]"
      ),
      [
         ('state', '[stale]'),
         ('url', '[url =&gt; [name](http://rc.com)]'),
      ]),
     # entry
     ((
             "[url =&gt; [linkNameJS](javascript:alert(document.domain))]\n"
             "[url =&gt; [linkNameHTTP](http://rhodecode.com)]\n"
             "[url =&gt; [linkNameHTTPS](https://rhodecode.com)]\n"
             "[url =&gt; [linkNamePath](/repo_group)]\n"
      ),
      [
          ('generic', '[linkNameJS]'),
          ('url', '[url =&gt; [linkNameHTTP](http://rhodecode.com)]'),
          ('url', '[url =&gt; [linkNameHTTPS](https://rhodecode.com)]'),
          ('url', '[url =&gt; [linkNamePath](/repo_group)]'),
      ]),
     # entry
     ((
         "hello pta[tag] gog [[]] [[] sda ero[or]d [me =&gt;>< sa]"
         "[requires] [stale] [see<>=&gt;] [see =&gt; http://url.com]"
         "[requires =&gt; url] [lang =&gt; python] [just a tag] "
         "<html_tag first='abc' attr=\"my.url?attr=&another=\"></html_tag>"
         "[,d] [ =&gt; ULR ] [obsolete] [desc]]"
     ),
      [
         ('label', '[desc]'),
         ('label', '[obsolete]'),
         ('label', '[or]'),
         ('label', '[requires]'),
         ('label', '[tag]'),
         ('state', '[stale]'),
         ('lang', '[lang =&gt; python]'),
         ('ref', '[requires =&gt; url]'),
         ('see', '[see =&gt; http://url.com]'),
 
      ]),
 
 ], ids=no_newline_id_generator)
 def test_metatag_extraction(sample, expected_tags):
     from rhodecode.lib.helpers import extract_metatags
     tags, value = extract_metatags(sample)
     assert sorted(tags) == sorted(expected_tags)
 
 
 @pytest.mark.parametrize("tag_data, expected_html", [
 
     (('state', '[stable]'), '<div class="metatag" tag="state stable">stable</div>'),
     (('state', '[stale]'), '<div class="metatag" tag="state stale">stale</div>'),
     (('state', '[featured]'), '<div class="metatag" tag="state featured">featured</div>'),
     (('state', '[dev]'), '<div class="metatag" tag="state dev">dev</div>'),
     (('state', '[dead]'), '<div class="metatag" tag="state dead">dead</div>'),
 
     (('label', '[personal]'), '<div class="metatag" tag="label">personal</div>'),
     (('generic', '[v2.0.0]'), '<div class="metatag" tag="generic">v2.0.0</div>'),
 
     (('lang', '[lang =&gt; JavaScript]'), '<div class="metatag" tag="lang">JavaScript</div>'),
     (('lang', '[lang =&gt; C++]'), '<div class="metatag" tag="lang">C++</div>'),
     (('lang', '[lang =&gt; C#]'), '<div class="metatag" tag="lang">C#</div>'),
     (('lang', '[lang =&gt; Delphi/Object]'), '<div class="metatag" tag="lang">Delphi/Object</div>'),
     (('lang', '[lang =&gt; Objective-C]'), '<div class="metatag" tag="lang">Objective-C</div>'),
     (('lang', '[lang =&gt; .NET]'), '<div class="metatag" tag="lang">.NET</div>'),
 
     (('license', '[license =&gt; BSD 3-clause]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/BSD 3-clause">BSD 3-clause</a></div>'),
     (('license', '[license =&gt; GPLv3]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/GPLv3">GPLv3</a></div>'),
     (('license', '[license =&gt; MIT]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/MIT">MIT</a></div>'),
     (('license', '[license =&gt; AGPLv3]'), '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/AGPLv3">AGPLv3</a></div>'),
 
     (('ref', '[requires =&gt; RepoName]'), '<div class="metatag" tag="ref requires">requires: <a href="/RepoName">RepoName</a></div>'),
     (('ref', '[recommends =&gt; GroupName]'), '<div class="metatag" tag="ref recommends">recommends: <a href="/GroupName">GroupName</a></div>'),
     (('ref', '[conflicts =&gt; SomeName]'), '<div class="metatag" tag="ref conflicts">conflicts: <a href="/SomeName">SomeName</a></div>'),
     (('ref', '[base =&gt; SomeName]'), '<div class="metatag" tag="ref base">base: <a href="/SomeName">SomeName</a></div>'),
 
     (('see', '[see =&gt; http://rhodecode.com]'), '<div class="metatag" tag="see">see: http://rhodecode.com </div>'),
 
     (('url', '[url =&gt; [linkName](https://rhodecode.com)]'), '<div class="metatag" tag="url"> <a href="https://rhodecode.com">linkName</a> </div>'),
     (('url', '[url =&gt; [example link](https://rhodecode.com)]'), '<div class="metatag" tag="url"> <a href="https://rhodecode.com">example link</a> </div>'),
     (('url', '[url =&gt; [v1.0.0](https://rhodecode.com)]'), '<div class="metatag" tag="url"> <a href="https://rhodecode.com">v1.0.0</a> </div>'),
 
 ])
 def test_metatags_stylize(tag_data, expected_html):
     from rhodecode.lib.helpers import style_metatag
     tag_type,value = tag_data
     assert style_metatag(tag_type, value) == expected_html
 
 
 @pytest.mark.parametrize("tmpl_url, email, expected", [
     ('http://test.com/{email}', '[e-mail]', 'http://test.com/[e-mail]'),
 
     ('http://test.com/{md5email}', '[e-mail]', 'http://test.com/3cb7232fcc48743000cb86d0d5022bd9'),
     ('http://test.com/{md5email}', 'testąć@foo.com', 'http://test.com/978debb907a3c55cd741872ab293ef30'),
 
     ('http://testX.com/{md5email}?s={size}', '[e-mail]', 'http://testX.com/3cb7232fcc48743000cb86d0d5022bd9?s=24'),
     ('http://testX.com/{md5email}?s={size}', 'testąć@foo.com', 'http://testX.com/978debb907a3c55cd741872ab293ef30?s=24'),
 
     ('{scheme}://{netloc}/{md5email}/{size}', '[e-mail]', 'https://server.com/3cb7232fcc48743000cb86d0d5022bd9/24'),
     ('{scheme}://{netloc}/{md5email}/{size}', 'testąć@foo.com', 'https://server.com/978debb907a3c55cd741872ab293ef30/24'),
 
     ('http://test.com/{email}', 'testąć@foo.com', 'http://test.com/testąć@foo.com'),
     ('http://test.com/{email}?size={size}', '[e-mail]', 'http://test.com/[e-mail]?size=24'),
     ('http://test.com/{email}?size={size}', 'testąć@foo.com', 'http://test.com/testąć@foo.com?size=24'),
 ])
 def test_gravatar_url_builder(tmpl_url, email, expected, request_stub):
     from rhodecode.lib.helpers import gravatar_url
 
     def fake_tmpl_context(_url):
         _c = AttributeDict()
         _c.visual = AttributeDict()
         _c.visual.use_gravatar = True
         _c.visual.gravatar_url = _url
         return _c
 
     # mock pyramid.threadlocals
     def fake_get_current_request():
         request_stub.scheme = 'https'
         request_stub.host = 'server.com'
 
         request_stub._call_context = fake_tmpl_context(tmpl_url)
         return request_stub
 
     with mock.patch('rhodecode.lib.helpers.get_current_request',
                     fake_get_current_request):
 
         grav = gravatar_url(email_address=email, size=24)
         assert grav == expected
 
 
 @pytest.mark.parametrize(
     "email, first_name, last_name, expected_initials, expected_color", [
 
         ('[e-mail]', '', '', 'TR', '#8a994d'),
         ('[e-mail]', '', '', 'MK', '#6559b3'),
         # special cases of email
         ('[e-mail]', '', '', 'JD', '#526600'),
         ('[e-mail]', '', '', 'GR', '#990052'),
         ('[e-mail]', 'Guido', 'Van Rossum', 'GR', '#990052'),
 
         ('[e-mail]', '', '', 'RR', '#46598c'),
         ('[e-mail]', 'Nguyễn Thái', 'Tgọc Duy', 'ND', '#665200'),
 
         ('[e-mail]', '', '', 'JF', '#73006b'),
         ('[e-mail]', 'Marcin', 'Kuzminski', 'MK', '#104036'),
         # partials
         ('[e-mail]', 'Marcin', '', 'MR', '#104036'),  # fn+email
         ('[e-mail]', '', 'Kuzminski', 'AK', '#104036'),  # em+ln
         # non-ascii
         ('[e-mail]', 'Marcin', 'Śuzminski', 'MS', '#104036'),
         ('marcin.ś[e-mail]', '', '', 'MS', '#73000f'),
 
         # special cases, LDAP can provide those...
         ('admin@', 'Marcin', 'Śuzminski', 'MS', '#aa00ff'),
         ('marcin.śuzminski', '', '', 'MS', '#402020'),
         ('null', '', '', 'NL', '#8c4646'),
         ('[e-mail]', 'some', '', 'SA', '#664e33')
 ])
 def test_initials_gravatar_pick_of_initials_and_color_algo(
         email, first_name, last_name, expected_initials, expected_color):
     instance = InitialsGravatar(email, first_name, last_name)
     assert instance.get_initials() == expected_initials
     assert instance.str2color(email) == expected_color
 
 
 def test_initials_gravatar_mapping_algo():
     pos = set()
     instance = InitialsGravatar('', '', '')
     iterations = 0
 
     variations = []
     for letter1 in string.ascii_letters:
         for letter2 in string.ascii_letters[::-1][:10]:
             for letter3 in string.ascii_letters[:10]:
                 variations.append(
                     '[e-mail]' % (letter1+letter2+letter3))
 
     max_variations = 4096
     for email in variations[:max_variations]:
         iterations += 1
         pos.add(
             instance.pick_color_bank_index(email,
                                            instance.get_color_bank()))
 
     # we assume that we have match all 256 possible positions,
     # in reasonable amount of different email addresses
     assert len(pos) == 256
     assert iterations == max_variations
 
 
 @pytest.mark.parametrize("tmpl, repo_name, overrides, prefix, expected", [
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '', 'http://vps1:8000/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {}, '/rc', 'http://vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc', 'http://user@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc', 'http://marcink@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'user'}, '/rc/', 'http://user@vps1:8000/rc/group/repo1'),
     (Repository.DEFAULT_CLONE_URI, 'group/repo1', {'user': 'marcink'}, '/rc/', 'http://marcink@vps1:8000/rc/group/repo1'),
     ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {}, '', 'http://vps1:8000/_23'),
     ('{scheme}://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'),
     ('http://{user}@{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://marcink@vps1:8000/_23'),
     ('http://{netloc}/_{repoid}', 'group/repo1', {'user': 'marcink'}, '', 'http://vps1:8000/_23'),
     ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://[e-mail]/group/repo1'),
     ('https://{user}@proxy1.server.com/{repo}', 'group/repo1', {}, '', 'https://proxy1.server.com/group/repo1'),
     ('https://proxy1.server.com/{user}/{repo}', 'group/repo1', {'user': 'marcink'}, '', 'https://proxy1.server.com/marcink/group/repo1'),
 ])
 def test_clone_url_generator(tmpl, repo_name, overrides, prefix, expected):
     from rhodecode.lib.utils2 import get_clone_url
 
     class RequestStub(object):
         def request_url(self, name):
             return 'http://vps1:8000' + prefix
 
         def route_url(self, name):
             return self.request_url(name)
 
     clone_url = get_clone_url(
         request=RequestStub(),
         uri_tmpl=tmpl,
         repo_name=repo_name, repo_id=23, repo_type='hg', **overrides)
     assert clone_url == expected
 
 
 def test_clone_url_svn_ssh_generator():
     from rhodecode.lib.utils2 import get_clone_url
 
     class RequestStub(object):
         def request_url(self, name):
             return 'http://vps1:8000'
 
         def route_url(self, name):
             return self.request_url(name)
 
     clone_url = get_clone_url(
         request=RequestStub(),
         uri_tmpl=Repository.DEFAULT_CLONE_URI_SSH,
         repo_name='svn-test', repo_id=23, repo_type='svn', **{'sys_user': 'rcdev'})
     assert clone_url == 'svn+ssh://rcdev@vps1/svn-test'
 
 
 idx = 0
 
 
 def _quick_url(text, tmpl="""<a class="tooltip-hovercard revision-link" href="%s" data-hovercard-alt="Commit: %s" data-hovercard-url="/some-url">%s</a>""", url_=None, commits=''):
     """
     Changes `some text url[foo]` => `some text <a href="/">foo</a>
 
     :param text:
     """
     import re
     # quickly change expected url[] into a link
     url_pat = re.compile(r'(?:url\[)(.+?)(?:\])')
     commits = commits or []
 
     global idx
     idx = 0
 
     def url_func(match_obj):
         global idx
         _url = match_obj.groups()[0]
         if commits:
             commit = commits[idx]
             idx += 1
             return tmpl % (url_ or '/some-url', _url, commit)
         else:
             return tmpl % (url_ or '/some-url', _url)
 
     return url_pat.sub(url_func, text)
 
 
 @pytest.mark.parametrize("sample, expected, commits", [
     (
             "",
             "",
             [""]
     ),
     (
             "git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
             "git-svn-id: https://svn.apache.org/repos/asf/libcloud/trunk@1441655 13f79535-47bb-0310-9956-ffa450edef68",
             [""]
     ),
     (
             "from rev 000000000000",
             "from rev url[000000000000]",
             ["000000000000"]
     ),
 
     (
             "from rev 000000000000123123 also rev 000000000000",
             "from rev url[000000000000123123] also rev url[000000000000]",
             ["000000000000123123", "000000000000"]
     ),
     (
             "this should-000 00",
             "this should-000 00",
             [""]
     ),
     (
             "longtextffffffffff rev 123123123123",
             "longtextffffffffff rev url[123123123123]",
             ["123123123123"]
     ),
     (
             "rev ffffffffffffffffffffffffffffffffffffffffffffffffff",
             "rev ffffffffffffffffffffffffffffffffffffffffffffffffff",
             ["ffffffffffffffffffffffffffffffffffffffffffffffffff"]
     ),
     (
             "ffffffffffff some text traalaa",
             "url[ffffffffffff] some text traalaa",
             ["ffffffffffff"]
     ),
     (
             """Multi line
             123123123123
             some text 000000000000
             sometimes !
             """,
             """Multi line
             url[123123123123]
             some text url[000000000000]
             sometimes !
             """,
             ["123123123123", "000000000000"]
     )
 ], ids=no_newline_id_generator)
 def test_urlify_commits(sample, expected, commits):
     def fake_url(self, *args, **kwargs):
         return '/some-url'
 
     expected = _quick_url(expected, commits=commits)
 
     with mock.patch('rhodecode.lib.helpers.route_url', fake_url):
         from rhodecode.lib.helpers import urlify_commits
         assert urlify_commits(sample, 'repo_name') == expected
 
 
 @pytest.mark.parametrize("sample, expected, url_", [
     ("",
      "",
      ""),
     ("https://svn.apache.org/repos",
      "url[https://svn.apache.org/repos]",
      "https://svn.apache.org/repos"),
     ("http://svn.apache.org/repos",
      "url[http://svn.apache.org/repos]",
      "http://svn.apache.org/repos"),
     ("from rev a also rev http://google.com",
      "from rev a also rev url[http://google.com]",
      "http://google.com"),
     ("""Multi line
      https://foo.bar.com
      some text lalala""",
      """Multi line
      url[https://foo.bar.com]
      some text lalala""",
      "https://foo.bar.com")
 ], ids=no_newline_id_generator)
 def test_urlify_test(sample, expected, url_):
     from rhodecode.lib.helpers import urlify_text
     expected = _quick_url(expected, tmpl="""<a href="%s">%s</a>""", url_=url_)
     assert urlify_text(sample) == expected
 
 
 @pytest.mark.parametrize("test, expected", [
   ("", None),
   ("/_2", '2'),
   ("_2", '2'),
   ("/_2/", '2'),
   ("_2/", '2'),
 
   ("/_21", '21'),
   ("_21", '21'),
   ("/_21/", '21'),
   ("_21/", '21'),
 
   ("/_21/foobar", '21'),
   ("_21/121", '21'),
   ("/_21/_12", '21'),
   ("_21/rc/foo", '21'),
 
 ])
 def test_get_repo_by_id(test, expected):
     from rhodecode.model.repo import RepoModel
     _test = RepoModel()._extract_id_from_repo_name(test)
     assert _test == expected
 
 
 def test_invalidation_context(baseapp):
     repo_id = 9999
 
     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
         repo_id, CacheKey.CACHE_TYPE_FEED)
     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
         repo_id=repo_id)
     region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
     calls = [1, 2]
 
     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
     def _dummy_func(cache_key):
         val = calls.pop(0)
         return 'result:{}'.format(val)
 
     inv_context_manager = rc_cache.InvalidationContext(
         uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
 
     # 1st call, fresh caches
     with inv_context_manager as invalidation_context:
         should_invalidate = invalidation_context.should_invalidate()
         if should_invalidate:
             result = _dummy_func.refresh('some-key')
         else:
             result = _dummy_func('some-key')
 
         assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
         assert should_invalidate is True
 
         assert 'result:1' == result
         # should be cached so calling it twice will give the same result !
         result = _dummy_func('some-key')
         assert 'result:1' == result
 
     # 2nd call, we create a new context manager, this should be now key aware, and
     # return an active cache region
     with inv_context_manager as invalidation_context:
         should_invalidate = invalidation_context.should_invalidate()
         assert isinstance(invalidation_context, rc_cache.ActiveRegionCache)
         assert should_invalidate is False
 
     # Mark invalidation
     CacheKey.set_invalidate(invalidation_namespace)
 
     # 3nd call, fresh caches
     with inv_context_manager as invalidation_context:
         should_invalidate = invalidation_context.should_invalidate()
         if should_invalidate:
             result = _dummy_func.refresh('some-key')
         else:
             result = _dummy_func('some-key')
 
         assert isinstance(invalidation_context, rc_cache.FreshRegionCache)
         assert should_invalidate is True
 
         assert 'result:2' == result
 
         # cached again, same result
         result = _dummy_func('some-key')
         assert 'result:2' == result
 
 
 def test_invalidation_context_exception_in_compute(baseapp):
     repo_id = 888
 
     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
         repo_id, CacheKey.CACHE_TYPE_FEED)
     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
         repo_id=repo_id)
     region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
     @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
     def _dummy_func(cache_key):
         raise Exception('Error in cache func')
 
     with pytest.raises(Exception):
         inv_context_manager = rc_cache.InvalidationContext(
             uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
 
         # 1st call, fresh caches
         with inv_context_manager as invalidation_context:
             should_invalidate = invalidation_context.should_invalidate()
             if should_invalidate:
                 _dummy_func.refresh('some-key-2')
             else:
                 _dummy_func('some-key-2')
 
 
 @pytest.mark.parametrize('execution_number', range(5))
 def test_cache_invalidation_race_condition(execution_number, baseapp):
     import time
 
     repo_id = 777
 
     cache_namespace_uid = 'cache_repo_instance.{}_{}'.format(
         repo_id, CacheKey.CACHE_TYPE_FEED)
     invalidation_namespace = CacheKey.REPO_INVALIDATION_NAMESPACE.format(
         repo_id=repo_id)
     region = rc_cache.get_or_create_region('cache_repo_longterm', cache_namespace_uid)
 
     @run_test_concurrently(25)
     def test_create_and_delete_cache_keys():
         time.sleep(0.2)
 
         @region.conditional_cache_on_arguments(namespace=cache_namespace_uid)
         def _dummy_func(cache_key):
             val = 'async'
             return 'result:{}'.format(val)
 
         inv_context_manager = rc_cache.InvalidationContext(
             uid=cache_namespace_uid, invalidation_namespace=invalidation_namespace)
 
         # 1st call, fresh caches
         with inv_context_manager as invalidation_context:
             should_invalidate = invalidation_context.should_invalidate()
             if should_invalidate:
                 _dummy_func.refresh('some-key-3')
             else:
                 _dummy_func('some-key-3')
 
         # Mark invalidation
         CacheKey.set_invalidate(invalidation_namespace)
 
     test_create_and_delete_cache_keys()