##// END OF EJS Templates
release: merge back stable branch into default
marcink -
r4251:fc351abb merge default
parent child Browse files
Show More
@@ -0,0 +1,60 b''
1 |RCE| 4.18.1 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2020-01-20
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13
14
15 General
16 ^^^^^^^
17
18 - API: invalidate license cache on set_license_key call.
19 - API: add send_email flag for comments api to allow commenting without email notification.
20 - API: added pull requests versions into returned API data.
21 - Dashboard: fixed jumping of text in grid loading by new loading indicator.
22 - Installation: add few extra defaults that makes RhodeCode nicer out of the box.
23 - Pull Requests: small code cleanup to define other type of merge username.
24 RC_MERGE_USER_NAME_ATTR env variable defines what should be used from user as merge username.
25 - Gists: cleanup UI and make the gist access id use monospace according to the new UI.
26
27
28 Security
29 ^^^^^^^^
30
31 - Repository permission: properly flush permission caches on set private mode of repository.
32 Otherwise we get cached values still in place until it expires.
33 - Repository permission: add set/un-set of private repository from permissions page.
34 - Permissions: flush all user permissions in case of default user permission changes.
35
36
37 Performance
38 ^^^^^^^^^^^
39
40 - Caches: used more efficient way of fetching all users for permissions invalidation.
41 - Issue trackers: optimized performance of fetching issue tracker patterns.
42
43
44 Fixes
45 ^^^^^
46
47 - SSH: fixed SSH problems with EE edition.
48 - Branch permissions: remove emtpy tooltips on branch permission entries.
49 - Core: fixed cython compat inspect that caused some API calls to not work correctly in EE release.
50 - Audit logger: use copy of params we later modify to prevent from modification by the store
51 function of parameters that we only use for reading.
52 - Users: fixed wrong mention of readme in user description help block.
53 - Issue trackers: fixed wrong examples in patterns.
54 - Issue trackers: fixed missing option to get back to inherited settings.
55
56
57 Upgrade notes
58 ^^^^^^^^^^^^^
59
60 - Scheduled release addressing problems in 4.18.X releases.
@@ -0,0 +1,49 b''
1 |RCE| 4.18.2 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2020-01-28
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13
14
15 General
16 ^^^^^^^
17
18 - Permissions: add better help text about default permissions, and correlation with anonymous access enabled.
19 - Mentions: markdown renderer now wraps username in hovercard logic allowing checking the mentioned user.
20 - Documentation: added note about hard restart due to celery update.
21 - Maintenance: run rebuildfncache for Mercurial in maintenance command.
22
23
24 Security
25 ^^^^^^^^
26
27
28
29 Performance
30 ^^^^^^^^^^^
31
32 - Authentication: cache plugins for auth and their settings in the auth_registry for single request.
33 This heavily influences SVN performance on multiple-file commits.
34
35
36 Fixes
37 ^^^^^
38
39 - Descriptions: fixed rendering problem with certain meta-tags in repo description.
40 - Emails: fixed fonts rendering problems in Outlook.
41 - Emails: fixed bug in test email sending.
42 - Summary: fixed styling of readme indicator.
43 - Flash: fixed display problem with flash messages on error pages.
44
45
46 Upgrade notes
47 ^^^^^^^^^^^^^
48
49 - Scheduled release addressing problems in 4.18.X releases.
@@ -0,0 +1,64 b''
1 |RCE| 4.18.3 |RNS|
2 ------------------
3
4 Release Date
5 ^^^^^^^^^^^^
6
7 - 2020-03-24
8
9
10 New Features
11 ^^^^^^^^^^^^
12
13 - LDAP: added nested user groups sync which was planned in 4.18.X but didn't
14 make it to the release. New option for sync is available in the LDAP configuration.
15
16
17 General
18 ^^^^^^^
19
20 - API: added branch permissions functions.
21 - Pull requests: added creating indicator to let users know they should wait until PR is creating.
22 - Pull requests: allow super-admins to force change state of locked PRs.
23 - Users/User groups: in edit mode we now show the actual name of what we're editing.
24 - SSH: allow generation of legacy SSH keys for older systems and Windows users.
25 - File store: don't response with cookie data on file-store download response.
26 - File store: use our own logic for setting content-type. This solves a problem
27 when previously used resolver set different content-type+content-encoding which
28 is an incorrect behaviour.
29 - My Account: show info about password usage for external accounts e.g github/google etc
30 We now recommend using auth-tokens instead of actual passwords.
31 - Repositories: in description field we now show mention of metatags only if they
32 are enabled.
33
34
35 Security
36 ^^^^^^^^
37
38 - Remote sync: don't expose credentials in displayed URLs.
39 Remote links url had visible credentials displayed in the link.
40 This was used for web-view and not needed anymore.
41
42
43 Performance
44 ^^^^^^^^^^^
45
46 - Full text search: significantly improved GIT commit indexing performance by reducing
47 number of calls to the vcsserver.
48
49
50 Fixes
51 ^^^^^
52
53 - Mercurial: fixed cases of lookup of branches that are exactly 20 character long.
54 - SVN: allow legacy (pre SVN 1.7) extraction of post commit data.
55 - GIT: use non-unicode author extraction as it's returned as bytes from backend, and
56 we can get an unicode errors while there's some non-ascii characters.
57 - GIT: use safe configparser for git submodules to prevent from errors on submodules with % sign.
58 - System info: fixed UI problem with new version update info screen.
59
60
61 Upgrade notes
62 ^^^^^^^^^^^^^
63
64 - Scheduled release addressing problems in 4.18.X releases.
@@ -58,3 +58,7 b' ad5bd0c4bd322fdbd04bb825a3d027e08f7a3901'
58 58 037f5794b55a6236d68f6485a485372dde6566e0 v4.17.3
59 59 83bc3100cfd6094c1d04f475ddb299b7dc3d0b33 v4.17.4
60 60 e3de8c95baf8cc9109ca56aee8193a2cb6a54c8a v4.17.4
61 f37a3126570477543507f0bc9d245ce75546181a v4.18.0
62 71d8791463e87b64c1a18475de330ee600d37561 v4.18.1
63 4bd6b75dac1d25c64885d4d49385e5533f21c525 v4.18.2
64 12ed92fe57f2e9fc7b71dc0b65e26c2da5c7085f v4.18.3
@@ -57,5 +57,5 b' Each lines should represent a single nam'
57 57 Run this line from CLI to execute the code from the `repo_delete_task.py` file and
58 58 exit the ishell after the execution::
59 59
60 echo "%run repo_delete_task.py" | rccontrol ishell Enterprise-1
60 echo "%run repo_delete_task.py" | rccontrol ishell enterprise-1
61 61
@@ -124,6 +124,7 b' 1. To configure Apache, create and edit '
124 124 LogLevel info
125 125 # allows custom host names, prevents 400 errors on checkout
126 126 HttpProtocolOptions Unsafe
127 # Most likely this will be: /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
127 128 Include /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
128 129 </VirtualHost>
129 130
@@ -48,7 +48,7 b' uses, or if required it can be a differe'
48 48
49 49
50 50
51 To switch to reds-based user sessions uncomment the following section in
51 To switch to redis-based user sessions uncomment the following section in
52 52 your :file:`/home/{user}/.rccontrol/{instance-id}/rhodecode.ini` file.
53 53
54 54 .. code-block:: ini
@@ -33,6 +33,15 b' 2. Run the |RCC| installer and accept th'
33 33 Do you accept the RhodeCode Control license?
34 34 Press [Y] to accept license and [V] to view license text: y
35 35
36
37 .. important::
38
39 We recommend running RhodeCode as a non-root user, such as `rhodecode`;
40 this user must have a proper home directory.
41 Either log in as that user to install the software, or do it as root
42 with `sudo -i -u rhodecode ./RhodeCode-installer-linux-*`
43
44
36 45 3. Install a VCS Server, and configure it to start at boot.
37 46
38 47 .. code-block:: bash
@@ -193,6 +193,10 b' Fixes'
193 193 Upgrade notes
194 194 ^^^^^^^^^^^^^
195 195
196 - Major Celery Version upgrade. The 4.18.X release includes a major Celery version.
197 It's recommended to run `rccontrol self-stop && rccontrol self-init` after the
198 upgrade to ensure celery workers are restarted and updated.
199
196 200 - New Automation task. We've changed the logic for updating latest change inside repository group.
197 201 New logic includes scanning for changes in all nested objects. Since this is a heavy task
198 202 a new dedicated scheduler task has been created to update it automatically on a scheduled base.
@@ -218,6 +222,11 b' Upgrade notes'
218 222 Please review vcsserver.ini settings under:
219 223 `rc_cache.repo_object.backend = dogpile.cache.rc.redis_msgpack`
220 224
225 - Gunicorn configuration now moved to .ini files.
226 Upgrading to 4.18.X will overwrite the gunicorn_conf.py file. If there are any custom changes in that file
227 they will be lost. Recommended way to configure gunicorn is now via the .ini files. Please check `rhodecode.template.ini` file
228 for example gunicorn configuration.
229
221 230 - New memory monitoring for Gunicorn workers. Starting from 4.18 release a option was added
222 231 to limit the maximum amount of memory used by a worker.
223 232 Please review new settings in `[server:main]` section for memory management in both
@@ -9,6 +9,9 b' Release Notes'
9 9 .. toctree::
10 10 :maxdepth: 1
11 11
12 release-notes-4.18.3.rst
13 release-notes-4.18.2.rst
14 release-notes-4.18.1.rst
12 15 release-notes-4.18.0.rst
13 16 release-notes-4.17.4.rst
14 17 release-notes-4.17.3.rst
@@ -18,7 +18,6 b''
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 import inspect
22 21 import itertools
23 22 import logging
24 23 import sys
@@ -186,10 +185,12 b' def request_view(request):'
186 185 Main request handling method. It handles all logic to call a specific
187 186 exposed method
188 187 """
188 # cython compatible inspect
189 from rhodecode.config.patches import inspect_getargspec
190 inspect = inspect_getargspec()
189 191
190 192 # check if we can find this session using api_key, get_by_auth_token
191 193 # search not expired tokens only
192
193 194 try:
194 195 api_user = User.get_by_auth_token(request.rpc_api_key)
195 196
@@ -56,5 +56,6 b' class TestGetMethod(object):'
56 56 'request': '<RequiredType>',
57 57 'resolves_comment_id': '<Optional:None>',
58 58 'status': '<Optional:None>',
59 'userid': '<Optional:<OptionalAttr:apiuser>>'}]
59 'userid': '<Optional:<OptionalAttr:apiuser>>',
60 'send_email': '<Optional:True>'}]
60 61 assert_ok(id_, expected, given=response.body)
@@ -66,7 +66,7 b' class TestGrantUserGroupPermission(objec'
66 66 perm=perm)
67 67 response = api_call(self.app, params)
68 68
69 expected = 'permission `%s` does not exist' % (perm,)
69 expected = 'permission `%s` does not exist.' % (perm,)
70 70 assert_error(id_, expected, given=response.body)
71 71
72 72 @mock.patch.object(RepoModel, 'grant_user_group_permission', crash)
@@ -132,8 +132,7 b' class TestGrantUserGroupPermissionFromRe'
132 132 RepoGroupModel().revoke_user_group_permission(
133 133 repo_group.group_id, user_group.users_group_id)
134 134 else:
135 expected = 'repository group `%s` does not exist' % (
136 repo_group.name,)
135 expected = 'repository group `%s` does not exist' % (repo_group.name,)
137 136 assert_error(id_, expected, given=response.body)
138 137
139 138 def test_api_grant_user_group_permission_to_repo_group_wrong_permission(
@@ -149,7 +148,7 b' class TestGrantUserGroupPermissionFromRe'
149 148 perm=perm)
150 149 response = api_call(self.app, params)
151 150
152 expected = 'permission `%s` does not exist' % (perm,)
151 expected = 'permission `%s` does not exist. Permission should start with prefix: `group.`' % (perm,)
153 152 assert_error(id_, expected, given=response.body)
154 153
155 154 @mock.patch.object(RepoGroupModel, 'grant_user_group_permission', crash)
@@ -65,7 +65,7 b' class TestGrantUserPermission(object):'
65 65 perm=perm)
66 66 response = api_call(self.app, params)
67 67
68 expected = 'permission `%s` does not exist' % (perm,)
68 expected = 'permission `%s` does not exist.' % (perm,)
69 69 assert_error(id_, expected, given=response.body)
70 70
71 71 @mock.patch.object(RepoModel, 'grant_user_permission', crash)
@@ -132,7 +132,7 b' class TestGrantUserPermissionFromRepoGro'
132 132 perm=perm)
133 133 response = api_call(self.app, params)
134 134
135 expected = 'permission `%s` does not exist' % (perm,)
135 expected = 'permission `%s` does not exist. Permission should start with prefix: `group.`' % (perm,)
136 136 assert_error(id_, expected, given=response.body)
137 137
138 138 @mock.patch.object(RepoGroupModel, 'grant_user_permission', crash)
@@ -130,7 +130,7 b' class TestGrantUserPermissionFromUserGro'
130 130 perm=perm)
131 131 response = api_call(self.app, params)
132 132
133 expected = 'permission `%s` does not exist' % perm
133 expected = 'permission `%s` does not exist. Permission should start with prefix: `usergroup.`' % perm
134 134 assert_error(id_, expected, given=response.body)
135 135
136 136 def test_api_grant_user_permission_to_user_group_exception_when_adding(
@@ -308,7 +308,11 b' def get_perm_or_error(permid, prefix=Non'
308 308
309 309 perm = PermissionModel.cls.get_by_key(permid)
310 310 if perm is None:
311 raise JSONRPCError('permission `%s` does not exist' % (permid,))
311 msg = 'permission `{}` does not exist.'.format(permid)
312 if prefix:
313 msg += ' Permission should start with prefix: `{}`'.format(prefix)
314 raise JSONRPCError(msg)
315
312 316 if prefix:
313 317 if not perm.permission_name.startswith(prefix):
314 318 raise JSONRPCError('permission `%s` is invalid, '
@@ -351,12 +355,12 b' def get_pull_request_or_error(pullreques'
351 355 def build_commit_data(commit, detail_level):
352 356 parsed_diff = []
353 357 if detail_level == 'extended':
354 for f in commit.added:
355 parsed_diff.append(_get_commit_dict(filename=f.path, op='A'))
356 for f in commit.changed:
357 parsed_diff.append(_get_commit_dict(filename=f.path, op='M'))
358 for f in commit.removed:
359 parsed_diff.append(_get_commit_dict(filename=f.path, op='D'))
358 for f_path in commit.added_paths:
359 parsed_diff.append(_get_commit_dict(filename=f_path, op='A'))
360 for f_path in commit.changed_paths:
361 parsed_diff.append(_get_commit_dict(filename=f_path, op='M'))
362 for f_path in commit.removed_paths:
363 parsed_diff.append(_get_commit_dict(filename=f_path, op='D'))
360 364
361 365 elif detail_level == 'full':
362 366 from rhodecode.lib.diffs import DiffProcessor
@@ -73,6 +73,7 b' def get_pull_request(request, apiuser, p'
73 73 "status" : "<status>",
74 74 "created_on": "<date_time_created>",
75 75 "updated_on": "<date_time_updated>",
76 "versions": "<number_or_versions_of_pr>",
76 77 "commit_ids": [
77 78 ...
78 79 "<commit_id>",
@@ -452,7 +453,7 b' def comment_pull_request('
452 453 message=Optional(None), commit_id=Optional(None), status=Optional(None),
453 454 comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
454 455 resolves_comment_id=Optional(None), extra_recipients=Optional([]),
455 userid=Optional(OAttr('apiuser'))):
456 userid=Optional(OAttr('apiuser')), send_email=Optional(True)):
456 457 """
457 458 Comment on the pull request specified with the `pullrequestid`,
458 459 in the |repo| specified by the `repoid`, and optionally change the
@@ -483,6 +484,8 b' def comment_pull_request('
483 484 :type extra_recipients: Optional(list)
484 485 :param userid: Comment on the pull request as this user
485 486 :type userid: Optional(str or int)
487 :param send_email: Define if this comment should also send email notification
488 :type send_email: Optional(bool)
486 489
487 490 Example output:
488 491
@@ -527,6 +530,7 b' def comment_pull_request('
527 530 comment_type = Optional.extract(comment_type)
528 531 resolves_comment_id = Optional.extract(resolves_comment_id)
529 532 extra_recipients = Optional.extract(extra_recipients)
533 send_email = Optional.extract(send_email, binary=True)
530 534
531 535 if not message and not status:
532 536 raise JSONRPCError(
@@ -587,7 +591,8 b' def comment_pull_request('
587 591 comment_type=comment_type,
588 592 resolves_comment_id=resolves_comment_id,
589 593 auth_user=auth_user,
590 extra_recipients=extra_recipients
594 extra_recipients=extra_recipients,
595 send_email=send_email
591 596 )
592 597
593 598 if allowed_to_change_status and status:
@@ -1551,7 +1551,7 b' def comment_commit('
1551 1551 request, apiuser, repoid, commit_id, message, status=Optional(None),
1552 1552 comment_type=Optional(ChangesetComment.COMMENT_TYPE_NOTE),
1553 1553 resolves_comment_id=Optional(None), extra_recipients=Optional([]),
1554 userid=Optional(OAttr('apiuser'))):
1554 userid=Optional(OAttr('apiuser')), send_email=Optional(True)):
1555 1555 """
1556 1556 Set a commit comment, and optionally change the status of the commit.
1557 1557
@@ -1575,6 +1575,8 b' def comment_commit('
1575 1575 :type extra_recipients: Optional(list)
1576 1576 :param userid: Set the user name of the comment creator.
1577 1577 :type userid: Optional(str or int)
1578 :param send_email: Define if this comment should also send email notification
1579 :type send_email: Optional(bool)
1578 1580
1579 1581 Example error output:
1580 1582
@@ -1610,6 +1612,7 b' def comment_commit('
1610 1612 comment_type = Optional.extract(comment_type)
1611 1613 resolves_comment_id = Optional.extract(resolves_comment_id)
1612 1614 extra_recipients = Optional.extract(extra_recipients)
1615 send_email = Optional.extract(send_email, binary=True)
1613 1616
1614 1617 allowed_statuses = [x[0] for x in ChangesetStatus.STATUSES]
1615 1618 if status and status not in allowed_statuses:
@@ -1639,7 +1642,8 b' def comment_commit('
1639 1642 comment_type=comment_type,
1640 1643 resolves_comment_id=resolves_comment_id,
1641 1644 auth_user=apiuser,
1642 extra_recipients=extra_recipients
1645 extra_recipients=extra_recipients,
1646 send_email=send_email
1643 1647 )
1644 1648 if status:
1645 1649 # also do a status change
@@ -18,7 +18,6 b''
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 import inspect
22 21 import logging
23 22 import itertools
24 23 import base64
@@ -334,6 +333,9 b' def get_method(request, apiuser, pattern'
334 333 ]
335 334 error : null
336 335 """
336 from rhodecode.config.patches import inspect_getargspec
337 inspect = inspect_getargspec()
338
337 339 if not has_superadmin_permission(apiuser):
338 340 raise JSONRPCForbidden()
339 341
@@ -37,7 +37,7 b' from rhodecode.model import user_group'
37 37 from rhodecode.model import user
38 38 from rhodecode.model.db import User
39 39 from rhodecode.model.scm import ScmModel
40 from rhodecode.model.settings import VcsSettingsModel
40 from rhodecode.model.settings import VcsSettingsModel, IssueTrackerSettingsModel
41 41 from rhodecode.model.repo import ReadmeFinder
42 42
43 43 log = logging.getLogger(__name__)
@@ -226,6 +226,7 b' class RepoAppView(BaseAppView):'
226 226 self.db_repo_name = self.db_repo.repo_name
227 227 self.db_repo_pull_requests = ScmModel().get_pull_requests(self.db_repo)
228 228 self.db_repo_artifacts = ScmModel().get_artifacts(self.db_repo)
229 self.db_repo_patterns = IssueTrackerSettingsModel(repo=self.db_repo)
229 230
230 231 def _handle_missing_requirements(self, error):
231 232 log.error(
@@ -573,7 +573,7 b' class AdminSettingsView(BaseAppView):'
573 573
574 574 email_kwargs = {
575 575 'date': datetime.datetime.now(),
576 'user': c.rhodecode_user
576 'user': self._rhodecode_db_user
577 577 }
578 578
579 579 (subject, headers, email_body,
@@ -872,7 +872,10 b' class UsersView(UserAppView):'
872 872
873 873 c.active = 'ssh_keys_generate'
874 874 comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
875 c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
875 private_format = self.request.GET.get('private_format') \
876 or SshKeyModel.DEFAULT_PRIVATE_KEY_FORMAT
877 c.private, c.public = SshKeyModel().generate_keypair(
878 comment=comment, private_format=private_format)
876 879
877 880 return self._get_template_context(c)
878 881
@@ -33,6 +33,7 b' from rhodecode.lib import audit_logger'
33 33 from rhodecode.lib.auth import (
34 34 CSRFRequired, NotAnonymous, HasRepoPermissionAny, HasRepoGroupPermissionAny,
35 35 LoginRequired)
36 from rhodecode.lib.vcs.conf.mtypes import get_mimetypes_db
36 37 from rhodecode.model.db import Session, FileStore, UserApiKeys
37 38
38 39 log = logging.getLogger(__name__)
@@ -46,6 +47,15 b' class FileStoreView(BaseAppView):'
46 47 self.storage = utils.get_file_storage(self.request.registry.settings)
47 48 return c
48 49
50 def _guess_type(self, file_name):
51 """
52 Our own type guesser for mimetypes using the rich DB
53 """
54 if not hasattr(self, 'db'):
55 self.db = get_mimetypes_db()
56 _content_type, _encoding = self.db.guess_type(file_name, strict=False)
57 return _content_type, _encoding
58
49 59 def _serve_file(self, file_uid):
50 60
51 61 if not self.storage.exists(file_uid):
@@ -92,7 +102,18 b' class FileStoreView(BaseAppView):'
92 102 FileStore.bump_access_counter(file_uid)
93 103
94 104 file_path = self.storage.store_path(file_uid)
95 return FileResponse(file_path)
105 content_type = 'application/octet-stream'
106 content_encoding = None
107
108 _content_type, _encoding = self._guess_type(file_path)
109 if _content_type:
110 content_type = _content_type
111
112 # For file store we don't submit any session data, this logic tells the
113 # Session lib to skip it
114 setattr(self.request, '_file_response', True)
115 return FileResponse(file_path, request=self.request,
116 content_type=content_type, content_encoding=content_encoding)
96 117
97 118 @LoginRequired()
98 119 @NotAnonymous()
@@ -105,11 +105,11 b' class TestGistsController(TestController'
105 105 g4 = create_gist('gist4', gist_type='private').gist_access_id
106 106 response = self.app.get(route_path('gists_show'))
107 107
108 response.mustcontain('gist: %s' % g1.gist_access_id)
109 response.mustcontain('gist: %s' % g2.gist_access_id)
110 response.mustcontain('gist: %s' % g3.gist_access_id)
108 response.mustcontain(g1.gist_access_id)
109 response.mustcontain(g2.gist_access_id)
110 response.mustcontain(g3.gist_access_id)
111 111 response.mustcontain('gist3-desc')
112 response.mustcontain(no=['gist: %s' % g4])
112 response.mustcontain(no=[g4])
113 113
114 114 # Expiration information should be visible
115 115 expires_tag = '%s' % h.age_component(
@@ -122,7 +122,7 b' class TestGistsController(TestController'
122 122 response = self.app.get(route_path('gists_show', params=dict(private=1)))
123 123
124 124 # and privates
125 response.mustcontain('gist: %s' % gist.gist_access_id)
125 response.mustcontain(gist.gist_access_id)
126 126
127 127 def test_index_show_all(self, create_gist):
128 128 self.log_user()
@@ -136,7 +136,7 b' class TestGistsController(TestController'
136 136 assert len(GistModel.get_all()) == 4
137 137 # and privates
138 138 for gist in GistModel.get_all():
139 response.mustcontain('gist: %s' % gist.gist_access_id)
139 response.mustcontain(gist.gist_access_id)
140 140
141 141 def test_index_show_all_hidden_from_regular(self, create_gist):
142 142 self.log_user(TEST_USER_REGULAR_LOGIN, TEST_USER_REGULAR_PASS)
@@ -150,7 +150,7 b' class TestGistsController(TestController'
150 150 # since we don't have access to private in this view, we
151 151 # should see nothing
152 152 for gist in GistModel.get_all():
153 response.mustcontain(no=['gist: %s' % gist.gist_access_id])
153 response.mustcontain(no=[gist.gist_access_id])
154 154
155 155 def test_create(self):
156 156 self.log_user()
@@ -33,7 +33,7 b' def assert_and_get_main_filter_content(r'
33 33 if data_item['type'] == 'search':
34 34 display_val = data_item['value_display']
35 35 if data_item['id'] == -1:
36 assert 'File search for:' in display_val, display_val
36 assert 'File content search for:' in display_val, display_val
37 37 elif data_item['id'] == -2:
38 38 assert 'Commit search for:' in display_val, display_val
39 39 else:
@@ -453,7 +453,7 b' class HomeView(BaseAppView, DataGridAppV'
453 453 qry = query
454 454 return {'q': qry, 'type': 'content'}
455 455
456 label = u'File search for `{}`'.format(h.escape(query))
456 label = u'File content search for `{}`'.format(h.escape(query))
457 457 file_qry = {
458 458 'id': -10,
459 459 'value': query,
@@ -497,7 +497,7 b' class HomeView(BaseAppView, DataGridAppV'
497 497 qry = query
498 498 return {'q': qry, 'type': 'content'}
499 499
500 label = u'File search for `{}`'.format(query)
500 label = u'File content search for `{}`'.format(query)
501 501 file_qry = {
502 502 'id': -30,
503 503 'value': query,
@@ -541,7 +541,7 b' class HomeView(BaseAppView, DataGridAppV'
541 541 {
542 542 'id': -1,
543 543 'value': query,
544 'value_display': u'File search for: `{}`'.format(query),
544 'value_display': u'File content search for: `{}`'.format(query),
545 545 'value_icon': '<i class="icon-code"></i>',
546 546 'type': 'search',
547 547 'subtype': 'global',
@@ -26,6 +26,10 b' def includeme(config):'
26 26 pattern='/_hovercard/user/{user_id}')
27 27
28 28 config.add_route(
29 name='hovercard_username',
30 pattern='/_hovercard/username/{username}')
31
32 config.add_route(
29 33 name='hovercard_user_group',
30 34 pattern='/_hovercard/user_group/{user_group_id}')
31 35
@@ -65,6 +65,19 b' class HoverCardsView(BaseAppView):'
65 65
66 66 @LoginRequired()
67 67 @view_config(
68 route_name='hovercard_username', request_method='GET', xhr=True,
69 renderer='rhodecode:templates/hovercards/hovercard_user.mako')
70 def hovercard_username(self):
71 c = self.load_default_context()
72 username = self.request.matchdict['username']
73 c.user = User.get_by_username(username)
74 if not c.user:
75 raise HTTPNotFound()
76
77 return self._get_template_context(c)
78
79 @LoginRequired()
80 @view_config(
68 81 route_name='hovercard_user_group', request_method='GET', xhr=True,
69 82 renderer='rhodecode:templates/hovercards/hovercard_user_group.mako')
70 83 def hovercard_user_group(self):
@@ -108,7 +108,8 b' class TestLoginController(object):'
108 108
109 109 def test_login_regular_forbidden_when_super_admin_restriction(self):
110 110 from rhodecode.authentication.plugins.auth_rhodecode import RhodeCodeAuthPlugin
111 with fixture.auth_restriction(RhodeCodeAuthPlugin.AUTH_RESTRICTION_SUPER_ADMIN):
111 with fixture.auth_restriction(self.app._pyramid_registry,
112 RhodeCodeAuthPlugin.AUTH_RESTRICTION_SUPER_ADMIN):
112 113 response = self.app.post(route_path('login'),
113 114 {'username': 'test_regular',
114 115 'password': 'test12'})
@@ -118,7 +119,8 b' class TestLoginController(object):'
118 119
119 120 def test_login_regular_forbidden_when_scope_restriction(self):
120 121 from rhodecode.authentication.plugins.auth_rhodecode import RhodeCodeAuthPlugin
121 with fixture.scope_restriction(RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_VCS):
122 with fixture.scope_restriction(self.app._pyramid_registry,
123 RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_VCS):
122 124 response = self.app.post(route_path('login'),
123 125 {'username': 'test_regular',
124 126 'password': 'test12'})
@@ -76,6 +76,7 b' class MyAccountView(BaseAppView, DataGri'
76 76 def my_account_profile(self):
77 77 c = self.load_default_context()
78 78 c.active = 'profile'
79 c.extern_type = c.user.extern_type
79 80 return self._get_template_context(c)
80 81
81 82 @LoginRequired()
@@ -72,8 +72,11 b' class MyAccountSshKeysView(BaseAppView, '
72 72
73 73 c.active = 'ssh_keys_generate'
74 74 if c.ssh_key_generator_enabled:
75 private_format = self.request.GET.get('private_format') \
76 or SshKeyModel.DEFAULT_PRIVATE_KEY_FORMAT
75 77 comment = 'RhodeCode-SSH {}'.format(c.user.email or '')
76 c.private, c.public = SshKeyModel().generate_keypair(comment=comment)
78 c.private, c.public = SshKeyModel().generate_keypair(
79 comment=comment, private_format=private_format)
77 80 c.target_form_url = h.route_path(
78 81 'my_account_ssh_keys', _query=dict(default_key=c.public))
79 82 return self._get_template_context(c)
@@ -28,6 +28,7 b' from rhodecode.lib import helpers as h'
28 28 from rhodecode.lib import audit_logger
29 29 from rhodecode.lib.auth import (
30 30 LoginRequired, HasRepoGroupPermissionAnyDecorator, CSRFRequired)
31 from rhodecode.model.db import User
31 32 from rhodecode.model.permission import PermissionModel
32 33 from rhodecode.model.repo_group import RepoGroupModel
33 34 from rhodecode.model.forms import RepoGroupPermsForm
@@ -96,7 +97,13 b' class RepoGroupPermissionsView(RepoGroup'
96 97
97 98 Session().commit()
98 99 h.flash(_('Repository Group permissions updated'), category='success')
99 PermissionModel().flush_user_permission_caches(changes)
100
101 affected_user_ids = None
102 if changes.get('default_user_changed', False):
103 # if we change the default user, we need to flush everyone permissions
104 affected_user_ids = User.get_all_user_ids()
105 PermissionModel().flush_user_permission_caches(
106 changes, affected_user_ids=affected_user_ids)
100 107
101 108 raise HTTPFound(
102 109 h.route_path('edit_repo_group_perms',
@@ -28,6 +28,8 b' from rhodecode.lib import helpers as h'
28 28 from rhodecode.lib import audit_logger
29 29 from rhodecode.lib.auth import (
30 30 LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
31 from rhodecode.lib.utils2 import str2bool
32 from rhodecode.model.db import User
31 33 from rhodecode.model.forms import RepoPermsForm
32 34 from rhodecode.model.meta import Session
33 35 from rhodecode.model.permission import PermissionModel
@@ -89,7 +91,12 b' class RepoSettingsPermissionsView(RepoAp'
89 91 Session().commit()
90 92 h.flash(_('Repository access permissions updated'), category='success')
91 93
92 PermissionModel().flush_user_permission_caches(changes)
94 affected_user_ids = None
95 if changes.get('default_user_changed', False):
96 # if we change the default user, we need to flush everyone permissions
97 affected_user_ids = User.get_all_user_ids()
98 PermissionModel().flush_user_permission_caches(
99 changes, affected_user_ids=affected_user_ids)
93 100
94 101 raise HTTPFound(
95 102 h.route_path('edit_repo_perms', repo_name=self.db_repo_name))
@@ -104,9 +111,11 b' class RepoSettingsPermissionsView(RepoAp'
104 111 _ = self.request.translate
105 112 self.load_default_context()
106 113
114 private_flag = str2bool(self.request.POST.get('private'))
115
107 116 try:
108 117 RepoModel().update(
109 self.db_repo, **{'repo_private': True, 'repo_name': self.db_repo_name})
118 self.db_repo, **{'repo_private': private_flag, 'repo_name': self.db_repo_name})
110 119 Session().commit()
111 120
112 121 h.flash(_('Repository `{}` private mode set successfully').format(self.db_repo_name),
@@ -116,7 +125,11 b' class RepoSettingsPermissionsView(RepoAp'
116 125 h.flash(_('Error occurred during update of repository {}').format(
117 126 self.db_repo_name), category='error')
118 127
128 # NOTE(dan): we change repo private mode we need to notify all USERS
129 affected_user_ids = User.get_all_user_ids()
130 PermissionModel().trigger_permission_flush(affected_user_ids)
131
119 132 return {
120 133 'redirect_url': h.route_path('edit_repo_perms', repo_name=self.db_repo_name),
121 'private': True
134 'private': private_flag
122 135 }
@@ -275,6 +275,20 b' class RepoPullRequestsView(RepoAppView, '
275 275
276 276 c.state_progressing = pull_request.is_state_changing()
277 277
278 _new_state = {
279 'created': PullRequest.STATE_CREATED,
280 }.get(self.request.GET.get('force_state'))
281 if c.is_super_admin and _new_state:
282 with pull_request.set_state(PullRequest.STATE_UPDATING, final_state=_new_state):
283 h.flash(
284 _('Pull Request state was force changed to `{}`').format(_new_state),
285 category='success')
286 Session().commit()
287
288 raise HTTPFound(h.route_path(
289 'pullrequest_show', repo_name=self.db_repo_name,
290 pull_request_id=pull_request_id))
291
278 292 version = self.request.GET.get('version')
279 293 from_version = self.request.GET.get('from_version') or version
280 294 merge_checks = self.request.GET.get('merge_checks')
@@ -31,7 +31,7 b' from rhodecode.lib.auth import ('
31 31 LoginRequired, HasRepoPermissionAnyDecorator, CSRFRequired)
32 32 from rhodecode.model.forms import IssueTrackerPatternsForm
33 33 from rhodecode.model.meta import Session
34 from rhodecode.model.settings import IssueTrackerSettingsModel, SettingsModel
34 from rhodecode.model.settings import SettingsModel
35 35
36 36 log = logging.getLogger(__name__)
37 37
@@ -53,7 +53,7 b' class RepoSettingsIssueTrackersView(Repo'
53 53 c.active = 'issuetracker'
54 54 c.data = 'data'
55 55
56 c.settings_model = IssueTrackerSettingsModel(repo=self.db_repo)
56 c.settings_model = self.db_repo_patterns
57 57 c.global_patterns = c.settings_model.get_global_settings()
58 58 c.repo_patterns = c.settings_model.get_repo_settings()
59 59
@@ -79,7 +79,7 b' class RepoSettingsIssueTrackersView(Repo'
79 79 def repo_issuetracker_delete(self):
80 80 _ = self.request.translate
81 81 uid = self.request.POST.get('uid')
82 repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name)
82 repo_settings = self.db_repo_patterns
83 83 try:
84 84 repo_settings.delete_entries(uid)
85 85 except Exception:
@@ -113,7 +113,7 b' class RepoSettingsIssueTrackersView(Repo'
113 113 def repo_issuetracker_update(self):
114 114 _ = self.request.translate
115 115 # Save inheritance
116 repo_settings = IssueTrackerSettingsModel(repo=self.db_repo_name)
116 repo_settings = self.db_repo_patterns
117 117 inherited = (
118 118 self.request.POST.get('inherit_global_issuetracker') == "inherited")
119 119 repo_settings.inherit_global_settings = inherited
@@ -24,6 +24,7 b''
24 24 # LogLevel info
25 25 # # allows custom host names, prevents 400 errors on checkout
26 26 # HttpProtocolOptions Unsafe
27 # # Most likely this will be: /home/user/.rccontrol/enterprise-1/mod_dav_svn.conf
27 28 # Include /path/to/generated/mod_dav_svn.conf
28 29 # </VirtualHost>
29 30 #
@@ -150,6 +150,7 b' class RhodeCodeAuthPluginBase(object):'
150 150
151 151 def __init__(self, plugin_id):
152 152 self._plugin_id = plugin_id
153 self._settings = {}
153 154
154 155 def __str__(self):
155 156 return self.get_id()
@@ -226,17 +227,26 b' class RhodeCodeAuthPluginBase(object):'
226 227 """
227 228 return AuthnPluginSettingsSchemaBase()
228 229
229 def get_settings(self):
230 """
231 Returns the plugin settings as dictionary.
232 """
230 def _propagate_settings(self, raw_settings):
233 231 settings = {}
234 raw_settings = SettingsModel().get_all_settings()
235 232 for node in self.get_settings_schema():
236 233 settings[node.name] = self.get_setting_by_name(
237 234 node.name, plugin_cached_settings=raw_settings)
238 235 return settings
239 236
237 def get_settings(self, use_cache=True):
238 """
239 Returns the plugin settings as dictionary.
240 """
241 if self._settings != {} and use_cache:
242 return self._settings
243
244 raw_settings = SettingsModel().get_all_settings()
245 settings = self._propagate_settings(raw_settings)
246
247 self._settings = settings
248 return self._settings
249
240 250 def get_setting_by_name(self, name, default=None, plugin_cached_settings=None):
241 251 """
242 252 Returns a plugin setting by name.
@@ -594,19 +604,19 b' class AuthLdapBase(object):'
594 604 if not full_resolve:
595 605 return '{}:{}'.format(host, port)
596 606
597 log.debug('LDAP: Resolving IP for LDAP host %s', host)
607 log.debug('LDAP: Resolving IP for LDAP host `%s`', host)
598 608 try:
599 609 ip = socket.gethostbyname(host)
600 log.debug('Got LDAP server %s ip %s', host, ip)
610 log.debug('LDAP: Got LDAP host `%s` ip %s', host, ip)
601 611 except Exception:
602 raise LdapConnectionError(
603 'Failed to resolve host: `{}`'.format(host))
612 raise LdapConnectionError('Failed to resolve host: `{}`'.format(host))
604 613
605 614 log.debug('LDAP: Checking if IP %s is accessible', ip)
606 615 s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
607 616 try:
608 617 s.connect((ip, int(port)))
609 618 s.shutdown(socket.SHUT_RD)
619 log.debug('LDAP: connection to %s successful', ip)
610 620 except Exception:
611 621 raise LdapConnectionError(
612 622 'Failed to connect to host: `{}:{}`'.format(host, port))
@@ -667,7 +677,7 b' def loadplugin(plugin_id):'
667 677
668 678 def get_authn_registry(registry=None):
669 679 registry = registry or get_current_registry()
670 authn_registry = registry.getUtility(IAuthnPluginRegistry)
680 authn_registry = registry.queryUtility(IAuthnPluginRegistry)
671 681 return authn_registry
672 682
673 683
@@ -690,6 +700,7 b' def authenticate(username, password, env'
690 700 headers_only = environ and not (username and password)
691 701
692 702 authn_registry = get_authn_registry(registry)
703
693 704 plugins_to_check = authn_registry.get_plugins_for_authentication()
694 705 log.debug('Starting ordered authentication chain using %s plugins',
695 706 [x.name for x in plugins_to_check])
@@ -145,16 +145,16 b' class AuthLdap(AuthLdapBase):'
145 145 log.debug('Trying simple_bind with password and given login DN: %r',
146 146 self.LDAP_BIND_DN)
147 147 ldap_conn.simple_bind_s(self.LDAP_BIND_DN, self.LDAP_BIND_PASS)
148
148 log.debug('simple_bind successful')
149 149 return ldap_conn
150 150
151 151 def fetch_attrs_from_simple_bind(self, server, dn, username, password):
152 152 try:
153 153 log.debug('Trying simple bind with %r', dn)
154 154 server.simple_bind_s(dn, safe_str(password))
155 user = server.search_ext_s(
155 _dn, attrs = server.search_ext_s(
156 156 dn, ldap.SCOPE_BASE, '(objectClass=*)', )[0]
157 _, attrs = user
157
158 158 return attrs
159 159
160 160 except ldap.INVALID_CREDENTIALS:
@@ -272,7 +272,7 b' class LdapSettingsSchema(AuthnPluginSett'
272 272 'uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com'),
273 273 missing='',
274 274 preparer=strip_whitespace,
275 title=_('Account'),
275 title=_('Bind account'),
276 276 widget='string')
277 277 dn_pass = colander.SchemaNode(
278 278 colander.String(),
@@ -280,7 +280,7 b' class LdapSettingsSchema(AuthnPluginSett'
280 280 description=_('Password to authenticate for given user DN.'),
281 281 missing='',
282 282 preparer=strip_whitespace,
283 title=_('Password'),
283 title=_('Bind account password'),
284 284 widget='password')
285 285 tls_kind = colander.SchemaNode(
286 286 colander.String(),
@@ -318,7 +318,7 b' class LdapSettingsSchema(AuthnPluginSett'
318 318 colander.String(),
319 319 default='',
320 320 description=_('Base DN to search. Dynamic bind is supported. Add `$login` marker '
321 'in it to be replaced with current user credentials \n'
321 'in it to be replaced with current user username \n'
322 322 '(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)'),
323 323 missing='',
324 324 preparer=strip_whitespace,
@@ -38,6 +38,7 b' class AuthenticationPluginRegistry(objec'
38 38
39 39 def __init__(self, settings):
40 40 self._plugins = {}
41 self._plugins_for_auth = None
41 42 self._fallback_plugin = settings.get(self.fallback_plugin_key, None)
42 43
43 44 def add_authn_plugin(self, config, plugin):
@@ -63,6 +64,10 b' class AuthenticationPluginRegistry(objec'
63 64 if plugin.uid == plugin_uid:
64 65 return plugin
65 66
67 def invalidate_plugins_for_auth(self):
68 log.debug('Invalidating cached plugins for authentication')
69 self._plugins_for_auth = None
70
66 71 def get_plugins_for_authentication(self):
67 72 """
68 73 Returns a list of plugins which should be consulted when authenticating
@@ -70,6 +75,9 b' class AuthenticationPluginRegistry(objec'
70 75 Additionally it includes the fallback plugin from the INI file, if
71 76 `rhodecode.auth_plugin_fallback` is set to a plugin ID.
72 77 """
78 if self._plugins_for_auth is not None:
79 return self._plugins_for_auth
80
73 81 plugins = []
74 82
75 83 # Add all enabled and active plugins to the list. We iterate over the
@@ -80,6 +88,9 b' class AuthenticationPluginRegistry(objec'
80 88 plugin = self.get_plugin(plugin_id)
81 89 if plugin is not None and plugin.is_active(
82 90 plugin_cached_settings=raw_settings):
91
92 # inject settings into plugin, we can re-use the DB fetched settings here
93 plugin._settings = plugin._propagate_settings(raw_settings)
83 94 plugins.append(plugin)
84 95
85 96 # Add the fallback plugin from ini file.
@@ -89,6 +100,8 b' class AuthenticationPluginRegistry(objec'
89 100 self._fallback_plugin)
90 101 plugin = self.get_plugin(self._fallback_plugin)
91 102 if plugin is not None and plugin not in plugins:
103 plugin._settings = plugin._propagate_settings(raw_settings)
92 104 plugins.append(plugin)
93 105
94 return plugins
106 self._plugins_for_auth = plugins
107 return self._plugins_for_auth
@@ -99,11 +99,12 b' class AuthnPluginViewBase(BaseAppView):'
99 99 for name, value in valid_data.items():
100 100 self.plugin.create_or_update_setting(name, value)
101 101 Session().commit()
102 SettingsModel().invalidate_settings_cache()
102 103
103 104 # Display success message and redirect.
104 105 h.flash(_('Auth settings updated successfully.'), category='success')
105 redirect_to = self.request.resource_path(
106 self.context, route_name='auth_home')
106 redirect_to = self.request.resource_path(self.context, route_name='auth_home')
107
107 108 return HTTPFound(redirect_to)
108 109
109 110
@@ -159,7 +160,7 b' class AuthSettingsView(BaseAppView):'
159 160 'auth_plugins', plugins)
160 161 Session().add(setting)
161 162 Session().commit()
162
163 SettingsModel().invalidate_settings_cache()
163 164 h.flash(_('Auth settings updated successfully.'), category='success')
164 165 except formencode.Invalid as errors:
165 166 e = errors.error_dict or {}
@@ -174,6 +175,6 b' class AuthSettingsView(BaseAppView):'
174 175 h.flash(_('Error occurred during update of auth settings.'),
175 176 category='error')
176 177
177 redirect_to = self.request.resource_path(
178 self.context, route_name='auth_home')
178 redirect_to = self.request.resource_path(self.context, route_name='auth_home')
179
179 180 return HTTPFound(redirect_to)
@@ -95,3 +95,5 b' def inspect_getargspec():'
95 95 return inspect.ArgSpec(args, varargs, varkw, func.func_defaults)
96 96
97 97 inspect.getargspec = custom_getargspec
98
99 return inspect
This diff has been collapsed as it changes many lines, (4240 lines changed) Show them Hide them
@@ -1,14 +1,14 b''
1 1 # Translations template for rhodecode-enterprise-ce.
2 # Copyright (C) 2019 RhodeCode GmbH
2 # Copyright (C) 2020 RhodeCode GmbH
3 3 # This file is distributed under the same license as the rhodecode-enterprise-ce project.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2019.
4 # FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
5 5 #
6 6 #, fuzzy
7 7 msgid ""
8 8 msgstr ""
9 "Project-Id-Version: rhodecode-enterprise-ce 4.17.0\n"
9 "Project-Id-Version: rhodecode-enterprise-ce 4.18.0\n"
10 10 "Report-Msgid-Bugs-To: marcin@rhodecode.com\n"
11 "POT-Creation-Date: 2019-07-03 14:48+0000\n"
11 "POT-Creation-Date: 2020-01-08 13:56+0000\n"
12 12 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13 13 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14 14 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -33,60 +33,60 b' msgstr ""'
33 33 msgid "Removed Exception {}"
34 34 msgstr ""
35 35
36 #: rhodecode/apps/admin/views/permissions.py:120
36 #: rhodecode/apps/admin/views/permissions.py:121
37 37 msgid "Application permissions updated successfully"
38 38 msgstr ""
39 39
40 #: rhodecode/apps/admin/views/permissions.py:141
41 #: rhodecode/apps/admin/views/permissions.py:217
42 #: rhodecode/apps/admin/views/permissions.py:319
40 #: rhodecode/apps/admin/views/permissions.py:142
41 #: rhodecode/apps/admin/views/permissions.py:218
42 #: rhodecode/apps/admin/views/permissions.py:320
43 43 msgid "Error occurred during update of permissions"
44 44 msgstr ""
45 45
46 #: rhodecode/apps/admin/views/permissions.py:197
46 #: rhodecode/apps/admin/views/permissions.py:198
47 47 msgid "Object permissions updated successfully"
48 48 msgstr ""
49 49
50 #: rhodecode/apps/admin/views/permissions.py:299
50 #: rhodecode/apps/admin/views/permissions.py:300
51 51 msgid "Global permissions updated successfully"
52 52 msgstr ""
53 53
54 #: rhodecode/apps/admin/views/permissions.py:484
55 #: rhodecode/templates/admin/gists/show.mako:63
54 #: rhodecode/apps/admin/views/permissions.py:485
55 #: rhodecode/templates/admin/gists/gist_show.mako:50
56 56 #: rhodecode/templates/admin/integrations/list.mako:172
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5
58 #: rhodecode/templates/base/issue_tracker_settings.mako:60
59 #: rhodecode/templates/data_table/_dt_elements.mako:167
60 #: rhodecode/templates/data_table/_dt_elements.mako:241
61 #: rhodecode/templates/data_table/_dt_elements.mako:254
62 #: rhodecode/templates/data_table/_dt_elements.mako:255
63 #: rhodecode/templates/data_table/_dt_elements.mako:267
57 #: rhodecode/templates/admin/my_account/my_account_profile.mako:7
58 #: rhodecode/templates/base/issue_tracker_settings.mako:137
59 #: rhodecode/templates/data_table/_dt_elements.mako:173
60 #: rhodecode/templates/data_table/_dt_elements.mako:249
61 #: rhodecode/templates/data_table/_dt_elements.mako:262
62 #: rhodecode/templates/data_table/_dt_elements.mako:263
63 #: rhodecode/templates/data_table/_dt_elements.mako:276
64 64 #: rhodecode/templates/debug_style/buttons.html:128
65 65 #: rhodecode/templates/files/files_add.mako:57
66 66 #: rhodecode/templates/files/files_edit.mako:58
67 67 #: rhodecode/templates/files/files_source.mako:29
68 68 #: rhodecode/templates/files/files_source.mako:42
69 #: rhodecode/templates/pullrequests/pullrequest_show.mako:60
70 #: rhodecode/templates/pullrequests/pullrequest_show.mako:343
71 #: rhodecode/templates/user_group/profile.mako:7
72 #: rhodecode/templates/users/user_profile.mako:7
69 #: rhodecode/templates/pullrequests/pullrequest_show.mako:74
70 #: rhodecode/templates/pullrequests/pullrequest_show.mako:302
71 #: rhodecode/templates/user_group/profile.mako:8
72 #: rhodecode/templates/users/user_profile.mako:8
73 73 msgid "Edit"
74 74 msgstr ""
75 75
76 #: rhodecode/apps/admin/views/permissions.py:512
76 #: rhodecode/apps/admin/views/permissions.py:513
77 77 msgid "Updated SSH keys file: {}"
78 78 msgstr ""
79 79
80 #: rhodecode/apps/admin/views/permissions.py:515
80 #: rhodecode/apps/admin/views/permissions.py:516
81 81 msgid "SSH key support is disabled in .ini file"
82 82 msgstr ""
83 83
84 #: rhodecode/apps/admin/views/repo_groups.py:329
84 #: rhodecode/apps/admin/views/repo_groups.py:328
85 85 #, python-format
86 86 msgid "Created repository group %s"
87 87 msgstr ""
88 88
89 #: rhodecode/apps/admin/views/repo_groups.py:347
89 #: rhodecode/apps/admin/views/repo_groups.py:346
90 90 #, python-format
91 91 msgid "Error occurred during creation of repository group %s"
92 92 msgstr ""
@@ -102,7 +102,7 b' msgstr ""'
102 102 #: rhodecode/apps/admin/views/settings.py:162
103 103 #: rhodecode/apps/admin/views/settings.py:317
104 104 #: rhodecode/apps/admin/views/settings.py:392
105 #: rhodecode/apps/admin/views/settings.py:724
105 #: rhodecode/apps/admin/views/settings.py:726
106 106 #: rhodecode/apps/repository/views/repo_settings_vcs.py:124
107 107 msgid "Some form inputs contain invalid data."
108 108 msgstr ""
@@ -135,45 +135,45 b' msgid "Error occurred during updating vi'
135 135 msgstr ""
136 136
137 137 #: rhodecode/apps/admin/views/settings.py:496
138 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:125
138 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:127
139 139 msgid "Invalid issue tracker pattern: {}"
140 140 msgstr ""
141 141
142 142 #: rhodecode/apps/admin/views/settings.py:513
143 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:134
143 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:136
144 144 msgid "Updated issue tracker entries"
145 145 msgstr ""
146 146
147 #: rhodecode/apps/admin/views/settings.py:531
148 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:89
149 msgid "Removed issue tracker entry"
150 msgstr ""
151
152 #: rhodecode/apps/admin/views/settings.py:568
147 #: rhodecode/apps/admin/views/settings.py:533
148 #: rhodecode/apps/repository/views/repo_settings_issue_trackers.py:91
149 msgid "Removed issue tracker entry."
150 msgstr ""
151
152 #: rhodecode/apps/admin/views/settings.py:571
153 153 msgid "Please enter email address"
154 154 msgstr ""
155 155
156 #: rhodecode/apps/admin/views/settings.py:586
156 #: rhodecode/apps/admin/views/settings.py:588
157 157 msgid "Send email task created"
158 158 msgstr ""
159 159
160 #: rhodecode/apps/admin/views/settings.py:636
160 #: rhodecode/apps/admin/views/settings.py:638
161 161 msgid "Added new hook"
162 162 msgstr ""
163 163
164 #: rhodecode/apps/admin/views/settings.py:651
164 #: rhodecode/apps/admin/views/settings.py:653
165 165 msgid "Updated hooks"
166 166 msgstr ""
167 167
168 #: rhodecode/apps/admin/views/settings.py:655
168 #: rhodecode/apps/admin/views/settings.py:657
169 169 msgid "Error occurred during hook creation"
170 170 msgstr ""
171 171
172 #: rhodecode/apps/admin/views/settings.py:748
172 #: rhodecode/apps/admin/views/settings.py:750
173 173 msgid "Error occurred during updating labs settings"
174 174 msgstr ""
175 175
176 #: rhodecode/apps/admin/views/settings.py:753
176 #: rhodecode/apps/admin/views/settings.py:755
177 177 msgid "Updated Labs settings"
178 178 msgstr ""
179 179
@@ -330,6 +330,7 b' msgid "VCS Backends"'
330 330 msgstr ""
331 331
332 332 #: rhodecode/apps/admin/views/system_info.py:151
333 #: rhodecode/templates/admin/settings/settings_system.mako:32
333 334 msgid "VCS Server"
334 335 msgstr ""
335 336
@@ -345,200 +346,210 b' msgstr ""'
345 346 msgid "SVN"
346 347 msgstr ""
347 348
348 #: rhodecode/apps/admin/views/user_groups.py:243
349 #: rhodecode/apps/admin/views/user_groups.py:238
349 350 #, python-format
350 351 msgid "Created user group %(user_group_link)s"
351 352 msgstr ""
352 353
353 #: rhodecode/apps/admin/views/user_groups.py:265
354 #: rhodecode/apps/admin/views/user_groups.py:260
354 355 #, python-format
355 356 msgid "Error occurred during creation of user group %s"
356 357 msgstr ""
357 358
358 #: rhodecode/apps/admin/views/users.py:219
359 #: rhodecode/apps/admin/views/users.py:221
359 360 #, python-format
360 361 msgid "Created user %(user_link)s"
361 362 msgstr ""
362 363
363 #: rhodecode/apps/admin/views/users.py:240
364 #: rhodecode/apps/admin/views/users.py:242
364 365 #, python-format
365 366 msgid "Error occurred during creation of user %s"
366 367 msgstr ""
367 368
368 #: rhodecode/apps/admin/views/users.py:314
369 #: rhodecode/apps/admin/views/users.py:344
369 370 msgid "User updated successfully"
370 371 msgstr ""
371 372
372 #: rhodecode/apps/admin/views/users.py:332
373 #: rhodecode/apps/admin/views/users.py:362
373 374 #, python-format
374 375 msgid "Error occurred during update of user %s"
375 376 msgstr ""
376 377
377 #: rhodecode/apps/admin/views/users.py:364
378 #: rhodecode/apps/admin/views/users.py:391
378 379 #, python-format
379 380 msgid "Detached %s repositories"
380 381 msgstr ""
381 382
382 #: rhodecode/apps/admin/views/users.py:369
383 #: rhodecode/apps/admin/views/users.py:394
383 384 #, python-format
384 385 msgid "Deleted %s repositories"
385 386 msgstr ""
386 387
387 #: rhodecode/apps/admin/views/users.py:377
388 #: rhodecode/apps/admin/views/users.py:400
388 389 #, python-format
389 390 msgid "Detached %s repository groups"
390 391 msgstr ""
391 392
392 #: rhodecode/apps/admin/views/users.py:382
393 #: rhodecode/apps/admin/views/users.py:403
393 394 #, python-format
394 395 msgid "Deleted %s repository groups"
395 396 msgstr ""
396 397
397 #: rhodecode/apps/admin/views/users.py:390
398 #: rhodecode/apps/admin/views/users.py:409
398 399 #, python-format
399 400 msgid "Detached %s user groups"
400 401 msgstr ""
401 402
402 #: rhodecode/apps/admin/views/users.py:395
403 #, python-format
404 msgid "Deleted %s user groups"
405 msgstr ""
406
407 403 #: rhodecode/apps/admin/views/users.py:412
408 msgid "Successfully deleted user"
404 #, python-format
405 msgid "Deleted %s user groups"
409 406 msgstr ""
410 407
411 408 #: rhodecode/apps/admin/views/users.py:418
409 #, python-format
410 msgid "Detached %s artifacts"
411 msgstr ""
412
413 #: rhodecode/apps/admin/views/users.py:421
414 #, python-format
415 msgid "Deleted %s artifacts"
416 msgstr ""
417
418 #: rhodecode/apps/admin/views/users.py:454
419 msgid "Successfully deleted user `{}`"
420 msgstr ""
421
422 #: rhodecode/apps/admin/views/users.py:460
412 423 msgid "An error occurred during deletion of user"
413 424 msgstr ""
414 425
415 #: rhodecode/apps/admin/views/users.py:483
426 #: rhodecode/apps/admin/views/users.py:525
416 427 msgid ""
417 428 "The user participates as reviewer in {} pull request and cannot be deleted. \n"
418 429 "You can set the user to \"{}\" instead of deleting it."
419 430 msgstr ""
420 431
421 #: rhodecode/apps/admin/views/users.py:489
432 #: rhodecode/apps/admin/views/users.py:531
422 433 msgid ""
423 434 "The user participates as reviewer in {} pull requests and cannot be deleted. \n"
424 435 "You can set the user to \"{}\" instead of deleting it."
425 436 msgstr ""
426 437
427 #: rhodecode/apps/admin/views/users.py:578
438 #: rhodecode/apps/admin/views/users.py:620
428 439 msgid "User global permissions updated successfully"
429 440 msgstr ""
430 441
431 #: rhodecode/apps/admin/views/users.py:596
442 #: rhodecode/apps/admin/views/users.py:638
432 443 #: rhodecode/apps/user_group/views/__init__.py:479
433 444 msgid "An error occurred during permissions saving"
434 445 msgstr ""
435 446
436 #: rhodecode/apps/admin/views/users.py:619
447 #: rhodecode/apps/admin/views/users.py:661
437 448 msgid "Force password change enabled for user"
438 449 msgstr ""
439 450
440 #: rhodecode/apps/admin/views/users.py:627
441 #: rhodecode/apps/admin/views/users.py:657
451 #: rhodecode/apps/admin/views/users.py:669
452 #: rhodecode/apps/admin/views/users.py:699
442 453 msgid "An error occurred during password reset for user"
443 454 msgstr ""
444 455
445 #: rhodecode/apps/admin/views/users.py:648
456 #: rhodecode/apps/admin/views/users.py:690
446 457 msgid "Force password change disabled for user"
447 458 msgstr ""
448 459
449 #: rhodecode/apps/admin/views/users.py:695
460 #: rhodecode/apps/admin/views/users.py:737
450 461 #, python-format
451 462 msgid "Linked repository group `%s` as personal"
452 463 msgstr ""
453 464
454 #: rhodecode/apps/admin/views/users.py:701
465 #: rhodecode/apps/admin/views/users.py:743
455 466 #, python-format
456 467 msgid "Created repository group `%s`"
457 468 msgstr ""
458 469
459 #: rhodecode/apps/admin/views/users.py:705
470 #: rhodecode/apps/admin/views/users.py:747
460 471 #, python-format
461 472 msgid "Repository group `%s` is already taken"
462 473 msgstr ""
463 474
464 #: rhodecode/apps/admin/views/users.py:710
475 #: rhodecode/apps/admin/views/users.py:752
465 476 msgid "An error occurred during repository group creation for user"
466 477 msgstr ""
467 478
468 #: rhodecode/apps/admin/views/users.py:733
469 #: rhodecode/apps/my_account/views/my_account.py:161
479 #: rhodecode/apps/admin/views/users.py:775
480 #: rhodecode/apps/my_account/views/my_account.py:160
470 481 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16
471 482 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16
472 483 msgid "Role"
473 484 msgstr ""
474 485
475 #: rhodecode/apps/admin/views/users.py:772
476 #: rhodecode/apps/my_account/views/my_account.py:196
486 #: rhodecode/apps/admin/views/users.py:814
487 #: rhodecode/apps/my_account/views/my_account.py:195
477 488 msgid "Auth token successfully created"
478 489 msgstr ""
479 490
480 #: rhodecode/apps/admin/views/users.py:801
481 #: rhodecode/apps/my_account/views/my_account.py:220
491 #: rhodecode/apps/admin/views/users.py:843
492 #: rhodecode/apps/my_account/views/my_account.py:219
482 493 msgid "Auth token successfully deleted"
483 494 msgstr ""
484 495
485 #: rhodecode/apps/admin/views/users.py:874
496 #: rhodecode/apps/admin/views/users.py:916
486 497 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:114
487 498 msgid "Ssh Key successfully created"
488 499 msgstr ""
489 500
490 #: rhodecode/apps/admin/views/users.py:880
491 #: rhodecode/apps/admin/views/users.py:884
501 #: rhodecode/apps/admin/views/users.py:922
502 #: rhodecode/apps/admin/views/users.py:926
492 503 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:120
493 504 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:124
494 505 msgid "An error occurred during ssh key saving: {}"
495 506 msgstr ""
496 507
497 #: rhodecode/apps/admin/views/users.py:918
508 #: rhodecode/apps/admin/views/users.py:960
498 509 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:154
499 510 msgid "Ssh key successfully deleted"
500 511 msgstr ""
501 512
502 #: rhodecode/apps/admin/views/users.py:964
513 #: rhodecode/apps/admin/views/users.py:1006
503 514 #, python-format
504 515 msgid "Added new email address `%s` for user account"
505 516 msgstr ""
506 517
507 #: rhodecode/apps/admin/views/users.py:970
518 #: rhodecode/apps/admin/views/users.py:1012
508 519 msgid "Email `{}` is already registered for another user."
509 520 msgstr ""
510 521
511 #: rhodecode/apps/admin/views/users.py:974
522 #: rhodecode/apps/admin/views/users.py:1016
512 523 msgid "An error occurred during email saving"
513 524 msgstr ""
514 525
515 #: rhodecode/apps/admin/views/users.py:1001
526 #: rhodecode/apps/admin/views/users.py:1043
516 527 msgid "Removed email address from user account"
517 528 msgstr ""
518 529
519 #: rhodecode/apps/admin/views/users.py:1047
530 #: rhodecode/apps/admin/views/users.py:1089
520 531 #, python-format
521 532 msgid "An error occurred during ip saving:%s"
522 533 msgstr ""
523 534
524 #: rhodecode/apps/admin/views/users.py:1069
535 #: rhodecode/apps/admin/views/users.py:1111
525 536 msgid "An error occurred during ip saving"
526 537 msgstr ""
527 538
528 #: rhodecode/apps/admin/views/users.py:1073
539 #: rhodecode/apps/admin/views/users.py:1115
529 540 #, python-format
530 541 msgid "Added ips %s to user whitelist"
531 542 msgstr ""
532 543
533 #: rhodecode/apps/admin/views/users.py:1103
544 #: rhodecode/apps/admin/views/users.py:1145
534 545 msgid "Removed ip address from user whitelist"
535 546 msgstr ""
536 547
537 #: rhodecode/apps/admin/views/users.py:1168
548 #: rhodecode/apps/admin/views/users.py:1210
538 549 msgid "Groups successfully changed"
539 550 msgstr ""
540 551
541 #: rhodecode/apps/admin/views/users.py:1262
552 #: rhodecode/apps/admin/views/users.py:1330
542 553 msgid "Deleted {} cache keys"
543 554 msgstr ""
544 555
@@ -562,9 +573,10 b' msgstr ""'
562 573 msgid "1 month"
563 574 msgstr ""
564 575
565 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:44668
566 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
567 #: rhodecode/public/js/src/rhodecode.js:502
576 #: rhodecode/apps/gist/views.py:64 rhodecode/public/js/scripts.js:50068
577 #: rhodecode/public/js/scripts.min.js:1
578 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
579 #: rhodecode/public/js/src/rhodecode.js:621
568 580 msgid "Lifetime"
569 581 msgstr ""
570 582
@@ -576,158 +588,170 b' msgstr ""'
576 588 msgid "Can be accessed by anonymous users"
577 589 msgstr ""
578 590
579 #: rhodecode/apps/gist/views.py:213
591 #: rhodecode/apps/gist/views.py:218
580 592 msgid "Error occurred during gist creation"
581 593 msgstr ""
582 594
583 #: rhodecode/apps/gist/views.py:237
595 #: rhodecode/apps/gist/views.py:242
584 596 #, python-format
585 597 msgid "Deleted gist %s"
586 598 msgstr ""
587 599
588 #: rhodecode/apps/gist/views.py:325
589 #: rhodecode/templates/admin/gists/show.mako:74
600 #: rhodecode/apps/gist/views.py:330
601 #: rhodecode/templates/admin/gists/gist_show.mako:73
590 602 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:36
591 603 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:36
592 #: rhodecode/templates/data_table/_dt_elements.mako:324
604 #: rhodecode/templates/data_table/_dt_elements.mako:333
593 605 msgid "never"
594 606 msgstr ""
595 607
596 #: rhodecode/apps/gist/views.py:331
608 #: rhodecode/apps/gist/views.py:336
597 609 #, python-format
598 610 msgid "%(expiry)s - current value"
599 611 msgstr ""
600 612
601 #: rhodecode/apps/gist/views.py:376
602 msgid "Successfully updated gist content"
603 msgstr ""
604
605 613 #: rhodecode/apps/gist/views.py:381
614 msgid "Successfully updated gist content"
615 msgstr ""
616
617 #: rhodecode/apps/gist/views.py:386
606 618 msgid "Successfully updated gist data"
607 619 msgstr ""
608 620
609 #: rhodecode/apps/gist/views.py:384
621 #: rhodecode/apps/gist/views.py:389
610 622 msgid "Error occurred during update of gist {}: {}"
611 623 msgstr ""
612 624
613 #: rhodecode/apps/gist/views.py:388
625 #: rhodecode/apps/gist/views.py:393
614 626 #, python-format
615 627 msgid "Error occurred during update of gist %s"
616 628 msgstr ""
617 629
618 #: rhodecode/apps/home/views.py:388
619 #: rhodecode/apps/repository/views/repo_pull_requests.py:878
620 #: rhodecode/templates/admin/my_account/my_account.mako:42
621 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
630 #: rhodecode/apps/home/views.py:397
631 #: rhodecode/apps/repository/views/repo_pull_requests.py:879
632 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
622 633 #: rhodecode/templates/admin/repos/repo_add.mako:15
623 634 #: rhodecode/templates/admin/repos/repo_add.mako:19
624 635 #: rhodecode/templates/admin/users/user_edit_advanced.mako:12
625 #: rhodecode/templates/base/base.mako:103
626 #: rhodecode/templates/base/base.mako:122
627 #: rhodecode/templates/base/base.mako:944
636 #: rhodecode/templates/base/base.mako:107
637 #: rhodecode/templates/base/base.mako:126
638 #: rhodecode/templates/base/base.mako:1111
628 639 msgid "Repositories"
629 640 msgstr ""
630 641
631 #: rhodecode/apps/home/views.py:415
642 #: rhodecode/apps/home/views.py:424
632 643 #: rhodecode/templates/admin/integrations/form.mako:17
633 644 #: rhodecode/templates/admin/integrations/list.mako:10
634 645 #: rhodecode/templates/admin/permissions/permissions_objects.mako:31
635 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
646 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198
636 647 msgid "Repository Groups"
637 648 msgstr ""
638 649
639 #: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178
650 #: rhodecode/apps/journal/views.py:133 rhodecode/apps/journal/views.py:179
640 651 msgid "public journal"
641 652 msgstr ""
642 653
643 #: rhodecode/apps/journal/views.py:136 rhodecode/apps/journal/views.py:182
654 #: rhodecode/apps/journal/views.py:137 rhodecode/apps/journal/views.py:183
644 655 msgid "journal"
645 656 msgstr ""
646 657
647 #: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:400
658 #: rhodecode/apps/login/views.py:304 rhodecode/apps/login/views.py:403
648 659 msgid "Bad captcha"
649 660 msgstr ""
650 661
651 #: rhodecode/apps/login/views.py:332
652 msgid "You have successfully registered with RhodeCode"
653 msgstr ""
654
655 #: rhodecode/apps/login/views.py:369
662 #: rhodecode/apps/login/views.py:330
663 msgid "You have successfully registered with RhodeCode. You can log-in now."
664 msgstr ""
665
666 #: rhodecode/apps/login/views.py:334
667 msgid "Please use the {identity} button to log-in"
668 msgstr ""
669
670 #: rhodecode/apps/login/views.py:372
656 671 msgid "If such email exists, a password reset link was sent to it."
657 672 msgstr ""
658 673
659 #: rhodecode/apps/login/views.py:382
674 #: rhodecode/apps/login/views.py:385
660 675 msgid "Password reset has been disabled."
661 676 msgstr ""
662 677
663 #: rhodecode/apps/login/views.py:471
678 #: rhodecode/apps/login/views.py:474
664 679 msgid "Given reset token is invalid"
665 680 msgstr ""
666 681
667 #: rhodecode/apps/login/views.py:479
682 #: rhodecode/apps/login/views.py:482
668 683 msgid "Your password reset was successful, a new password has been sent to your email"
669 684 msgstr ""
670 685
671 #: rhodecode/apps/my_account/views/my_account.py:136
686 #: rhodecode/apps/my_account/views/my_account.py:135
672 687 msgid "Error occurred during update of user password"
673 688 msgstr ""
674 689
675 #: rhodecode/apps/my_account/views/my_account.py:143
690 #: rhodecode/apps/my_account/views/my_account.py:142
676 691 msgid "Successfully updated password"
677 692 msgstr ""
678 693
679 #: rhodecode/apps/my_account/views/my_account.py:284
694 #: rhodecode/apps/my_account/views/my_account.py:283
680 695 msgid "Error occurred during adding email"
681 696 msgstr ""
682 697
683 #: rhodecode/apps/my_account/views/my_account.py:287
698 #: rhodecode/apps/my_account/views/my_account.py:286
684 699 msgid "Successfully added email"
685 700 msgstr ""
686 701
687 #: rhodecode/apps/my_account/views/my_account.py:309
702 #: rhodecode/apps/my_account/views/my_account.py:308
688 703 msgid "Email successfully deleted"
689 704 msgstr ""
690 705
691 #: rhodecode/apps/my_account/views/my_account.py:476
706 #: rhodecode/apps/my_account/views/my_account.py:518
707 msgid "Position {} is defined twice. Please correct this error."
708 msgstr ""
709
710 #: rhodecode/apps/my_account/views/my_account.py:531
692 711 msgid "Update Bookmarks"
693 712 msgstr ""
694 713
695 #: rhodecode/apps/my_account/views/my_account.py:478
696 msgid "Failed to update bookmarks. Make sure an unique position is used"
697 msgstr ""
698
699 #: rhodecode/apps/my_account/views/my_account.py:629
714 #: rhodecode/apps/my_account/views/my_account.py:533
715 msgid "Failed to update bookmarks. Make sure an unique position is used."
716 msgstr ""
717
718 #: rhodecode/apps/my_account/views/my_account.py:685
700 719 msgid "Your account was updated successfully"
701 720 msgstr ""
702 721
703 #: rhodecode/apps/my_account/views/my_account.py:636
722 #: rhodecode/apps/my_account/views/my_account.py:692
704 723 msgid "Error occurred during update of user"
705 724 msgstr ""
706 725
707 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:98
726 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:57
727 #: rhodecode/apps/repository/views/repo_settings_advanced.py:77
728 msgid "updated commit cache"
729 msgstr ""
730
731 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:105
708 732 #, python-format
709 733 msgid "Removed repository group `%s`"
710 734 msgstr ""
711 735
712 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:102
736 #: rhodecode/apps/repo_group/views/repo_group_advanced.py:109
713 737 #, python-format
714 738 msgid "Error occurred during deletion of repository group %s"
715 739 msgstr ""
716 740
717 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:76
741 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:74
718 742 #: rhodecode/apps/user_group/views/__init__.py:346
719 743 msgid "Cannot change permission for yourself as admin"
720 744 msgstr ""
721 745
722 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:100
746 #: rhodecode/apps/repo_group/views/repo_group_permissions.py:98
723 747 msgid "Repository Group permissions updated"
724 748 msgstr ""
725 749
726 #: rhodecode/apps/repo_group/views/repo_group_settings.py:173
750 #: rhodecode/apps/repo_group/views/repo_group_settings.py:174
727 751 msgid "Repository Group `{}` updated successfully"
728 752 msgstr ""
729 753
730 #: rhodecode/apps/repo_group/views/repo_group_settings.py:178
754 #: rhodecode/apps/repo_group/views/repo_group_settings.py:179
731 755 #, python-format
732 756 msgid "Error occurred during update of repository group %s"
733 757 msgstr ""
@@ -742,7 +766,7 b' msgstr ""'
742 766
743 767 #: rhodecode/apps/repository/views/repo_changelog.py:66
744 768 #: rhodecode/apps/repository/views/repo_compare.py:64
745 #: rhodecode/apps/repository/views/repo_pull_requests.py:727
769 #: rhodecode/apps/repository/views/repo_pull_requests.py:728
746 770 msgid "There are no commits yet"
747 771 msgstr ""
748 772
@@ -752,32 +776,32 b' msgstr ""'
752 776 msgid "No such commit exists for this repository"
753 777 msgstr ""
754 778
755 #: rhodecode/apps/repository/views/repo_checks.py:102
779 #: rhodecode/apps/repository/views/repo_checks.py:103
756 780 #, python-format
757 781 msgid "Created repository %s from %s"
758 782 msgstr ""
759 783
760 #: rhodecode/apps/repository/views/repo_checks.py:111
784 #: rhodecode/apps/repository/views/repo_checks.py:112
761 785 #, python-format
762 786 msgid "Forked repository %s as %s"
763 787 msgstr ""
764 788
765 #: rhodecode/apps/repository/views/repo_checks.py:114
789 #: rhodecode/apps/repository/views/repo_checks.py:115
766 790 #, python-format
767 791 msgid "Created repository %s"
768 792 msgstr ""
769 793
770 #: rhodecode/apps/repository/views/repo_commits.py:110
794 #: rhodecode/apps/repository/views/repo_commits.py:111
771 795 msgid "No such commit exists. Org exception: `{}`"
772 796 msgstr ""
773 797
774 #: rhodecode/apps/repository/views/repo_commits.py:326
775 #: rhodecode/apps/repository/views/repo_pull_requests.py:1347
798 #: rhodecode/apps/repository/views/repo_commits.py:330
799 #: rhodecode/apps/repository/views/repo_pull_requests.py:1362
776 800 #, python-format
777 801 msgid "Status change %(transition_icon)s %(status)s"
778 802 msgstr ""
779 803
780 #: rhodecode/apps/repository/views/repo_commits.py:371
804 #: rhodecode/apps/repository/views/repo_commits.py:375
781 805 msgid "Changing the status of a commit associated with a closed pull request is not allowed"
782 806 msgstr ""
783 807
@@ -806,12 +830,12 b' msgstr ""'
806 830 msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s."
807 831 msgstr ""
808 832
809 #: rhodecode/apps/repository/views/repo_feed.py:69
833 #: rhodecode/apps/repository/views/repo_feed.py:68
810 834 #, python-format
811 835 msgid "Changes on %s repository"
812 836 msgstr ""
813 837
814 #: rhodecode/apps/repository/views/repo_feed.py:70
838 #: rhodecode/apps/repository/views/repo_feed.py:69
815 839 #, python-format
816 840 msgid "%s %s feed"
817 841 msgstr ""
@@ -838,108 +862,108 b' msgstr ""'
838 862 msgid "There are no files yet. %s"
839 863 msgstr ""
840 864
841 #: rhodecode/apps/repository/views/repo_files.py:325
865 #: rhodecode/apps/repository/views/repo_files.py:341
842 866 msgid "Downloads disabled"
843 867 msgstr ""
844 868
845 #: rhodecode/apps/repository/views/repo_files.py:331
869 #: rhodecode/apps/repository/views/repo_files.py:347
846 870 msgid "Unknown archive type for: `{}`"
847 871 msgstr ""
848 872
849 #: rhodecode/apps/repository/views/repo_files.py:337
873 #: rhodecode/apps/repository/views/repo_files.py:353
850 874 msgid "Unknown commit_id {}"
851 875 msgstr ""
852 876
853 #: rhodecode/apps/repository/views/repo_files.py:340
877 #: rhodecode/apps/repository/views/repo_files.py:356
854 878 msgid "Empty repository"
855 879 msgstr ""
856 880
857 #: rhodecode/apps/repository/views/repo_files.py:345
881 #: rhodecode/apps/repository/views/repo_files.py:361
858 882 msgid "No node at path {} for this repository"
859 883 msgstr ""
860 884
861 #: rhodecode/apps/repository/views/repo_files.py:394
885 #: rhodecode/apps/repository/views/repo_files.py:410
862 886 msgid "Unknown archive type"
863 887 msgstr ""
864 888
865 #: rhodecode/apps/repository/views/repo_files.py:963
889 #: rhodecode/apps/repository/views/repo_files.py:989
866 890 msgid "Changesets"
867 891 msgstr ""
868 892
869 #: rhodecode/apps/repository/views/repo_files.py:984
870 #: rhodecode/apps/repository/views/repo_summary.py:346
871 #: rhodecode/model/pull_request.py:1456 rhodecode/model/scm.py:918
893 #: rhodecode/apps/repository/views/repo_files.py:1010
894 #: rhodecode/apps/repository/views/repo_summary.py:264
895 #: rhodecode/model/pull_request.py:1572 rhodecode/model/scm.py:995
872 896 #: rhodecode/templates/base/vcs_settings.mako:235
873 897 #: rhodecode/templates/summary/components.mako:10
874 898 msgid "Branches"
875 899 msgstr ""
876 900
877 #: rhodecode/apps/repository/views/repo_files.py:988 rhodecode/model/scm.py:933
878 #: rhodecode/templates/base/vcs_settings.mako:260
901 #: rhodecode/apps/repository/views/repo_files.py:1014
902 #: rhodecode/model/scm.py:1012 rhodecode/templates/base/vcs_settings.mako:260
879 903 #: rhodecode/templates/summary/components.mako:34
880 904 msgid "Tags"
881 905 msgstr ""
882 906
883 #: rhodecode/apps/repository/views/repo_files.py:1092
884 #: rhodecode/apps/repository/views/repo_files.py:1120
907 #: rhodecode/apps/repository/views/repo_files.py:1118
908 #: rhodecode/apps/repository/views/repo_files.py:1146
885 909 msgid "Deleted file {} via RhodeCode Enterprise"
886 910 msgstr ""
887 911
888 #: rhodecode/apps/repository/views/repo_files.py:1141
912 #: rhodecode/apps/repository/views/repo_files.py:1167
889 913 msgid "Successfully deleted file `{}`"
890 914 msgstr ""
891 915
892 #: rhodecode/apps/repository/views/repo_files.py:1145
893 #: rhodecode/apps/repository/views/repo_files.py:1262
894 #: rhodecode/apps/repository/views/repo_files.py:1393
895 #: rhodecode/apps/repository/views/repo_files.py:1516
916 #: rhodecode/apps/repository/views/repo_files.py:1171
917 #: rhodecode/apps/repository/views/repo_files.py:1288
918 #: rhodecode/apps/repository/views/repo_files.py:1419
919 #: rhodecode/apps/repository/views/repo_files.py:1542
896 920 msgid "Error occurred during commit"
897 921 msgstr ""
898 922
899 #: rhodecode/apps/repository/views/repo_files.py:1177
900 #: rhodecode/apps/repository/views/repo_files.py:1208
923 #: rhodecode/apps/repository/views/repo_files.py:1203
924 #: rhodecode/apps/repository/views/repo_files.py:1234
901 925 msgid "Edited file {} via RhodeCode Enterprise"
902 926 msgstr ""
903 927
904 #: rhodecode/apps/repository/views/repo_files.py:1231
928 #: rhodecode/apps/repository/views/repo_files.py:1257
905 929 msgid "No changes detected on {}"
906 930 msgstr ""
907 931
908 #: rhodecode/apps/repository/views/repo_files.py:1255
932 #: rhodecode/apps/repository/views/repo_files.py:1281
909 933 msgid "Successfully committed changes to file `{}`"
910 934 msgstr ""
911 935
912 #: rhodecode/apps/repository/views/repo_files.py:1296
913 #: rhodecode/apps/repository/views/repo_files.py:1337
936 #: rhodecode/apps/repository/views/repo_files.py:1322
937 #: rhodecode/apps/repository/views/repo_files.py:1363
914 938 msgid "Added file via RhodeCode Enterprise"
915 939 msgstr ""
916 940
917 #: rhodecode/apps/repository/views/repo_files.py:1353
941 #: rhodecode/apps/repository/views/repo_files.py:1379
918 942 msgid "No filename specified"
919 943 msgstr ""
920 944
921 #: rhodecode/apps/repository/views/repo_files.py:1378
945 #: rhodecode/apps/repository/views/repo_files.py:1404
922 946 msgid "Successfully committed new file `{}`"
923 947 msgstr ""
924 948
925 #: rhodecode/apps/repository/views/repo_files.py:1386
926 #: rhodecode/apps/repository/views/repo_files.py:1498
949 #: rhodecode/apps/repository/views/repo_files.py:1412
950 #: rhodecode/apps/repository/views/repo_files.py:1524
927 951 msgid "The location specified must be a relative path and must not contain .. in the path"
928 952 msgstr ""
929 953
930 #: rhodecode/apps/repository/views/repo_files.py:1443
954 #: rhodecode/apps/repository/views/repo_files.py:1469
931 955 msgid "Uploaded file via RhodeCode Enterprise"
932 956 msgstr ""
933 957
934 #: rhodecode/apps/repository/views/repo_files.py:1487
958 #: rhodecode/apps/repository/views/repo_files.py:1513
935 959 msgid "Successfully committed {} new files"
936 960 msgstr ""
937 961
938 #: rhodecode/apps/repository/views/repo_files.py:1489
962 #: rhodecode/apps/repository/views/repo_files.py:1515
939 963 msgid "Successfully committed 1 new file"
940 964 msgstr ""
941 965
942 #: rhodecode/apps/repository/views/repo_forks.py:147
966 #: rhodecode/apps/repository/views/repo_forks.py:146
943 967 msgid "Compare fork"
944 968 msgstr ""
945 969
@@ -948,185 +972,186 b' msgstr ""'
948 972 msgid "An error occurred during repository forking %s"
949 973 msgstr ""
950 974
951 #: rhodecode/apps/repository/views/repo_permissions.py:57
975 #: rhodecode/apps/repository/views/repo_permissions.py:55
952 976 msgid "Explicitly add user or user group with write+ permission to modify their branch permissions."
953 977 msgstr ""
954 978
955 #: rhodecode/apps/repository/views/repo_permissions.py:92
956 msgid "Repository permissions updated"
957 msgstr ""
958
959 #: rhodecode/apps/repository/views/repo_pull_requests.py:278
960 msgid "Cannot show pull requests in state other than `{}`. Current state is: `{}`"
961 msgstr ""
962
963 #: rhodecode/apps/repository/views/repo_pull_requests.py:757
979 #: rhodecode/apps/repository/views/repo_permissions.py:90
980 msgid "Repository access permissions updated"
981 msgstr ""
982
983 #: rhodecode/apps/repository/views/repo_permissions.py:112
984 msgid "Repository `{}` private mode set successfully"
985 msgstr ""
986
987 #: rhodecode/apps/repository/views/repo_permissions.py:116
988 #: rhodecode/apps/repository/views/repo_settings.py:176
989 msgid "Error occurred during update of repository {}"
990 msgstr ""
991
992 #: rhodecode/apps/repository/views/repo_pull_requests.py:758
964 993 msgid "Commit does not exist"
965 994 msgstr ""
966 995
967 #: rhodecode/apps/repository/views/repo_pull_requests.py:909
996 #: rhodecode/apps/repository/views/repo_pull_requests.py:910
968 997 msgid "Error creating pull request: {}"
969 998 msgstr ""
970 999
971 #: rhodecode/apps/repository/views/repo_pull_requests.py:928
1000 #: rhodecode/apps/repository/views/repo_pull_requests.py:929
972 1001 msgid "source_repo or target repo not found"
973 1002 msgstr ""
974 1003
975 #: rhodecode/apps/repository/views/repo_pull_requests.py:939
1004 #: rhodecode/apps/repository/views/repo_pull_requests.py:940
976 1005 msgid "Not Enough permissions to source repo `{}`."
977 1006 msgstr ""
978 1007
979 #: rhodecode/apps/repository/views/repo_pull_requests.py:954
1008 #: rhodecode/apps/repository/views/repo_pull_requests.py:955
980 1009 msgid "Not Enough permissions to target repo `{}`."
981 1010 msgstr ""
982 1011
983 #: rhodecode/apps/repository/views/repo_pull_requests.py:1017
1012 #: rhodecode/apps/repository/views/repo_pull_requests.py:1018
984 1013 msgid "Successfully opened new pull request"
985 1014 msgstr ""
986 1015
987 #: rhodecode/apps/repository/views/repo_pull_requests.py:1020
1016 #: rhodecode/apps/repository/views/repo_pull_requests.py:1021
988 1017 msgid "Error occurred during creation of this pull request."
989 1018 msgstr ""
990 1019
991 #: rhodecode/apps/repository/views/repo_pull_requests.py:1051
992 #: rhodecode/apps/repository/views/repo_pull_requests.py:1094
1020 #: rhodecode/apps/repository/views/repo_pull_requests.py:1053
1021 #: rhodecode/apps/repository/views/repo_pull_requests.py:1108
993 1022 msgid "Cannot update closed pull requests."
994 1023 msgstr ""
995 1024
996 #: rhodecode/apps/repository/views/repo_pull_requests.py:1058
997 msgid "Cannot update pull requests in state other than `{}`. Current state is: `{}`"
998 msgstr ""
999
1000 #: rhodecode/apps/repository/views/repo_pull_requests.py:1100
1025 #: rhodecode/apps/repository/views/repo_pull_requests.py:1075
1026 msgid "Cannot update pull requests commits in state other than `{}`. Current state is: `{}`"
1027 msgstr ""
1028
1029 #: rhodecode/apps/repository/views/repo_pull_requests.py:1114
1001 1030 msgid "Pull request title & description updated."
1002 1031 msgstr ""
1003 1032
1004 #: rhodecode/apps/repository/views/repo_pull_requests.py:1121
1033 #: rhodecode/apps/repository/views/repo_pull_requests.py:1136
1005 1034 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}"
1006 1035 msgstr ""
1007 1036
1008 #: rhodecode/apps/repository/views/repo_pull_requests.py:1135
1037 #: rhodecode/apps/repository/views/repo_pull_requests.py:1150
1009 1038 msgid "Reload page"
1010 1039 msgstr ""
1011 1040
1012 #: rhodecode/apps/repository/views/repo_pull_requests.py:1170
1041 #: rhodecode/apps/repository/views/repo_pull_requests.py:1185
1013 1042 msgid "Cannot merge pull requests in state other than `{}`. Current state is: `{}`"
1014 1043 msgstr ""
1015 1044
1016 #: rhodecode/apps/repository/views/repo_pull_requests.py:1216
1045 #: rhodecode/apps/repository/views/repo_pull_requests.py:1231
1017 1046 msgid "Pull request was successfully merged and closed."
1018 1047 msgstr ""
1019 1048
1020 #: rhodecode/apps/repository/views/repo_pull_requests.py:1240
1049 #: rhodecode/apps/repository/views/repo_pull_requests.py:1255
1021 1050 msgid "Pull request reviewers updated."
1022 1051 msgstr ""
1023 1052
1024 #: rhodecode/apps/repository/views/repo_pull_requests.py:1273
1053 #: rhodecode/apps/repository/views/repo_pull_requests.py:1288
1025 1054 msgid "Successfully deleted pull request"
1026 1055 msgstr ""
1027 1056
1028 #: rhodecode/apps/repository/views/repo_settings.py:171
1057 #: rhodecode/apps/repository/views/repo_settings.py:172
1029 1058 msgid "Repository `{}` updated successfully"
1030 1059 msgstr ""
1031 1060
1032 #: rhodecode/apps/repository/views/repo_settings.py:175
1033 msgid "Error occurred during update of repository {}"
1034 msgstr ""
1035
1036 #: rhodecode/apps/repository/views/repo_settings.py:208
1061 #: rhodecode/apps/repository/views/repo_settings.py:209
1037 1062 msgid "Unlocked"
1038 1063 msgstr ""
1039 1064
1040 #: rhodecode/apps/repository/views/repo_settings.py:213
1065 #: rhodecode/apps/repository/views/repo_settings.py:214
1041 1066 msgid "Locked"
1042 1067 msgstr ""
1043 1068
1044 #: rhodecode/apps/repository/views/repo_settings.py:215
1069 #: rhodecode/apps/repository/views/repo_settings.py:216
1045 1070 #, python-format
1046 1071 msgid "Repository has been %s"
1047 1072 msgstr ""
1048 1073
1049 #: rhodecode/apps/repository/views/repo_settings.py:219
1050 #: rhodecode/apps/repository/views/repo_settings_advanced.py:290
1074 #: rhodecode/apps/repository/views/repo_settings.py:220
1075 #: rhodecode/apps/repository/views/repo_settings_advanced.py:297
1051 1076 msgid "An error occurred during unlocking"
1052 1077 msgstr ""
1053 1078
1054 #: rhodecode/apps/repository/views/repo_settings.py:263
1079 #: rhodecode/apps/repository/views/repo_settings.py:264
1055 1080 msgid "An error occurred during deletion of repository stats"
1056 1081 msgstr ""
1057 1082
1058 #: rhodecode/apps/repository/views/repo_settings_advanced.py:99
1083 #: rhodecode/apps/repository/views/repo_settings_advanced.py:106
1059 1084 #, python-format
1060 1085 msgid "Archived repository `%s`"
1061 1086 msgstr ""
1062 1087
1063 #: rhodecode/apps/repository/views/repo_settings_advanced.py:104
1088 #: rhodecode/apps/repository/views/repo_settings_advanced.py:111
1064 1089 #, python-format
1065 1090 msgid "An error occurred during archiving of `%s`"
1066 1091 msgstr ""
1067 1092
1068 #: rhodecode/apps/repository/views/repo_settings_advanced.py:142
1093 #: rhodecode/apps/repository/views/repo_settings_advanced.py:149
1069 1094 #, python-format
1070 1095 msgid "Detached %s forks"
1071 1096 msgstr ""
1072 1097
1073 #: rhodecode/apps/repository/views/repo_settings_advanced.py:144
1098 #: rhodecode/apps/repository/views/repo_settings_advanced.py:151
1074 1099 #, python-format
1075 1100 msgid "Deleted %s forks"
1076 1101 msgstr ""
1077 1102
1078 #: rhodecode/apps/repository/views/repo_settings_advanced.py:153
1079 #, python-format
1080 msgid "Deleted repository `%s`"
1081 msgstr ""
1082
1083 1103 #: rhodecode/apps/repository/views/repo_settings_advanced.py:160
1104 #, python-format
1105 msgid "Deleted repository `%s`"
1106 msgstr ""
1107
1108 #: rhodecode/apps/repository/views/repo_settings_advanced.py:167
1084 1109 msgid "detach or delete"
1085 1110 msgstr ""
1086 1111
1087 #: rhodecode/apps/repository/views/repo_settings_advanced.py:161
1112 #: rhodecode/apps/repository/views/repo_settings_advanced.py:168
1088 1113 msgid "Cannot delete `{repo}` it still contains attached forks. Try using {delete_or_detach} option."
1089 1114 msgstr ""
1090 1115
1091 #: rhodecode/apps/repository/views/repo_settings_advanced.py:176
1116 #: rhodecode/apps/repository/views/repo_settings_advanced.py:183
1092 1117 msgid "Cannot delete `{repo}` it still contains {num} attached pull requests. Consider archiving the repository instead."
1093 1118 msgstr ""
1094 1119
1095 #: rhodecode/apps/repository/views/repo_settings_advanced.py:185
1120 #: rhodecode/apps/repository/views/repo_settings_advanced.py:192
1096 1121 #, python-format
1097 1122 msgid "An error occurred during deletion of `%s`"
1098 1123 msgstr ""
1099 1124
1100 #: rhodecode/apps/repository/views/repo_settings_advanced.py:210
1125 #: rhodecode/apps/repository/views/repo_settings_advanced.py:217
1101 1126 msgid "Updated repository visibility in public journal"
1102 1127 msgstr ""
1103 1128
1104 #: rhodecode/apps/repository/views/repo_settings_advanced.py:214
1129 #: rhodecode/apps/repository/views/repo_settings_advanced.py:221
1105 1130 msgid "An error occurred during setting this repository in public journal"
1106 1131 msgstr ""
1107 1132
1108 #: rhodecode/apps/repository/views/repo_settings_advanced.py:250
1133 #: rhodecode/apps/repository/views/repo_settings_advanced.py:257
1109 1134 msgid "Nothing"
1110 1135 msgstr ""
1111 1136
1112 #: rhodecode/apps/repository/views/repo_settings_advanced.py:253
1113 #, python-format
1114 msgid "Marked repo %s as fork of %s"
1115 msgstr ""
1116
1117 1137 #: rhodecode/apps/repository/views/repo_settings_advanced.py:260
1138 #, python-format
1139 msgid "Marked repo %s as fork of %s"
1140 msgstr ""
1141
1142 #: rhodecode/apps/repository/views/repo_settings_advanced.py:267
1118 1143 msgid "An error occurred during this operation"
1119 1144 msgstr ""
1120 1145
1121 #: rhodecode/apps/repository/views/repo_settings_advanced.py:284
1146 #: rhodecode/apps/repository/views/repo_settings_advanced.py:291
1122 1147 msgid "Locked repository"
1123 1148 msgstr ""
1124 1149
1125 #: rhodecode/apps/repository/views/repo_settings_advanced.py:287
1150 #: rhodecode/apps/repository/views/repo_settings_advanced.py:294
1126 1151 msgid "Unlocked repository"
1127 1152 msgstr ""
1128 1153
1129 #: rhodecode/apps/repository/views/repo_settings_advanced.py:307
1154 #: rhodecode/apps/repository/views/repo_settings_advanced.py:314
1130 1155 msgid "installed updated hooks into this repository"
1131 1156 msgstr ""
1132 1157
@@ -1154,23 +1179,23 b' msgstr ""'
1154 1179 msgid "Error occurred during updating repository VCS settings"
1155 1180 msgstr ""
1156 1181
1157 #: rhodecode/apps/repository/views/repo_summary.py:322
1182 #: rhodecode/apps/repository/views/repo_summary.py:240
1158 1183 #: rhodecode/templates/admin/permissions/permissions.mako:42
1159 1184 #: rhodecode/templates/summary/components.mako:8
1160 1185 msgid "Branch"
1161 1186 msgstr ""
1162 1187
1163 #: rhodecode/apps/repository/views/repo_summary.py:323
1188 #: rhodecode/apps/repository/views/repo_summary.py:241
1164 1189 #: rhodecode/templates/summary/components.mako:32
1165 1190 msgid "Tag"
1166 1191 msgstr ""
1167 1192
1168 #: rhodecode/apps/repository/views/repo_summary.py:324
1193 #: rhodecode/apps/repository/views/repo_summary.py:242
1169 1194 #: rhodecode/templates/summary/components.mako:44
1170 1195 msgid "Bookmark"
1171 1196 msgstr ""
1172 1197
1173 #: rhodecode/apps/repository/views/repo_summary.py:347
1198 #: rhodecode/apps/repository/views/repo_summary.py:265
1174 1199 msgid "Closed branches"
1175 1200 msgstr ""
1176 1201
@@ -1230,12 +1255,13 b' msgid "Enable or disable this authentica'
1230 1255 msgstr ""
1231 1256
1232 1257 #: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32
1233 #: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114
1234 #: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122
1235 #: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130
1258 #: rhodecode/model/permission.py:111 rhodecode/model/permission.py:115
1259 #: rhodecode/model/permission.py:119 rhodecode/model/permission.py:123
1260 #: rhodecode/model/permission.py:127 rhodecode/model/permission.py:131
1236 1261 #: rhodecode/model/validation_schema/schemas/integration_schema.py:195
1237 1262 #: rhodecode/templates/admin/auth/auth_settings.mako:64
1238 1263 #: rhodecode/templates/admin/integrations/list.mako:71
1264 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:23
1239 1265 msgid "Enabled"
1240 1266 msgstr ""
1241 1267
@@ -1334,7 +1360,7 b' msgstr ""'
1334 1360 msgid "Clean username"
1335 1361 msgstr ""
1336 1362
1337 #: rhodecode/authentication/plugins/auth_headers.py:98
1363 #: rhodecode/authentication/plugins/auth_headers.py:99
1338 1364 msgid "Headers"
1339 1365 msgstr ""
1340 1366
@@ -1390,7 +1416,7 b' msgstr ""'
1390 1416 #: rhodecode/authentication/plugins/auth_ldap.py:283
1391 1417 #: rhodecode/integrations/types/webhook.py:89 rhodecode/templates/login.mako:51
1392 1418 #: rhodecode/templates/register.mako:62
1393 #: rhodecode/templates/admin/my_account/my_account.mako:30
1419 #: rhodecode/templates/admin/my_account/my_account.mako:31
1394 1420 #: rhodecode/templates/admin/users/user_add.mako:44
1395 1421 #: rhodecode/templates/debug_style/login.html:45
1396 1422 msgid "Password"
@@ -1641,17 +1667,17 b' msgstr ""'
1641 1667 msgid "user permissions change"
1642 1668 msgstr ""
1643 1669
1644 #: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62
1670 #: rhodecode/forms/__init__.py:35
1645 1671 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:88
1646 1672 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:72
1647 1673 #: rhodecode/templates/admin/permissions/permissions_application.mako:60
1648 1674 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64
1649 1675 #: rhodecode/templates/admin/permissions/permissions_objects.mako:60
1650 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:206
1651 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84
1676 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:207
1677 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72
1652 1678 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66
1653 1679 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80
1654 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:188
1680 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:192
1655 1681 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244
1656 1682 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44
1657 1683 #: rhodecode/templates/admin/settings/settings_global.mako:141
@@ -1663,19 +1689,20 b' msgstr ""'
1663 1689 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:88
1664 1690 #: rhodecode/templates/admin/users/user_edit_emails.mako:63
1665 1691 #: rhodecode/templates/admin/users/user_edit_ips.mako:71
1666 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
1692 #: rhodecode/templates/admin/users/user_edit_profile.mako:146
1667 1693 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:67
1668 1694 #: rhodecode/templates/base/default_perms_box.mako:89
1669 1695 msgid "Reset"
1670 1696 msgstr ""
1671 1697
1672 #: rhodecode/forms/__init__.py:36 rhodecode/templates/admin/gists/show.mako:54
1698 #: rhodecode/forms/__init__.py:36
1699 #: rhodecode/templates/admin/gists/gist_show.mako:57
1673 1700 #: rhodecode/templates/admin/integrations/list.mako:179
1674 1701 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:50
1675 1702 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32
1676 1703 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33
1677 1704 #: rhodecode/templates/admin/notifications/notifications_data.mako:22
1678 #: rhodecode/templates/admin/notifications/notifications_show.mako:35
1705 #: rhodecode/templates/admin/notifications/notifications_show.mako:37
1679 1706 #: rhodecode/templates/admin/permissions/permissions_ips.mako:29
1680 1707 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:25
1681 1708 #: rhodecode/templates/admin/settings/settings_hooks.mako:46
@@ -1683,23 +1710,21 b' msgstr ""'
1683 1710 #: rhodecode/templates/admin/users/user_edit_emails.mako:31
1684 1711 #: rhodecode/templates/admin/users/user_edit_ips.mako:35
1685 1712 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30
1686 #: rhodecode/templates/base/issue_tracker_settings.mako:69
1713 #: rhodecode/templates/base/issue_tracker_settings.mako:146
1687 1714 #: rhodecode/templates/base/vcs_settings.mako:244
1688 1715 #: rhodecode/templates/base/vcs_settings.mako:269
1689 #: rhodecode/templates/changeset/changeset_file_comment.mako:144
1690 #: rhodecode/templates/changeset/changeset_file_comment.mako:146
1691 #: rhodecode/templates/changeset/changeset_file_comment.mako:149
1692 #: rhodecode/templates/data_table/_dt_elements.mako:172
1693 #: rhodecode/templates/data_table/_dt_elements.mako:245
1694 #: rhodecode/templates/data_table/_dt_elements.mako:259
1695 #: rhodecode/templates/data_table/_dt_elements.mako:271
1696 #: rhodecode/templates/data_table/_dt_elements.mako:397
1716 #: rhodecode/templates/changeset/changeset_file_comment.mako:140
1717 #: rhodecode/templates/changeset/changeset_file_comment.mako:142
1718 #: rhodecode/templates/changeset/changeset_file_comment.mako:145
1719 #: rhodecode/templates/data_table/_dt_elements.mako:179
1720 #: rhodecode/templates/data_table/_dt_elements.mako:253
1721 #: rhodecode/templates/data_table/_dt_elements.mako:268
1722 #: rhodecode/templates/data_table/_dt_elements.mako:280
1723 #: rhodecode/templates/data_table/_dt_elements.mako:426
1697 1724 #: rhodecode/templates/debug_style/buttons.html:132
1698 1725 #: rhodecode/templates/files/files_source.mako:30
1699 1726 #: rhodecode/templates/files/files_source.mako:37
1700 1727 #: rhodecode/templates/files/files_source.mako:43
1701 #: rhodecode/templates/pullrequests/pullrequest_show.mako:53
1702 #: rhodecode/templates/pullrequests/pullrequest_show.mako:57
1703 1728 msgid "Delete"
1704 1729 msgstr ""
1705 1730
@@ -1755,11 +1780,11 b' msgstr ""'
1755 1780 msgid "Integration {integration_name} deleted successfully."
1756 1781 msgstr ""
1757 1782
1758 #: rhodecode/integrations/views.py:301
1783 #: rhodecode/integrations/views.py:305
1759 1784 msgid "Errors exist when saving integration settings. Please check the form inputs."
1760 1785 msgstr ""
1761 1786
1762 #: rhodecode/integrations/views.py:326
1787 #: rhodecode/integrations/views.py:330
1763 1788 msgid "Integration {integration_name} updated successfully."
1764 1789 msgstr ""
1765 1790
@@ -1778,12 +1803,12 b' msgstr ""'
1778 1803
1779 1804 #: rhodecode/integrations/types/email.py:174
1780 1805 #: rhodecode/templates/register.mako:95
1781 #: rhodecode/templates/admin/my_account/my_account_profile.mako:55
1806 #: rhodecode/templates/admin/my_account/my_account_profile.mako:67
1782 1807 #: rhodecode/templates/admin/users/user_add.mako:86
1783 #: rhodecode/templates/admin/users/user_edit_profile.mako:64
1808 #: rhodecode/templates/admin/users/user_edit_profile.mako:62
1784 1809 #: rhodecode/templates/admin/users/users.mako:76
1785 #: rhodecode/templates/email_templates/user_registration.mako:25
1786 #: rhodecode/templates/users/user_profile.mako:58
1810 #: rhodecode/templates/email_templates/user_registration.mako:50
1811 #: rhodecode/templates/users/user_profile.mako:69
1787 1812 msgid "Email"
1788 1813 msgstr ""
1789 1814
@@ -1855,17 +1880,17 b' msgstr ""'
1855 1880 #: rhodecode/integrations/types/webhook.py:79 rhodecode/templates/login.mako:44
1856 1881 #: rhodecode/templates/register.mako:48
1857 1882 #: rhodecode/templates/admin/admin_log_base.mako:7
1858 #: rhodecode/templates/admin/my_account/my_account_profile.mako:25
1883 #: rhodecode/templates/admin/my_account/my_account_profile.mako:27
1859 1884 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23
1860 1885 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:45
1861 1886 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70
1862 1887 #: rhodecode/templates/admin/users/user_add.mako:35
1863 #: rhodecode/templates/admin/users/user_edit_profile.mako:38
1888 #: rhodecode/templates/admin/users/user_edit_profile.mako:36
1864 1889 #: rhodecode/templates/admin/users/users.mako:74
1865 1890 #: rhodecode/templates/debug_style/login.html:36
1866 #: rhodecode/templates/email_templates/user_registration.mako:23
1867 #: rhodecode/templates/user_group/profile.mako:51
1868 #: rhodecode/templates/users/user_profile.mako:28
1891 #: rhodecode/templates/email_templates/user_registration.mako:42
1892 #: rhodecode/templates/user_group/profile.mako:61
1893 #: rhodecode/templates/users/user_profile.mako:29
1869 1894 msgid "Username"
1870 1895 msgstr ""
1871 1896
@@ -2043,7 +2068,6 b' msgid "fork name %s"'
2043 2068 msgstr ""
2044 2069
2045 2070 #: rhodecode/lib/action_parser.py:191
2046 #: rhodecode/templates/pullrequests/pullrequest_show.mako:48
2047 2071 #, python-format
2048 2072 msgid "Pull request #%s"
2049 2073 msgstr ""
@@ -2076,24 +2100,23 b' msgstr ""'
2076 2100 msgid "Commit not found"
2077 2101 msgstr ""
2078 2102
2079 #: rhodecode/lib/auth.py:1619
2080 #, python-format
2081 msgid "IP %s not allowed"
2082 msgstr ""
2083
2084 #: rhodecode/lib/auth.py:1703
2103 #: rhodecode/lib/auth.py:1672
2104 msgid "IP {} not allowed"
2105 msgstr ""
2106
2107 #: rhodecode/lib/auth.py:1764
2085 2108 msgid "You need to be a registered user to perform this action"
2086 2109 msgstr ""
2087 2110
2088 #: rhodecode/lib/auth.py:1747
2111 #: rhodecode/lib/auth.py:1808
2089 2112 msgid "You need to be signed in to view this page"
2090 2113 msgstr ""
2091 2114
2092 #: rhodecode/lib/diffs.py:900
2115 #: rhodecode/lib/diffs.py:902
2093 2116 msgid "Click to select line"
2094 2117 msgstr ""
2095 2118
2096 #: rhodecode/lib/helpers.py:1857
2119 #: rhodecode/lib/helpers.py:1706
2097 2120 msgid ""
2098 2121 "Example filter terms:\n"
2099 2122 " repository:vcs\n"
@@ -2115,45 +2138,46 b' msgid ""'
2115 2138 " \"username:test AND repository:test*\"\n"
2116 2139 msgstr ""
2117 2140
2118 #: rhodecode/lib/helpers.py:1881
2141 #: rhodecode/lib/helpers.py:1730
2119 2142 #, python-format
2120 2143 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"
2121 2144 msgstr ""
2122 2145
2123 #: rhodecode/lib/utils2.py:536
2124 msgid "in ${ago}"
2125 msgstr ""
2126
2127 2146 #: rhodecode/lib/utils2.py:542
2147 msgid "in ${ago}"
2148 msgstr ""
2149
2150 #: rhodecode/lib/utils2.py:548
2128 2151 msgid "${ago} ago"
2129 2152 msgstr ""
2130 2153
2131 #: rhodecode/lib/utils2.py:551
2132 msgid "${val}, ${detail}"
2133 msgstr ""
2134
2135 #: rhodecode/lib/utils2.py:553
2136 msgid "${val}, ${detail} ago"
2137 msgstr ""
2138
2139 #: rhodecode/lib/utils2.py:555
2140 msgid "in ${val}, ${detail}"
2141 msgstr ""
2142
2143 2154 #: rhodecode/lib/utils2.py:557
2144 msgid "${val} and ${detail}"
2155 msgid "${val}, ${detail}"
2145 2156 msgstr ""
2146 2157
2147 2158 #: rhodecode/lib/utils2.py:559
2148 msgid "${val} and ${detail} ago"
2159 msgid "${val}, ${detail} ago"
2149 2160 msgstr ""
2150 2161
2151 2162 #: rhodecode/lib/utils2.py:561
2163 msgid "in ${val}, ${detail}"
2164 msgstr ""
2165
2166 #: rhodecode/lib/utils2.py:563
2167 msgid "${val} and ${detail}"
2168 msgstr ""
2169
2170 #: rhodecode/lib/utils2.py:565
2171 msgid "${val} and ${detail} ago"
2172 msgstr ""
2173
2174 #: rhodecode/lib/utils2.py:567
2152 2175 msgid "in ${val} and ${detail}"
2153 2176 msgstr ""
2154 2177
2155 #: rhodecode/lib/utils2.py:565 rhodecode/public/js/scripts.js:25634
2156 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
2178 #: rhodecode/lib/utils2.py:571 rhodecode/public/js/scripts.js:25634
2179 #: rhodecode/public/js/scripts.min.js:1
2180 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
2157 2181 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174
2158 2182 msgid "just now"
2159 2183 msgstr ""
@@ -2186,6 +2210,7 b' msgstr ""'
2186 2210 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2739
2187 2211 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2772
2188 2212 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2772
2213 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2987
2189 2214 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2275
2190 2215 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2267
2191 2216 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266
@@ -2193,7 +2218,7 b' msgstr ""'
2193 2218 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270
2194 2219 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2321
2195 2220 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2322
2196 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2959
2221 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:3061
2197 2222 msgid "Repository no access"
2198 2223 msgstr ""
2199 2224
@@ -2225,6 +2250,7 b' msgstr ""'
2225 2250 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2740
2226 2251 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2773
2227 2252 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2773
2253 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2988
2228 2254 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276
2229 2255 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268
2230 2256 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2267
@@ -2232,7 +2258,7 b' msgstr ""'
2232 2258 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2271
2233 2259 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322
2234 2260 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323
2235 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:2960
2261 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2523 rhodecode/model/db.py:3062
2236 2262 msgid "Repository read access"
2237 2263 msgstr ""
2238 2264
@@ -2264,6 +2290,7 b' msgstr ""'
2264 2290 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2741
2265 2291 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2774
2266 2292 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2774
2293 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2989
2267 2294 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277
2268 2295 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269
2269 2296 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268
@@ -2271,7 +2298,7 b' msgstr ""'
2271 2298 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272
2272 2299 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323
2273 2300 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324
2274 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2961
2301 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:3063
2275 2302 msgid "Repository write access"
2276 2303 msgstr ""
2277 2304
@@ -2303,6 +2330,7 b' msgstr ""'
2303 2330 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2742
2304 2331 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2775
2305 2332 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2775
2333 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2990
2306 2334 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278
2307 2335 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270
2308 2336 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269
@@ -2310,7 +2338,7 b' msgstr ""'
2310 2338 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273
2311 2339 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324
2312 2340 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325
2313 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2962
2341 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:3064
2314 2342 msgid "Repository admin access"
2315 2343 msgstr ""
2316 2344
@@ -2382,6 +2410,7 b' msgstr ""'
2382 2410 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2765
2383 2411 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2798
2384 2412 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2798
2413 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3013
2385 2414 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2296
2386 2415 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2288
2387 2416 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287
@@ -2389,7 +2418,7 b' msgstr ""'
2389 2418 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291
2390 2419 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2342
2391 2420 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2343
2392 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2985
2421 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:3087
2393 2422 msgid "Repository creation disabled"
2394 2423 msgstr ""
2395 2424
@@ -2421,6 +2450,7 b' msgstr ""'
2421 2450 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2766
2422 2451 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2799
2423 2452 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2799
2453 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3014
2424 2454 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297
2425 2455 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289
2426 2456 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2288
@@ -2428,7 +2458,7 b' msgstr ""'
2428 2458 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2292
2429 2459 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343
2430 2460 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344
2431 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:2986
2461 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2544 rhodecode/model/db.py:3088
2432 2462 msgid "Repository creation enabled"
2433 2463 msgstr ""
2434 2464
@@ -2460,6 +2490,7 b' msgstr ""'
2460 2490 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2770
2461 2491 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2803
2462 2492 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2803
2493 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3018
2463 2494 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2301
2464 2495 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2293
2465 2496 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292
@@ -2467,7 +2498,7 b' msgstr ""'
2467 2498 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296
2468 2499 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2347
2469 2500 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2348
2470 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2990
2501 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:3092
2471 2502 msgid "Repository forking disabled"
2472 2503 msgstr ""
2473 2504
@@ -2499,6 +2530,7 b' msgstr ""'
2499 2530 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2771
2500 2531 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2804
2501 2532 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2804
2533 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3019
2502 2534 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302
2503 2535 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294
2504 2536 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2293
@@ -2506,7 +2538,7 b' msgstr ""'
2506 2538 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2297
2507 2539 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348
2508 2540 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349
2509 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:2991
2541 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2549 rhodecode/model/db.py:3093
2510 2542 msgid "Repository forking enabled"
2511 2543 msgstr ""
2512 2544
@@ -2559,6 +2591,7 b' msgstr ""'
2559 2591 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3491
2560 2592 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3524
2561 2593 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3525
2594 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3757
2562 2595 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2915
2563 2596 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2907
2564 2597 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2907
@@ -2566,10 +2599,10 b' msgstr ""'
2566 2599 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2910
2567 2600 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3011
2568 2601 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3012
2569 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3712
2570 #: rhodecode/public/js/scripts.js:43644
2571 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
2572 #: rhodecode/public/js/src/rhodecode/pullrequests.js:319
2602 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3230 rhodecode/model/db.py:3831
2603 #: rhodecode/public/js/scripts.js:44680 rhodecode/public/js/scripts.min.js:1
2604 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
2605 #: rhodecode/public/js/src/rhodecode/pullrequests.js:320
2573 2606 msgid "Not Reviewed"
2574 2607 msgstr ""
2575 2608
@@ -2601,6 +2634,7 b' msgstr ""'
2601 2634 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3492
2602 2635 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3525
2603 2636 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3526
2637 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3758
2604 2638 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916
2605 2639 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908
2606 2640 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2908
@@ -2608,7 +2642,7 b' msgstr ""'
2608 2642 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2911
2609 2643 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012
2610 2644 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013
2611 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3713
2645 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3231 rhodecode/model/db.py:3832
2612 2646 msgid "Approved"
2613 2647 msgstr ""
2614 2648
@@ -2640,6 +2674,7 b' msgstr ""'
2640 2674 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3493
2641 2675 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3526
2642 2676 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3527
2677 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3759
2643 2678 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917
2644 2679 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909
2645 2680 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909
@@ -2647,7 +2682,7 b' msgstr ""'
2647 2682 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912
2648 2683 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013
2649 2684 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014
2650 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3714
2685 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3833
2651 2686 msgid "Rejected"
2652 2687 msgstr ""
2653 2688
@@ -2679,6 +2714,7 b' msgstr ""'
2679 2714 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:3494
2680 2715 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:3527
2681 2716 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:3528
2717 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3760
2682 2718 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918
2683 2719 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910
2684 2720 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910
@@ -2686,7 +2722,7 b' msgstr ""'
2686 2722 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913
2687 2723 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014
2688 2724 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015
2689 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3715
2725 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3834
2690 2726 msgid "Under Review"
2691 2727 msgstr ""
2692 2728
@@ -2715,6 +2751,7 b' msgstr ""'
2715 2751 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2744
2716 2752 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2777
2717 2753 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2777
2754 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2992
2718 2755 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2280
2719 2756 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2272
2720 2757 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271
@@ -2722,7 +2759,7 b' msgstr ""'
2722 2759 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275
2723 2760 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2326
2724 2761 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2327
2725 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2964
2762 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:3066
2726 2763 msgid "Repository group no access"
2727 2764 msgstr ""
2728 2765
@@ -2751,6 +2788,7 b' msgstr ""'
2751 2788 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2745
2752 2789 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2778
2753 2790 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2778
2791 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2993
2754 2792 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281
2755 2793 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273
2756 2794 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2272
@@ -2758,7 +2796,7 b' msgstr ""'
2758 2796 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2276
2759 2797 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327
2760 2798 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328
2761 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:2965
2799 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2528 rhodecode/model/db.py:3067
2762 2800 msgid "Repository group read access"
2763 2801 msgstr ""
2764 2802
@@ -2787,6 +2825,7 b' msgstr ""'
2787 2825 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2746
2788 2826 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2779
2789 2827 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2779
2828 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2994
2790 2829 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282
2791 2830 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274
2792 2831 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273
@@ -2794,7 +2833,7 b' msgstr ""'
2794 2833 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277
2795 2834 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328
2796 2835 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329
2797 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2966
2836 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:3068
2798 2837 msgid "Repository group write access"
2799 2838 msgstr ""
2800 2839
@@ -2823,6 +2862,7 b' msgstr ""'
2823 2862 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2747
2824 2863 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2780
2825 2864 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2780
2865 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2995
2826 2866 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283
2827 2867 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275
2828 2868 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274
@@ -2830,7 +2870,7 b' msgstr ""'
2830 2870 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278
2831 2871 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329
2832 2872 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330
2833 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2967
2873 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:3069
2834 2874 msgid "Repository group admin access"
2835 2875 msgstr ""
2836 2876
@@ -2858,6 +2898,7 b' msgstr ""'
2858 2898 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2749
2859 2899 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2782
2860 2900 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2782
2901 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2997
2861 2902 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285
2862 2903 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277
2863 2904 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276
@@ -2865,7 +2906,7 b' msgstr ""'
2865 2906 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280
2866 2907 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331
2867 2908 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332
2868 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:2969
2909 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:3071
2869 2910 msgid "User group no access"
2870 2911 msgstr ""
2871 2912
@@ -2893,6 +2934,7 b' msgstr ""'
2893 2934 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2750
2894 2935 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2783
2895 2936 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2783
2937 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2998
2896 2938 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286
2897 2939 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278
2898 2940 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277
@@ -2900,7 +2942,7 b' msgstr ""'
2900 2942 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281
2901 2943 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332
2902 2944 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333
2903 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2970
2945 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:3072
2904 2946 msgid "User group read access"
2905 2947 msgstr ""
2906 2948
@@ -2928,6 +2970,7 b' msgstr ""'
2928 2970 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2751
2929 2971 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2784
2930 2972 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2784
2973 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2999
2931 2974 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287
2932 2975 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279
2933 2976 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278
@@ -2935,7 +2978,7 b' msgstr ""'
2935 2978 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282
2936 2979 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333
2937 2980 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334
2938 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:2971
2981 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:3073
2939 2982 msgid "User group write access"
2940 2983 msgstr ""
2941 2984
@@ -2963,6 +3006,7 b' msgstr ""'
2963 3006 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2752
2964 3007 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2785
2965 3008 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2785
3009 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3000
2966 3010 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288
2967 3011 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280
2968 3012 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279
@@ -2970,7 +3014,7 b' msgstr ""'
2970 3014 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283
2971 3015 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334
2972 3016 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335
2973 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2972
3017 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:3074
2974 3018 msgid "User group admin access"
2975 3019 msgstr ""
2976 3020
@@ -2998,6 +3042,7 b' msgstr ""'
2998 3042 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2759
2999 3043 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2792
3000 3044 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2792
3045 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3007
3001 3046 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290
3002 3047 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282
3003 3048 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281
@@ -3005,7 +3050,7 b' msgstr ""'
3005 3050 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285
3006 3051 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336
3007 3052 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337
3008 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2979
3053 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:3081
3009 3054 msgid "Repository Group creation disabled"
3010 3055 msgstr ""
3011 3056
@@ -3033,6 +3078,7 b' msgstr ""'
3033 3078 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2760
3034 3079 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2793
3035 3080 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2793
3081 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3008
3036 3082 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291
3037 3083 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283
3038 3084 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282
@@ -3040,7 +3086,7 b' msgstr ""'
3040 3086 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286
3041 3087 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337
3042 3088 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338
3043 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2980
3089 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:3082
3044 3090 msgid "Repository Group creation enabled"
3045 3091 msgstr ""
3046 3092
@@ -3068,6 +3114,7 b' msgstr ""'
3068 3114 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2762
3069 3115 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2795
3070 3116 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2795
3117 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3010
3071 3118 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293
3072 3119 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285
3073 3120 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284
@@ -3075,7 +3122,7 b' msgstr ""'
3075 3122 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288
3076 3123 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339
3077 3124 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340
3078 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2982
3125 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:3084
3079 3126 msgid "User Group creation disabled"
3080 3127 msgstr ""
3081 3128
@@ -3103,6 +3150,7 b' msgstr ""'
3103 3150 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2763
3104 3151 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2796
3105 3152 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2796
3153 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3011
3106 3154 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294
3107 3155 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286
3108 3156 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285
@@ -3110,7 +3158,7 b' msgstr ""'
3110 3158 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289
3111 3159 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340
3112 3160 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341
3113 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2983
3161 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:3085
3114 3162 msgid "User Group creation enabled"
3115 3163 msgstr ""
3116 3164
@@ -3138,6 +3186,7 b' msgstr ""'
3138 3186 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2773
3139 3187 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2806
3140 3188 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2806
3189 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3021
3141 3190 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2304
3142 3191 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2296
3143 3192 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295
@@ -3145,7 +3194,7 b' msgstr ""'
3145 3194 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299
3146 3195 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2350
3147 3196 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2351
3148 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2993
3197 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:3095
3149 3198 msgid "Registration disabled"
3150 3199 msgstr ""
3151 3200
@@ -3173,6 +3222,7 b' msgstr ""'
3173 3222 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2774
3174 3223 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2807
3175 3224 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2807
3225 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3022
3176 3226 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305
3177 3227 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297
3178 3228 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2296
@@ -3180,7 +3230,7 b' msgstr ""'
3180 3230 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2300
3181 3231 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351
3182 3232 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352
3183 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:2994
3233 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2552 rhodecode/model/db.py:3096
3184 3234 msgid "User Registration with manual account activation"
3185 3235 msgstr ""
3186 3236
@@ -3208,6 +3258,7 b' msgstr ""'
3208 3258 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2775
3209 3259 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2808
3210 3260 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2808
3261 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3023
3211 3262 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306
3212 3263 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298
3213 3264 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297
@@ -3215,7 +3266,7 b' msgstr ""'
3215 3266 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301
3216 3267 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352
3217 3268 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353
3218 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2995
3269 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:3097
3219 3270 msgid "User Registration with automatic account activation"
3220 3271 msgstr ""
3221 3272
@@ -3243,6 +3294,7 b' msgstr ""'
3243 3294 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2781
3244 3295 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2814
3245 3296 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2814
3297 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3029
3246 3298 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308
3247 3299 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300
3248 3300 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299
@@ -3250,8 +3302,8 b' msgstr ""'
3250 3302 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303
3251 3303 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2358
3252 3304 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2359
3253 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3001
3254 #: rhodecode/model/permission.py:105
3305 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:3103
3306 #: rhodecode/model/permission.py:106
3255 3307 msgid "Manual activation of external account"
3256 3308 msgstr ""
3257 3309
@@ -3279,6 +3331,7 b' msgstr ""'
3279 3331 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2782
3280 3332 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2815
3281 3333 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2815
3334 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3030
3282 3335 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309
3283 3336 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301
3284 3337 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300
@@ -3286,8 +3339,8 b' msgstr ""'
3286 3339 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304
3287 3340 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359
3288 3341 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360
3289 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3002
3290 #: rhodecode/model/permission.py:106
3342 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2560 rhodecode/model/db.py:3104
3343 #: rhodecode/model/permission.py:107
3291 3344 msgid "Automatic activation of external account"
3292 3345 msgstr ""
3293 3346
@@ -3309,6 +3362,7 b' msgstr ""'
3309 3362 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2767
3310 3363 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2800
3311 3364 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2800
3365 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3015
3312 3366 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298
3313 3367 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290
3314 3368 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289
@@ -3316,7 +3370,7 b' msgstr ""'
3316 3370 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293
3317 3371 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344
3318 3372 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345
3319 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2987
3373 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:3089
3320 3374 msgid "Repository creation enabled with write permission to a repository group"
3321 3375 msgstr ""
3322 3376
@@ -3338,6 +3392,7 b' msgstr ""'
3338 3392 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2768
3339 3393 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2801
3340 3394 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2801
3395 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3016
3341 3396 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299
3342 3397 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291
3343 3398 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290
@@ -3345,7 +3400,7 b' msgstr ""'
3345 3400 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294
3346 3401 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345
3347 3402 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346
3348 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2988
3403 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:3090
3349 3404 msgid "Repository creation disabled with write permission to a repository group"
3350 3405 msgstr ""
3351 3406
@@ -3364,6 +3419,7 b' msgstr ""'
3364 3419 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2737
3365 3420 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2770
3366 3421 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2770
3422 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2985
3367 3423 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2273
3368 3424 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2265
3369 3425 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2264
@@ -3371,7 +3427,7 b' msgstr ""'
3371 3427 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2268
3372 3428 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2319
3373 3429 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2320
3374 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:2957
3430 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2520 rhodecode/model/db.py:3059
3375 3431 msgid "RhodeCode Super Administrator"
3376 3432 msgstr ""
3377 3433
@@ -3388,6 +3444,7 b' msgstr ""'
3388 3444 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2784
3389 3445 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2817
3390 3446 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2817
3447 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3032
3391 3448 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311
3392 3449 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303
3393 3450 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302
@@ -3395,7 +3452,7 b' msgstr ""'
3395 3452 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306
3396 3453 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2361
3397 3454 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2362
3398 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3004
3455 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:3106
3399 3456 msgid "Inherit object permissions from default user disabled"
3400 3457 msgstr ""
3401 3458
@@ -3412,6 +3469,7 b' msgstr ""'
3412 3469 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2785
3413 3470 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2818
3414 3471 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2818
3472 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3033
3415 3473 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312
3416 3474 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304
3417 3475 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303
@@ -3419,7 +3477,7 b' msgstr ""'
3419 3477 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307
3420 3478 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362
3421 3479 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363
3422 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3005
3480 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2563 rhodecode/model/db.py:3107
3423 3481 msgid "Inherit object permissions from default user enabled"
3424 3482 msgstr ""
3425 3483
@@ -3428,6 +3486,7 b' msgstr ""'
3428 3486 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1118
3429 3487 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1120
3430 3488 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1120
3489 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1137
3431 3490 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910
3432 3491 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911
3433 3492 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:910
@@ -3435,7 +3494,7 b' msgstr ""'
3435 3494 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:912
3436 3495 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955
3437 3496 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956
3438 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1134
3497 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1050 rhodecode/model/db.py:1178
3439 3498 msgid "all"
3440 3499 msgstr ""
3441 3500
@@ -3444,6 +3503,7 b' msgstr ""'
3444 3503 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1119
3445 3504 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1121
3446 3505 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1121
3506 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1138
3447 3507 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911
3448 3508 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912
3449 3509 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911
@@ -3451,7 +3511,7 b' msgstr ""'
3451 3511 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913
3452 3512 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956
3453 3513 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957
3454 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1135
3514 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1179
3455 3515 msgid "http/web interface"
3456 3516 msgstr ""
3457 3517
@@ -3460,6 +3520,7 b' msgstr ""'
3460 3520 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1120
3461 3521 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1122
3462 3522 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1122
3523 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1139
3463 3524 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912
3464 3525 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913
3465 3526 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912
@@ -3467,7 +3528,7 b' msgstr ""'
3467 3528 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914
3468 3529 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957
3469 3530 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958
3470 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1136
3531 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1180
3471 3532 msgid "vcs (git/hg/svn protocol)"
3472 3533 msgstr ""
3473 3534
@@ -3476,6 +3537,7 b' msgstr ""'
3476 3537 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1121
3477 3538 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1123
3478 3539 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1123
3540 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1140
3479 3541 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913
3480 3542 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914
3481 3543 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913
@@ -3483,7 +3545,7 b' msgstr ""'
3483 3545 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915
3484 3546 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958
3485 3547 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959
3486 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1137
3548 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1181
3487 3549 msgid "api calls"
3488 3550 msgstr ""
3489 3551
@@ -3492,6 +3554,7 b' msgstr ""'
3492 3554 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:1122
3493 3555 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:1124
3494 3556 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:1124
3557 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:1141
3495 3558 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914
3496 3559 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915
3497 3560 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914
@@ -3499,7 +3562,7 b' msgstr ""'
3499 3562 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916
3500 3563 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959
3501 3564 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960
3502 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1138
3565 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1182
3503 3566 msgid "feed access"
3504 3567 msgstr ""
3505 3568
@@ -3508,6 +3571,7 b' msgstr ""'
3508 3571 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2488
3509 3572 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2511
3510 3573 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2511
3574 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:2638
3511 3575 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2051
3512 3576 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2043
3513 3577 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2042
@@ -3515,7 +3579,7 b' msgstr ""'
3515 3579 #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2046
3516 3580 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2090
3517 3581 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2091
3518 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2610
3582 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2284 rhodecode/model/db.py:2717
3519 3583 msgid "No parent"
3520 3584 msgstr ""
3521 3585
@@ -3524,9 +3588,10 b' msgstr ""'
3524 3588 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2777
3525 3589 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2810
3526 3590 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2810
3591 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3025
3527 3592 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354
3528 3593 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355
3529 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:2997
3594 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:3099
3530 3595 msgid "Password reset enabled"
3531 3596 msgstr ""
3532 3597
@@ -3535,9 +3600,10 b' msgstr ""'
3535 3600 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2778
3536 3601 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2811
3537 3602 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2811
3603 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3026
3538 3604 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355
3539 3605 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356
3540 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2998
3606 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:3100
3541 3607 msgid "Password reset hidden"
3542 3608 msgstr ""
3543 3609
@@ -3546,9 +3612,10 b' msgstr ""'
3546 3612 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2779
3547 3613 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2812
3548 3614 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2812
3615 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3027
3549 3616 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356
3550 3617 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357
3551 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2999
3618 #: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:3101
3552 3619 msgid "Password reset disabled"
3553 3620 msgstr ""
3554 3621
@@ -3556,7 +3623,8 b' msgstr ""'
3556 3623 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2754
3557 3624 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2787
3558 3625 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2787
3559 #: rhodecode/model/db.py:2974
3626 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3002
3627 #: rhodecode/model/db.py:3076
3560 3628 msgid "Branch no permissions"
3561 3629 msgstr ""
3562 3630
@@ -3564,7 +3632,8 b' msgstr ""'
3564 3632 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2755
3565 3633 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2788
3566 3634 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2788
3567 #: rhodecode/model/db.py:2975
3635 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3003
3636 #: rhodecode/model/db.py:3077
3568 3637 msgid "Branch access by web merge"
3569 3638 msgstr ""
3570 3639
@@ -3572,7 +3641,8 b' msgstr ""'
3572 3641 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2756
3573 3642 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2789
3574 3643 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2789
3575 #: rhodecode/model/db.py:2976
3644 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3004
3645 #: rhodecode/model/db.py:3078
3576 3646 msgid "Branch access by push"
3577 3647 msgstr ""
3578 3648
@@ -3580,27 +3650,28 b' msgstr ""'
3580 3650 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_0.py:2757
3581 3651 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_1.py:2790
3582 3652 #: rhodecode/lib/dbmigrate/schema/db_4_16_0_2.py:2790
3583 #: rhodecode/model/db.py:2977
3653 #: rhodecode/lib/dbmigrate/schema/db_4_18_0_1.py:3005
3654 #: rhodecode/model/db.py:3079
3584 3655 msgid "Branch access by push with force"
3585 3656 msgstr ""
3586 3657
3587 #: rhodecode/lib/index/whoosh.py:164
3658 #: rhodecode/lib/index/whoosh.py:189
3588 3659 msgid "Index Type"
3589 3660 msgstr ""
3590 3661
3591 #: rhodecode/lib/index/whoosh.py:167
3662 #: rhodecode/lib/index/whoosh.py:192
3592 3663 msgid "File Index"
3593 3664 msgstr ""
3594 3665
3595 #: rhodecode/lib/index/whoosh.py:168 rhodecode/lib/index/whoosh.py:174
3666 #: rhodecode/lib/index/whoosh.py:193 rhodecode/lib/index/whoosh.py:199
3596 3667 msgid "Indexed documents"
3597 3668 msgstr ""
3598 3669
3599 #: rhodecode/lib/index/whoosh.py:169 rhodecode/lib/index/whoosh.py:175
3670 #: rhodecode/lib/index/whoosh.py:194 rhodecode/lib/index/whoosh.py:200
3600 3671 msgid "Last update"
3601 3672 msgstr ""
3602 3673
3603 #: rhodecode/lib/index/whoosh.py:173
3674 #: rhodecode/lib/index/whoosh.py:198
3604 3675 msgid "Commit index"
3605 3676 msgstr ""
3606 3677
@@ -3613,7 +3684,7 b' msgid "This pull request cannot be merge'
3613 3684 msgstr ""
3614 3685
3615 3686 #: rhodecode/lib/vcs/backends/base.py:155
3616 msgid "This pull request cannot be merged because of merge conflicts."
3687 msgid "This pull request cannot be merged because of merge conflicts. {unresolved_files}"
3617 3688 msgstr ""
3618 3689
3619 3690 #: rhodecode/lib/vcs/backends/base.py:157
@@ -3668,14 +3739,18 b' msgstr ""'
3668 3739 msgid "1 month {end_date}"
3669 3740 msgstr ""
3670 3741
3671 #: rhodecode/model/comment.py:422
3742 #: rhodecode/model/comment.py:473
3672 3743 msgid "made a comment"
3673 3744 msgstr ""
3674 3745
3675 #: rhodecode/model/comment.py:423
3746 #: rhodecode/model/comment.py:474
3676 3747 msgid "Show it now"
3677 3748 msgstr ""
3678 3749
3750 #: rhodecode/model/db.py:1183
3751 msgid "artifacts downloads"
3752 msgstr ""
3753
3679 3754 #: rhodecode/model/forms.py:88
3680 3755 msgid "Please enter a login"
3681 3756 msgstr ""
@@ -3694,96 +3769,106 b' msgstr ""'
3694 3769 msgid "Enter %(min)i characters or more"
3695 3770 msgstr ""
3696 3771
3697 #: rhodecode/model/notification.py:244
3772 #: rhodecode/model/notification.py:245
3698 3773 #, python-format
3699 3774 msgid "%(user)s commented on commit %(date_or_age)s"
3700 3775 msgstr ""
3701 3776
3702 #: rhodecode/model/notification.py:245
3777 #: rhodecode/model/notification.py:246
3703 3778 #, python-format
3704 3779 msgid "%(user)s commented on commit at %(date_or_age)s"
3705 3780 msgstr ""
3706 3781
3707 #: rhodecode/model/notification.py:248
3708 #, python-format
3709 msgid "%(user)s sent message %(date_or_age)s"
3710 msgstr ""
3711
3712 3782 #: rhodecode/model/notification.py:249
3713 3783 #, python-format
3784 msgid "%(user)s sent message %(date_or_age)s"
3785 msgstr ""
3786
3787 #: rhodecode/model/notification.py:250
3788 #, python-format
3714 3789 msgid "%(user)s sent message at %(date_or_age)s"
3715 3790 msgstr ""
3716 3791
3717 #: rhodecode/model/notification.py:252
3718 #, python-format
3719 msgid "%(user)s mentioned you %(date_or_age)s"
3720 msgstr ""
3721
3722 3792 #: rhodecode/model/notification.py:253
3723 3793 #, python-format
3794 msgid "%(user)s mentioned you %(date_or_age)s"
3795 msgstr ""
3796
3797 #: rhodecode/model/notification.py:254
3798 #, python-format
3724 3799 msgid "%(user)s mentioned you at %(date_or_age)s"
3725 3800 msgstr ""
3726 3801
3727 #: rhodecode/model/notification.py:256
3728 #, python-format
3729 msgid "%(user)s registered in RhodeCode %(date_or_age)s"
3730 msgstr ""
3731
3732 3802 #: rhodecode/model/notification.py:257
3733 3803 #, python-format
3804 msgid "%(user)s registered in RhodeCode %(date_or_age)s"
3805 msgstr ""
3806
3807 #: rhodecode/model/notification.py:258
3808 #, python-format
3734 3809 msgid "%(user)s registered in RhodeCode at %(date_or_age)s"
3735 3810 msgstr ""
3736 3811
3737 #: rhodecode/model/notification.py:260
3738 #, python-format
3739 msgid "%(user)s opened new pull request %(date_or_age)s"
3740 msgstr ""
3741
3742 3812 #: rhodecode/model/notification.py:261
3743 3813 #, python-format
3814 msgid "%(user)s opened new pull request %(date_or_age)s"
3815 msgstr ""
3816
3817 #: rhodecode/model/notification.py:262
3818 #, python-format
3744 3819 msgid "%(user)s opened new pull request at %(date_or_age)s"
3745 3820 msgstr ""
3746 3821
3747 #: rhodecode/model/notification.py:264
3748 #, python-format
3749 msgid "%(user)s commented on pull request %(date_or_age)s"
3750 msgstr ""
3751
3752 3822 #: rhodecode/model/notification.py:265
3753 3823 #, python-format
3824 msgid "%(user)s updated pull request %(date_or_age)s"
3825 msgstr ""
3826
3827 #: rhodecode/model/notification.py:266
3828 #, python-format
3829 msgid "%(user)s updated pull request at %(date_or_age)s"
3830 msgstr ""
3831
3832 #: rhodecode/model/notification.py:269
3833 #, python-format
3834 msgid "%(user)s commented on pull request %(date_or_age)s"
3835 msgstr ""
3836
3837 #: rhodecode/model/notification.py:270
3838 #, python-format
3754 3839 msgid "%(user)s commented on pull request at %(date_or_age)s"
3755 3840 msgstr ""
3756 3841
3757 #: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77
3758 #: rhodecode/model/permission.py:83
3759 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
3760 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:196
3761 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
3762 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
3763 msgid "None"
3764 msgstr ""
3765
3766 3842 #: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78
3767 3843 #: rhodecode/model/permission.py:84
3768 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
3769 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
3770 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
3771 msgid "Read"
3844 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11
3845 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197
3846 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11
3847 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11
3848 msgid "None"
3772 3849 msgstr ""
3773 3850
3774 3851 #: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79
3775 3852 #: rhodecode/model/permission.py:85
3776 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
3777 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
3778 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
3779 #: rhodecode/templates/changeset/changeset_file_comment.mako:273
3780 #: rhodecode/templates/changeset/changeset_file_comment.mako:323
3781 #: rhodecode/templates/data_table/_dt_elements.mako:411
3782 msgid "Write"
3853 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12
3854 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12
3855 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12
3856 msgid "Read"
3783 3857 msgstr ""
3784 3858
3785 3859 #: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80
3786 3860 #: rhodecode/model/permission.py:86
3861 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13
3862 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13
3863 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13
3864 #: rhodecode/templates/changeset/changeset_file_comment.mako:268
3865 #: rhodecode/templates/changeset/changeset_file_comment.mako:319
3866 #: rhodecode/templates/data_table/_dt_elements.mako:440
3867 msgid "Write"
3868 msgstr ""
3869
3870 #: rhodecode/model/permission.py:75 rhodecode/model/permission.py:81
3871 #: rhodecode/model/permission.py:87
3787 3872 #: rhodecode/templates/admin/auth/plugin_settings.mako:12
3788 3873 #: rhodecode/templates/admin/defaults/defaults.mako:12
3789 3874 #: rhodecode/templates/admin/integrations/base.mako:21
@@ -3805,153 +3890,154 b' msgstr ""'
3805 3890 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:14
3806 3891 #: rhodecode/templates/admin/users/user_add.mako:11
3807 3892 #: rhodecode/templates/admin/users/user_edit.mako:12
3808 #: rhodecode/templates/base/base.mako:639
3893 #: rhodecode/templates/base/base.mako:801
3809 3894 msgid "Admin"
3810 3895 msgstr ""
3811 3896
3812 #: rhodecode/model/permission.py:89
3813 msgid "Protected/No Access"
3814 msgstr ""
3815
3816 3897 #: rhodecode/model/permission.py:90
3817 msgid "Web merge"
3898 msgid "Protected/No Access"
3818 3899 msgstr ""
3819 3900
3820 3901 #: rhodecode/model/permission.py:91
3821 msgid "Push"
3902 msgid "Web merge"
3822 3903 msgstr ""
3823 3904
3824 3905 #: rhodecode/model/permission.py:92
3906 msgid "Push"
3907 msgstr ""
3908
3909 #: rhodecode/model/permission.py:93
3825 3910 msgid "Force Push"
3826 3911 msgstr ""
3827 3912
3828 #: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109
3829 #: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117
3830 #: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125
3831 #: rhodecode/model/permission.py:129
3913 #: rhodecode/model/permission.py:96 rhodecode/model/permission.py:110
3914 #: rhodecode/model/permission.py:114 rhodecode/model/permission.py:118
3915 #: rhodecode/model/permission.py:122 rhodecode/model/permission.py:126
3916 #: rhodecode/model/permission.py:130
3917 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:27
3832 3918 msgid "Disabled"
3833 3919 msgstr ""
3834 3920
3835 #: rhodecode/model/permission.py:96
3836 msgid "Allowed with manual account activation"
3837 msgstr ""
3838
3839 3921 #: rhodecode/model/permission.py:97
3922 msgid "Allowed with manual account activation"
3923 msgstr ""
3924
3925 #: rhodecode/model/permission.py:98
3840 3926 msgid "Allowed with automatic account activation"
3841 3927 msgstr ""
3842 3928
3843 #: rhodecode/model/permission.py:100
3844 msgid "Allow password recovery"
3845 msgstr ""
3846
3847 3929 #: rhodecode/model/permission.py:101
3848 msgid "Hide password recovery link"
3930 msgid "Allow password recovery"
3849 3931 msgstr ""
3850 3932
3851 3933 #: rhodecode/model/permission.py:102
3934 msgid "Hide password recovery link"
3935 msgstr ""
3936
3937 #: rhodecode/model/permission.py:103
3852 3938 msgid "Disable password recovery"
3853 3939 msgstr ""
3854 3940
3855 #: rhodecode/model/pull_request.py:80
3941 #: rhodecode/model/pull_request.py:90
3856 3942 msgid "Pull request update successful."
3857 3943 msgstr ""
3858 3944
3859 #: rhodecode/model/pull_request.py:82
3860 msgid "Pull request update failed because of an unknown error."
3861 msgstr ""
3862
3863 #: rhodecode/model/pull_request.py:84
3864 msgid "No update needed because the source and target have not changed."
3865 msgstr ""
3866
3867 #: rhodecode/model/pull_request.py:86
3868 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed."
3869 msgstr ""
3870
3871 #: rhodecode/model/pull_request.py:89
3872 msgid "This pull request cannot be updated because the target reference is missing."
3873 msgstr ""
3874
3875 3945 #: rhodecode/model/pull_request.py:92
3946 msgid "Pull request update failed because of an unknown error."
3947 msgstr ""
3948
3949 #: rhodecode/model/pull_request.py:94
3950 msgid "No update needed because the source and target have not changed."
3951 msgstr ""
3952
3953 #: rhodecode/model/pull_request.py:96
3954 msgid "Pull request cannot be updated because the reference type is not supported for an update. Only Branch, Tag or Bookmark is allowed."
3955 msgstr ""
3956
3957 #: rhodecode/model/pull_request.py:99
3958 msgid "This pull request cannot be updated because the target reference is missing."
3959 msgstr ""
3960
3961 #: rhodecode/model/pull_request.py:102
3876 3962 msgid "This pull request cannot be updated because the source reference is missing."
3877 3963 msgstr ""
3878 3964
3879 #: rhodecode/model/pull_request.py:1240
3965 #: rhodecode/model/pull_request.py:1355
3880 3966 msgid "Server-side pull request merging is disabled."
3881 3967 msgstr ""
3882 3968
3883 #: rhodecode/model/pull_request.py:1242
3969 #: rhodecode/model/pull_request.py:1357
3884 3970 msgid "This pull request is closed."
3885 3971 msgstr ""
3886 3972
3887 #: rhodecode/model/pull_request.py:1256
3973 #: rhodecode/model/pull_request.py:1371
3888 3974 msgid "Pull request merging is not supported."
3889 3975 msgstr ""
3890 3976
3891 #: rhodecode/model/pull_request.py:1275
3977 #: rhodecode/model/pull_request.py:1390
3892 3978 msgid "Target repository large files support is disabled."
3893 3979 msgstr ""
3894 3980
3895 #: rhodecode/model/pull_request.py:1278
3981 #: rhodecode/model/pull_request.py:1393
3896 3982 msgid "Source repository large files support is disabled."
3897 3983 msgstr ""
3898 3984
3899 #: rhodecode/model/pull_request.py:1455 rhodecode/model/scm.py:926
3900 #: rhodecode/templates/admin/my_account/my_account.mako:31
3901 #: rhodecode/templates/base/base.mako:469
3985 #: rhodecode/model/pull_request.py:1571 rhodecode/model/scm.py:1004
3986 #: rhodecode/templates/admin/my_account/my_account.mako:32
3987 #: rhodecode/templates/base/base.mako:633
3902 3988 #: rhodecode/templates/summary/components.mako:46
3903 3989 msgid "Bookmarks"
3904 3990 msgstr ""
3905 3991
3906 #: rhodecode/model/pull_request.py:1460
3992 #: rhodecode/model/pull_request.py:1576
3907 3993 msgid "Commit IDs"
3908 3994 msgstr ""
3909 3995
3910 #: rhodecode/model/pull_request.py:1463
3996 #: rhodecode/model/pull_request.py:1579
3911 3997 #: rhodecode/templates/summary/components.mako:22
3912 3998 msgid "Closed Branches"
3913 3999 msgstr ""
3914 4000
3915 #: rhodecode/model/pull_request.py:1629
4001 #: rhodecode/model/pull_request.py:1744
4002 msgid "WIP marker in title prevents from accidental merge."
4003 msgstr ""
4004
4005 #: rhodecode/model/pull_request.py:1755
3916 4006 msgid "User `{}` not allowed to perform merge."
3917 4007 msgstr ""
3918 4008
3919 #: rhodecode/model/pull_request.py:1647
4009 #: rhodecode/model/pull_request.py:1773
3920 4010 msgid "Target branch `{}` changes rejected by rule {}."
3921 4011 msgstr ""
3922 4012
3923 #: rhodecode/model/pull_request.py:1661
4013 #: rhodecode/model/pull_request.py:1787
3924 4014 msgid "Pull request reviewer approval is pending."
3925 4015 msgstr ""
3926 4016
3927 #: rhodecode/model/pull_request.py:1675
4017 #: rhodecode/model/pull_request.py:1801
3928 4018 msgid "Cannot merge, {} TODO still not resolved."
3929 4019 msgstr ""
3930 4020
3931 #: rhodecode/model/pull_request.py:1678
4021 #: rhodecode/model/pull_request.py:1804
3932 4022 msgid "Cannot merge, {} TODOs still not resolved."
3933 4023 msgstr ""
3934 4024
3935 #: rhodecode/model/pull_request.py:1713
4025 #: rhodecode/model/pull_request.py:1839
3936 4026 msgid "Merge strategy: rebase"
3937 4027 msgstr ""
3938 4028
3939 #: rhodecode/model/pull_request.py:1718
4029 #: rhodecode/model/pull_request.py:1844
3940 4030 msgid "Merge strategy: explicit merge commit"
3941 4031 msgstr ""
3942 4032
3943 #: rhodecode/model/pull_request.py:1726
4033 #: rhodecode/model/pull_request.py:1852
3944 4034 msgid "Source branch will be closed after merge."
3945 4035 msgstr ""
3946 4036
3947 #: rhodecode/model/pull_request.py:1728
4037 #: rhodecode/model/pull_request.py:1854
3948 4038 msgid "Source branch will be deleted after merge."
3949 4039 msgstr ""
3950 4040
3951 #: rhodecode/model/scm.py:904
3952 msgid "latest tip"
3953 msgstr ""
3954
3955 4041 #: rhodecode/model/validators.py:93 rhodecode/model/validators.py:94
3956 4042 msgid "Value cannot be an empty list"
3957 4043 msgstr ""
@@ -4066,7 +4152,7 b' msgid "Repository group with name \\"%(re'
4066 4152 msgstr ""
4067 4153
4068 4154 #: rhodecode/model/validators.py:567
4069 #: rhodecode/model/validation_schema/schemas/repo_schema.py:219
4155 #: rhodecode/model/validation_schema/schemas/repo_schema.py:230
4070 4156 msgid "Repository name cannot end with .git"
4071 4157 msgstr ""
4072 4158
@@ -4089,7 +4175,7 b' msgid "You do not have the permission to'
4089 4175 msgstr ""
4090 4176
4091 4177 #: rhodecode/model/validators.py:680
4092 #: rhodecode/model/validation_schema/schemas/repo_schema.py:125
4178 #: rhodecode/model/validation_schema/schemas/repo_schema.py:136
4093 4179 msgid "You do not have the permission to store repositories in the root location."
4094 4180 msgstr ""
4095 4181
@@ -4102,8 +4188,8 b' msgid "This is not a valid path"'
4102 4188 msgstr ""
4103 4189
4104 4190 #: rhodecode/model/validators.py:871
4105 #: rhodecode/model/validation_schema/schemas/user_schema.py:141
4106 #: rhodecode/model/validation_schema/schemas/user_schema.py:145
4191 #: rhodecode/model/validation_schema/schemas/user_schema.py:144
4192 #: rhodecode/model/validation_schema/schemas/user_schema.py:148
4107 4193 msgid "This e-mail address is already taken"
4108 4194 msgstr ""
4109 4195
@@ -4240,29 +4326,29 b' msgid "Repo group owner with id `{}` doe'
4240 4326 msgstr ""
4241 4327
4242 4328 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:136
4243 #: rhodecode/model/validation_schema/schemas/repo_schema.py:204
4329 #: rhodecode/model/validation_schema/schemas/repo_schema.py:215
4244 4330 msgid "Repository with name `{}` already exists"
4245 4331 msgstr ""
4246 4332
4247 4333 #: rhodecode/model/validation_schema/schemas/repo_group_schema.py:141
4248 #: rhodecode/model/validation_schema/schemas/repo_schema.py:209
4334 #: rhodecode/model/validation_schema/schemas/repo_schema.py:220
4249 4335 msgid "Repository group with name `{}` already exists"
4250 4336 msgstr ""
4251 4337
4252 #: rhodecode/model/validation_schema/schemas/repo_schema.py:55
4338 #: rhodecode/model/validation_schema/schemas/repo_schema.py:60
4253 4339 msgid "Repo owner with id `{}` does not exists"
4254 4340 msgstr ""
4255 4341
4256 #: rhodecode/model/validation_schema/schemas/repo_schema.py:91
4342 #: rhodecode/model/validation_schema/schemas/repo_schema.py:102
4257 4343 msgid "Fork with id `{}` does not exists"
4258 4344 msgstr ""
4259 4345
4260 #: rhodecode/model/validation_schema/schemas/repo_schema.py:94
4346 #: rhodecode/model/validation_schema/schemas/repo_schema.py:105
4261 4347 msgid "Cannot set fork of parameter of this repository to itself"
4262 4348 msgstr ""
4263 4349
4264 #: rhodecode/model/validation_schema/schemas/repo_schema.py:119
4265 #: rhodecode/model/validation_schema/schemas/repo_schema.py:123
4350 #: rhodecode/model/validation_schema/schemas/repo_schema.py:130
4351 #: rhodecode/model/validation_schema/schemas/repo_schema.py:134
4266 4352 msgid "Repository group `{}` does not exist"
4267 4353 msgstr ""
4268 4354
@@ -4282,7 +4368,7 b' msgstr ""'
4282 4368 msgid "New password must be different to old password"
4283 4369 msgstr ""
4284 4370
4285 #: rhodecode/model/validation_schema/schemas/user_schema.py:174
4371 #: rhodecode/model/validation_schema/schemas/user_schema.py:183
4286 4372 msgid "Additional emails can be specified at <a href=\"{}\">extra emails</a> page."
4287 4373 msgstr ""
4288 4374
@@ -4290,398 +4376,418 b' msgstr ""'
4290 4376 msgid ": , "
4291 4377 msgstr ""
4292 4378
4293 #: rhodecode/public/js/scripts.js:24109
4294 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
4379 #: rhodecode/public/js/scripts.js:24109 rhodecode/public/js/scripts.min.js:1
4380 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
4295 4381 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87
4296 4382 msgid "No results"
4297 4383 msgstr ""
4298 4384
4299 #: rhodecode/public/js/scripts.js:25569
4300 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
4385 #: rhodecode/public/js/scripts.js:25569 rhodecode/public/js/scripts.min.js:1
4386 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:130
4301 4387 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109
4302 4388 msgid "{0} year"
4303 4389 msgstr ""
4304 4390
4305 #: rhodecode/public/js/scripts.js:25570
4306 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
4391 #: rhodecode/public/js/scripts.js:25570 rhodecode/public/js/scripts.min.js:1
4392 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
4307 4393 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110
4308 4394 msgid "{0} month"
4309 4395 msgstr ""
4310 4396
4311 #: rhodecode/public/js/scripts.js:25571
4312 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
4397 #: rhodecode/public/js/scripts.js:25571 rhodecode/public/js/scripts.min.js:1
4398 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
4313 4399 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111
4314 4400 msgid "{0} day"
4315 4401 msgstr ""
4316 4402
4317 #: rhodecode/public/js/scripts.js:25572
4318 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
4403 #: rhodecode/public/js/scripts.js:25572 rhodecode/public/js/scripts.min.js:1
4404 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
4319 4405 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112
4320 4406 msgid "{0} hour"
4321 4407 msgstr ""
4322 4408
4323 #: rhodecode/public/js/scripts.js:25573
4324 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
4409 #: rhodecode/public/js/scripts.js:25573 rhodecode/public/js/scripts.min.js:1
4410 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
4325 4411 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113
4326 4412 msgid "{0} min"
4327 4413 msgstr ""
4328 4414
4329 #: rhodecode/public/js/scripts.js:25574
4330 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
4415 #: rhodecode/public/js/scripts.js:25574 rhodecode/public/js/scripts.min.js:1
4416 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:127
4331 4417 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114
4332 4418 msgid "{0} sec"
4333 4419 msgstr ""
4334 4420
4335 #: rhodecode/public/js/scripts.js:25594
4336 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
4421 #: rhodecode/public/js/scripts.js:25594 rhodecode/public/js/scripts.min.js:1
4422 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
4337 4423 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134
4338 4424 msgid "in {0}"
4339 4425 msgstr ""
4340 4426
4341 #: rhodecode/public/js/scripts.js:25602
4342 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
4427 #: rhodecode/public/js/scripts.js:25602 rhodecode/public/js/scripts.min.js:1
4428 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:112
4343 4429 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142
4344 4430 msgid "{0} ago"
4345 4431 msgstr ""
4346 4432
4347 #: rhodecode/public/js/scripts.js:25614
4348 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
4433 #: rhodecode/public/js/scripts.js:25614 rhodecode/public/js/scripts.min.js:1
4434 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:132
4349 4435 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154
4350 4436 msgid "{0}, {1} ago"
4351 4437 msgstr ""
4352 4438
4353 #: rhodecode/public/js/scripts.js:25616
4354 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
4439 #: rhodecode/public/js/scripts.js:25616 rhodecode/public/js/scripts.min.js:1
4440 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
4355 4441 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156
4356 4442 msgid "in {0}, {1}"
4357 4443 msgstr ""
4358 4444
4359 #: rhodecode/public/js/scripts.js:25620
4360 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
4445 #: rhodecode/public/js/scripts.js:25620 rhodecode/public/js/scripts.min.js:1
4446 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:113
4361 4447 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160
4362 4448 msgid "{0} and {1}"
4363 4449 msgstr ""
4364 4450
4365 #: rhodecode/public/js/scripts.js:25622
4366 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
4451 #: rhodecode/public/js/scripts.js:25622 rhodecode/public/js/scripts.min.js:1
4452 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
4367 4453 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162
4368 4454 msgid "{0} and {1} ago"
4369 4455 msgstr ""
4370 4456
4371 #: rhodecode/public/js/scripts.js:25624
4372 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
4457 #: rhodecode/public/js/scripts.js:25624 rhodecode/public/js/scripts.min.js:1
4458 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
4373 4459 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164
4374 4460 msgid "in {0} and {1}"
4375 4461 msgstr ""
4376 4462
4377 #: rhodecode/public/js/scripts.js:39683
4378 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
4463 #: rhodecode/public/js/scripts.js:40622 rhodecode/public/js/scripts.min.js:1
4464 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
4379 4465 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4
4380 4466 msgid "Loading more results..."
4381 4467 msgstr ""
4382 4468
4383 #: rhodecode/public/js/scripts.js:39686
4384 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
4469 #: rhodecode/public/js/scripts.js:40625 rhodecode/public/js/scripts.min.js:1
4470 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
4385 4471 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7
4386 4472 msgid "Searching..."
4387 4473 msgstr ""
4388 4474
4389 #: rhodecode/public/js/scripts.js:39689
4390 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
4475 #: rhodecode/public/js/scripts.js:40628 rhodecode/public/js/scripts.min.js:1
4476 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
4391 4477 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10
4392 4478 msgid "No matches found"
4393 4479 msgstr ""
4394 4480
4395 #: rhodecode/public/js/scripts.js:39692
4396 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
4481 #: rhodecode/public/js/scripts.js:40631 rhodecode/public/js/scripts.min.js:1
4482 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:28
4397 4483 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13
4398 4484 msgid "Loading failed"
4399 4485 msgstr ""
4400 4486
4401 #: rhodecode/public/js/scripts.js:39696
4402 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
4487 #: rhodecode/public/js/scripts.js:40635 rhodecode/public/js/scripts.min.js:1
4488 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
4403 4489 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17
4404 4490 msgid "One result is available, press enter to select it."
4405 4491 msgstr ""
4406 4492
4407 #: rhodecode/public/js/scripts.js:39698
4408 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:117
4493 #: rhodecode/public/js/scripts.js:40637 rhodecode/public/js/scripts.min.js:1
4494 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:126
4409 4495 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19
4410 4496 msgid "{0} results are available, use up and down arrow keys to navigate."
4411 4497 msgstr ""
4412 4498
4413 #: rhodecode/public/js/scripts.js:39703
4414 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
4499 #: rhodecode/public/js/scripts.js:40642 rhodecode/public/js/scripts.min.js:1
4500 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
4415 4501 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24
4416 4502 msgid "Please enter {0} or more character"
4417 4503 msgstr ""
4418 4504
4419 #: rhodecode/public/js/scripts.js:39705
4420 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51
4505 #: rhodecode/public/js/scripts.js:40644 rhodecode/public/js/scripts.min.js:1
4506 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
4421 4507 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26
4422 4508 msgid "Please enter {0} or more characters"
4423 4509 msgstr ""
4424 4510
4425 #: rhodecode/public/js/scripts.js:39710
4426 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
4511 #: rhodecode/public/js/scripts.js:40649 rhodecode/public/js/scripts.min.js:1
4512 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
4427 4513 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31
4428 4514 msgid "Please delete {0} character"
4429 4515 msgstr ""
4430 4516
4431 #: rhodecode/public/js/scripts.js:39712
4432 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:49
4517 #: rhodecode/public/js/scripts.js:40651 rhodecode/public/js/scripts.min.js:1
4518 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50
4433 4519 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33
4434 4520 msgid "Please delete {0} characters"
4435 4521 msgstr ""
4436 4522
4437 #: rhodecode/public/js/scripts.js:39716
4438 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
4523 #: rhodecode/public/js/scripts.js:40655 rhodecode/public/js/scripts.min.js:1
4524 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
4439 4525 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37
4440 4526 msgid "You can only select {0} item"
4441 4527 msgstr ""
4442 4528
4443 #: rhodecode/public/js/scripts.js:39718
4444 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
4529 #: rhodecode/public/js/scripts.js:40657 rhodecode/public/js/scripts.min.js:1
4530 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
4445 4531 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39
4446 4532 msgid "You can only select {0} items"
4447 4533 msgstr ""
4448 4534
4449 #: rhodecode/public/js/scripts.js:40656
4450 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:97
4535 #: rhodecode/public/js/scripts.js:41595 rhodecode/public/js/scripts.min.js:1
4536 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
4451 4537 #: rhodecode/public/js/src/rhodecode/changelog.js:35
4452 4538 msgid "showing {0} out of {1} commit"
4453 4539 msgstr ""
4454 4540
4455 #: rhodecode/public/js/scripts.js:40658
4456 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:98
4541 #: rhodecode/public/js/scripts.js:41597 rhodecode/public/js/scripts.min.js:1
4542 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105
4457 4543 #: rhodecode/public/js/src/rhodecode/changelog.js:37
4458 4544 msgid "showing {0} out of {1} commits"
4459 4545 msgstr ""
4460 4546
4461 #: rhodecode/public/js/scripts.js:41194
4462 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
4463 #: rhodecode/public/js/src/rhodecode/codemirror.js:364
4547 #: rhodecode/public/js/scripts.js:42136 rhodecode/public/js/scripts.min.js:1
4548 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
4549 #: rhodecode/public/js/src/rhodecode/codemirror.js:363
4464 4550 msgid "Set status to Approved"
4465 4551 msgstr ""
4466 4552
4467 #: rhodecode/public/js/scripts.js:41213
4468 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:58
4553 #: rhodecode/public/js/scripts.js:42156 rhodecode/public/js/scripts.min.js:1
4554 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
4469 4555 #: rhodecode/public/js/src/rhodecode/codemirror.js:383
4470 4556 msgid "Set status to Rejected"
4471 4557 msgstr ""
4472 4558
4473 #: rhodecode/public/js/scripts.js:41232
4474 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
4559 #: rhodecode/public/js/scripts.js:42175 rhodecode/public/js/scripts.min.js:1
4560 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
4475 4561 #: rhodecode/public/js/src/rhodecode/codemirror.js:402
4476 #: rhodecode/templates/email_templates/commit_comment.mako:102
4477 #: rhodecode/templates/email_templates/pull_request_comment.mako:107
4478 4562 msgid "TODO comment"
4479 4563 msgstr ""
4480 4564
4481 #: rhodecode/public/js/scripts.js:41252
4482 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44
4565 #: rhodecode/public/js/scripts.js:42195 rhodecode/public/js/scripts.min.js:1
4566 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45
4483 4567 #: rhodecode/public/js/src/rhodecode/codemirror.js:422
4484 4568 msgid "Note Comment"
4485 4569 msgstr ""
4486 4570
4487 #: rhodecode/public/js/scripts.js:41553 rhodecode/public/js/scripts.js:41907
4488 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
4571 #: rhodecode/public/js/scripts.js:42496 rhodecode/public/js/scripts.js:42850
4572 #: rhodecode/public/js/scripts.min.js:1
4573 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
4489 4574 #: rhodecode/public/js/src/rhodecode/codemirror.js:723
4490 4575 #: rhodecode/public/js/src/rhodecode/comments.js:233
4491 4576 msgid "Status Review"
4492 4577 msgstr ""
4493 4578
4494 #: rhodecode/public/js/scripts.js:41568 rhodecode/public/js/scripts.js:41922
4495 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
4579 #: rhodecode/public/js/scripts.js:42511 rhodecode/public/js/scripts.js:42865
4580 #: rhodecode/public/js/scripts.min.js:1
4581 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
4496 4582 #: rhodecode/public/js/src/rhodecode/codemirror.js:738
4497 4583 #: rhodecode/public/js/src/rhodecode/comments.js:248
4498 4584 msgid "Comment text will be set automatically based on currently selected status ({0}) ..."
4499 4585 msgstr ""
4500 4586
4501 #: rhodecode/public/js/scripts.js:41649 rhodecode/public/js/scripts.js:42117
4502 #: rhodecode/public/js/scripts.js:43030
4503 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:26
4587 #: rhodecode/public/js/scripts.js:42592 rhodecode/public/js/scripts.js:43061
4588 #: rhodecode/public/js/scripts.js:44066 rhodecode/public/js/scripts.min.js:1
4589 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:27
4504 4590 #: rhodecode/public/js/src/rhodecode/codemirror.js:819
4505 #: rhodecode/public/js/src/rhodecode/comments.js:443
4506 #: rhodecode/public/js/src/rhodecode/files.js:493
4507 #: rhodecode/templates/files/files_browser_tree.mako:52
4591 #: rhodecode/public/js/src/rhodecode/comments.js:444
4592 #: rhodecode/public/js/src/rhodecode/files.js:495
4593 #: rhodecode/templates/files/files_browser_tree.mako:55
4508 4594 msgid "Loading ..."
4509 4595 msgstr ""
4510 4596
4511 #: rhodecode/public/js/scripts.js:41823
4512 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:96
4597 #: rhodecode/public/js/scripts.js:42766 rhodecode/public/js/scripts.min.js:1
4598 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
4513 4599 #: rhodecode/public/js/src/rhodecode/comments.js:149
4514 4600 msgid "resolve comment"
4515 4601 msgstr ""
4516 4602
4517 #: rhodecode/public/js/scripts.js:42066
4518 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
4519 #: rhodecode/public/js/src/rhodecode/comments.js:392
4603 #: rhodecode/public/js/scripts.js:43010 rhodecode/public/js/scripts.min.js:1
4604 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
4605 #: rhodecode/public/js/src/rhodecode/comments.js:393
4520 4606 msgid "Submitting..."
4521 4607 msgstr ""
4522 4608
4523 #: rhodecode/public/js/scripts.js:42231
4524 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
4525 #: rhodecode/public/js/src/rhodecode/comments.js:557
4609 #: rhodecode/public/js/scripts.js:43175 rhodecode/public/js/scripts.min.js:1
4610 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
4611 #: rhodecode/public/js/src/rhodecode/comments.js:560
4526 4612 msgid "Delete this comment?"
4527 4613 msgstr ""
4528 4614
4529 #: rhodecode/public/js/scripts.js:42305
4530 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
4531 #: rhodecode/public/js/src/rhodecode/comments.js:631
4615 #: rhodecode/public/js/scripts.js:43249 rhodecode/public/js/scripts.min.js:1
4616 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:25
4532 4617 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}"
4533 4618 msgstr ""
4534 4619
4535 #: rhodecode/public/js/scripts.js:42382
4536 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
4537 #: rhodecode/public/js/src/rhodecode/comments.js:708
4620 #: rhodecode/public/js/scripts.js:43415 rhodecode/public/js/scripts.min.js:1
4621 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24
4622 #: rhodecode/public/js/src/rhodecode/comments.js:800
4538 4623 msgid "Leave a comment on line {0}."
4539 4624 msgstr ""
4540 4625
4541 #: rhodecode/public/js/scripts.js:42507
4542 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73
4543 #: rhodecode/public/js/src/rhodecode/comments.js:833
4626 #: rhodecode/public/js/scripts.js:43541 rhodecode/public/js/scripts.min.js:1
4627 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
4628 #: rhodecode/public/js/src/rhodecode/comments.js:926
4544 4629 msgid "TODO from comment {0} was fixed."
4545 4630 msgstr ""
4546 4631
4547 #: rhodecode/public/js/scripts.js:42785
4548 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
4632 #: rhodecode/public/js/scripts.js:43819 rhodecode/public/js/scripts.min.js:1
4633 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:107
4549 4634 #: rhodecode/public/js/src/rhodecode/files.js:248
4550 4635 msgid "truncated result"
4551 4636 msgstr ""
4552 4637
4553 #: rhodecode/public/js/scripts.js:42787
4554 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
4638 #: rhodecode/public/js/scripts.js:43821 rhodecode/public/js/scripts.min.js:1
4639 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:108
4555 4640 #: rhodecode/public/js/src/rhodecode/files.js:250
4556 4641 msgid "truncated results"
4557 4642 msgstr ""
4558 4643
4559 #: rhodecode/public/js/scripts.js:42796
4560 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34
4644 #: rhodecode/public/js/scripts.js:43830 rhodecode/public/js/scripts.min.js:1
4645 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
4561 4646 #: rhodecode/public/js/src/rhodecode/files.js:259
4562 4647 msgid "No matching files"
4563 4648 msgstr ""
4564 4649
4565 #: rhodecode/public/js/scripts.js:42854
4566 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:55
4650 #: rhodecode/public/js/scripts.js:43888 rhodecode/public/js/scripts.min.js:1
4651 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
4567 4652 #: rhodecode/public/js/src/rhodecode/files.js:317
4568 4653 msgid "Selection link"
4569 4654 msgstr ""
4570 4655
4571 #: rhodecode/public/js/scripts.js:42946
4572 #: rhodecode/public/js/src/rhodecode/files.js:409
4656 #: rhodecode/public/js/scripts.js:43981 rhodecode/public/js/scripts.min.js:1
4657 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
4658 #: rhodecode/public/js/src/rhodecode/files.js:410
4573 4659 msgid "All Authors"
4574 4660 msgstr ""
4575 4661
4576 #: rhodecode/public/js/scripts.js:43081
4662 #: rhodecode/public/js/scripts.js:44117 rhodecode/public/js/scripts.min.js:1
4663 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72
4577 4664 #: rhodecode/public/js/src/rhodecode/followers.js:26
4578 4665 msgid "Stopped watching this repository"
4579 4666 msgstr ""
4580 4667
4581 #: rhodecode/public/js/scripts.js:43082
4668 #: rhodecode/public/js/scripts.js:44118 rhodecode/public/js/scripts.min.js:1
4669 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
4582 4670 #: rhodecode/public/js/src/rhodecode/followers.js:27
4583 #: rhodecode/templates/base/base.mako:226
4671 #: rhodecode/templates/base/base.mako:301
4584 4672 msgid "Watch"
4585 4673 msgstr ""
4586 4674
4587 #: rhodecode/public/js/scripts.js:43085
4675 #: rhodecode/public/js/scripts.js:44121 rhodecode/public/js/scripts.min.js:1
4676 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69
4588 4677 #: rhodecode/public/js/src/rhodecode/followers.js:30
4589 4678 msgid "Started watching this repository"
4590 4679 msgstr ""
4591 4680
4592 #: rhodecode/public/js/scripts.js:43086
4681 #: rhodecode/public/js/scripts.js:44122 rhodecode/public/js/scripts.min.js:1
4682 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81
4593 4683 #: rhodecode/public/js/src/rhodecode/followers.js:31
4594 #: rhodecode/templates/base/base.mako:224
4684 #: rhodecode/templates/base/base.mako:299
4595 4685 msgid "Unwatch"
4596 4686 msgstr ""
4597 4687
4598 #: rhodecode/public/js/scripts.js:43459
4599 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
4600 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134
4601 msgid "All reviewers must vote."
4602 msgstr ""
4603
4604 #: rhodecode/public/js/scripts.js:43468
4605 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5
4606 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143
4607 msgid "All individual reviewers must vote."
4608 msgstr ""
4609
4610 #: rhodecode/public/js/scripts.js:43473
4688 #: rhodecode/public/js/scripts.js:44495 rhodecode/public/js/scripts.min.js:1
4611 4689 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7
4612 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148
4690 #: rhodecode/public/js/src/rhodecode/pullrequests.js:135
4691 msgid "All reviewers must vote."
4692 msgstr ""
4693
4694 #: rhodecode/public/js/scripts.js:44504 rhodecode/public/js/scripts.min.js:1
4695 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6
4696 #: rhodecode/public/js/src/rhodecode/pullrequests.js:144
4697 msgid "All individual reviewers must vote."
4698 msgstr ""
4699
4700 #: rhodecode/public/js/scripts.js:44509 rhodecode/public/js/scripts.min.js:1
4701 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
4702 #: rhodecode/public/js/src/rhodecode/pullrequests.js:149
4613 4703 msgid "At least {0} reviewer must vote."
4614 4704 msgstr ""
4615 4705
4616 #: rhodecode/public/js/scripts.js:43479
4617 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8
4618 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154
4706 #: rhodecode/public/js/scripts.js:44515 rhodecode/public/js/scripts.min.js:1
4707 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
4708 #: rhodecode/public/js/src/rhodecode/pullrequests.js:155
4619 4709 msgid "At least {0} reviewers must vote."
4620 4710 msgstr ""
4621 4711
4622 #: rhodecode/public/js/scripts.js:43495
4623 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52
4624 #: rhodecode/public/js/src/rhodecode/pullrequests.js:170
4712 #: rhodecode/public/js/scripts.js:44531 rhodecode/public/js/scripts.min.js:1
4713 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
4714 #: rhodecode/public/js/src/rhodecode/pullrequests.js:171
4625 4715 msgid "Reviewers picked from source code changes."
4626 4716 msgstr ""
4627 4717
4628 #: rhodecode/public/js/scripts.js:43502
4718 #: rhodecode/public/js/scripts.js:44538 rhodecode/public/js/scripts.min.js:1
4629 4719 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4
4630 #: rhodecode/public/js/src/rhodecode/pullrequests.js:177
4720 #: rhodecode/public/js/src/rhodecode/pullrequests.js:178
4631 4721 msgid "Adding new reviewers is forbidden."
4632 4722 msgstr ""
4633 4723
4634 #: rhodecode/public/js/scripts.js:43509
4635 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9
4636 #: rhodecode/public/js/src/rhodecode/pullrequests.js:184
4724 #: rhodecode/public/js/scripts.js:44545 rhodecode/public/js/scripts.min.js:1
4725 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
4726 #: rhodecode/public/js/src/rhodecode/pullrequests.js:185
4637 4727 msgid "Author is not allowed to be a reviewer."
4638 4728 msgstr ""
4639 4729
4640 #: rhodecode/public/js/scripts.js:43523
4641 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13
4642 #: rhodecode/public/js/src/rhodecode/pullrequests.js:198
4730 #: rhodecode/public/js/scripts.js:44559 rhodecode/public/js/scripts.min.js:1
4731 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
4732 #: rhodecode/public/js/src/rhodecode/pullrequests.js:199
4643 4733 msgid "Commit Authors are not allowed to be a reviewer."
4644 4734 msgstr ""
4645 4735
4646 #: rhodecode/public/js/scripts.js:43631
4647 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
4648 #: rhodecode/public/js/src/rhodecode/pullrequests.js:306
4736 #: rhodecode/public/js/scripts.js:44667 rhodecode/public/js/scripts.min.js:1
4737 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
4738 #: rhodecode/public/js/src/rhodecode/pullrequests.js:307
4649 4739 msgid "User `{0}` not allowed to be a reviewer"
4650 4740 msgstr ""
4651 4741
4652 #: rhodecode/public/js/scripts.js:43637
4653 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
4654 #: rhodecode/public/js/src/rhodecode/pullrequests.js:312
4742 #: rhodecode/public/js/scripts.js:44673 rhodecode/public/js/scripts.min.js:1
4743 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
4744 #: rhodecode/public/js/src/rhodecode/pullrequests.js:313
4655 4745 msgid "User `{0}` already in reviewers"
4656 4746 msgstr ""
4657 4747
4658 #: rhodecode/public/js/scripts.js:43725
4659 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83
4660 #: rhodecode/public/js/src/rhodecode/pullrequests.js:400
4748 #: rhodecode/public/js/scripts.js:44773 rhodecode/public/js/scripts.min.js:1
4749 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89
4750 #: rhodecode/public/js/src/rhodecode/pullrequests.js:413
4661 4751 msgid "added manually by \"{0}\""
4662 4752 msgstr ""
4663 4753
4664 #: rhodecode/public/js/scripts.js:43729
4665 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
4666 #: rhodecode/public/js/src/rhodecode/pullrequests.js:404
4754 #: rhodecode/public/js/scripts.js:44777 rhodecode/public/js/scripts.min.js:1
4755 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:101
4756 #: rhodecode/public/js/src/rhodecode/pullrequests.js:417
4667 4757 msgid "member of \"{0}\""
4668 4758 msgstr ""
4669 4759
4670 #: rhodecode/public/js/scripts.js:44310
4671 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:87
4760 #: rhodecode/public/js/scripts.js:44953 rhodecode/public/js/scripts.min.js:1
4761 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
4762 #: rhodecode/public/js/src/rhodecode/pullrequests.js:608
4763 msgid "Updating..."
4764 msgstr ""
4765
4766 #: rhodecode/public/js/scripts.js:44963 rhodecode/public/js/scripts.min.js:1
4767 #: rhodecode/public/js/src/rhodecode/pullrequests.js:618
4768 msgid "Force updating..."
4769 msgstr ""
4770
4771 #: rhodecode/public/js/scripts.js:49591 rhodecode/public/js/scripts.min.js:1
4772 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
4672 4773 #: rhodecode/public/js/src/rhodecode.js:144
4673 4774 msgid "file"
4674 4775 msgstr ""
4675 4776
4676 #: rhodecode/public/js/scripts.js:44704
4677 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84
4678 #: rhodecode/public/js/src/rhodecode.js:538
4777 #: rhodecode/public/js/scripts.js:49735 rhodecode/public/js/scripts.min.js:1
4778 #: rhodecode/public/js/src/rhodecode.js:288
4779 msgid "Loading..."
4780 msgstr ""
4781
4782 #: rhodecode/public/js/scripts.js:50104 rhodecode/public/js/scripts.min.js:1
4783 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:90
4784 #: rhodecode/public/js/src/rhodecode.js:657
4679 4785 msgid "date not in future"
4680 4786 msgstr ""
4681 4787
4682 #: rhodecode/public/js/scripts.js:44712
4683 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
4684 #: rhodecode/public/js/src/rhodecode.js:546
4788 #: rhodecode/public/js/scripts.js:50112 rhodecode/public/js/scripts.min.js:1
4789 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67
4790 #: rhodecode/public/js/src/rhodecode.js:665
4685 4791 msgid "Specified expiration date"
4686 4792 msgstr ""
4687 4793
@@ -4690,248 +4796,260 b' msgid "(from usergroup {0})"'
4690 4796 msgstr ""
4691 4797
4692 4798 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3
4693 #: rhodecode/templates/codeblocks/diffs.mako:506
4694 #: rhodecode/templates/codeblocks/diffs.mako:511
4799 #: rhodecode/templates/codeblocks/diffs.mako:594
4800 #: rhodecode/templates/codeblocks/diffs.mako:598
4695 4801 msgid "Add another comment"
4696 4802 msgstr ""
4697 4803
4698 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10
4699 msgid "Changed files"
4700 msgstr ""
4701
4702 4804 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11
4805 msgid "Changed files"
4806 msgstr ""
4807
4808 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12
4703 4809 #: rhodecode/public/js/src/i18n_messages.js:5
4704 #: rhodecode/templates/pullrequests/pullrequest_show.mako:329
4810 #: rhodecode/templates/pullrequests/pullrequest_show.mako:288
4705 4811 msgid "Close"
4706 4812 msgstr ""
4707 4813
4708 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:14
4814 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:15
4709 4815 msgid "Context file: "
4710 4816 msgstr ""
4711 4817
4712 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:16
4713 msgid "Diff to Commit "
4714 msgstr ""
4715
4716 4818 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17
4717 msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
4819 msgid "Diff to Commit "
4718 4820 msgstr ""
4719 4821
4720 4822 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:18
4721 msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
4823 msgid "Fetching repository state failed. Error code: {0} {1}. Try <a href=\"{2}\">refreshing</a> this page."
4722 4824 msgstr ""
4723 4825
4724 4826 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19
4725 msgid "Follow"
4827 msgid "Fetching repository state failed. Error code: {0} {1}. Try refreshing this page."
4726 4828 msgstr ""
4727 4829
4728 4830 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20
4729 msgid "Hide full context diff"
4831 msgid "Follow"
4730 4832 msgstr ""
4731 4833
4732 4834 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21
4733 msgid "Hide whitespace changes"
4835 msgid "Hide full context diff"
4734 4836 msgstr ""
4735 4837
4736 4838 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22
4839 msgid "Hide whitespace changes"
4840 msgstr ""
4841
4842 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23
4737 4843 #: rhodecode/public/js/src/i18n_messages.js:4
4738 4844 msgid "Invite reviewers to this discussion"
4739 4845 msgstr ""
4740 4846
4741 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29
4742 msgid "No bookmarks available yet."
4743 msgstr ""
4744
4745 4847 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30
4746 msgid "No branches available yet."
4848 msgid "No bookmarks available yet."
4747 4849 msgstr ""
4748 4850
4749 4851 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:31
4750 msgid "No forks available yet."
4852 msgid "No branches available yet."
4751 4853 msgstr ""
4752 4854
4753 4855 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:32
4856 msgid "No forks available yet."
4857 msgstr ""
4858
4859 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:33
4754 4860 msgid "No gists available yet."
4755 4861 msgstr ""
4756 4862
4757 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:35
4758 msgid "No pull requests available yet."
4759 msgstr ""
4760
4761 4863 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:36
4762 msgid "No repositories available yet."
4864 msgid "No pull requests available yet."
4763 4865 msgstr ""
4764 4866
4765 4867 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:37
4868 msgid "No repositories available yet."
4869 msgstr ""
4870
4871 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:38
4766 4872 msgid "No repository groups available yet."
4767 4873 msgstr ""
4768 4874
4769 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39
4770 msgid "No ssh keys available yet."
4771 msgstr ""
4772
4773 4875 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40
4774 msgid "No tags available yet."
4876 msgid "No ssh keys available yet."
4775 4877 msgstr ""
4776 4878
4777 4879 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41
4778 msgid "No user groups available yet."
4880 msgid "No tags available yet."
4779 4881 msgstr ""
4780 4882
4781 4883 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:42
4884 msgid "No user groups available yet."
4885 msgstr ""
4886
4887 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:43
4782 4888 msgid "No users available yet."
4783 4889 msgstr ""
4784 4890
4785 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46
4786 #: rhodecode/templates/commits/changelog.mako:78
4787 msgid "Open new pull request"
4788 msgstr ""
4789
4790 4891 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47
4892 #: rhodecode/templates/commits/changelog.mako:78
4893 msgid "Open new pull request"
4894 msgstr ""
4895
4896 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48
4791 4897 msgid "Open new pull request for selected commit"
4792 4898 msgstr ""
4793 4899
4794 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:53
4900 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54
4795 4901 msgid "Saving..."
4796 4902 msgstr ""
4797 4903
4798 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56
4904 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:57
4799 4905 #: rhodecode/public/js/src/i18n_messages.js:6
4800 4906 #: rhodecode/templates/admin/settings/settings_email.mako:50
4801 4907 msgid "Send"
4802 4908 msgstr ""
4803 4909
4804 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59
4910 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
4805 4911 msgid "Show at Commit "
4806 4912 msgstr ""
4807 4913
4808 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60
4809 msgid "Show full context diff"
4810 msgstr ""
4811
4812 4914 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61
4813 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
4814 msgid "Show more"
4915 msgid "Show commit range {0} ... {1}"
4815 4916 msgstr ""
4816 4917
4817 4918 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62
4818 msgid "Show selected commit __S"
4919 msgid "Show full context diff"
4819 4920 msgstr ""
4820 4921
4821 4922 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:63
4822 msgid "Show selected commits __S ... __E"
4923 #: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:39
4924 msgid "Show more"
4823 4925 msgstr ""
4824 4926
4825 4927 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:64
4826 msgid "Show whitespace changes"
4928 msgid "Show selected commit __S"
4929 msgstr ""
4930
4931 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:65
4932 msgid "Show selected commits __S ... __E"
4827 4933 msgstr ""
4828 4934
4829 4935 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66
4830 msgid "Start following this repository"
4936 msgid "Show whitespace changes"
4831 4937 msgstr ""
4832 4938
4833 4939 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:68
4834 msgid "Stop following this repository"
4835 msgstr ""
4836
4837 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:70
4838 #: rhodecode/public/js/src/i18n_messages.js:7
4839 msgid "Switch to chat"
4940 msgid "Start following this repository"
4840 4941 msgstr ""
4841 4942
4842 4943 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71
4843 #: rhodecode/public/js/src/i18n_messages.js:8
4844 msgid "Switch to comment"
4944 msgid "Stop following this repository"
4845 4945 msgstr ""
4846 4946
4847 4947 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74
4848 msgid "There are currently no open pull requests requiring your participation."
4948 #: rhodecode/public/js/src/i18n_messages.js:7
4949 msgid "Switch to chat"
4849 4950 msgstr ""
4850 4951
4851 4952 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75
4953 #: rhodecode/public/js/src/i18n_messages.js:8
4954 msgid "Switch to comment"
4955 msgstr ""
4956
4957 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:78
4958 msgid "There are currently no open pull requests requiring your participation."
4959 msgstr ""
4960
4961 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79
4852 4962 msgid "Toggle Wide Mode diff"
4853 4963 msgstr ""
4854 4964
4855 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:76
4965 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:80
4856 4966 msgid "Unfollow"
4857 4967 msgstr ""
4858 4968
4859 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:77
4860 msgid "Updating..."
4861 msgstr ""
4862
4863 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:82
4864 #: rhodecode/templates/admin/auth/auth_settings.mako:69
4865 msgid "activated"
4866 msgstr ""
4867
4868 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:85
4869 msgid "disabled"
4870 msgstr ""
4871
4872 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86
4873 msgid "enabled"
4874 msgstr ""
4875
4876 4969 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88
4970 #: rhodecode/templates/admin/auth/auth_settings.mako:69
4971 msgid "activated"
4972 msgstr ""
4973
4974 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91
4975 msgid "disabled"
4976 msgstr ""
4977
4978 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92
4979 msgid "enabled"
4980 msgstr ""
4981
4982 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:94
4877 4983 msgid "files"
4878 4984 msgstr ""
4879 4985
4880 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93
4881 #: rhodecode/templates/pullrequests/pullrequest.mako:135
4882 msgid "loading..."
4883 msgstr ""
4884
4885 4986 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:95
4886 #: rhodecode/templates/admin/auth/auth_settings.mako:69
4887 msgid "not active"
4888 msgstr ""
4889
4890 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:99
4891 msgid "specify commit"
4987 msgid "go to numeric commit"
4988 msgstr ""
4989
4990 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100
4991 #: rhodecode/templates/pullrequests/pullrequest.mako:136
4992 msgid "loading..."
4892 4993 msgstr ""
4893 4994
4894 4995 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:102
4895 msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
4896 msgstr ""
4897
4898 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:103
4899 msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
4900 msgstr ""
4901
4902 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:104
4903 msgid "{0} active out of {1} users"
4996 #: rhodecode/templates/admin/auth/auth_settings.mako:69
4997 msgid "not active"
4998 msgstr ""
4999
5000 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:106
5001 msgid "specify commit"
4904 5002 msgstr ""
4905 5003
4906 5004 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:109
4907 msgid "{0} days"
5005 msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)"
5006 msgstr ""
5007
5008 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:110
5009 msgid "{0} ({1} inactive) of {2} users ({3} inactive)"
4908 5010 msgstr ""
4909 5011
4910 5012 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:111
4911 msgid "{0} hours"
4912 msgstr ""
4913
4914 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:114
4915 msgid "{0} months"
4916 msgstr ""
4917
4918 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:115
4919 msgid "{0} out of {1} ssh keys"
5013 msgid "{0} active out of {1} users"
4920 5014 msgstr ""
4921 5015
4922 5016 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:116
4923 msgid "{0} out of {1} users"
4924 msgstr ""
4925
4926 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:119
4927 msgid "{0} user groups ({1} inactive)"
4928 msgstr ""
4929
4930 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:120
4931 msgid "{0} users ({1} inactive)"
5017 msgid "{0} days"
5018 msgstr ""
5019
5020 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:118
5021 msgid "{0} hours"
5022 msgstr ""
5023
5024 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:121
5025 msgid "{0} months"
4932 5026 msgstr ""
4933 5027
4934 5028 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:122
5029 msgid "{0} of {1} repository groups"
5030 msgstr ""
5031
5032 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:123
5033 msgid "{0} out of {1} ssh keys"
5034 msgstr ""
5035
5036 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:124
5037 msgid "{0} out of {1} users"
5038 msgstr ""
5039
5040 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:125
5041 msgid "{0} repository groups"
5042 msgstr ""
5043
5044 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:128
5045 msgid "{0} user groups ({1} inactive)"
5046 msgstr ""
5047
5048 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:129
5049 msgid "{0} users ({1} inactive)"
5050 msgstr ""
5051
5052 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:131
4935 5053 msgid "{0} years"
4936 5054 msgstr ""
4937 5055
@@ -4943,58 +5061,45 b' msgstr ""'
4943 5061 msgid "MathML"
4944 5062 msgstr ""
4945 5063
5064 #: rhodecode/public/js/src/rhodecode/comments.js:634
5065 msgid "Leave a resolution comment, or click resolve button to resolve TODO comment #{0}"
5066 msgstr ""
5067
4946 5068 #: rhodecode/templates/index.mako:5
4947 5069 msgid "Dashboard"
4948 5070 msgstr ""
4949 5071
4950 5072 #: rhodecode/templates/index_base.mako:20
4951 #: rhodecode/templates/admin/main.mako:34
4952 #: rhodecode/templates/admin/repos/repo_add.mako:22
4953 #: rhodecode/templates/admin/repos/repos.mako:31
4954 #: rhodecode/templates/base/base.mako:410
4955 msgid "Add Repository"
4956 msgstr ""
4957
4958 #: rhodecode/templates/index_base.mako:24
4959 #: rhodecode/templates/admin/main.mako:43
4960 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
4961 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:31
4962 #: rhodecode/templates/base/base.mako:413
4963 msgid "Add Repository Group"
4964 msgstr ""
4965
4966 #: rhodecode/templates/index_base.mako:47
4967 5073 msgid "No repositories or repositories groups exists here."
4968 5074 msgstr ""
4969 5075
4970 #: rhodecode/templates/index_base.mako:65
4971 #: rhodecode/templates/index_base.mako:98
4972 #: rhodecode/templates/admin/gists/index.mako:107
5076 #: rhodecode/templates/index_base.mako:62
5077 #: rhodecode/templates/index_base.mako:153
5078 #: rhodecode/templates/admin/gists/gist_index.mako:107
4973 5079 #: rhodecode/templates/admin/integrations/list.mako:72
4974 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
4975 #: rhodecode/templates/admin/my_account/my_account_repos.mako:31
5080 #: rhodecode/templates/admin/my_account/my_account_repos.mako:28
4976 5081 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:39
4977 #: rhodecode/templates/admin/my_account/my_account_watched.mako:31
5082 #: rhodecode/templates/admin/my_account/my_account_watched.mako:28
4978 5083 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:74
4979 5084 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16
4980 #: rhodecode/templates/admin/repos/repos.mako:58
5085 #: rhodecode/templates/admin/repos/repos.mako:76
4981 5086 #: rhodecode/templates/admin/user_groups/user_groups.mako:76
4982 5087 #: rhodecode/templates/admin/users/user_edit_groups.mako:54
4983 5088 #: rhodecode/templates/base/perms_summary.mako:168
4984 5089 #: rhodecode/templates/base/perms_summary.mako:242
4985 5090 #: rhodecode/templates/bookmarks/bookmarks.mako:57
4986 5091 #: rhodecode/templates/branches/branches.mako:56
4987 #: rhodecode/templates/files/files_browser_tree.mako:11
4988 #: rhodecode/templates/pullrequests/pullrequests.mako:81
5092 #: rhodecode/templates/files/files_browser_tree.mako:13
4989 5093 #: rhodecode/templates/tags/tags.mako:57
4990 5094 msgid "Name"
4991 5095 msgstr ""
4992 5096
4993 #: rhodecode/templates/index_base.mako:68
4994 #: rhodecode/templates/index_base.mako:101
4995 #: rhodecode/templates/admin/gists/index.mako:109
5097 #: rhodecode/templates/index_base.mako:71
5098 #: rhodecode/templates/index_base.mako:162
5099 #: rhodecode/templates/admin/gists/gist_index.mako:109
4996 5100 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15
4997 5101 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:72
5102 #: rhodecode/templates/admin/my_account/my_account_profile.mako:57
4998 5103 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10
4999 5104 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57
5000 5105 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44
@@ -5005,7 +5110,7 b' msgstr ""'
5005 5110 #: rhodecode/templates/admin/repos/repo_add_base.mako:66
5006 5111 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29
5007 5112 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170
5008 #: rhodecode/templates/admin/repos/repos.mako:61
5113 #: rhodecode/templates/admin/repos/repos.mako:84
5009 5114 #: rhodecode/templates/admin/user_groups/user_group_add.mako:42
5010 5115 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42
5011 5116 #: rhodecode/templates/admin/user_groups/user_groups.mako:78
@@ -5013,61 +5118,61 b' msgstr ""'
5013 5118 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:72
5014 5119 #: rhodecode/templates/admin/users/user_edit_groups.mako:59
5015 5120 #: rhodecode/templates/admin/users/user_edit_ips.mako:12
5121 #: rhodecode/templates/admin/users/user_edit_profile.mako:71
5016 5122 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10
5017 5123 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52
5018 #: rhodecode/templates/base/issue_tracker_settings.mako:10
5019 #: rhodecode/templates/changeset/changeset.mako:76
5124 #: rhodecode/templates/base/issue_tracker_settings.mako:78
5020 5125 #: rhodecode/templates/compare/compare_commits.mako:21
5021 #: rhodecode/templates/email_templates/commit_comment.mako:89
5022 #: rhodecode/templates/email_templates/pull_request_review.mako:41
5023 #: rhodecode/templates/email_templates/pull_request_review.mako:75
5126 #: rhodecode/templates/email_templates/pull_request_review.mako:43
5127 #: rhodecode/templates/email_templates/pull_request_review.mako:123
5128 #: rhodecode/templates/email_templates/pull_request_update.mako:43
5129 #: rhodecode/templates/email_templates/pull_request_update.mako:135
5024 5130 #: rhodecode/templates/forks/fork.mako:56
5025 5131 #: rhodecode/templates/forks/forks.mako:62
5026 #: rhodecode/templates/pullrequests/pullrequest.mako:49
5027 #: rhodecode/templates/pullrequests/pullrequest_show.mako:166
5028 #: rhodecode/templates/pullrequests/pullrequest_show.mako:480
5132 #: rhodecode/templates/pullrequests/pullrequest.mako:50
5133 #: rhodecode/templates/pullrequests/pullrequest_show.mako:547
5029 5134 #: rhodecode/templates/summary/components.mako:159
5135 #: rhodecode/templates/user_group/profile.mako:25
5136 #: rhodecode/templates/users/user_profile.mako:59
5030 5137 msgid "Description"
5031 5138 msgstr ""
5032 5139
5033 #: rhodecode/templates/index_base.mako:71
5034 #: rhodecode/templates/index_base.mako:104
5140 #: rhodecode/templates/index_base.mako:78
5141 #: rhodecode/templates/index_base.mako:169
5035 5142 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:80
5036 #: rhodecode/templates/admin/repos/repos.mako:64
5143 #: rhodecode/templates/admin/repos/repos.mako:91
5037 5144 msgid "Last Change"
5038 5145 msgstr ""
5039 5146
5040 #: rhodecode/templates/index_base.mako:76
5041 #: rhodecode/templates/index_base.mako:109
5147 #: rhodecode/templates/index_base.mako:91
5148 #: rhodecode/templates/index_base.mako:182
5042 5149 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50
5043 5150 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:8
5044 5151 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37
5045 5152 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:84
5046 5153 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6
5047 5154 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:152
5048 #: rhodecode/templates/admin/repos/repos.mako:69
5155 #: rhodecode/templates/admin/repos/repos.mako:104
5049 5156 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6
5050 5157 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24
5051 5158 #: rhodecode/templates/admin/user_groups/user_groups.mako:86
5052 5159 #: rhodecode/templates/admin/users/user_edit_groups.mako:65
5053 5160 #: rhodecode/templates/forks/forks.mako:58
5054 5161 #: rhodecode/templates/summary/components.mako:148
5055 #: rhodecode/templates/user_group/profile.mako:24
5162 #: rhodecode/templates/user_group/profile.mako:35
5056 5163 msgid "Owner"
5057 5164 msgstr ""
5058 5165
5059 #: rhodecode/templates/index_base.mako:107
5060 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35
5061 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35
5062 #: rhodecode/templates/admin/repos/repos.mako:67
5166 #: rhodecode/templates/index_base.mako:176
5167 #: rhodecode/templates/admin/repos/repos.mako:98
5063 5168 #: rhodecode/templates/bookmarks/bookmarks.mako:64
5064 5169 #: rhodecode/templates/branches/branches.mako:63
5065 #: rhodecode/templates/changeset/changeset.mako:33
5066 5170 #: rhodecode/templates/compare/compare_commits.mako:19
5067 #: rhodecode/templates/email_templates/commit_comment.mako:49
5068 #: rhodecode/templates/email_templates/commit_comment.mako:88
5069 #: rhodecode/templates/files/file_authors_box.mako:26
5070 #: rhodecode/templates/pullrequests/pullrequest_show.mako:478
5171 #: rhodecode/templates/email_templates/commit_comment.mako:56
5172 #: rhodecode/templates/email_templates/commit_comment.mako:109
5173 #: rhodecode/templates/email_templates/commit_comment.mako:135
5174 #: rhodecode/templates/files/file_authors_box.mako:28
5175 #: rhodecode/templates/pullrequests/pullrequest_show.mako:545
5071 5176 #: rhodecode/templates/search/search_commit.mako:9
5072 5177 #: rhodecode/templates/summary/components.mako:117
5073 5178 #: rhodecode/templates/summary/components.mako:125
@@ -5082,8 +5187,8 b' msgid "%s Repository group dashboard"'
5082 5187 msgstr ""
5083 5188
5084 5189 #: rhodecode/templates/index_repo_group.mako:13
5085 #: rhodecode/templates/base/base.mako:611
5086 #: rhodecode/templates/base/base.mako:612
5190 #: rhodecode/templates/base/base.mako:773
5191 #: rhodecode/templates/base/base.mako:774
5087 5192 msgid "Home"
5088 5193 msgstr ""
5089 5194
@@ -5121,7 +5226,7 b' msgid "Please contact "'
5121 5226 msgstr ""
5122 5227
5123 5228 #: rhodecode/templates/login.mako:84 rhodecode/templates/password_reset.mako:39
5124 #: rhodecode/templates/base/base.mako:50
5229 #: rhodecode/templates/base/base.mako:59
5125 5230 msgid "Support"
5126 5231 msgstr ""
5127 5232
@@ -5191,19 +5296,19 b' msgid "Re-enter password"'
5191 5296 msgstr ""
5192 5297
5193 5298 #: rhodecode/templates/register.mako:81
5194 #: rhodecode/templates/admin/my_account/my_account_profile.mako:35
5299 #: rhodecode/templates/admin/my_account/my_account_profile.mako:37
5195 5300 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32
5196 5301 #: rhodecode/templates/admin/users/user_add.mako:68
5197 #: rhodecode/templates/admin/users/user_edit_profile.mako:46
5302 #: rhodecode/templates/admin/users/user_edit_profile.mako:44
5198 5303 #: rhodecode/templates/admin/users/users.mako:78
5199 5304 msgid "First Name"
5200 5305 msgstr ""
5201 5306
5202 5307 #: rhodecode/templates/register.mako:88
5203 #: rhodecode/templates/admin/my_account/my_account_profile.mako:45
5308 #: rhodecode/templates/admin/my_account/my_account_profile.mako:47
5204 5309 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41
5205 5310 #: rhodecode/templates/admin/users/user_add.mako:77
5206 #: rhodecode/templates/admin/users/user_edit_profile.mako:55
5311 #: rhodecode/templates/admin/users/user_edit_profile.mako:53
5207 5312 #: rhodecode/templates/admin/users/users.mako:80
5208 5313 msgid "Last Name"
5209 5314 msgstr ""
@@ -5229,7 +5334,7 b' msgid "Audit long entry"'
5229 5334 msgstr ""
5230 5335
5231 5336 #: rhodecode/templates/admin/admin_audit_log_entry.mako:34
5232 #: rhodecode/templates/users/user.mako:4 rhodecode/templates/users/user.mako:11
5337 #: rhodecode/templates/users/user.mako:4
5233 5338 msgid "User"
5234 5339 msgstr ""
5235 5340
@@ -5249,12 +5354,11 b' msgstr ""'
5249 5354 #: rhodecode/templates/admin/admin_audit_log_entry.mako:63
5250 5355 #: rhodecode/templates/admin/admin_log_base.mako:8
5251 5356 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:19
5252 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37
5253 5357 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13
5254 5358 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55
5255 5359 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:86
5256 5360 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13
5257 #: rhodecode/templates/admin/repos/repos.mako:73
5361 #: rhodecode/templates/admin/repos/repos.mako:116
5258 5362 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71
5259 5363 #: rhodecode/templates/admin/user_groups/user_groups.mako:88
5260 5364 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:19
@@ -5279,16 +5383,16 b' msgstr ""'
5279 5383 #: rhodecode/templates/admin/admin_log_base.mako:10
5280 5384 #: rhodecode/templates/admin/defaults/defaults.mako:32
5281 5385 #: rhodecode/templates/admin/permissions/permissions_objects.mako:16
5282 #: rhodecode/templates/base/base.mako:486
5283 #: rhodecode/templates/base/base.mako:488
5284 #: rhodecode/templates/base/base.mako:490
5386 #: rhodecode/templates/base/base.mako:653
5387 #: rhodecode/templates/base/base.mako:655
5388 #: rhodecode/templates/base/base.mako:657
5285 5389 #: rhodecode/templates/search/search_commit.mako:8
5286 5390 #: rhodecode/templates/search/search_path.mako:7
5287 5391 msgid "Repository"
5288 5392 msgstr ""
5289 5393
5290 5394 #: rhodecode/templates/admin/admin_audit_logs.mako:5
5291 #: rhodecode/templates/base/base.mako:102
5395 #: rhodecode/templates/base/base.mako:106
5292 5396 msgid "Admin audit logs"
5293 5397 msgstr ""
5294 5398
@@ -5298,7 +5402,7 b' msgstr ""'
5298 5402
5299 5403 #: rhodecode/templates/admin/admin_audit_logs.mako:26
5300 5404 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15
5301 #: rhodecode/templates/admin/users/user_edit_audit.mako:15
5405 #: rhodecode/templates/admin/users/user_edit_audit.mako:16
5302 5406 #: rhodecode/templates/journal/journal.mako:13
5303 5407 msgid "filter"
5304 5408 msgstr ""
@@ -5311,7 +5415,7 b' msgstr ""'
5311 5415
5312 5416 #: rhodecode/templates/admin/admin_audit_logs.mako:29
5313 5417 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:18
5314 #: rhodecode/templates/admin/users/user_edit_audit.mako:18
5418 #: rhodecode/templates/admin/users/user_edit_audit.mako:19
5315 5419 #: rhodecode/templates/journal/journal.mako:16
5316 5420 msgid "Example Queries"
5317 5421 msgstr ""
@@ -5341,10 +5445,22 b' msgstr ""'
5341 5445 msgid "Repositories under administration"
5342 5446 msgstr ""
5343 5447
5448 #: rhodecode/templates/admin/main.mako:34
5449 #: rhodecode/templates/admin/repos/repo_add.mako:22
5450 #: rhodecode/templates/admin/repos/repos.mako:31
5451 msgid "Add Repository"
5452 msgstr ""
5453
5344 5454 #: rhodecode/templates/admin/main.mako:39
5345 5455 msgid "Repository groups under administration"
5346 5456 msgstr ""
5347 5457
5458 #: rhodecode/templates/admin/main.mako:43
5459 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16
5460 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:31
5461 msgid "Add Repository Group"
5462 msgstr ""
5463
5348 5464 #: rhodecode/templates/admin/main.mako:48
5349 5465 msgid "User groups under administration"
5350 5466 msgstr ""
@@ -5393,24 +5509,20 b' msgstr ""'
5393 5509 #: rhodecode/templates/admin/auth/auth_settings.mako:85
5394 5510 #: rhodecode/templates/admin/auth/plugin_settings.mako:96
5395 5511 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63
5396 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:108
5512 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:109
5397 5513 #: rhodecode/templates/admin/permissions/permissions_application.mako:59
5398 5514 #: rhodecode/templates/admin/permissions/permissions_objects.mako:59
5399 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77
5400 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205
5401 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83
5402 #: rhodecode/templates/admin/repos/repo_add_base.mako:106
5515 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:206
5516 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:71
5403 5517 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79
5404 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187
5518 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:191
5405 5519 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243
5406 5520 #: rhodecode/templates/admin/settings/settings_hooks.mako:63
5407 5521 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15
5408 #: rhodecode/templates/admin/user_groups/user_group_add.mako:59
5409 5522 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192
5410 5523 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102
5411 #: rhodecode/templates/admin/users/user_add.mako:128
5412 5524 #: rhodecode/templates/admin/users/user_edit_groups.mako:27
5413 #: rhodecode/templates/admin/users/user_edit_profile.mako:134
5525 #: rhodecode/templates/admin/users/user_edit_profile.mako:145
5414 5526 #: rhodecode/templates/base/default_perms_box.mako:88
5415 5527 msgid "Save"
5416 5528 msgstr ""
@@ -5429,22 +5541,23 b' msgid "Default Settings For New Reposito'
5429 5541 msgstr ""
5430 5542
5431 5543 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14
5432 #: rhodecode/templates/admin/gists/index.mako:105
5544 #: rhodecode/templates/admin/gists/gist_index.mako:105
5433 5545 #: rhodecode/templates/admin/integrations/list.mako:73
5434 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
5546 #: rhodecode/templates/admin/repos/repo_add_base.mako:57
5435 5547 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12
5436 5548 msgid "Type"
5437 5549 msgstr ""
5438 5550
5439 5551 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:23
5440 #: rhodecode/templates/admin/repos/repo_add_base.mako:98
5552 #: rhodecode/templates/admin/repos/repo_add_base.mako:89
5441 5553 msgid "Private Repository"
5442 5554 msgstr ""
5443 5555
5444 5556 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27
5445 #: rhodecode/templates/admin/repos/repo_add_base.mako:102
5557 #: rhodecode/templates/admin/repos/repo_add_base.mako:93
5558 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109
5446 5559 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192
5447 #: rhodecode/templates/forks/fork.mako:95
5560 #: rhodecode/templates/forks/fork.mako:85
5448 5561 msgid "Private repositories are only visible to people explicitly added as collaborators."
5449 5562 msgstr ""
5450 5563
@@ -5472,88 +5585,85 b' msgstr ""'
5472 5585 msgid "Enable automatic repository locking. Pulling from a repository will lock it, and it is unlocked by pushing back by the same user."
5473 5586 msgstr ""
5474 5587
5475 #: rhodecode/templates/admin/gists/edit.mako:5
5476 #: rhodecode/templates/admin/gists/edit.mako:12
5588 #: rhodecode/templates/admin/gists/gist_edit.mako:5
5477 5589 msgid "Edit Gist"
5478 5590 msgstr ""
5479 5591
5480 #: rhodecode/templates/admin/gists/edit.mako:33
5481 #: rhodecode/templates/admin/gists/new.mako:30
5592 #: rhodecode/templates/admin/gists/gist_edit.mako:33
5593 #: rhodecode/templates/admin/gists/gist_new.mako:34
5594 msgid "Gist lifetime"
5595 msgstr ""
5596
5597 #: rhodecode/templates/admin/gists/gist_edit.mako:36
5598 msgid "Gist access level"
5599 msgstr ""
5600
5601 #: rhodecode/templates/admin/gists/gist_edit.mako:40
5602 #: rhodecode/templates/admin/gists/gist_new.mako:40
5482 5603 msgid "Gist description ..."
5483 5604 msgstr ""
5484 5605
5485 #: rhodecode/templates/admin/gists/edit.mako:38
5486 #: rhodecode/templates/admin/gists/new.mako:38
5487 msgid "Gist lifetime"
5488 msgstr ""
5489
5490 #: rhodecode/templates/admin/gists/edit.mako:41
5491 #: rhodecode/templates/admin/gists/new.mako:41
5492 msgid "Gist access level"
5493 msgstr ""
5494
5495 #: rhodecode/templates/admin/gists/edit.mako:56
5496 #: rhodecode/templates/admin/gists/new.mako:50
5606 #: rhodecode/templates/admin/gists/gist_edit.mako:54
5607 #: rhodecode/templates/admin/gists/gist_new.mako:48
5497 5608 #: rhodecode/templates/files/files_add.mako:68
5498 5609 #: rhodecode/templates/files/files_edit.mako:69
5499 5610 msgid "plain"
5500 5611 msgstr ""
5501 5612
5502 #: rhodecode/templates/admin/gists/edit.mako:101
5613 #: rhodecode/templates/admin/gists/gist_edit.mako:99
5503 5614 msgid "Update Gist"
5504 5615 msgstr ""
5505 5616
5506 #: rhodecode/templates/admin/gists/edit.mako:102
5507 #: rhodecode/templates/base/issue_tracker_settings.mako:73
5508 #: rhodecode/templates/changeset/changeset_file_comment.mako:392
5509 #: rhodecode/templates/codeblocks/diffs.mako:72
5510 #: rhodecode/templates/pullrequests/pullrequest_show.mako:61
5617 #: rhodecode/templates/admin/gists/gist_edit.mako:100
5618 #: rhodecode/templates/base/issue_tracker_settings.mako:150
5619 #: rhodecode/templates/changeset/changeset_file_comment.mako:391
5620 #: rhodecode/templates/codeblocks/diffs.mako:84
5621 #: rhodecode/templates/pullrequests/pullrequest_show.mako:75
5511 5622 msgid "Cancel"
5512 5623 msgstr ""
5513 5624
5514 #: rhodecode/templates/admin/gists/edit.mako:125
5625 #: rhodecode/templates/admin/gists/gist_edit.mako:123
5515 5626 #, python-format
5516 5627 msgid "Gist was updated since you started editing. Copy your changes and click %(here)s to reload the new version."
5517 5628 msgstr ""
5518 5629
5519 #: rhodecode/templates/admin/gists/index.mako:6
5630 #: rhodecode/templates/admin/gists/gist_index.mako:6
5520 5631 msgid "Private Gists for user {}"
5521 5632 msgstr ""
5522 5633
5523 #: rhodecode/templates/admin/gists/index.mako:8
5634 #: rhodecode/templates/admin/gists/gist_index.mako:8
5524 5635 msgid "Public Gists for user {}"
5525 5636 msgstr ""
5526 5637
5527 #: rhodecode/templates/admin/gists/index.mako:10
5638 #: rhodecode/templates/admin/gists/gist_index.mako:10
5528 5639 msgid "Public Gists"
5529 5640 msgstr ""
5530 5641
5531 #: rhodecode/templates/admin/gists/index.mako:30
5642 #: rhodecode/templates/admin/gists/gist_index.mako:30
5532 5643 msgid "All gists"
5533 5644 msgstr ""
5534 5645
5535 #: rhodecode/templates/admin/gists/index.mako:32
5646 #: rhodecode/templates/admin/gists/gist_index.mako:32
5536 5647 msgid "All public"
5537 5648 msgstr ""
5538 5649
5539 #: rhodecode/templates/admin/gists/index.mako:34
5650 #: rhodecode/templates/admin/gists/gist_index.mako:34
5540 5651 msgid "My gists"
5541 5652 msgstr ""
5542 5653
5543 #: rhodecode/templates/admin/gists/index.mako:35
5654 #: rhodecode/templates/admin/gists/gist_index.mako:35
5544 5655 msgid "My private"
5545 5656 msgstr ""
5546 5657
5547 #: rhodecode/templates/admin/gists/index.mako:36
5658 #: rhodecode/templates/admin/gists/gist_index.mako:36
5548 5659 msgid "My public"
5549 5660 msgstr ""
5550 5661
5551 #: rhodecode/templates/admin/gists/index.mako:43
5552 #: rhodecode/templates/admin/gists/show.mako:35
5662 #: rhodecode/templates/admin/gists/gist_index.mako:43
5553 5663 msgid "Create New Gist"
5554 5664 msgstr ""
5555 5665
5556 #: rhodecode/templates/admin/gists/index.mako:54
5666 #: rhodecode/templates/admin/gists/gist_index.mako:54
5557 5667 #: rhodecode/templates/admin/my_account/my_account_repos.mako:7
5558 5668 #: rhodecode/templates/admin/my_account/my_account_watched.mako:7
5559 5669 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11
@@ -5564,27 +5674,27 b' msgstr ""'
5564 5674 #: rhodecode/templates/bookmarks/bookmarks.mako:33
5565 5675 #: rhodecode/templates/branches/branches.mako:33
5566 5676 #: rhodecode/templates/journal/journal.mako:12
5677 #: rhodecode/templates/pullrequests/pullrequests.mako:53
5567 5678 #: rhodecode/templates/tags/tags.mako:33
5568 5679 msgid "quick filter..."
5569 5680 msgstr ""
5570 5681
5571 #: rhodecode/templates/admin/gists/index.mako:103
5572 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
5682 #: rhodecode/templates/admin/gists/gist_index.mako:103
5683 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59
5573 5684 #: rhodecode/templates/bookmarks/bookmarks.mako:61
5574 5685 #: rhodecode/templates/branches/branches.mako:60
5575 #: rhodecode/templates/changeset/changeset.mako:195
5576 5686 #: rhodecode/templates/commits/changelog.mako:119
5577 5687 #: rhodecode/templates/compare/compare_commits.mako:18
5578 #: rhodecode/templates/files/files_browser_tree.mako:15
5579 #: rhodecode/templates/pullrequests/pullrequest_show.mako:477
5580 #: rhodecode/templates/pullrequests/pullrequests.mako:83
5581 #: rhodecode/templates/search/search_commit.mako:19
5688 #: rhodecode/templates/files/files_browser_tree.mako:17
5689 #: rhodecode/templates/pullrequests/pullrequest_show.mako:544
5690 #: rhodecode/templates/pullrequests/pullrequests.mako:98
5691 #: rhodecode/templates/search/search_commit.mako:18
5582 5692 #: rhodecode/templates/summary/summary_commits.mako:11
5583 5693 #: rhodecode/templates/tags/tags.mako:61
5584 5694 msgid "Author"
5585 5695 msgstr ""
5586 5696
5587 #: rhodecode/templates/admin/gists/index.mako:111
5697 #: rhodecode/templates/admin/gists/gist_index.mako:111
5588 5698 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11
5589 5699 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51
5590 5700 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:9
@@ -5592,71 +5702,92 b' msgstr ""'
5592 5702 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:7
5593 5703 #: rhodecode/templates/admin/users/user_edit_advanced.mako:6
5594 5704 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11
5705 #: rhodecode/templates/pullrequests/pullrequest_show.mako:52
5595 5706 msgid "Created on"
5596 5707 msgstr ""
5597 5708
5598 #: rhodecode/templates/admin/gists/index.mako:113
5599 #: rhodecode/templates/admin/gists/show.mako:72
5709 #: rhodecode/templates/admin/gists/gist_index.mako:113
5600 5710 msgid "Expires"
5601 5711 msgstr ""
5602 5712
5603 #: rhodecode/templates/admin/gists/new.mako:5
5604 #: rhodecode/templates/admin/gists/new.mako:12
5713 #: rhodecode/templates/admin/gists/gist_new.mako:5
5714 #: rhodecode/templates/base/base.mako:572
5605 5715 msgid "New Gist"
5606 5716 msgstr ""
5607 5717
5608 #: rhodecode/templates/admin/gists/new.mako:35
5718 #: rhodecode/templates/admin/gists/gist_new.mako:31
5609 5719 msgid "Gist id"
5610 5720 msgstr ""
5611 5721
5612 #: rhodecode/templates/admin/gists/new.mako:36
5722 #: rhodecode/templates/admin/gists/gist_new.mako:32
5613 5723 msgid "Auto generated"
5614 5724 msgstr ""
5615 5725
5616 #: rhodecode/templates/admin/gists/new.mako:49
5617 msgid "name this file..."
5618 msgstr ""
5619
5620 #: rhodecode/templates/admin/gists/new.mako:60
5621 msgid "Create Private Gist"
5622 msgstr ""
5623
5624 #: rhodecode/templates/admin/gists/new.mako:61
5625 msgid "Create Public Gist"
5626 msgstr ""
5627
5628 #: rhodecode/templates/admin/gists/show.mako:13
5629 #: rhodecode/templates/admin/gists/show.mako:20
5726 #: rhodecode/templates/admin/gists/gist_new.mako:37
5727 msgid "Private Gist access level"
5728 msgstr ""
5729
5730 #: rhodecode/templates/admin/gists/gist_new.mako:47
5731 msgid "name gist file..."
5732 msgstr ""
5733
5734 #: rhodecode/templates/admin/gists/gist_new.mako:61
5735 msgid "Create Gist"
5736 msgstr ""
5737
5738 #: rhodecode/templates/admin/gists/gist_new.mako:69
5739 #: rhodecode/templates/admin/gists/gist_new.mako:70
5740 #: rhodecode/templates/data_table/_dt_elements.mako:344
5741 msgid "Private Gist"
5742 msgstr ""
5743
5744 #: rhodecode/templates/admin/gists/gist_new.mako:70
5745 msgid "Private Gists are not listed and only accessible through their secret url."
5746 msgstr ""
5747
5748 #: rhodecode/templates/admin/gists/gist_new.mako:73
5749 #: rhodecode/templates/admin/gists/gist_new.mako:74
5750 #: rhodecode/templates/data_table/_dt_elements.mako:342
5751 msgid "Public Gist"
5752 msgstr ""
5753
5754 #: rhodecode/templates/admin/gists/gist_new.mako:74
5755 msgid "Public Gists are accessible to anyone and listed in Gists page."
5756 msgstr ""
5757
5758 #: rhodecode/templates/admin/gists/gist_show.mako:14
5759 #: rhodecode/templates/admin/gists/gist_show.mako:21
5630 5760 msgid "Gist"
5631 5761 msgstr ""
5632 5762
5633 #: rhodecode/templates/admin/gists/show.mako:47
5763 #: rhodecode/templates/admin/gists/gist_show.mako:41
5634 5764 msgid "Copy the url"
5635 5765 msgstr ""
5636 5766
5637 #: rhodecode/templates/admin/gists/show.mako:54
5638 msgid "Confirm to delete this Gist"
5639 msgstr ""
5640
5641 #: rhodecode/templates/admin/gists/show.mako:60
5767 #: rhodecode/templates/admin/gists/gist_show.mako:47
5768 #: rhodecode/templates/files/files_source.mako:106
5642 5769 msgid "Copy content"
5643 5770 msgstr ""
5644 5771
5645 #: rhodecode/templates/admin/gists/show.mako:65
5772 #: rhodecode/templates/admin/gists/gist_show.mako:52
5646 5773 msgid "Show as Raw"
5647 5774 msgstr ""
5648 5775
5649 #: rhodecode/templates/admin/gists/show.mako:69
5650 msgid "Private Gist"
5651 msgstr ""
5652
5653 #: rhodecode/templates/admin/gists/show.mako:85
5776 #: rhodecode/templates/admin/gists/gist_show.mako:57
5777 msgid "Confirm to delete this Gist"
5778 msgstr ""
5779
5780 #: rhodecode/templates/admin/gists/gist_show.mako:70
5654 5781 msgid "created"
5655 5782 msgstr ""
5656 5783
5657 #: rhodecode/templates/admin/gists/show.mako:100
5784 #: rhodecode/templates/admin/gists/gist_show.mako:71
5785 msgid "expires"
5786 msgstr ""
5787
5788 #: rhodecode/templates/admin/gists/gist_show.mako:92
5658 5789 #: rhodecode/templates/files/files_delete.mako:58
5659 #: rhodecode/templates/files/files_source.mako:133
5790 #: rhodecode/templates/files/files_source.mako:125
5660 5791 msgid "Show as raw"
5661 5792 msgstr ""
5662 5793
@@ -5676,7 +5807,7 b' msgstr ""'
5676 5807 #: rhodecode/templates/admin/integrations/new.mako:15
5677 5808 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:33
5678 5809 #: rhodecode/templates/admin/repos/repo_edit.mako:74
5679 #: rhodecode/templates/base/base.mako:109
5810 #: rhodecode/templates/base/base.mako:113
5680 5811 msgid "Integrations"
5681 5812 msgstr ""
5682 5813
@@ -5690,7 +5821,7 b' msgstr ""'
5690 5821 #: rhodecode/templates/admin/repos/repo_edit.mako:42
5691 5822 #: rhodecode/templates/admin/settings/settings.mako:14
5692 5823 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:34
5693 #: rhodecode/templates/base/base.mako:111
5824 #: rhodecode/templates/base/base.mako:115
5694 5825 msgid "Settings"
5695 5826 msgstr ""
5696 5827
@@ -5746,6 +5877,7 b' msgid "Create one"'
5746 5877 msgstr ""
5747 5878
5748 5879 #: rhodecode/templates/admin/integrations/list.mako:132
5880 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:19
5749 5881 msgid "repo"
5750 5882 msgstr ""
5751 5883
@@ -5790,7 +5922,7 b' msgid "No description available"'
5790 5922 msgstr ""
5791 5923
5792 5924 #: rhodecode/templates/admin/my_account/my_account.mako:5
5793 #: rhodecode/templates/base/base.mako:462
5925 #: rhodecode/templates/base/base.mako:617
5794 5926 msgid "My account"
5795 5927 msgstr ""
5796 5928
@@ -5799,16 +5931,21 b' msgid "My Account"'
5799 5931 msgstr ""
5800 5932
5801 5933 #: rhodecode/templates/admin/my_account/my_account.mako:29
5802 #: rhodecode/templates/email_templates/user_registration.mako:26
5803 #: rhodecode/templates/users/user.mako:29
5934 #: rhodecode/templates/email_templates/user_registration.mako:54
5804 5935 msgid "Profile"
5805 5936 msgstr ""
5806 5937
5807 #: rhodecode/templates/admin/my_account/my_account.mako:32
5808 msgid "Auth Tokens"
5938 #: rhodecode/templates/admin/my_account/my_account.mako:30
5939 #: rhodecode/templates/admin/users/user_edit.mako:45
5940 #: rhodecode/templates/debug_style/index.html:55
5941 msgid "Emails"
5809 5942 msgstr ""
5810 5943
5811 5944 #: rhodecode/templates/admin/my_account/my_account.mako:33
5945 msgid "Auth Tokens"
5946 msgstr ""
5947
5948 #: rhodecode/templates/admin/my_account/my_account.mako:34
5812 5949 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3
5813 5950 #: rhodecode/templates/admin/permissions/permissions.mako:51
5814 5951 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4
@@ -5817,41 +5954,39 b' msgstr ""'
5817 5954 msgid "SSH Keys"
5818 5955 msgstr ""
5819 5956
5820 #: rhodecode/templates/admin/my_account/my_account.mako:34
5957 #: rhodecode/templates/admin/my_account/my_account.mako:35
5821 5958 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:5
5822 5959 msgid "User Group Membership"
5823 5960 msgstr ""
5824 5961
5825 #: rhodecode/templates/admin/my_account/my_account.mako:39
5962 #: rhodecode/templates/admin/my_account/my_account.mako:40
5826 5963 msgid "External Identities"
5827 5964 msgstr ""
5828 5965
5829 #: rhodecode/templates/admin/my_account/my_account.mako:41
5830 #: rhodecode/templates/admin/users/user_edit.mako:45
5831 msgid "Emails"
5832 msgstr ""
5833
5834 5966 #: rhodecode/templates/admin/my_account/my_account.mako:43
5835 msgid "Watched"
5967 msgid "Owned Repositories"
5836 5968 msgstr ""
5837 5969
5838 5970 #: rhodecode/templates/admin/my_account/my_account.mako:44
5839 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
5840 #: rhodecode/templates/base/base.mako:303
5841 #: rhodecode/templates/base/base.mako:466
5842 msgid "Pull Requests"
5971 msgid "Watched Repositories"
5843 5972 msgstr ""
5844 5973
5845 5974 #: rhodecode/templates/admin/my_account/my_account.mako:45
5846 #: rhodecode/templates/admin/permissions/permissions.mako:14
5847 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31
5848 #: rhodecode/templates/admin/repos/repo_edit.mako:45
5849 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
5850 #: rhodecode/templates/base/base.mako:107
5851 msgid "Permissions"
5975 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:42
5976 #: rhodecode/templates/base/base.mako:376
5977 #: rhodecode/templates/base/base.mako:621
5978 msgid "Pull Requests"
5852 5979 msgstr ""
5853 5980
5854 5981 #: rhodecode/templates/admin/my_account/my_account.mako:46
5982 #: rhodecode/templates/admin/permissions/permissions.mako:14
5983 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:31
5984 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35
5985 #: rhodecode/templates/base/base.mako:111
5986 msgid "Permissions"
5987 msgstr ""
5988
5989 #: rhodecode/templates/admin/my_account/my_account.mako:47
5855 5990 msgid "Live Notifications"
5856 5991 msgstr ""
5857 5992
@@ -5926,63 +6061,63 b' msgstr ""'
5926 6061 msgid "Position"
5927 6062 msgstr ""
5928 6063
5929 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:16
6064 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:17
5930 6065 msgid "Bookmark title (max 30 characters, optional)"
5931 6066 msgstr ""
5932 6067
5933 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:23
6068 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:24
5934 6069 msgid "Clear"
5935 6070 msgstr ""
5936 6071
5937 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:29
6072 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:30
5938 6073 msgid "Server URL is available as ${server_url} variable. E.g. Redirect url: ${server_url}/_admin/exception_tracker"
5939 6074 msgstr ""
5940 6075
5941 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:33
6076 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:34
5942 6077 msgid "Redirect URL"
5943 6078 msgstr ""
5944 6079
5945 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:43
6080 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:44
5946 6081 msgid "Repository template"
5947 6082 msgstr ""
5948 6083
5949 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:49
6084 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:50
5950 6085 msgid "Repository group template"
5951 6086 msgstr ""
5952 6087
5953 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:55
6088 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:56
5954 6089 msgid "Template Repository or Repository group"
5955 6090 msgstr ""
5956 6091
5957 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:65
6092 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:66
5958 6093 msgid "Available as ${repo_url} e.g. Redirect url: ${repo_url}/changelog"
5959 6094 msgstr ""
5960 6095
5961 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:67
6096 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:68
5962 6097 msgid "Available as ${repo_group_url} e.g. Redirect url: ${repo_group_url}"
5963 6098 msgstr ""
5964 6099
5965 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:69
6100 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:70
5966 6101 msgid "Available as full url variables in redirect url. i.e: ${repo_url}, ${repo_group_url}."
5967 6102 msgstr ""
5968 6103
5969 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:79
6104 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:80
5970 6105 msgid "Your Bookmarks"
5971 6106 msgstr ""
5972 6107
5973 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:84
6108 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:85
5974 6109 msgid "Store upto 10 bookmark links to favorite repositories, external issue tracker or CI server. "
5975 6110 msgstr ""
5976 6111
5977 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:86
6112 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:87
5978 6113 msgid "Bookmarks are accessible from your username dropdown or by keyboard shortcut `g 0-9`"
5979 6114 msgstr ""
5980 6115
5981 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:140
6116 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:141
5982 6117 msgid "repository"
5983 6118 msgstr ""
5984 6119
5985 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:191
6120 #: rhodecode/templates/admin/my_account/my_account_bookmarks.mako:192
5986 6121 msgid "repository group"
5987 6122 msgstr ""
5988 6123
@@ -6016,15 +6151,15 b' msgstr ""'
6016 6151 msgid "Source type"
6017 6152 msgstr ""
6018 6153
6019 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:22
6154 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:4
6020 6155 msgid "Your Live Notification Settings"
6021 6156 msgstr ""
6022 6157
6023 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:34
6158 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:16
6024 6159 msgid "Notifications Status"
6025 6160 msgstr ""
6026 6161
6027 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:47
6162 #: rhodecode/templates/admin/my_account/my_account_notifications.mako:40
6028 6163 msgid "Test Notifications"
6029 6164 msgstr ""
6030 6165
@@ -6032,20 +6167,20 b' msgstr ""'
6032 6167 msgid "Change Your Account Password"
6033 6168 msgstr ""
6034 6169
6035 #: rhodecode/templates/admin/my_account/my_account_profile.mako:4
6170 #: rhodecode/templates/admin/my_account/my_account_profile.mako:6
6036 6171 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4
6037 6172 msgid "My Profile"
6038 6173 msgstr ""
6039 6174
6040 #: rhodecode/templates/admin/my_account/my_account_profile.mako:11
6175 #: rhodecode/templates/admin/my_account/my_account_profile.mako:13
6041 6176 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:54
6042 #: rhodecode/templates/admin/users/user_edit_profile.mako:25
6043 #: rhodecode/templates/users/user_profile.mako:14
6177 #: rhodecode/templates/admin/users/user_edit_profile.mako:23
6178 #: rhodecode/templates/users/user_profile.mako:15
6044 6179 msgid "Photo"
6045 6180 msgstr ""
6046 6181
6047 #: rhodecode/templates/admin/my_account/my_account_profile.mako:59
6048 #: rhodecode/templates/users/user_profile.mako:62
6182 #: rhodecode/templates/admin/my_account/my_account_profile.mako:71
6183 #: rhodecode/templates/users/user_profile.mako:73
6049 6184 msgid "Missing email, please update your user email address."
6050 6185 msgstr ""
6051 6186
@@ -6062,21 +6197,26 b' msgstr ""'
6062 6197 msgid "Pull Requests You Participate In"
6063 6198 msgstr ""
6064 6199
6065 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:53
6200 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:51
6066 6201 msgid "Target Repo"
6067 6202 msgstr ""
6068 6203
6069 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:59
6204 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55
6205 #: rhodecode/templates/pullrequests/pullrequests.mako:94
6206 msgid "Id"
6207 msgstr ""
6208
6209 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:57
6070 6210 #: rhodecode/templates/admin/settings/settings_global.mako:9
6071 #: rhodecode/templates/email_templates/pull_request_review.mako:39
6072 #: rhodecode/templates/email_templates/pull_request_review.mako:72
6073 #: rhodecode/templates/pullrequests/pullrequest.mako:40
6074 #: rhodecode/templates/pullrequests/pullrequests.mako:85
6211 #: rhodecode/templates/email_templates/pull_request_review.mako:41
6212 #: rhodecode/templates/email_templates/pull_request_update.mako:41
6213 #: rhodecode/templates/pullrequests/pullrequest.mako:38
6214 #: rhodecode/templates/pullrequests/pullrequests.mako:96
6075 6215 msgid "Title"
6076 6216 msgstr ""
6077 6217
6078 6218 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:63
6079 #: rhodecode/templates/pullrequests/pullrequests.mako:89
6219 #: rhodecode/templates/pullrequests/pullrequests.mako:102
6080 6220 msgid "Last Update"
6081 6221 msgstr ""
6082 6222
@@ -6131,15 +6271,15 b' msgid "Click add to use this generated S'
6131 6271 msgstr ""
6132 6272
6133 6273 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:49
6134 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41
6274 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:47
6135 6275 #: rhodecode/templates/admin/user_groups/user_group_add.mako:51
6136 6276 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51
6137 6277 #: rhodecode/templates/admin/user_groups/user_groups.mako:84
6138 6278 #: rhodecode/templates/admin/users/user_add.mako:97
6139 6279 #: rhodecode/templates/admin/users/user_edit_groups.mako:64
6140 #: rhodecode/templates/admin/users/user_edit_profile.mako:89
6280 #: rhodecode/templates/admin/users/user_edit_profile.mako:101
6141 6281 #: rhodecode/templates/admin/users/users.mako:85
6142 #: rhodecode/templates/user_group/profile.mako:34
6282 #: rhodecode/templates/user_group/profile.mako:44
6143 6283 msgid "Active"
6144 6284 msgstr ""
6145 6285
@@ -6161,16 +6301,20 b' msgstr ""'
6161 6301
6162 6302 #: rhodecode/templates/admin/notifications/notifications_show.mako:5
6163 6303 #: rhodecode/templates/admin/notifications/notifications_show.mako:14
6304 #: rhodecode/templates/debug_style/email_plain_rendered.mako:5
6305 #: rhodecode/templates/debug_style/email_plain_rendered.mako:14
6164 6306 msgid "Show notification"
6165 6307 msgstr ""
6166 6308
6167 6309 #: rhodecode/templates/admin/notifications/notifications_show.mako:12
6168 6310 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:5
6169 6311 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:20
6312 #: rhodecode/templates/debug_style/email_plain_rendered.mako:12
6170 6313 msgid "My Notifications"
6171 6314 msgstr ""
6172 6315
6173 #: rhodecode/templates/admin/notifications/notifications_show.mako:40
6316 #: rhodecode/templates/admin/notifications/notifications_show.mako:42
6317 #: rhodecode/templates/debug_style/email_plain_rendered.mako:38
6174 6318 msgid "Subject"
6175 6319 msgstr ""
6176 6320
@@ -6188,7 +6332,8 b' msgid "All"'
6188 6332 msgstr ""
6189 6333
6190 6334 #: rhodecode/templates/admin/notifications/notifications_show_all.mako:41
6191 #: rhodecode/templates/changeset/changeset.mako:158
6335 #: rhodecode/templates/changeset/changeset.mako:172
6336 #: rhodecode/templates/pullrequests/pullrequest_show.mako:656
6192 6337 msgid "Comments"
6193 6338 msgstr ""
6194 6339
@@ -6357,8 +6502,8 b' msgstr ""'
6357 6502
6358 6503 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:14
6359 6504 #: rhodecode/templates/admin/users/user_edit_advanced.mako:13
6360 #: rhodecode/templates/base/base.mako:104
6361 #: rhodecode/templates/base/base.mako:125
6505 #: rhodecode/templates/base/base.mako:108
6506 #: rhodecode/templates/base/base.mako:129
6362 6507 msgid "Repository groups"
6363 6508 msgstr ""
6364 6509
@@ -6371,10 +6516,10 b' msgstr ""'
6371 6516
6372 6517 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:44
6373 6518 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:25
6374 #: rhodecode/templates/admin/repos/repo_add_base.mako:52
6519 #: rhodecode/templates/admin/repos/repo_add_base.mako:43
6375 6520 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:33
6376 #: rhodecode/templates/base/base.mako:499
6377 #: rhodecode/templates/data_table/_dt_elements.mako:208
6521 #: rhodecode/templates/base/base.mako:666
6522 #: rhodecode/templates/data_table/_dt_elements.mako:215
6378 6523 #: rhodecode/templates/forks/fork.mako:41
6379 6524 msgid "Repository group"
6380 6525 msgstr ""
@@ -6385,15 +6530,19 b' msgid "Plain text format with support of'
6385 6530 msgstr ""
6386 6531
6387 6532 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:68
6388 #: rhodecode/templates/admin/repos/repo_add_base.mako:89
6533 #: rhodecode/templates/admin/repos/repo_add_base.mako:80
6389 6534 msgid "Copy Parent Group Permissions"
6390 6535 msgstr ""
6391 6536
6392 6537 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:72
6393 #: rhodecode/templates/admin/repos/repo_add_base.mako:93
6538 #: rhodecode/templates/admin/repos/repo_add_base.mako:84
6394 6539 msgid "Copy permissions from parent repository group."
6395 6540 msgstr ""
6396 6541
6542 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:77
6543 msgid "Create Repository Group"
6544 msgstr ""
6545
6397 6546 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:5
6398 6547 #, python-format
6399 6548 msgid "%s repository group settings"
@@ -6416,44 +6565,54 b' msgid "Updated on"'
6416 6565 msgstr ""
6417 6566
6418 6567 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:11
6419 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
6420 msgid "Cached Commit date"
6568 msgid "Cached Commit source"
6421 6569 msgstr ""
6422 6570
6423 6571 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:12
6424 msgid "Cached Commit repo_id"
6425 msgstr ""
6426
6427 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:14
6428 msgid "Is Personal Group"
6429 msgstr ""
6430
6431 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:16
6432 msgid "Total repositories"
6572 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
6573 msgid "Cached Commit id"
6574 msgstr ""
6575
6576 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:13
6577 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:10
6578 msgid "Cached Commit date"
6579 msgstr ""
6580
6581 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:15
6582 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
6583 msgid "Cached Commit data"
6433 6584 msgstr ""
6434 6585
6435 6586 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:17
6436 msgid "Top level repositories"
6587 msgid "Is Personal Group"
6437 6588 msgstr ""
6438 6589
6439 6590 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:19
6591 msgid "Total repositories"
6592 msgstr ""
6593
6594 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:20
6595 msgid "Top level repositories"
6596 msgstr ""
6597
6598 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:22
6440 6599 msgid "Children groups"
6441 6600 msgstr ""
6442 6601
6443 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:25
6602 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:28
6444 6603 msgid "Repository Group Advanced: {}"
6445 6604 msgstr ""
6446 6605
6447 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:35
6606 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:38
6448 6607 msgid "Delete repository group"
6449 6608 msgstr ""
6450 6609
6451 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:64
6610 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:67
6452 6611 #, python-format
6453 6612 msgid "Confirm to delete this group: %s"
6454 6613 msgstr ""
6455 6614
6456 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:65
6615 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:68
6457 6616 msgid "Delete this repository group"
6458 6617 msgstr ""
6459 6618
@@ -6470,7 +6629,7 b' msgstr ""'
6470 6629 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32
6471 6630 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31
6472 6631 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33
6473 msgid "super admin"
6632 msgid "super-admin"
6474 6633 msgstr ""
6475 6634
6476 6635 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35
@@ -6496,9 +6655,9 b' msgid "inactive duplicate"'
6496 6655 msgstr ""
6497 6656
6498 6657 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77
6499 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:156
6658 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:157
6500 6659 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106
6501 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:151
6660 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:155
6502 6661 #: rhodecode/templates/admin/repos/repo_edit_strip.mako:46
6503 6662 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79
6504 6663 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:158
@@ -6510,27 +6669,27 b' msgstr ""'
6510 6669 msgid "delegated admin"
6511 6670 msgstr ""
6512 6671
6513 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:151
6514 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:146
6672 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:152
6673 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150
6515 6674 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:153
6516 6675 msgid "members"
6517 6676 msgstr ""
6518 6677
6519 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:183
6520 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:178
6678 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:184
6679 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:182
6521 6680 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:184
6522 6681 msgid "Add user/user group"
6523 6682 msgstr ""
6524 6683
6525 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:193
6684 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:194
6526 6685 msgid "Apply to children"
6527 6686 msgstr ""
6528 6687
6529 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199
6530 msgid "Both"
6531 msgstr ""
6532
6533 6688 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:200
6689 msgid "Both"
6690 msgstr ""
6691
6692 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:201
6534 6693 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen."
6535 6694 msgstr ""
6536 6695
@@ -6546,22 +6705,10 b' msgstr ""'
6546 6705 msgid "Change owner of this repository group."
6547 6706 msgstr ""
6548 6707
6549 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:72
6550 msgid "Enable Repository Locking"
6551 msgstr ""
6552
6553 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:78
6554 msgid "Repository locking will be enabled on all subgroups and repositories inside this repository group. Pulling from a repository locks it, and it is unlocked by pushing back by the same user."
6555 msgstr ""
6556
6557 6708 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:5
6558 6709 msgid "Repository groups administration"
6559 6710 msgstr ""
6560 6711
6561 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:26
6562 msgid "repository groups"
6563 msgstr ""
6564
6565 6712 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:82
6566 6713 msgid "Number of top level repositories"
6567 6714 msgstr ""
@@ -6579,41 +6726,34 b' msgid "Import Existing Repository ?"'
6579 6726 msgstr ""
6580 6727
6581 6728 #: rhodecode/templates/admin/repos/repo_add_base.mako:23
6582 #: rhodecode/templates/base/base.mako:248
6729 #: rhodecode/templates/base/base.mako:323
6583 6730 msgid "Clone from"
6584 6731 msgstr ""
6585 6732
6586 #: rhodecode/templates/admin/repos/repo_add_base.mako:47
6587 msgid "Set the type of repository to create."
6588 msgstr ""
6589
6590 #: rhodecode/templates/admin/repos/repo_add_base.mako:58
6733 #: rhodecode/templates/admin/repos/repo_add_base.mako:49
6591 6734 #: rhodecode/templates/forks/fork.mako:47
6592 6735 #, python-format
6593 6736 msgid "Select my personal group (%(repo_group_name)s)"
6594 6737 msgstr ""
6595 6738
6596 #: rhodecode/templates/admin/repos/repo_add_base.mako:61
6739 #: rhodecode/templates/admin/repos/repo_add_base.mako:52
6597 6740 #: rhodecode/templates/forks/fork.mako:50
6598 6741 msgid "Optionally select a group to put this repository into."
6599 6742 msgstr ""
6600 6743
6744 #: rhodecode/templates/admin/repos/repo_add_base.mako:61
6745 msgid "Set the type of repository to create."
6746 msgstr ""
6747
6601 6748 #: rhodecode/templates/admin/repos/repo_add_base.mako:71
6602 6749 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:177
6750 #: rhodecode/templates/admin/users/user_edit_profile.mako:76
6603 6751 #: rhodecode/templates/forks/fork.mako:61
6604 6752 msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions"
6605 6753 msgstr ""
6606 6754
6607 #: rhodecode/templates/admin/repos/repo_add_base.mako:80
6608 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
6609 #: rhodecode/templates/forks/fork.mako:71
6610 msgid "Landing commit"
6611 msgstr ""
6612
6613 #: rhodecode/templates/admin/repos/repo_add_base.mako:84
6614 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
6615 #: rhodecode/templates/forks/fork.mako:75
6616 msgid "The default commit for file pages, downloads, full text search index, and README generation."
6755 #: rhodecode/templates/admin/repos/repo_add_base.mako:97
6756 msgid "Create Repository"
6617 6757 msgstr ""
6618 6758
6619 6759 #: rhodecode/templates/admin/repos/repo_creating.mako:5
@@ -6630,8 +6770,11 b' msgid "Repository \\"%(repo_name)s\\" is b'
6630 6770 msgstr ""
6631 6771
6632 6772 #: rhodecode/templates/admin/repos/repo_edit.mako:8
6633 #, python-format
6634 msgid "%s repository settings"
6773 msgid "{} repository settings"
6774 msgstr ""
6775
6776 #: rhodecode/templates/admin/repos/repo_edit.mako:45
6777 msgid "Access Permissions"
6635 6778 msgstr ""
6636 6779
6637 6780 #: rhodecode/templates/admin/repos/repo_edit.mako:48
@@ -6685,133 +6828,129 b' msgstr ""'
6685 6828 msgid "Repository ID"
6686 6829 msgstr ""
6687 6830
6688 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:9
6689 msgid "Cached Commit id"
6690 msgstr ""
6691
6692 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:11
6831 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
6693 6832 msgid "Attached scoped tokens"
6694 6833 msgstr ""
6695 6834
6696 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:12
6697 msgid "Pull requests source"
6698 msgstr ""
6699
6700 6835 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:13
6701 msgid "Pull requests target"
6836 msgid "Pull requests source"
6702 6837 msgstr ""
6703 6838
6704 6839 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:14
6840 msgid "Pull requests target"
6841 msgstr ""
6842
6843 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:15
6705 6844 msgid "Attached Artifacts"
6706 6845 msgstr ""
6707 6846
6708 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:20
6847 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:21
6709 6848 #, python-format
6710 6849 msgid "Repository: %s"
6711 6850 msgstr ""
6712 6851
6713 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:30
6852 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:31
6714 6853 msgid "Fork Reference"
6715 6854 msgstr ""
6716 6855
6717 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:36
6856 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:37
6718 6857 #, python-format
6719 6858 msgid "This repository is a fork of %(repo_link)s"
6720 6859 msgstr ""
6721 6860
6722 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:42
6861 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:43
6723 6862 msgid "Set"
6724 6863 msgstr ""
6725 6864
6726 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:45
6865 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:46
6727 6866 msgid "Manually set this repository as a fork of another from the list"
6728 6867 msgstr ""
6729 6868
6730 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:54
6869 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:55
6731 6870 msgid "Public Journal Visibility"
6732 6871 msgstr ""
6733 6872
6734 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:61
6873 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:62
6735 6874 msgid "Remove from Public Journal"
6736 6875 msgstr ""
6737 6876
6738 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:65
6877 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:66
6739 6878 msgid "Add to Public Journal"
6740 6879 msgstr ""
6741 6880
6742 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:70
6881 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:71
6743 6882 msgid "All actions made on this repository will be visible to everyone following the public journal."
6744 6883 msgstr ""
6745 6884
6746 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:79
6885 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:80
6747 6886 msgid "Locking state"
6748 6887 msgstr ""
6749 6888
6750 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:88
6889 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:89
6751 6890 msgid "This Repository is not currently locked."
6752 6891 msgstr ""
6753 6892
6754 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:95
6893 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:96
6755 6894 msgid "Confirm to unlock repository."
6756 6895 msgstr ""
6757 6896
6758 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:97
6897 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:98
6759 6898 msgid "Unlock repository"
6760 6899 msgstr ""
6761 6900
6762 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:102
6901 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:103
6763 6902 msgid "Confirm to lock repository."
6764 6903 msgstr ""
6765 6904
6766 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:104
6905 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:105
6767 6906 msgid "Lock repository"
6768 6907 msgstr ""
6769 6908
6770 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:110
6909 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:111
6771 6910 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."
6772 6911 msgstr ""
6773 6912
6774 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:120
6913 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:121
6775 6914 msgid "Hooks"
6776 6915 msgstr ""
6777 6916
6778 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:124
6779 msgid "Hook type"
6780 msgstr ""
6781
6782 6917 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:125
6783 msgid "Hook version"
6918 msgid "Hook type"
6784 6919 msgstr ""
6785 6920
6786 6921 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:126
6922 msgid "Hook version"
6923 msgstr ""
6924
6925 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:127
6787 6926 msgid "Current version"
6788 6927 msgstr ""
6789 6928
6790 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:129
6929 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:130
6791 6930 msgid "PRE HOOK"
6792 6931 msgstr ""
6793 6932
6794 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:134
6933 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:135
6795 6934 msgid "POST HOOK"
6796 6935 msgstr ""
6797 6936
6798 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:140
6937 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:141
6799 6938 msgid "Unable to read hook information from VCS Server"
6800 6939 msgstr ""
6801 6940
6802 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:146
6803 msgid "Confirm to reinstall hooks for this repository."
6804 msgstr ""
6805
6806 6941 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:147
6942 msgid "Confirm to reinstall hooks for this repository."
6943 msgstr ""
6944
6945 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:148
6807 6946 msgid "Update Hooks"
6808 6947 msgstr ""
6809 6948
6810 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:154
6949 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:155
6811 6950 msgid "Archive repository"
6812 6951 msgstr ""
6813 6952
6814 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:163
6953 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:164
6815 6954 #, python-format
6816 6955 msgid "Confirm to archive this repository: %s"
6817 6956 msgstr ""
@@ -6841,24 +6980,24 b' msgid "Consider to archive this reposito'
6841 6980 msgstr ""
6842 6981
6843 6982 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:219
6844 #: rhodecode/templates/data_table/_dt_elements.mako:173
6983 #: rhodecode/templates/data_table/_dt_elements.mako:180
6845 6984 #, python-format
6846 6985 msgid "Confirm to delete this repository: %s"
6847 6986 msgstr ""
6848 6987
6849 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:221
6988 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:220
6850 6989 msgid "Delete this repository"
6851 6990 msgstr ""
6852 6991
6853 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:226
6992 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:225
6854 6993 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."
6855 6994 msgstr ""
6856 6995
6857 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260
6996 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
6858 6997 msgid "Change repository"
6859 6998 msgstr ""
6860 6999
6861 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:260
7000 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:259
6862 7001 msgid "Pick repository"
6863 7002 msgstr ""
6864 7003
@@ -6867,7 +7006,7 b' msgid "Repository Audit Logs"'
6867 7006 msgstr ""
6868 7007
6869 7008 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:14
6870 #: rhodecode/templates/admin/users/user_edit_audit.mako:14
7009 #: rhodecode/templates/admin/users/user_edit_audit.mako:15
6871 7010 msgid "audit filter..."
6872 7011 msgstr ""
6873 7012
@@ -6895,45 +7034,59 b' msgstr ""'
6895 7034 msgid "Confirm to invalidate repository cache"
6896 7035 msgstr ""
6897 7036
6898 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:39
6899 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
6900 msgid "Key"
7037 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:32
7038 msgid "Invalidation keys"
6901 7039 msgstr ""
6902 7040
6903 7041 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40
6904 msgid "Namespace"
6905 msgstr ""
6906
6907 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:58
6908 msgid "Cache keys"
6909 msgstr ""
6910
6911 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:77
7042 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:84
6912 7043 #: rhodecode/templates/admin/users/user_edit_caches.mako:19
6913 7044 msgid "Show all"
6914 7045 msgstr ""
6915 7046
6916 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:95
7047 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:44
7048 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:88
7049 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:11
7050 msgid "Key"
7051 msgstr ""
7052
7053 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:45
7054 msgid "State UID"
7055 msgstr ""
7056
7057 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:46
7058 msgid "Namespace"
7059 msgstr ""
7060
7061 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:65
7062 msgid "Cache keys"
7063 msgstr ""
7064
7065 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:89
7066 msgid "Region"
7067 msgstr ""
7068
7069 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:106
6917 7070 msgid "Shadow Repositories"
6918 7071 msgstr ""
6919 7072
6920 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:107
6921 msgid "No Shadow repositories exist for this repository."
6922 msgstr ""
6923
6924 7073 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:118
7074 msgid "No Shadow repositories exist for this repository."
7075 msgstr ""
7076
7077 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:129
6925 7078 msgid "Diff Caches"
6926 7079 msgstr ""
6927 7080
6928 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:123
7081 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:137
6929 7082 msgid "Cached diff name"
6930 7083 msgstr ""
6931 7084
6932 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:131
7085 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:145
6933 7086 msgid "Cached diff files"
6934 7087 msgstr ""
6935 7088
6936 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:135
7089 #: rhodecode/templates/admin/repos/repo_edit_caches.mako:149
6937 7090 msgid "Cached diff size"
6938 7091 msgstr ""
6939 7092
@@ -6988,18 +7141,17 b' msgid "Inherited Issue Tracker Patterns"'
6988 7141 msgstr ""
6989 7142
6990 7143 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30
6991 #: rhodecode/templates/base/issue_tracker_settings.mako:11
7144 #: rhodecode/templates/base/issue_tracker_settings.mako:79
6992 7145 #: rhodecode/templates/base/perms_summary.mako:169
6993 7146 msgid "Pattern"
6994 7147 msgstr ""
6995 7148
6996 7149 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:31
6997 #: rhodecode/templates/base/issue_tracker_settings.mako:12
7150 #: rhodecode/templates/base/issue_tracker_settings.mako:80
6998 7151 msgid "Url"
6999 7152 msgstr ""
7000 7153
7001 7154 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32
7002 #: rhodecode/templates/base/issue_tracker_settings.mako:13
7003 7155 msgid "Prefix"
7004 7156 msgstr ""
7005 7157
@@ -7038,7 +7190,7 b' msgid "Performing Maintenance"'
7038 7190 msgstr ""
7039 7191
7040 7192 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:5
7041 msgid "Repository Permissions"
7193 msgid "Repository Access Permissions"
7042 7194 msgstr ""
7043 7195
7044 7196 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55
@@ -7057,6 +7209,10 b' msgstr ""'
7057 7209 msgid "used by {} branch rules, requires write+ permissions"
7058 7210 msgstr ""
7059 7211
7212 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110
7213 msgid "set private mode"
7214 msgstr ""
7215
7060 7216 #: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3
7061 7217 msgid "Repository Branch Permissions."
7062 7218 msgstr ""
@@ -7180,12 +7336,20 b' msgstr ""'
7180 7336 msgid "http[s] url to sync data back. This field can used for doing {sync_link}."
7181 7337 msgstr ""
7182 7338
7339 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:141
7340 msgid "Landing commit"
7341 msgstr ""
7342
7343 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:146
7344 msgid "The default commit for file pages, downloads, full text search index, and README generation."
7345 msgstr ""
7346
7183 7347 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:164
7184 7348 msgid "Change owner of this repository."
7185 7349 msgstr ""
7186 7350
7187 7351 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:187
7188 #: rhodecode/templates/data_table/_dt_elements.mako:92
7352 #: rhodecode/templates/data_table/_dt_elements.mako:104
7189 7353 msgid "Private repository"
7190 7354 msgstr ""
7191 7355
@@ -7307,11 +7471,7 b' msgstr ""'
7307 7471 msgid "Repositories administration"
7308 7472 msgstr ""
7309 7473
7310 #: rhodecode/templates/admin/repos/repos.mako:26
7311 msgid "repositories"
7312 msgstr ""
7313
7314 #: rhodecode/templates/admin/repos/repos.mako:71
7474 #: rhodecode/templates/admin/repos/repos.mako:110
7315 7475 msgid "State"
7316 7476 msgstr ""
7317 7477
@@ -7444,7 +7604,7 b' msgid "Set a custom text that is shown a'
7444 7604 msgstr ""
7445 7605
7446 7606 #: rhodecode/templates/admin/settings/settings_global.mako:36
7447 #: rhodecode/templates/admin/users/user_edit_advanced.mako:69
7607 #: rhodecode/templates/admin/users/user_edit_advanced.mako:80
7448 7608 msgid "Personal Repository Group"
7449 7609 msgstr ""
7450 7610
@@ -7553,11 +7713,11 b' msgid "Custom logos"'
7553 7713 msgstr ""
7554 7714
7555 7715 #: rhodecode/templates/admin/settings/settings_global.mako:111
7556 msgid "Custom js/css code added at the end of the <header/> tag."
7716 msgid "Custom js/css code added at the end of the <head/> tag."
7557 7717 msgstr ""
7558 7718
7559 7719 #: rhodecode/templates/admin/settings/settings_global.mako:112
7560 msgid "Use <script/> or <css/> tags to define custom styling or scripting"
7720 msgid "Use <script/> or <style/> tags to define custom scripting or styling."
7561 7721 msgstr ""
7562 7722
7563 7723 #: rhodecode/templates/admin/settings/settings_global.mako:119
@@ -7569,7 +7729,7 b' msgid "Custom js/css code added at the e'
7569 7729 msgstr ""
7570 7730
7571 7731 #: rhodecode/templates/admin/settings/settings_global.mako:134
7572 msgid "Use <script> or <css> tags to define custom styling or scripting"
7732 msgid "Use <script> or <style> tags to define custom scripting or styling."
7573 7733 msgstr ""
7574 7734
7575 7735 #: rhodecode/templates/admin/settings/settings_hooks.mako:3
@@ -7693,7 +7853,7 b' msgstr ""'
7693 7853 msgid "create summary snapshot"
7694 7854 msgstr ""
7695 7855
7696 #: rhodecode/templates/admin/settings/settings_system.mako:32
7856 #: rhodecode/templates/admin/settings/settings_system.mako:46
7697 7857 msgid "Python Packages"
7698 7858 msgstr ""
7699 7859
@@ -7808,7 +7968,7 b' msgid ""'
7808 7968 msgstr ""
7809 7969
7810 7970 #: rhodecode/templates/admin/settings/settings_visual.mako:136
7811 #: rhodecode/templates/debug_style/index.html:63
7971 #: rhodecode/templates/debug_style/index.html:64
7812 7972 msgid "Icons"
7813 7973 msgstr ""
7814 7974
@@ -7867,8 +8027,8 b' msgstr ""'
7867 8027
7868 8028 #: rhodecode/templates/admin/user_groups/user_group_add.mako:13
7869 8029 #: rhodecode/templates/admin/users/user_edit_advanced.mako:14
7870 #: rhodecode/templates/base/base.mako:106
7871 #: rhodecode/templates/base/base.mako:128
8030 #: rhodecode/templates/base/base.mako:110
8031 #: rhodecode/templates/base/base.mako:132
7872 8032 msgid "User groups"
7873 8033 msgstr ""
7874 8034
@@ -7877,9 +8037,12 b' msgstr ""'
7877 8037 msgid "Short, optional description for this user group."
7878 8038 msgstr ""
7879 8039
8040 #: rhodecode/templates/admin/user_groups/user_group_add.mako:59
8041 msgid "Create User Group"
8042 msgstr ""
8043
7880 8044 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:5
7881 #, python-format
7882 msgid "%s user group settings"
8045 msgid "{} user group settings"
7883 8046 msgstr ""
7884 8047
7885 8048 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:37
@@ -7899,7 +8062,7 b' msgstr ""'
7899 8062 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:9
7900 8063 #: rhodecode/templates/admin/user_groups/user_groups.mako:80
7901 8064 #: rhodecode/templates/debug_style/form-elements.html:509
7902 #: rhodecode/templates/user_group/profile.mako:45
8065 #: rhodecode/templates/user_group/profile.mako:55
7903 8066 msgid "Members"
7904 8067 msgstr ""
7905 8068
@@ -7916,7 +8079,7 b' msgid "Assigned to repo groups"'
7916 8079 msgstr ""
7917 8080
7918 8081 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:15
7919 #: rhodecode/templates/admin/users/user_edit_advanced.mako:17
8082 #: rhodecode/templates/admin/users/user_edit_advanced.mako:19
7920 8083 msgid "Assigned to review rules"
7921 8084 msgstr ""
7922 8085
@@ -7980,7 +8143,7 b' msgid "Add members"'
7980 8143 msgstr ""
7981 8144
7982 8145 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:96
7983 #: rhodecode/templates/user_group/profile.mako:68
8146 #: rhodecode/templates/user_group/profile.mako:78
7984 8147 msgid "No members yet"
7985 8148 msgstr ""
7986 8149
@@ -7999,7 +8162,7 b' msgstr ""'
7999 8162
8000 8163 #: rhodecode/templates/admin/users/user_add.mako:13
8001 8164 #: rhodecode/templates/admin/users/user_edit.mako:14
8002 #: rhodecode/templates/base/base.mako:105
8165 #: rhodecode/templates/base/base.mako:109
8003 8166 msgid "Users"
8004 8167 msgstr ""
8005 8168
@@ -8029,22 +8192,23 b' msgid "Add personal repository group"'
8029 8192 msgstr ""
8030 8193
8031 8194 #: rhodecode/templates/admin/users/user_add.mako:121
8032 #: rhodecode/templates/admin/users/user_edit_advanced.mako:80
8033 #, python-format
8034 msgid "New group will be created at: `/%(path)s`"
8195 msgid "New group will be created at: `/{path}`"
8035 8196 msgstr ""
8036 8197
8037 8198 #: rhodecode/templates/admin/users/user_add.mako:122
8038 8199 msgid "User will be automatically set as this group owner."
8039 8200 msgstr ""
8040 8201
8202 #: rhodecode/templates/admin/users/user_add.mako:128
8203 msgid "Create User"
8204 msgstr ""
8205
8041 8206 #: rhodecode/templates/admin/users/user_add.mako:139
8042 8207 msgid "generated password:"
8043 8208 msgstr ""
8044 8209
8045 8210 #: rhodecode/templates/admin/users/user_edit.mako:5
8046 #, python-format
8047 msgid "%s user settings"
8211 msgid "{} user settings"
8048 8212 msgstr ""
8049 8213
8050 8214 #: rhodecode/templates/admin/users/user_edit.mako:31
@@ -8053,7 +8217,7 b' msgstr ""'
8053 8217
8054 8218 #: rhodecode/templates/admin/users/user_edit.mako:39
8055 8219 #: rhodecode/templates/admin/users/user_edit_profile.mako:5
8056 #: rhodecode/templates/users/user_profile.mako:5
8220 #: rhodecode/templates/users/user_profile.mako:6
8057 8221 msgid "User Profile"
8058 8222 msgstr ""
8059 8223
@@ -8088,99 +8252,115 b' msgid "Last activity"'
8088 8252 msgstr ""
8089 8253
8090 8254 #: rhodecode/templates/admin/users/user_edit_advanced.mako:16
8255 msgid "Owned Artifacts"
8256 msgstr ""
8257
8258 #: rhodecode/templates/admin/users/user_edit_advanced.mako:18
8091 8259 msgid "Reviewer of pull requests"
8092 8260 msgstr ""
8093 8261
8094 #: rhodecode/templates/admin/users/user_edit_advanced.mako:19
8262 #: rhodecode/templates/admin/users/user_edit_advanced.mako:21
8095 8263 msgid "Member of User groups"
8096 8264 msgstr ""
8097 8265
8098 #: rhodecode/templates/admin/users/user_edit_advanced.mako:20
8266 #: rhodecode/templates/admin/users/user_edit_advanced.mako:22
8099 8267 msgid "Force password change"
8100 8268 msgstr ""
8101 8269
8102 #: rhodecode/templates/admin/users/user_edit_advanced.mako:26
8103 #, python-format
8104 msgid "User: %s"
8105 msgstr ""
8106
8107 #: rhodecode/templates/admin/users/user_edit_advanced.mako:35
8108 msgid "Force Password Reset"
8109 msgstr ""
8110
8111 #: rhodecode/templates/admin/users/user_edit_advanced.mako:41
8112 msgid "Disable forced password reset"
8270 #: rhodecode/templates/admin/users/user_edit_advanced.mako:28
8271 msgid "User: {}"
8113 8272 msgstr ""
8114 8273
8115 8274 #: rhodecode/templates/admin/users/user_edit_advanced.mako:46
8275 msgid "Force Password Reset"
8276 msgstr ""
8277
8278 #: rhodecode/templates/admin/users/user_edit_advanced.mako:52
8279 msgid "Disable forced password reset"
8280 msgstr ""
8281
8282 #: rhodecode/templates/admin/users/user_edit_advanced.mako:57
8116 8283 msgid "Clear the forced password change flag."
8117 8284 msgstr ""
8118 8285
8119 #: rhodecode/templates/admin/users/user_edit_advanced.mako:53
8286 #: rhodecode/templates/admin/users/user_edit_advanced.mako:64
8120 8287 msgid "Confirm to enable forced password change"
8121 8288 msgstr ""
8122 8289
8123 #: rhodecode/templates/admin/users/user_edit_advanced.mako:54
8290 #: rhodecode/templates/admin/users/user_edit_advanced.mako:65
8124 8291 msgid "Enable forced password reset"
8125 8292 msgstr ""
8126 8293
8127 #: rhodecode/templates/admin/users/user_edit_advanced.mako:59
8294 #: rhodecode/templates/admin/users/user_edit_advanced.mako:70
8128 8295 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"
8129 8296 msgstr ""
8130 8297
8131 #: rhodecode/templates/admin/users/user_edit_advanced.mako:75
8298 #: rhodecode/templates/admin/users/user_edit_advanced.mako:86
8132 8299 msgid "Users personal repository group"
8133 8300 msgstr ""
8134 8301
8135 #: rhodecode/templates/admin/users/user_edit_advanced.mako:78
8302 #: rhodecode/templates/admin/users/user_edit_advanced.mako:89
8136 8303 msgid "This user currently does not have a personal repository group"
8137 8304 msgstr ""
8138 8305
8139 #: rhodecode/templates/admin/users/user_edit_advanced.mako:85
8306 #: rhodecode/templates/admin/users/user_edit_advanced.mako:91
8307 #, python-format
8308 msgid "New group will be created at: `/%(path)s`"
8309 msgstr ""
8310
8311 #: rhodecode/templates/admin/users/user_edit_advanced.mako:96
8140 8312 msgid "Create personal repository group"
8141 8313 msgstr ""
8142 8314
8143 #: rhodecode/templates/admin/users/user_edit_advanced.mako:94
8144 msgid "Delete User"
8145 msgstr ""
8146
8147 8315 #: rhodecode/templates/admin/users/user_edit_advanced.mako:105
8316 msgid "Delete User"
8317 msgstr ""
8318
8319 #: rhodecode/templates/admin/users/user_edit_advanced.mako:116
8148 8320 msgid "Detach repositories"
8149 8321 msgstr ""
8150 8322
8151 #: rhodecode/templates/admin/users/user_edit_advanced.mako:108
8152 #: rhodecode/templates/admin/users/user_edit_advanced.mako:120
8153 #: rhodecode/templates/admin/users/user_edit_advanced.mako:132
8323 #: rhodecode/templates/admin/users/user_edit_advanced.mako:119
8324 #: rhodecode/templates/admin/users/user_edit_advanced.mako:131
8325 #: rhodecode/templates/admin/users/user_edit_advanced.mako:143
8154 8326 msgid "Delete repositories"
8155 8327 msgstr ""
8156 8328
8157 #: rhodecode/templates/admin/users/user_edit_advanced.mako:117
8329 #: rhodecode/templates/admin/users/user_edit_advanced.mako:128
8158 8330 msgid "Detach repository groups"
8159 8331 msgstr ""
8160 8332
8161 #: rhodecode/templates/admin/users/user_edit_advanced.mako:129
8333 #: rhodecode/templates/admin/users/user_edit_advanced.mako:140
8162 8334 msgid "Detach user groups"
8163 8335 msgstr ""
8164 8336
8165 #: rhodecode/templates/admin/users/user_edit_advanced.mako:141
8166 msgid "New owner for detached objects"
8167 msgstr ""
8168
8169 #: rhodecode/templates/admin/users/user_edit_advanced.mako:148
8170 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the above user."
8171 msgstr ""
8172
8173 #: rhodecode/templates/admin/users/user_edit_advanced.mako:150
8174 msgid "The delete option will delete the user and all his owned objects!"
8175 msgstr ""
8176
8177 #: rhodecode/templates/admin/users/user_edit_advanced.mako:163
8178 #: rhodecode/templates/data_table/_dt_elements.mako:260
8179 #, python-format
8180 msgid "Confirm to delete this user: %s"
8337 #: rhodecode/templates/admin/users/user_edit_advanced.mako:152
8338 msgid "Detach Artifacts"
8339 msgstr ""
8340
8341 #: rhodecode/templates/admin/users/user_edit_advanced.mako:155
8342 msgid "Delete Artifacts"
8181 8343 msgstr ""
8182 8344
8183 8345 #: rhodecode/templates/admin/users/user_edit_advanced.mako:165
8346 msgid "New owner for detached objects"
8347 msgstr ""
8348
8349 #: rhodecode/templates/admin/users/user_edit_advanced.mako:172
8350 msgid "When selecting the detach option, the depending objects owned by this user will be assigned to the above user."
8351 msgstr ""
8352
8353 #: rhodecode/templates/admin/users/user_edit_advanced.mako:174
8354 msgid "The delete option will delete the user and all his owned objects!"
8355 msgstr ""
8356
8357 #: rhodecode/templates/admin/users/user_edit_advanced.mako:187
8358 #: rhodecode/templates/data_table/_dt_elements.mako:269
8359 #, python-format
8360 msgid "Confirm to delete this user: %s"
8361 msgstr ""
8362
8363 #: rhodecode/templates/admin/users/user_edit_advanced.mako:189
8184 8364 msgid "Delete this user"
8185 8365 msgstr ""
8186 8366
@@ -8188,6 +8368,10 b' msgstr ""'
8188 8368 msgid "User Audit Logs"
8189 8369 msgstr ""
8190 8370
8371 #: rhodecode/templates/admin/users/user_edit_audit.mako:10
8372 msgid "Download as JSON"
8373 msgstr ""
8374
8191 8375 #: rhodecode/templates/admin/users/user_edit_caches.mako:33
8192 8376 msgid "Invalidate user cache"
8193 8377 msgstr ""
@@ -8238,44 +8422,46 b' msgid ""'
8238 8422 "To specify multiple entries on an address range use 127.0.0.1-127.0.0.10 syntax"
8239 8423 msgstr ""
8240 8424
8241 #: rhodecode/templates/admin/users/user_edit_profile.mako:17
8425 #: rhodecode/templates/admin/users/user_edit_profile.mako:16
8242 8426 #, python-format
8243 8427 msgid "This user was created from external source (%s). Editing some of the settings is limited."
8244 8428 msgstr ""
8245 8429
8246 #: rhodecode/templates/admin/users/user_edit_profile.mako:30
8430 #: rhodecode/templates/admin/users/user_edit_profile.mako:28
8247 8431 msgid "Change the avatar at"
8248 8432 msgstr ""
8249 8433
8250 #: rhodecode/templates/admin/users/user_edit_profile.mako:73
8434 #: rhodecode/templates/admin/users/user_edit_profile.mako:85
8251 8435 msgid "New Password"
8252 8436 msgstr ""
8253 8437
8254 #: rhodecode/templates/admin/users/user_edit_profile.mako:81
8438 #: rhodecode/templates/admin/users/user_edit_profile.mako:93
8255 8439 msgid "New Password Confirmation"
8256 8440 msgstr ""
8257 8441
8258 #: rhodecode/templates/admin/users/user_edit_profile.mako:97
8259 msgid "Super Admin"
8260 msgstr ""
8261
8262 #: rhodecode/templates/admin/users/user_edit_profile.mako:105
8442 #: rhodecode/templates/admin/users/user_edit_profile.mako:109
8443 #: rhodecode/templates/admin/users/users.mako:87
8444 #: rhodecode/templates/base/perms_summary.mako:145
8445 msgid "Super-admin"
8446 msgstr ""
8447
8448 #: rhodecode/templates/admin/users/user_edit_profile.mako:117
8263 8449 msgid "Authentication type"
8264 8450 msgstr ""
8265 8451
8266 #: rhodecode/templates/admin/users/user_edit_profile.mako:110
8267 msgid "User was created using an external source. He is bound to authentication using this method."
8268 msgstr ""
8269
8270 #: rhodecode/templates/admin/users/user_edit_profile.mako:115
8452 #: rhodecode/templates/admin/users/user_edit_profile.mako:121
8453 msgid "When user was created using an external source. He is bound to authentication using this method."
8454 msgstr ""
8455
8456 #: rhodecode/templates/admin/users/user_edit_profile.mako:126
8271 8457 msgid "Name in Source of Record"
8272 8458 msgstr ""
8273 8459
8274 #: rhodecode/templates/admin/users/user_edit_profile.mako:124
8460 #: rhodecode/templates/admin/users/user_edit_profile.mako:135
8275 8461 msgid "Language"
8276 8462 msgstr ""
8277 8463
8278 #: rhodecode/templates/admin/users/user_edit_profile.mako:130
8464 #: rhodecode/templates/admin/users/user_edit_profile.mako:141
8279 8465 #, python-format
8280 8466 msgid "User interface language. Help translate %(rc_link)s into your language."
8281 8467 msgstr ""
@@ -8321,11 +8507,6 b' msgstr ""'
8321 8507 msgid "Users administration"
8322 8508 msgstr ""
8323 8509
8324 #: rhodecode/templates/admin/users/users.mako:87
8325 #: rhodecode/templates/base/perms_summary.mako:145
8326 msgid "Super admin"
8327 msgstr ""
8328
8329 8510 #: rhodecode/templates/admin/users/users.mako:89
8330 8511 msgid "Auth type"
8331 8512 msgstr ""
@@ -8334,203 +8515,177 b' msgstr ""'
8334 8515 msgid "{} Artifacts"
8335 8516 msgstr ""
8336 8517
8337 #: rhodecode/templates/base/base.mako:57
8518 #: rhodecode/templates/base/base.mako:66
8338 8519 msgid "RhodeCode instance id: {}"
8339 8520 msgstr ""
8340 8521
8341 #: rhodecode/templates/base/base.mako:90
8342 msgid "Super Admin Panel"
8343 msgstr ""
8344
8345 #: rhodecode/templates/base/base.mako:92
8522 #: rhodecode/templates/base/base.mako:94
8523 msgid "Super-admin Panel"
8524 msgstr ""
8525
8526 #: rhodecode/templates/base/base.mako:96
8346 8527 msgid "Delegated Admin Panel"
8347 8528 msgstr ""
8348 8529
8349 #: rhodecode/templates/base/base.mako:108
8530 #: rhodecode/templates/base/base.mako:112
8350 8531 msgid "Authentication"
8351 8532 msgstr ""
8352 8533
8353 #: rhodecode/templates/base/base.mako:110
8534 #: rhodecode/templates/base/base.mako:114
8354 8535 msgid "Defaults"
8355 8536 msgstr ""
8356 8537
8357 #: rhodecode/templates/base/base.mako:150
8358 #: rhodecode/templates/files/files_source_header.mako:53
8359 #: rhodecode/templates/files/files_tree_header.mako:40
8538 #: rhodecode/templates/base/base.mako:154
8539 #: rhodecode/templates/base/base.mako:194
8540 #: rhodecode/templates/changeset/changeset.mako:154
8541 #: rhodecode/templates/files/files_source_header.mako:57
8542 #: rhodecode/templates/files/files_tree_header.mako:43
8360 8543 #: rhodecode/templates/summary/components.mako:250
8361 8544 msgid "Show More"
8362 8545 msgstr ""
8363 8546
8364 #: rhodecode/templates/base/base.mako:220
8365 #: rhodecode/templates/base/base.mako:231
8547 #: rhodecode/templates/base/base.mako:295
8548 #: rhodecode/templates/base/base.mako:306
8366 8549 msgid "RSS Feed"
8367 8550 msgstr ""
8368 8551
8369 #: rhodecode/templates/base/base.mako:222
8552 #: rhodecode/templates/base/base.mako:297
8370 8553 msgid "Watch this Repository and actions on it in your personalized journal"
8371 8554 msgstr ""
8372 8555
8373 #: rhodecode/templates/base/base.mako:240
8556 #: rhodecode/templates/base/base.mako:315
8374 8557 msgid "Fork of"
8375 8558 msgstr ""
8376 8559
8377 #: rhodecode/templates/base/base.mako:257
8560 #: rhodecode/templates/base/base.mako:332
8378 8561 #, python-format
8379 8562 msgid "Repository locked by %(user)s"
8380 8563 msgstr ""
8381 8564
8382 #: rhodecode/templates/base/base.mako:262
8565 #: rhodecode/templates/base/base.mako:337
8383 8566 msgid "Repository not locked. Pull repository to lock it."
8384 8567 msgstr ""
8385 8568
8386 #: rhodecode/templates/base/base.mako:277
8569 #: rhodecode/templates/base/base.mako:353
8387 8570 msgid "This repository has been archived. It is now read-only."
8388 8571 msgstr ""
8389 8572
8390 #: rhodecode/templates/base/base.mako:290
8391 #: rhodecode/templates/data_table/_dt_elements.mako:46
8392 #: rhodecode/templates/data_table/_dt_elements.mako:47
8393 #: rhodecode/templates/data_table/_dt_elements.mako:198
8394 #: rhodecode/templates/pullrequests/pullrequest.mako:30
8573 #: rhodecode/templates/base/base.mako:366
8574 #: rhodecode/templates/data_table/_dt_elements.mako:58
8575 #: rhodecode/templates/data_table/_dt_elements.mako:59
8576 #: rhodecode/templates/data_table/_dt_elements.mako:205
8395 8577 msgid "Summary"
8396 8578 msgstr ""
8397 8579
8398 #: rhodecode/templates/base/base.mako:291
8399 #: rhodecode/templates/data_table/_dt_elements.mako:51
8400 #: rhodecode/templates/data_table/_dt_elements.mako:52
8401 #: rhodecode/templates/files/file_authors_box.mako:28
8402 #: rhodecode/templates/search/search.mako:85
8580 #: rhodecode/templates/base/base.mako:367
8581 #: rhodecode/templates/data_table/_dt_elements.mako:63
8582 #: rhodecode/templates/data_table/_dt_elements.mako:64
8583 #: rhodecode/templates/files/file_authors_box.mako:30
8584 #: rhodecode/templates/search/search.mako:99
8403 8585 #: rhodecode/templates/summary/components.mako:119
8404 8586 #: rhodecode/templates/summary/components.mako:127
8405 8587 msgid "Commits"
8406 8588 msgstr ""
8407 8589
8408 #: rhodecode/templates/base/base.mako:292
8409 #: rhodecode/templates/data_table/_dt_elements.mako:56
8410 #: rhodecode/templates/data_table/_dt_elements.mako:57
8590 #: rhodecode/templates/base/base.mako:368
8591 #: rhodecode/templates/data_table/_dt_elements.mako:68
8592 #: rhodecode/templates/data_table/_dt_elements.mako:69
8411 8593 #: rhodecode/templates/files/files.mako:15
8412 #: rhodecode/templates/search/search.mako:85
8594 #: rhodecode/templates/search/search.mako:99
8413 8595 msgid "Files"
8414 8596 msgstr ""
8415 8597
8416 #: rhodecode/templates/base/base.mako:293
8598 #: rhodecode/templates/base/base.mako:369
8417 8599 #: rhodecode/templates/bookmarks/bookmarks.mako:66
8418 8600 #: rhodecode/templates/branches/branches.mako:65
8419 8601 #: rhodecode/templates/tags/tags.mako:66
8420 8602 msgid "Compare"
8421 8603 msgstr ""
8422 8604
8423 #: rhodecode/templates/base/base.mako:298
8605 #: rhodecode/templates/base/base.mako:374
8424 8606 #, python-format
8425 8607 msgid "Show Pull Requests for %s"
8426 8608 msgstr ""
8427 8609
8428 #: rhodecode/templates/base/base.mako:301
8429 msgid "Pull Request"
8430 msgstr ""
8431
8432 #: rhodecode/templates/base/base.mako:310
8610 #: rhodecode/templates/base/base.mako:385
8433 8611 msgid "Artifacts"
8434 8612 msgstr ""
8435 8613
8436 #: rhodecode/templates/base/base.mako:313
8614 #: rhodecode/templates/base/base.mako:391
8437 8615 msgid "Repository Settings"
8438 8616 msgstr ""
8439 8617
8440 #: rhodecode/templates/base/base.mako:324
8441 #: rhodecode/templates/base/base.mako:339
8442 #: rhodecode/templates/base/base.mako:406
8443 #: rhodecode/templates/base/base.mako:418
8618 #: rhodecode/templates/base/base.mako:397
8619 #: rhodecode/templates/base/base.mako:410
8444 8620 msgid "Options"
8445 8621 msgstr ""
8446 8622
8447 #: rhodecode/templates/base/base.mako:327
8448 msgid "Fork this repository"
8449 msgstr ""
8450
8451 #: rhodecode/templates/base/base.mako:328
8452 msgid "Create Pull Request"
8453 msgstr ""
8454
8455 #: rhodecode/templates/base/base.mako:331
8623 #: rhodecode/templates/base/base.mako:402
8456 8624 msgid "Unlock Repository"
8457 8625 msgstr ""
8458 8626
8459 #: rhodecode/templates/base/base.mako:333
8627 #: rhodecode/templates/base/base.mako:404
8460 8628 msgid "Lock Repository"
8461 8629 msgstr ""
8462 8630
8463 #: rhodecode/templates/base/base.mako:393
8631 #: rhodecode/templates/base/base.mako:461
8464 8632 msgid "Group Home"
8465 8633 msgstr ""
8466 8634
8467 #: rhodecode/templates/base/base.mako:395
8635 #: rhodecode/templates/base/base.mako:465
8468 8636 msgid "You have admin right to this group, and can edit it"
8469 8637 msgstr ""
8470 8638
8471 #: rhodecode/templates/base/base.mako:395
8639 #: rhodecode/templates/base/base.mako:465
8472 8640 msgid "Group Settings"
8473 8641 msgstr ""
8474 8642
8475 #: rhodecode/templates/base/base.mako:439
8643 #: rhodecode/templates/base/base.mako:508
8644 msgid "Create"
8645 msgstr ""
8646
8647 #: rhodecode/templates/base/base.mako:516
8648 msgid "This Repository"
8649 msgstr ""
8650
8651 #: rhodecode/templates/base/base.mako:518
8652 msgid "Create Pull Request"
8653 msgstr ""
8654
8655 #: rhodecode/templates/base/base.mako:522
8656 msgid "Fork this repository"
8657 msgstr ""
8658
8659 #: rhodecode/templates/base/base.mako:529
8660 msgid "This Repository Group"
8661 msgstr ""
8662
8663 #: rhodecode/templates/base/base.mako:533
8664 #: rhodecode/templates/base/base.mako:549
8665 #: rhodecode/templates/base/base.mako:561
8666 msgid "New Repository"
8667 msgstr ""
8668
8669 #: rhodecode/templates/base/base.mako:539
8670 #: rhodecode/templates/base/base.mako:553
8671 #: rhodecode/templates/base/base.mako:567
8672 msgid "New Repository Group"
8673 msgstr ""
8674
8675 #: rhodecode/templates/base/base.mako:594
8476 8676 msgid "Sign in"
8477 8677 msgstr ""
8478 8678
8479 #: rhodecode/templates/base/base.mako:464
8480 msgid "My personal group"
8481 msgstr ""
8482
8483 #: rhodecode/templates/base/base.mako:471
8484 msgid "Manage"
8485 msgstr ""
8486
8487 #: rhodecode/templates/base/base.mako:476
8488 msgid "No Bookmarks yet."
8489 msgstr ""
8490
8491 #: rhodecode/templates/base/base.mako:514
8492 msgid "Sign Out"
8493 msgstr ""
8494
8495 #: rhodecode/templates/base/base.mako:575
8496 msgid "search / go to..."
8497 msgstr ""
8498
8499 #: rhodecode/templates/base/base.mako:618
8500 msgid "Show activity journal"
8501 msgstr ""
8502
8503 8679 #: rhodecode/templates/base/base.mako:619
8504 #: rhodecode/templates/journal/journal.mako:4
8505 #: rhodecode/templates/journal/journal.mako:14
8506 msgid "Journal"
8507 msgstr ""
8508
8509 #: rhodecode/templates/base/base.mako:624
8510 msgid "Show Public activity journal"
8680 msgid "My personal group"
8511 8681 msgstr ""
8512 8682
8513 8683 #: rhodecode/templates/base/base.mako:625
8514 msgid "Public journal"
8515 msgstr ""
8516
8517 #: rhodecode/templates/base/base.mako:631
8518 msgid "Show Gists"
8519 msgstr ""
8520
8521 #: rhodecode/templates/base/base.mako:632
8522 msgid "Gists"
8523 msgstr ""
8524
8525 #: rhodecode/templates/base/base.mako:638
8526 msgid "Admin settings"
8527 msgstr ""
8528
8529 #: rhodecode/templates/base/base.mako:649
8530 8684 #: rhodecode/templates/debug_style/alerts.html:5
8531 8685 #: rhodecode/templates/debug_style/buttons.html:5
8532 8686 #: rhodecode/templates/debug_style/code-block.html:6
8533 8687 #: rhodecode/templates/debug_style/collapsable-content.html:5
8688 #: rhodecode/templates/debug_style/emails.html:5
8534 8689 #: rhodecode/templates/debug_style/form-elements-small.html:5
8535 8690 #: rhodecode/templates/debug_style/form-elements.html:5
8536 8691 #: rhodecode/templates/debug_style/form-inline.html:5
@@ -8548,15 +8703,57 b' msgstr ""'
8548 8703 msgid "Style"
8549 8704 msgstr ""
8550 8705
8551 #: rhodecode/templates/base/base.mako:650
8706 #: rhodecode/templates/base/base.mako:626
8552 8707 msgid "[Style]"
8553 8708 msgstr ""
8554 8709
8555 #: rhodecode/templates/base/base.mako:907
8710 #: rhodecode/templates/base/base.mako:643
8711 msgid "No Bookmarks yet."
8712 msgstr ""
8713
8714 #: rhodecode/templates/base/base.mako:681
8715 msgid "Sign Out"
8716 msgstr ""
8717
8718 #: rhodecode/templates/base/base.mako:737
8719 msgid "search / go to..."
8720 msgstr ""
8721
8722 #: rhodecode/templates/base/base.mako:780
8723 msgid "Show activity journal"
8724 msgstr ""
8725
8726 #: rhodecode/templates/base/base.mako:781
8727 #: rhodecode/templates/journal/journal.mako:4
8728 #: rhodecode/templates/journal/journal.mako:14
8729 msgid "Journal"
8730 msgstr ""
8731
8732 #: rhodecode/templates/base/base.mako:786
8733 msgid "Show Public activity journal"
8734 msgstr ""
8735
8736 #: rhodecode/templates/base/base.mako:787
8737 msgid "Public journal"
8738 msgstr ""
8739
8740 #: rhodecode/templates/base/base.mako:793
8741 msgid "Show Gists"
8742 msgstr ""
8743
8744 #: rhodecode/templates/base/base.mako:794
8745 msgid "Gists"
8746 msgstr ""
8747
8748 #: rhodecode/templates/base/base.mako:800
8749 msgid "Admin settings"
8750 msgstr ""
8751
8752 #: rhodecode/templates/base/base.mako:1074
8556 8753 msgid "Keyboard shortcuts"
8557 8754 msgstr ""
8558 8755
8559 #: rhodecode/templates/base/base.mako:915
8756 #: rhodecode/templates/base/base.mako:1082
8560 8757 msgid "Site-wide shortcuts"
8561 8758 msgstr ""
8562 8759
@@ -8635,32 +8832,36 b' msgid ""'
8635 8832 "permission by members of user groups."
8636 8833 msgstr ""
8637 8834
8638 #: rhodecode/templates/base/issue_tracker_settings.mako:21
8639 msgid "Read more"
8640 msgstr ""
8641
8642 #: rhodecode/templates/base/issue_tracker_settings.mako:83
8835 #: rhodecode/templates/base/issue_tracker_settings.mako:81
8836 msgid "Extra Prefix"
8837 msgstr ""
8838
8839 #: rhodecode/templates/base/issue_tracker_settings.mako:92
8840 msgid "show examples"
8841 msgstr ""
8842
8843 #: rhodecode/templates/base/issue_tracker_settings.mako:160
8643 8844 msgid "Add new"
8644 8845 msgstr ""
8645 8846
8646 #: rhodecode/templates/base/issue_tracker_settings.mako:91
8847 #: rhodecode/templates/base/issue_tracker_settings.mako:168
8647 8848 msgid "New Entry"
8648 8849 msgstr ""
8649 8850
8650 #: rhodecode/templates/base/issue_tracker_settings.mako:95
8851 #: rhodecode/templates/base/issue_tracker_settings.mako:172
8651 8852 msgid "Confirm to remove this pattern:"
8652 8853 msgstr ""
8653 8854
8654 #: rhodecode/templates/base/issue_tracker_settings.mako:191
8655 #: rhodecode/templates/changeset/changeset_file_comment.mako:276
8656 #: rhodecode/templates/changeset/changeset_file_comment.mako:326
8657 #: rhodecode/templates/data_table/_dt_elements.mako:414
8855 #: rhodecode/templates/base/issue_tracker_settings.mako:293
8856 #: rhodecode/templates/changeset/changeset_file_comment.mako:271
8857 #: rhodecode/templates/changeset/changeset_file_comment.mako:322
8858 #: rhodecode/templates/data_table/_dt_elements.mako:443
8658 8859 #: rhodecode/templates/files/files_add.mako:61
8659 8860 #: rhodecode/templates/files/files_edit.mako:62
8660 8861 msgid "Preview"
8661 8862 msgstr ""
8662 8863
8663 #: rhodecode/templates/base/issue_tracker_settings.mako:192
8864 #: rhodecode/templates/base/issue_tracker_settings.mako:294
8664 8865 msgid "Test Pattern Preview"
8665 8866 msgstr ""
8666 8867
@@ -8679,7 +8880,6 b' msgid "none"'
8679 8880 msgstr ""
8680 8881
8681 8882 #: rhodecode/templates/base/perms_summary.mako:37
8682 #: rhodecode/templates/changeset/changeset.mako:107
8683 8883 #: rhodecode/templates/commits/changelog_elements.mako:102
8684 8884 #: rhodecode/templates/files/base.mako:11
8685 8885 msgid "merge"
@@ -8769,7 +8969,7 b' msgstr ""'
8769 8969 msgid "No matching permission defined"
8770 8970 msgstr ""
8771 8971
8772 #: rhodecode/templates/base/root.mako:149
8972 #: rhodecode/templates/base/root.mako:155
8773 8973 msgid "Please enable JavaScript to use RhodeCode Enterprise"
8774 8974 msgstr ""
8775 8975
@@ -8994,15 +9194,6 b' msgstr ""'
8994 9194 msgid "bookmarks"
8995 9195 msgstr ""
8996 9196
8997 #: rhodecode/templates/bookmarks/bookmarks_data.mako:13
8998 #: rhodecode/templates/changeset/changeset.mako:113
8999 #: rhodecode/templates/commits/changelog_elements.mako:116
9000 #: rhodecode/templates/files/base.mako:17
9001 #: rhodecode/templates/summary/summary_commits.mako:64
9002 #, python-format
9003 msgid "Bookmark %s"
9004 msgstr ""
9005
9006 9197 #: rhodecode/templates/branches/branches.mako:5
9007 9198 #, python-format
9008 9199 msgid "%s Branches"
@@ -9016,220 +9207,172 b' msgstr ""'
9016 9207 msgid "branches"
9017 9208 msgstr ""
9018 9209
9019 #: rhodecode/templates/branches/branches_data.mako:12
9020 #: rhodecode/templates/changeset/changeset.mako:126
9021 #: rhodecode/templates/commits/changelog_elements.mako:108
9022 #: rhodecode/templates/files/base.mako:36
9023 #: rhodecode/templates/summary/summary_commits.mako:78
9024 #, python-format
9025 msgid "Branch %s"
9026 msgstr ""
9027
9028 #: rhodecode/templates/changeset/changeset.mako:7
9029 #, python-format
9030 msgid "%s Commit"
9031 msgstr ""
9032
9033 #: rhodecode/templates/changeset/changeset.mako:38
9210 #: rhodecode/templates/changeset/changeset.mako:9
9211 msgid "{} Commit"
9212 msgstr ""
9213
9214 #: rhodecode/templates/changeset/changeset.mako:78
9034 9215 #: rhodecode/templates/commits/changelog_elements.mako:56
9216 #: rhodecode/templates/files/files_source_header.mako:48
9217 #: rhodecode/templates/files/files_tree_header.mako:35
9035 9218 #: rhodecode/templates/summary/summary_commits.mako:43
9036 9219 msgid "Copy the full commit id"
9037 9220 msgstr ""
9038 9221
9039 #: rhodecode/templates/changeset/changeset.mako:40
9222 #: rhodecode/templates/changeset/changeset.mako:83
9040 9223 msgid "Commit phase"
9041 9224 msgstr ""
9042 9225
9043 #: rhodecode/templates/changeset/changeset.mako:46
9044 #: rhodecode/templates/changeset/changeset.mako:53
9226 #: rhodecode/templates/changeset/changeset.mako:90
9227 #: rhodecode/templates/changeset/changeset.mako:97
9045 9228 msgid "Evolve State"
9046 9229 msgstr ""
9047 9230
9048 #: rhodecode/templates/changeset/changeset.mako:46
9231 #: rhodecode/templates/changeset/changeset.mako:91
9049 9232 msgid "obsolete"
9050 9233 msgstr ""
9051 9234
9052 #: rhodecode/templates/changeset/changeset.mako:53
9235 #: rhodecode/templates/changeset/changeset.mako:98
9053 9236 msgid "hidden"
9054 9237 msgstr ""
9055 9238
9056 #: rhodecode/templates/changeset/changeset.mako:60
9057 msgid "Parent Commit"
9058 msgstr ""
9059
9060 #: rhodecode/templates/changeset/changeset.mako:60
9061 msgid "parent"
9062 msgstr ""
9063
9064 #: rhodecode/templates/changeset/changeset.mako:64
9065 msgid "Child Commit"
9066 msgstr ""
9067
9068 #: rhodecode/templates/changeset/changeset.mako:64
9069 msgid "child"
9070 msgstr ""
9071
9072 #: rhodecode/templates/changeset/changeset.mako:80
9073 msgid "Expand"
9074 msgstr ""
9075
9076 #: rhodecode/templates/changeset/changeset.mako:89
9077 #: rhodecode/templates/changeset/changeset.mako:94
9078 #: rhodecode/templates/changeset/changeset_file_comment.mako:83
9079 #: rhodecode/templates/compare/compare_diff.mako:139
9080 msgid "Commit status"
9081 msgstr ""
9082
9083 #: rhodecode/templates/changeset/changeset.mako:102
9084 msgid "References"
9239 #: rhodecode/templates/changeset/changeset.mako:117
9240 msgid "Commit navigation"
9085 9241 msgstr ""
9086 9242
9087 9243 #: rhodecode/templates/changeset/changeset.mako:120
9088 #: rhodecode/templates/commits/changelog_elements.mako:124
9089 #: rhodecode/templates/files/base.mako:27
9090 #: rhodecode/templates/summary/summary_commits.mako:71
9091 #: rhodecode/templates/tags/tags_data.mako:12
9092 #, python-format
9093 msgid "Tag %s"
9094 msgstr ""
9095
9096 #: rhodecode/templates/changeset/changeset.mako:137
9244 msgid "Parent Commit"
9245 msgstr ""
9246
9247 #: rhodecode/templates/changeset/changeset.mako:120
9248 msgid "parent"
9249 msgstr ""
9250
9251 #: rhodecode/templates/changeset/changeset.mako:124
9252 msgid "Child Commit"
9253 msgstr ""
9254
9255 #: rhodecode/templates/changeset/changeset.mako:124
9256 msgid "child"
9257 msgstr ""
9258
9259 #: rhodecode/templates/changeset/changeset.mako:132
9097 9260 msgid "Diff options"
9098 9261 msgstr ""
9099 9262
9263 #: rhodecode/templates/changeset/changeset.mako:136
9264 msgid "Raw Diff"
9265 msgstr ""
9266
9100 9267 #: rhodecode/templates/changeset/changeset.mako:140
9101 msgid "Raw diff"
9102 msgstr ""
9103
9104 #: rhodecode/templates/changeset/changeset.mako:141
9105 msgid "Raw Diff"
9268 msgid "Patch Diff"
9106 9269 msgstr ""
9107 9270
9108 9271 #: rhodecode/templates/changeset/changeset.mako:144
9109 msgid "Patch diff"
9110 msgstr ""
9111
9112 #: rhodecode/templates/changeset/changeset.mako:145
9113 msgid "Patch Diff"
9114 msgstr ""
9115
9116 #: rhodecode/templates/changeset/changeset.mako:148
9117 msgid "Download diff"
9118 msgstr ""
9119
9120 #: rhodecode/templates/changeset/changeset.mako:149
9121 9272 msgid "Download Diff"
9122 9273 msgstr ""
9123 9274
9124 #: rhodecode/templates/changeset/changeset.mako:178
9125 msgid "Unresolved TODOs"
9126 msgstr ""
9127
9128 #: rhodecode/templates/changeset/changeset.mako:186
9129 msgid "There are no unresolved TODOs"
9130 msgstr ""
9131
9132 #: rhodecode/templates/changeset/changeset.mako:268
9275 #: rhodecode/templates/changeset/changeset.mako:224
9133 9276 msgid "No Child Commits"
9134 9277 msgstr ""
9135 9278
9136 #: rhodecode/templates/changeset/changeset.mako:304
9279 #: rhodecode/templates/changeset/changeset.mako:263
9137 9280 msgid "No Parent Commits"
9138 9281 msgstr ""
9139 9282
9140 #: rhodecode/templates/changeset/changeset_file_comment.mako:34
9283 #: rhodecode/templates/changeset/changeset_file_comment.mako:33
9284 #: rhodecode/templates/pullrequests/pullrequest_show.mako:401
9141 9285 msgid "Resolved by comment #{}"
9142 9286 msgstr ""
9143 9287
9144 #: rhodecode/templates/changeset/changeset_file_comment.mako:41
9288 #: rhodecode/templates/changeset/changeset_file_comment.mako:40
9145 9289 msgid "Click to resolve this comment"
9146 9290 msgstr ""
9147 9291
9148 #: rhodecode/templates/changeset/changeset_file_comment.mako:68
9149 9292 #: rhodecode/templates/changeset/changeset_file_comment.mako:70
9150 #, python-format
9151 msgid "pull request #%s"
9152 msgstr ""
9153
9154 #: rhodecode/templates/changeset/changeset_file_comment.mako:75
9293 #: rhodecode/templates/changeset/changeset_file_comment.mako:72
9294 msgid "pull request !{}"
9295 msgstr ""
9296
9297 #: rhodecode/templates/changeset/changeset_file_comment.mako:77
9155 9298 msgid "Status change on commit"
9156 9299 msgstr ""
9157 9300
9158 #: rhodecode/templates/changeset/changeset_file_comment.mako:90
9159 msgid "resolves comment #{}"
9160 msgstr ""
9161
9162 #: rhodecode/templates/changeset/changeset_file_comment.mako:98
9301 #: rhodecode/templates/changeset/changeset_file_comment.mako:85
9302 #: rhodecode/templates/compare/compare_diff.mako:139
9303 #: rhodecode/templates/email_templates/commit_comment.mako:53
9304 msgid "Commit status"
9305 msgstr ""
9306
9307 #: rhodecode/templates/changeset/changeset_file_comment.mako:94
9163 9308 msgid "Pull request author"
9164 9309 msgstr ""
9165 9310
9166 #: rhodecode/templates/changeset/changeset_file_comment.mako:99
9311 #: rhodecode/templates/changeset/changeset_file_comment.mako:95
9167 9312 msgid "author"
9168 9313 msgstr ""
9169 9314
9315 #: rhodecode/templates/changeset/changeset_file_comment.mako:103
9316 #: rhodecode/templates/changeset/changeset_file_comment.mako:119
9317 msgid "Outdated comment from pull request version v{0}, latest v{1}"
9318 msgstr ""
9319
9170 9320 #: rhodecode/templates/changeset/changeset_file_comment.mako:107
9171 #: rhodecode/templates/changeset/changeset_file_comment.mako:123
9172 msgid "Outdated comment from pull request version v{0}, latest v{1}"
9173 msgstr ""
9174
9175 #: rhodecode/templates/changeset/changeset_file_comment.mako:111
9176 #: rhodecode/templates/changeset/changeset_file_comment.mako:126
9321 #: rhodecode/templates/changeset/changeset_file_comment.mako:122
9177 9322 msgid "Comment from pull request version v{0}, latest v{1}"
9178 9323 msgstr ""
9179 9324
9180 #: rhodecode/templates/changeset/changeset_file_comment.mako:153
9181 #: rhodecode/templates/changeset/changeset_file_comment.mako:156
9325 #: rhodecode/templates/changeset/changeset_file_comment.mako:149
9326 #: rhodecode/templates/changeset/changeset_file_comment.mako:152
9182 9327 msgid "Prev"
9183 9328 msgstr ""
9184 9329
9185 #: rhodecode/templates/changeset/changeset_file_comment.mako:154
9186 #: rhodecode/templates/changeset/changeset_file_comment.mako:157
9330 #: rhodecode/templates/changeset/changeset_file_comment.mako:150
9331 #: rhodecode/templates/changeset/changeset_file_comment.mako:153
9187 9332 msgid "Next"
9188 9333 msgstr ""
9189 9334
9335 #: rhodecode/templates/changeset/changeset_file_comment.mako:188
9336 msgid "Leave a comment on this Pull Request."
9337 msgstr ""
9338
9339 #: rhodecode/templates/changeset/changeset_file_comment.mako:190
9340 msgid "Leave a comment on {} commits in this range."
9341 msgstr ""
9342
9190 9343 #: rhodecode/templates/changeset/changeset_file_comment.mako:192
9191 msgid "Leave a comment on this Pull Request."
9192 msgstr ""
9193
9194 #: rhodecode/templates/changeset/changeset_file_comment.mako:194
9195 msgid "Leave a comment on {} commits in this range."
9196 msgstr ""
9197
9198 #: rhodecode/templates/changeset/changeset_file_comment.mako:196
9199 9344 msgid "Leave a comment on this Commit."
9200 9345 msgstr ""
9201 9346
9202 #: rhodecode/templates/changeset/changeset_file_comment.mako:284
9203 #: rhodecode/templates/codeblocks/diffs.mako:67
9347 #: rhodecode/templates/changeset/changeset_file_comment.mako:279
9348 #: rhodecode/templates/codeblocks/diffs.mako:79
9204 9349 msgid "You need to be logged in to leave comments."
9205 9350 msgstr ""
9206 9351
9207 #: rhodecode/templates/changeset/changeset_file_comment.mako:285
9208 #: rhodecode/templates/codeblocks/diffs.mako:67
9352 #: rhodecode/templates/changeset/changeset_file_comment.mako:280
9353 #: rhodecode/templates/codeblocks/diffs.mako:79
9209 9354 msgid "Login now"
9210 9355 msgstr ""
9211 9356
9357 #: rhodecode/templates/changeset/changeset_file_comment.mako:327
9358 msgid "Mark as"
9359 msgstr ""
9360
9212 9361 #: rhodecode/templates/changeset/changeset_file_comment.mako:350
9213 #, python-format
9214 msgid "Comments parsed using %s syntax with %s, and %s actions support."
9215 msgstr ""
9216
9217 #: rhodecode/templates/changeset/changeset_file_comment.mako:352
9218 msgid "Use @username inside this text to send notification to this RhodeCode user"
9362 #: rhodecode/templates/files/files_upload.mako:86
9363 msgid "Drag'n Drop files here or"
9364 msgstr ""
9365
9366 #: rhodecode/templates/changeset/changeset_file_comment.mako:350
9367 #: rhodecode/templates/files/files_upload.mako:86
9368 msgid "Choose your files"
9219 9369 msgstr ""
9220 9370
9221 9371 #: rhodecode/templates/changeset/changeset_file_comment.mako:353
9222 msgid "Start typing with / for certain actions to be triggered via text box."
9223 msgstr ""
9224
9225 #: rhodecode/templates/changeset/changeset_file_comment.mako:370
9226 #: rhodecode/templates/pullrequests/pullrequest_show.mako:16
9227 #: rhodecode/templates/pullrequests/pullrequest_show.mako:156
9228 #: rhodecode/templates/pullrequests/pullrequests.mako:31
9229 msgid "Closed"
9230 msgstr ""
9231
9232 #: rhodecode/templates/changeset/changeset_file_comment.mako:400
9372 msgid "uploading..."
9373 msgstr ""
9374
9375 #: rhodecode/templates/changeset/changeset_file_comment.mako:384
9233 9376 #: rhodecode/templates/compare/compare_diff.mako:108
9234 9377 #: rhodecode/templates/compare/compare_diff.mako:116
9235 9378 #: rhodecode/templates/compare/compare_diff.mako:124
@@ -9237,20 +9380,47 b' msgstr ""'
9237 9380 msgid "Comment"
9238 9381 msgstr ""
9239 9382
9383 #: rhodecode/templates/changeset/changeset_file_comment.mako:403
9384 #: rhodecode/templates/pullrequests/pullrequest_show.mako:16
9385 #: rhodecode/templates/pullrequests/pullrequest_show.mako:103
9386 #: rhodecode/templates/pullrequests/pullrequests.mako:31
9387 msgid "Closed"
9388 msgstr ""
9389
9390 #: rhodecode/templates/changeset/changeset_file_comment.mako:412
9391 msgid "Comments parsed using {} syntax."
9392 msgstr ""
9393
9394 #: rhodecode/templates/changeset/changeset_file_comment.mako:413
9395 msgid "Use @username inside this text to send notification to this RhodeCode user"
9396 msgstr ""
9397
9398 #: rhodecode/templates/changeset/changeset_file_comment.mako:414
9399 msgid "and"
9400 msgstr ""
9401
9402 #: rhodecode/templates/changeset/changeset_file_comment.mako:415
9403 msgid "Start typing with / for certain actions to be triggered via text box."
9404 msgstr ""
9405
9406 #: rhodecode/templates/changeset/changeset_file_comment.mako:416
9407 msgid "actions supported."
9408 msgstr ""
9409
9240 9410 #: rhodecode/templates/changeset/changeset_range.mako:5
9241 9411 #, python-format
9242 9412 msgid "%s Commits"
9243 9413 msgstr ""
9244 9414
9245 #: rhodecode/templates/changeset/changeset_range.mako:32
9415 #: rhodecode/templates/changeset/changeset_range.mako:33
9246 9416 msgid "Commit Range"
9247 9417 msgstr ""
9248 9418
9249 #: rhodecode/templates/changeset/changeset_range.mako:41
9419 #: rhodecode/templates/changeset/changeset_range.mako:42
9250 9420 msgid "Range"
9251 9421 msgstr ""
9252 9422
9253 #: rhodecode/templates/changeset/changeset_range.mako:59
9423 #: rhodecode/templates/changeset/changeset_range.mako:60
9254 9424 msgid "Diff Option"
9255 9425 msgstr ""
9256 9426
@@ -9266,8 +9436,8 b' msgstr ""'
9266 9436 #: rhodecode/templates/changeset/diff_block.mako:10
9267 9437 #: rhodecode/templates/changeset/diff_block.mako:25
9268 9438 #: rhodecode/templates/changeset/diff_block.mako:46
9269 #: rhodecode/templates/codeblocks/diffs.mako:126
9270 #: rhodecode/templates/codeblocks/diffs.mako:183
9439 #: rhodecode/templates/codeblocks/diffs.mako:204
9440 #: rhodecode/templates/codeblocks/diffs.mako:268
9271 9441 msgid "Showing a big diff might take some time and resources, continue?"
9272 9442 msgstr ""
9273 9443
@@ -9275,8 +9445,8 b' msgstr ""'
9275 9445 #: rhodecode/templates/changeset/diff_block.mako:10
9276 9446 #: rhodecode/templates/changeset/diff_block.mako:25
9277 9447 #: rhodecode/templates/changeset/diff_block.mako:46
9278 #: rhodecode/templates/codeblocks/diffs.mako:126
9279 #: rhodecode/templates/codeblocks/diffs.mako:183
9448 #: rhodecode/templates/codeblocks/diffs.mako:204
9449 #: rhodecode/templates/codeblocks/diffs.mako:268
9280 9450 msgid "Show full diff"
9281 9451 msgstr ""
9282 9452
@@ -9289,152 +9459,181 b' msgstr ""'
9289 9459 msgid "Diff was truncated. File content available only in full diff."
9290 9460 msgstr ""
9291 9461
9292 #: rhodecode/templates/codeblocks/diffs.mako:113
9293 msgid "Browse Files at revision {}"
9294 msgstr ""
9295
9296 #: rhodecode/templates/codeblocks/diffs.mako:114
9297 msgid "Browse Files"
9298 msgstr ""
9299
9300 #: rhodecode/templates/codeblocks/diffs.mako:124
9462 #: rhodecode/templates/codeblocks/diffs.mako:125
9463 msgid "Expand all files"
9464 msgstr ""
9465
9466 #: rhodecode/templates/codeblocks/diffs.mako:127
9467 msgid "Collapse all files"
9468 msgstr ""
9469
9470 #: rhodecode/templates/codeblocks/diffs.mako:137
9471 msgid "not available in this view"
9472 msgstr ""
9473
9474 #: rhodecode/templates/codeblocks/diffs.mako:146
9475 msgid "{} unresolved"
9476 msgstr ""
9477
9478 #: rhodecode/templates/codeblocks/diffs.mako:149
9479 msgid "0 unresolved"
9480 msgstr ""
9481
9482 #: rhodecode/templates/codeblocks/diffs.mako:152
9483 msgid "{} Resolved"
9484 msgstr ""
9485
9486 #: rhodecode/templates/codeblocks/diffs.mako:166
9487 msgid "0 General"
9488 msgstr ""
9489
9490 #: rhodecode/templates/codeblocks/diffs.mako:174
9491 msgid "0 Inline"
9492 msgstr ""
9493
9494 #: rhodecode/templates/codeblocks/diffs.mako:185
9495 #: rhodecode/templates/codeblocks/diffs.mako:190
9496 msgid "{} Outdated"
9497 msgstr ""
9498
9499 #: rhodecode/templates/codeblocks/diffs.mako:187
9500 msgid "show outdated"
9501 msgstr ""
9502
9503 #: rhodecode/templates/codeblocks/diffs.mako:188
9504 msgid "hide outdated"
9505 msgstr ""
9506
9507 #: rhodecode/templates/codeblocks/diffs.mako:203
9301 9508 msgid "The requested changes are too big and content was truncated."
9302 9509 msgstr ""
9303 9510
9304 #: rhodecode/templates/codeblocks/diffs.mako:135
9305 msgid "File Changes"
9306 msgstr ""
9307
9308 #: rhodecode/templates/codeblocks/diffs.mako:142
9511 #: rhodecode/templates/codeblocks/diffs.mako:227
9309 9512 msgid "Some changes may be hidden"
9310 9513 msgstr ""
9311 9514
9312 #: rhodecode/templates/codeblocks/diffs.mako:144
9515 #: rhodecode/templates/codeblocks/diffs.mako:229
9313 9516 msgid "No files"
9314 9517 msgstr ""
9315 9518
9316 #: rhodecode/templates/codeblocks/diffs.mako:183
9519 #: rhodecode/templates/codeblocks/diffs.mako:268
9317 9520 msgid "The requested commit or file is too big and content was truncated."
9318 9521 msgstr ""
9319 9522
9320 #: rhodecode/templates/codeblocks/diffs.mako:190
9523 #: rhodecode/templates/codeblocks/diffs.mako:275
9321 9524 #, python-format
9322 9525 msgid "This diff has been collapsed as it changes many lines, (%i lines changed)"
9323 9526 msgstr ""
9324 9527
9325 #: rhodecode/templates/codeblocks/diffs.mako:192
9528 #: rhodecode/templates/codeblocks/diffs.mako:277
9326 9529 msgid "Show them"
9327 9530 msgstr ""
9328 9531
9329 #: rhodecode/templates/codeblocks/diffs.mako:195
9532 #: rhodecode/templates/codeblocks/diffs.mako:280
9330 9533 msgid "Hide them"
9331 9534 msgstr ""
9332 9535
9333 #: rhodecode/templates/codeblocks/diffs.mako:231
9334 #: rhodecode/templates/codeblocks/diffs.mako:250
9335 msgid "Unmatched inline comments below"
9336 msgstr ""
9337
9338 #: rhodecode/templates/codeblocks/diffs.mako:256
9339 msgid "Unmatched comments below"
9340 msgstr ""
9341
9342 #: rhodecode/templates/codeblocks/diffs.mako:321
9536 #: rhodecode/templates/codeblocks/diffs.mako:316
9537 #: rhodecode/templates/codeblocks/diffs.mako:335
9538 msgid "Unmatched/outdated inline comments below"
9539 msgstr ""
9540
9541 #: rhodecode/templates/codeblocks/diffs.mako:341
9542 msgid "Unmatched/outdated comments below"
9543 msgstr ""
9544
9545 #: rhodecode/templates/codeblocks/diffs.mako:409
9343 9546 msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it."
9344 9547 msgstr ""
9345 9548
9346 #: rhodecode/templates/codeblocks/diffs.mako:387
9549 #: rhodecode/templates/codeblocks/diffs.mako:476
9347 9550 msgid "Copy the full path"
9348 9551 msgstr ""
9349 9552
9350 #: rhodecode/templates/codeblocks/diffs.mako:454
9351 #: rhodecode/templates/codeblocks/diffs.mako:472
9553 #: rhodecode/templates/codeblocks/diffs.mako:543
9554 #: rhodecode/templates/codeblocks/diffs.mako:561
9352 9555 #, python-format
9353 9556 msgid "Show file at commit: %(commit_id)s"
9354 9557 msgstr ""
9355 9558
9356 #: rhodecode/templates/codeblocks/diffs.mako:456
9357 #: rhodecode/templates/codeblocks/diffs.mako:463
9559 #: rhodecode/templates/codeblocks/diffs.mako:545
9560 #: rhodecode/templates/codeblocks/diffs.mako:552
9358 9561 msgid "Show file before"
9359 9562 msgstr ""
9360 9563
9361 #: rhodecode/templates/codeblocks/diffs.mako:461
9362 #: rhodecode/templates/codeblocks/diffs.mako:479
9564 #: rhodecode/templates/codeblocks/diffs.mako:550
9565 #: rhodecode/templates/codeblocks/diffs.mako:568
9363 9566 #, python-format
9364 9567 msgid "File not present at commit: %(commit_id)s"
9365 9568 msgstr ""
9366 9569
9367 #: rhodecode/templates/codeblocks/diffs.mako:474
9368 #: rhodecode/templates/codeblocks/diffs.mako:481
9570 #: rhodecode/templates/codeblocks/diffs.mako:563
9571 #: rhodecode/templates/codeblocks/diffs.mako:570
9369 9572 msgid "Show file after"
9370 9573 msgstr ""
9371 9574
9372 #: rhodecode/templates/codeblocks/diffs.mako:488
9575 #: rhodecode/templates/codeblocks/diffs.mako:577
9373 9576 msgid "Show comments"
9374 9577 msgstr ""
9375 9578
9376 #: rhodecode/templates/codeblocks/diffs.mako:488
9579 #: rhodecode/templates/codeblocks/diffs.mako:577
9377 9580 msgid "Hide comments"
9378 9581 msgstr ""
9379 9582
9380 #: rhodecode/templates/codeblocks/diffs.mako:559
9381 #: rhodecode/templates/codeblocks/diffs.mako:602
9382 #: rhodecode/templates/codeblocks/diffs.mako:658
9583 #: rhodecode/templates/codeblocks/diffs.mako:646
9584 #: rhodecode/templates/codeblocks/diffs.mako:689
9585 #: rhodecode/templates/codeblocks/diffs.mako:745
9383 9586 msgid "comments including outdated"
9384 9587 msgstr ""
9385 9588
9386 #: rhodecode/templates/codeblocks/diffs.mako:561
9387 #: rhodecode/templates/codeblocks/diffs.mako:604
9388 #: rhodecode/templates/codeblocks/diffs.mako:660
9589 #: rhodecode/templates/codeblocks/diffs.mako:648
9590 #: rhodecode/templates/codeblocks/diffs.mako:691
9591 #: rhodecode/templates/codeblocks/diffs.mako:747
9389 9592 msgid "comments"
9390 9593 msgstr ""
9391 9594
9392 #: rhodecode/templates/codeblocks/diffs.mako:736
9393 msgid "View side by side"
9394 msgstr ""
9395
9396 #: rhodecode/templates/codeblocks/diffs.mako:738
9595 #: rhodecode/templates/codeblocks/diffs.mako:816
9596 msgid "Toggle wide diff"
9597 msgstr ""
9598
9599 #: rhodecode/templates/codeblocks/diffs.mako:824
9600 msgid "View diff as side by side"
9601 msgstr ""
9602
9603 #: rhodecode/templates/codeblocks/diffs.mako:826
9397 9604 msgid "Side by Side"
9398 9605 msgstr ""
9399 9606
9400 #: rhodecode/templates/codeblocks/diffs.mako:743
9401 msgid "View unified"
9402 msgstr ""
9403
9404 #: rhodecode/templates/codeblocks/diffs.mako:744
9607 #: rhodecode/templates/codeblocks/diffs.mako:831
9608 msgid "View diff as unified"
9609 msgstr ""
9610
9611 #: rhodecode/templates/codeblocks/diffs.mako:832
9405 9612 msgid "Unified"
9406 9613 msgstr ""
9407 9614
9408 #: rhodecode/templates/codeblocks/diffs.mako:749
9615 #: rhodecode/templates/codeblocks/diffs.mako:837
9409 9616 msgid "Turn off: Show the diff as commit range"
9410 9617 msgstr ""
9411 9618
9412 #: rhodecode/templates/codeblocks/diffs.mako:752
9413 #: rhodecode/templates/codeblocks/diffs.mako:759
9619 #: rhodecode/templates/codeblocks/diffs.mako:840
9620 #: rhodecode/templates/codeblocks/diffs.mako:847
9414 9621 msgid "Range Diff"
9415 9622 msgstr ""
9416 9623
9417 #: rhodecode/templates/codeblocks/diffs.mako:756
9624 #: rhodecode/templates/codeblocks/diffs.mako:844
9418 9625 msgid "Show the diff as commit range"
9419 9626 msgstr ""
9420 9627
9421 #: rhodecode/templates/codeblocks/diffs.mako:772
9422 msgid "Expand All Files"
9423 msgstr ""
9424
9425 #: rhodecode/templates/codeblocks/diffs.mako:776
9426 msgid "Collapse All Files"
9427 msgstr ""
9428
9429 #: rhodecode/templates/codeblocks/diffs.mako:799
9628 #: rhodecode/templates/codeblocks/diffs.mako:888
9430 9629 msgid "Disabled on range diff"
9431 9630 msgstr ""
9432 9631
9433 #: rhodecode/templates/codeblocks/diffs.mako:1017
9434 msgid "Diff Options"
9435 msgstr ""
9436
9437 #: rhodecode/templates/codeblocks/source.mako:25
9632 #: rhodecode/templates/codeblocks/diffs.mako:1119
9633 msgid "..."
9634 msgstr ""
9635
9636 #: rhodecode/templates/codeblocks/source.mako:22
9438 9637 msgid "view annotation from before this change"
9439 9638 msgstr ""
9440 9639
@@ -9536,11 +9735,32 b' msgstr ""'
9536 9735
9537 9736 #: rhodecode/templates/commits/changelog_elements.mako:80
9538 9737 #: rhodecode/templates/compare/compare_commits.mako:48
9539 #: rhodecode/templates/pullrequests/pullrequest_show.mako:515
9738 #: rhodecode/templates/pullrequests/pullrequest_show.mako:582
9540 9739 #: rhodecode/templates/search/search_commit.mako:34
9541 9740 msgid "Expand commit message"
9542 9741 msgstr ""
9543 9742
9743 #: rhodecode/templates/commits/changelog_elements.mako:108
9744 #: rhodecode/templates/files/base.mako:36
9745 #: rhodecode/templates/summary/summary_commits.mako:78
9746 #, python-format
9747 msgid "Branch %s"
9748 msgstr ""
9749
9750 #: rhodecode/templates/commits/changelog_elements.mako:116
9751 #: rhodecode/templates/files/base.mako:17
9752 #: rhodecode/templates/summary/summary_commits.mako:64
9753 #, python-format
9754 msgid "Bookmark %s"
9755 msgstr ""
9756
9757 #: rhodecode/templates/commits/changelog_elements.mako:124
9758 #: rhodecode/templates/files/base.mako:27
9759 #: rhodecode/templates/summary/summary_commits.mako:71
9760 #, python-format
9761 msgid "Tag %s"
9762 msgstr ""
9763
9544 9764 #: rhodecode/templates/commits/changelog_elements.mako:135
9545 9765 #: rhodecode/templates/summary/summary_commits.mako:87
9546 9766 msgid "Commit has comments"
@@ -9571,11 +9791,11 b' msgid "Compare was calculated based on t'
9571 9791 msgstr ""
9572 9792
9573 9793 #: rhodecode/templates/compare/compare_commits.mako:17
9574 #: rhodecode/templates/pullrequests/pullrequest_show.mako:476
9794 #: rhodecode/templates/pullrequests/pullrequest_show.mako:543
9575 9795 msgid "Time"
9576 9796 msgstr ""
9577 9797
9578 #: rhodecode/templates/compare/compare_commits.mako:67
9798 #: rhodecode/templates/compare/compare_commits.mako:66
9579 9799 msgid "No commits in this compare"
9580 9800 msgstr ""
9581 9801
@@ -9597,16 +9817,11 b' msgid "for file"'
9597 9817 msgstr ""
9598 9818
9599 9819 #: rhodecode/templates/compare/compare_diff.mako:56
9600 #: rhodecode/templates/email_templates/pull_request_review.mako:74
9601 #: rhodecode/templates/pullrequests/pullrequest_show.mako:104
9602 9820 msgid "Target"
9603 9821 msgstr ""
9604 9822
9605 9823 #: rhodecode/templates/compare/compare_diff.mako:70
9606 #: rhodecode/templates/email_templates/pull_request_comment.mako:90
9607 #: rhodecode/templates/email_templates/pull_request_review.mako:73
9608 #: rhodecode/templates/files/files_source.mako:86
9609 #: rhodecode/templates/pullrequests/pullrequest_show.mako:68
9824 #: rhodecode/templates/files/files_source.mako:100
9610 9825 msgid "Source"
9611 9826 msgstr ""
9612 9827
@@ -9633,94 +9848,93 b' msgstr ""'
9633 9848 msgid "Compare commits, branches, bookmarks or tags."
9634 9849 msgstr ""
9635 9850
9636 #: rhodecode/templates/data_table/_dt_elements.mako:61
9637 #: rhodecode/templates/data_table/_dt_elements.mako:62
9851 #: rhodecode/templates/data_table/_dt_elements.mako:73
9852 #: rhodecode/templates/data_table/_dt_elements.mako:74
9638 9853 msgid "Fork"
9639 9854 msgstr ""
9640 9855
9641 #: rhodecode/templates/data_table/_dt_elements.mako:83
9856 #: rhodecode/templates/data_table/_dt_elements.mako:95
9642 9857 msgid "Mercurial repository"
9643 9858 msgstr ""
9644 9859
9645 #: rhodecode/templates/data_table/_dt_elements.mako:85
9860 #: rhodecode/templates/data_table/_dt_elements.mako:97
9646 9861 msgid "Git repository"
9647 9862 msgstr ""
9648 9863
9649 #: rhodecode/templates/data_table/_dt_elements.mako:87
9864 #: rhodecode/templates/data_table/_dt_elements.mako:99
9650 9865 msgid "Subversion repository"
9651 9866 msgstr ""
9652 9867
9653 #: rhodecode/templates/data_table/_dt_elements.mako:94
9868 #: rhodecode/templates/data_table/_dt_elements.mako:106
9654 9869 msgid "Public repository"
9655 9870 msgstr ""
9656 9871
9657 #: rhodecode/templates/data_table/_dt_elements.mako:104
9872 #: rhodecode/templates/data_table/_dt_elements.mako:116
9658 9873 msgid "This repository is being created in a background task"
9659 9874 msgstr ""
9660 9875
9661 #: rhodecode/templates/data_table/_dt_elements.mako:105
9876 #: rhodecode/templates/data_table/_dt_elements.mako:117
9662 9877 msgid "creating..."
9663 9878 msgstr ""
9664 9879
9665 #: rhodecode/templates/data_table/_dt_elements.mako:137
9880 #: rhodecode/templates/data_table/_dt_elements.mako:149
9666 9881 msgid "No commits yet"
9667 9882 msgstr ""
9668 9883
9669 #: rhodecode/templates/data_table/_dt_elements.mako:144
9670 #: rhodecode/templates/data_table/_dt_elements.mako:146
9884 #: rhodecode/templates/data_table/_dt_elements.mako:156
9885 #: rhodecode/templates/data_table/_dt_elements.mako:158
9671 9886 #, python-format
9672 9887 msgid "Subscribe to %s rss feed"
9673 9888 msgstr ""
9674 9889
9675 #: rhodecode/templates/data_table/_dt_elements.mako:152
9676 #: rhodecode/templates/data_table/_dt_elements.mako:154
9890 #: rhodecode/templates/data_table/_dt_elements.mako:164
9891 #: rhodecode/templates/data_table/_dt_elements.mako:166
9677 9892 #, python-format
9678 9893 msgid "Subscribe to %s atom feed"
9679 9894 msgstr ""
9680 9895
9681 #: rhodecode/templates/data_table/_dt_elements.mako:182
9896 #: rhodecode/templates/data_table/_dt_elements.mako:189
9682 9897 msgid "Creating"
9683 9898 msgstr ""
9684 9899
9685 #: rhodecode/templates/data_table/_dt_elements.mako:184
9900 #: rhodecode/templates/data_table/_dt_elements.mako:191
9901 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:10
9686 9902 msgid "Created"
9687 9903 msgstr ""
9688 9904
9689 #: rhodecode/templates/data_table/_dt_elements.mako:226
9905 #: rhodecode/templates/data_table/_dt_elements.mako:234
9690 9906 msgid "personal"
9691 9907 msgstr ""
9692 9908
9693 #: rhodecode/templates/data_table/_dt_elements.mako:272
9909 #: rhodecode/templates/data_table/_dt_elements.mako:281
9694 9910 #, python-format
9695 9911 msgid "Confirm to delete this user group: %s"
9696 9912 msgstr ""
9697 9913
9698 #: rhodecode/templates/data_table/_dt_elements.mako:288
9914 #: rhodecode/templates/data_table/_dt_elements.mako:297
9699 9915 #: rhodecode/templates/user_group/user_group.mako:4
9700 #: rhodecode/templates/user_group/user_group.mako:11
9701 9916 msgid "User group"
9702 9917 msgstr ""
9703 9918
9704 #: rhodecode/templates/data_table/_dt_elements.mako:333
9705 #: rhodecode/templates/forks/fork.mako:91
9706 msgid "Private"
9707 msgstr ""
9708
9709 #: rhodecode/templates/data_table/_dt_elements.mako:366
9710 #, python-format
9711 msgid "Pull request #%(pr_number)s"
9919 #: rhodecode/templates/data_table/_dt_elements.mako:379
9920 #: rhodecode/templates/pullrequests/pullrequest_show.mako:51
9921 msgid "Pull request !{}"
9712 9922 msgstr ""
9713 9923
9714 9924 #: rhodecode/templates/data_table/_dt_elements.mako:387
9715 msgid "Copy the full url"
9716 msgstr ""
9717
9718 #: rhodecode/templates/data_table/_dt_elements.mako:398
9925 msgid "Work in progress"
9926 msgstr ""
9927
9928 #: rhodecode/templates/data_table/_dt_elements.mako:421
9929 msgid "Info"
9930 msgstr ""
9931
9932 #: rhodecode/templates/data_table/_dt_elements.mako:427
9719 9933 #, python-format
9720 9934 msgid "Confirm to delete this artifact: %s"
9721 9935 msgstr ""
9722 9936
9723 #: rhodecode/templates/data_table/_dt_elements.mako:431
9937 #: rhodecode/templates/data_table/_dt_elements.mako:460
9724 9938 #, python-format
9725 9939 msgid "Parsed using %s syntax"
9726 9940 msgstr ""
@@ -9778,71 +9992,71 b' msgstr ""'
9778 9992 msgid "Index"
9779 9993 msgstr ""
9780 9994
9781 #: rhodecode/templates/debug_style/index.html:55
9995 #: rhodecode/templates/debug_style/index.html:56
9782 9996 msgid "Typography"
9783 9997 msgstr ""
9784 9998
9785 #: rhodecode/templates/debug_style/index.html:56
9786 msgid "Forms"
9787 msgstr ""
9788
9789 9999 #: rhodecode/templates/debug_style/index.html:57
9790 msgid "Buttons"
10000 msgid "Forms"
9791 10001 msgstr ""
9792 10002
9793 10003 #: rhodecode/templates/debug_style/index.html:58
9794 msgid "Labels"
10004 msgid "Buttons"
9795 10005 msgstr ""
9796 10006
9797 10007 #: rhodecode/templates/debug_style/index.html:59
9798 msgid "Alerts"
10008 msgid "Labels"
9799 10009 msgstr ""
9800 10010
9801 10011 #: rhodecode/templates/debug_style/index.html:60
9802 msgid "Tables"
10012 msgid "Alerts"
9803 10013 msgstr ""
9804 10014
9805 10015 #: rhodecode/templates/debug_style/index.html:61
9806 msgid "Tables wide"
10016 msgid "Tables"
9807 10017 msgstr ""
9808 10018
9809 10019 #: rhodecode/templates/debug_style/index.html:62
10020 msgid "Tables wide"
10021 msgstr ""
10022
10023 #: rhodecode/templates/debug_style/index.html:63
9810 10024 msgid "Collapsable Content"
9811 10025 msgstr ""
9812 10026
9813 #: rhodecode/templates/debug_style/index.html:64
9814 msgid "Layout form with sidebar"
9815 msgstr ""
9816
9817 10027 #: rhodecode/templates/debug_style/index.html:65
9818 msgid "Login"
10028 msgid "Layout form with sidebar"
9819 10029 msgstr ""
9820 10030
9821 10031 #: rhodecode/templates/debug_style/index.html:66
9822 msgid "Login 2"
10032 msgid "Login"
9823 10033 msgstr ""
9824 10034
9825 10035 #: rhodecode/templates/debug_style/index.html:67
10036 msgid "Login 2"
10037 msgstr ""
10038
10039 #: rhodecode/templates/debug_style/index.html:68
9826 10040 msgid "Code blocks"
9827 10041 msgstr ""
9828 10042
9829 #: rhodecode/templates/debug_style/index.html:70
10043 #: rhodecode/templates/debug_style/index.html:71
9830 10044 msgid "Panels"
9831 10045 msgstr ""
9832 10046
9833 #: rhodecode/templates/debug_style/index.html:73
9834 msgid "Form elements"
9835 msgstr ""
9836
9837 10047 #: rhodecode/templates/debug_style/index.html:74
9838 msgid "Form elements small"
10048 msgid "Form elements"
9839 10049 msgstr ""
9840 10050
9841 10051 #: rhodecode/templates/debug_style/index.html:75
9842 msgid "Form inline elements"
10052 msgid "Form elements small"
9843 10053 msgstr ""
9844 10054
9845 10055 #: rhodecode/templates/debug_style/index.html:76
10056 msgid "Form inline elements"
10057 msgstr ""
10058
10059 #: rhodecode/templates/debug_style/index.html:77
9846 10060 msgid "Form vertical"
9847 10061 msgstr ""
9848 10062
@@ -9858,165 +10072,238 b' msgstr ""'
9858 10072 msgid "Don't have an account ?"
9859 10073 msgstr ""
9860 10074
9861 #: rhodecode/templates/email_templates/base.mako:39
9862 #, python-format
9863 msgid "This is a notification from RhodeCode. %(instance_url)s"
9864 msgstr ""
9865
9866 #: rhodecode/templates/email_templates/base.mako:122
10075 #: rhodecode/templates/email_templates/base.mako:75
10076 #: rhodecode/templates/email_templates/base.mako:519
10077 msgid "This is a notification from RhodeCode."
10078 msgstr ""
10079
10080 #: rhodecode/templates/email_templates/base.mako:501
9867 10081 msgid "RhodeCode"
9868 10082 msgstr ""
9869 10083
9870 #: rhodecode/templates/email_templates/commit_comment.mako:18
9871 #: rhodecode/templates/email_templates/pull_request_comment.mako:19
10084 #: rhodecode/templates/email_templates/commit_comment.mako:23
10085 #: rhodecode/templates/email_templates/commit_comment.mako:26
10086 #: rhodecode/templates/email_templates/commit_comment.mako:28
10087 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
10088 #: rhodecode/templates/email_templates/pull_request_comment.mako:27
10089 #: rhodecode/templates/email_templates/pull_request_comment.mako:29
9872 10090 msgid "[mention]"
9873 10091 msgstr ""
9874 10092
9875 #: rhodecode/templates/email_templates/commit_comment.mako:21
9876 #: rhodecode/templates/email_templates/commit_comment.mako:82
10093 #: rhodecode/templates/email_templates/commit_comment.mako:23
9877 10094 msgid "{user} left a {comment_type} on file `{comment_file}` in commit `{commit_id}`"
9878 10095 msgstr ""
9879 10096
9880 #: rhodecode/templates/email_templates/commit_comment.mako:21
9881 #: rhodecode/templates/email_templates/commit_comment.mako:24
10097 #: rhodecode/templates/email_templates/commit_comment.mako:23
9882 10098 #: rhodecode/templates/email_templates/commit_comment.mako:26
9883 msgid "in the {repo_name} repository"
9884 msgstr ""
9885
9886 #: rhodecode/templates/email_templates/commit_comment.mako:24
9887 msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`"
10099 #: rhodecode/templates/email_templates/commit_comment.mako:28
10100 msgid "in the `{repo_name}` repository"
9888 10101 msgstr ""
9889 10102
9890 10103 #: rhodecode/templates/email_templates/commit_comment.mako:26
9891 #: rhodecode/templates/email_templates/commit_comment.mako:84
10104 msgid "[status: {status}] {user} left a {comment_type} on commit `{commit_id}`"
10105 msgstr ""
10106
10107 #: rhodecode/templates/email_templates/commit_comment.mako:28
9892 10108 msgid "{user} left a {comment_type} on commit `{commit_id}`"
9893 10109 msgstr ""
9894 10110
9895 #: rhodecode/templates/email_templates/commit_comment.mako:47
9896 #: rhodecode/templates/email_templates/pull_request_comment.mako:47
10111 #: rhodecode/templates/email_templates/commit_comment.mako:50
10112 #: rhodecode/templates/email_templates/pull_request_comment.mako:60
9897 10113 msgid "Comment link"
9898 10114 msgstr ""
9899 10115
9900 #: rhodecode/templates/email_templates/commit_comment.mako:52
9901 #: rhodecode/templates/email_templates/pull_request_comment.mako:52
9902 msgid "File: {comment_file} on line {comment_line}"
10116 #: rhodecode/templates/email_templates/commit_comment.mako:53
10117 #: rhodecode/templates/email_templates/commit_comment.mako:129
10118 msgid "Status was changed to"
9903 10119 msgstr ""
9904 10120
9905 10121 #: rhodecode/templates/email_templates/commit_comment.mako:58
9906 msgid "Commit status was changed to"
9907 msgstr ""
9908
9909 #: rhodecode/templates/email_templates/commit_comment.mako:82
9910 #: rhodecode/templates/email_templates/commit_comment.mako:84
9911 msgid "in the {repo} repository"
9912 msgstr ""
9913
9914 #: rhodecode/templates/email_templates/commit_comment.mako:93
9915 #: rhodecode/templates/email_templates/pull_request_comment.mako:94
9916 msgid "Status"
9917 msgstr ""
9918
9919 #: rhodecode/templates/email_templates/commit_comment.mako:95
9920 msgid "The commit status was changed to"
10122 #: rhodecode/templates/email_templates/commit_comment.mako:141
10123 #: rhodecode/templates/search/search_commit.mako:12
10124 #: rhodecode/templates/summary/summary_commits.mako:9
10125 msgid "Commit message"
10126 msgstr ""
10127
10128 #: rhodecode/templates/email_templates/commit_comment.mako:61
10129 #: rhodecode/templates/email_templates/pull_request_comment.mako:74
10130 msgid "File: {comment_file} on line {comment_line}"
10131 msgstr ""
10132
10133 #: rhodecode/templates/email_templates/commit_comment.mako:65
10134 #: rhodecode/templates/email_templates/commit_comment.mako:155
10135 #: rhodecode/templates/email_templates/pull_request_comment.mako:78
10136 #: rhodecode/templates/email_templates/pull_request_comment.mako:186
10137 msgid "`TODO` number"
10138 msgstr ""
10139
10140 #: rhodecode/templates/email_templates/commit_comment.mako:67
10141 #: rhodecode/templates/email_templates/commit_comment.mako:157
10142 #: rhodecode/templates/email_templates/pull_request_comment.mako:80
10143 #: rhodecode/templates/email_templates/pull_request_comment.mako:188
10144 msgid "`Note` number"
10145 msgstr ""
10146
10147 #: rhodecode/templates/email_templates/commit_comment.mako:99
10148 #: rhodecode/templates/email_templates/pull_request_comment.mako:120
10149 msgid "left a"
9921 10150 msgstr ""
9922 10151
9923 10152 #: rhodecode/templates/email_templates/commit_comment.mako:102
9924 #: rhodecode/templates/email_templates/pull_request_comment.mako:107
9925 msgid "TODO comment on line: {comment_line}"
10153 msgid "{comment_type} on file `{comment_file}` in commit."
9926 10154 msgstr ""
9927 10155
9928 10156 #: rhodecode/templates/email_templates/commit_comment.mako:104
9929 #: rhodecode/templates/email_templates/pull_request_comment.mako:109
9930 msgid "Note comment on line: {comment_line}"
9931 msgstr ""
9932
9933 #: rhodecode/templates/email_templates/commit_comment.mako:104
9934 #: rhodecode/templates/email_templates/pull_request_comment.mako:109
9935 msgid "Note comment"
9936 msgstr ""
9937
9938 #: rhodecode/templates/email_templates/password_reset.mako:31
9939 msgid "Generate new password here"
9940 msgstr ""
9941
9942 #: rhodecode/templates/email_templates/pull_request_comment.mako:22
9943 #: rhodecode/templates/email_templates/pull_request_comment.mako:84
9944 msgid "{user} left a {comment_type} on file `{comment_file}` in pull request #{pr_id} \"{pr_title}\""
9945 msgstr ""
9946
9947 #: rhodecode/templates/email_templates/pull_request_comment.mako:25
9948 msgid "[status: {status}] {user} left a {comment_type} on pull request #{pr_id} \"{pr_title}\""
10157 msgid "{comment_type} on commit."
10158 msgstr ""
10159
10160 #: rhodecode/templates/email_templates/commit_comment.mako:109
10161 msgid "of repository"
10162 msgstr ""
10163
10164 #: rhodecode/templates/email_templates/commit_comment.mako:127
10165 msgid "Commit Status"
10166 msgstr ""
10167
10168 #: rhodecode/templates/email_templates/commit_comment.mako:147
10169 #: rhodecode/templates/email_templates/pull_request_comment.mako:178
10170 #: rhodecode/templates/search/search_path.mako:9
10171 msgid "File"
10172 msgstr ""
10173
10174 #: rhodecode/templates/email_templates/commit_comment.mako:148
10175 #: rhodecode/templates/email_templates/pull_request_comment.mako:179
10176 msgid "`{comment_file}` on line {comment_line}"
10177 msgstr ""
10178
10179 #: rhodecode/templates/email_templates/commit_comment.mako:167
10180 #: rhodecode/templates/email_templates/pull_request_comment.mako:198
10181 msgid "Reply"
10182 msgstr ""
10183
10184 #: rhodecode/templates/email_templates/pull_request_comment.mako:24
10185 msgid "{user} left a {comment_type} on file `{comment_file}` in pull request !{pr_id}: \"{pr_title}\""
9949 10186 msgstr ""
9950 10187
9951 10188 #: rhodecode/templates/email_templates/pull_request_comment.mako:27
9952 #: rhodecode/templates/email_templates/pull_request_comment.mako:86
9953 msgid "{user} left a {comment_type} on pull request #{pr_id} \"{pr_title}\""
9954 msgstr ""
9955
9956 #: rhodecode/templates/email_templates/pull_request_comment.mako:49
9957 #: rhodecode/templates/pullrequests/pullrequest.mako:67
9958 msgid "Source repository"
9959 msgstr ""
9960
9961 #: rhodecode/templates/email_templates/pull_request_comment.mako:58
9962 msgid "{user} submitted pull request #{pr_id} status: *{status}*"
9963 msgstr ""
9964
9965 #: rhodecode/templates/email_templates/pull_request_comment.mako:60
9966 msgid "{user} submitted pull request #{pr_id} status: *{status} and closed*"
9967 msgstr ""
9968
9969 #: rhodecode/templates/email_templates/pull_request_comment.mako:97
10189 msgid "[status: {status}] {user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
10190 msgstr ""
10191
10192 #: rhodecode/templates/email_templates/pull_request_comment.mako:29
10193 msgid "{user} left a {comment_type} on pull request !{pr_id}: \"{pr_title}\""
10194 msgstr ""
10195
10196 #: rhodecode/templates/email_templates/pull_request_comment.mako:62
10197 #: rhodecode/templates/hovercards/hovercard_pull_request.mako:24
10198 msgid "Pull Request"
10199 msgstr ""
10200
10201 #: rhodecode/templates/email_templates/pull_request_comment.mako:64
10202 #: rhodecode/templates/email_templates/pull_request_review.mako:39
10203 #: rhodecode/templates/email_templates/pull_request_update.mako:39
10204 msgid "Commit flow: {source_ref_type}:{source_ref_name} of {source_repo_url} into {target_ref_type}:{target_ref_name} of {target_repo_url}"
10205 msgstr ""
10206
10207 #: rhodecode/templates/email_templates/pull_request_comment.mako:67
10208 msgid "{user} submitted pull request !{pr_id} status: *{status}*"
10209 msgstr ""
10210
10211 #: rhodecode/templates/email_templates/pull_request_comment.mako:70
10212 msgid "{user} submitted pull request !{pr_id} status: *{status} and closed*"
10213 msgstr ""
10214
10215 #: rhodecode/templates/email_templates/pull_request_comment.mako:123
10216 msgid "{comment_type} on file `{comment_file}` in pull request."
10217 msgstr ""
10218
10219 #: rhodecode/templates/email_templates/pull_request_comment.mako:125
10220 msgid "{comment_type} on pull request."
10221 msgstr ""
10222
10223 #: rhodecode/templates/email_templates/pull_request_comment.mako:130
10224 #: rhodecode/templates/email_templates/pull_request_comment.mako:159
10225 #: rhodecode/templates/email_templates/pull_request_review.mako:89
10226 #: rhodecode/templates/email_templates/pull_request_review.mako:105
10227 #: rhodecode/templates/email_templates/pull_request_update.mako:101
10228 #: rhodecode/templates/email_templates/pull_request_update.mako:117
10229 msgid "Pull request"
10230 msgstr ""
10231
10232 #: rhodecode/templates/email_templates/pull_request_comment.mako:148
10233 msgid "Review Status"
10234 msgstr ""
10235
10236 #: rhodecode/templates/email_templates/pull_request_comment.mako:151
9970 10237 msgid "Closed pull request with status"
9971 10238 msgstr ""
9972 10239
9973 #: rhodecode/templates/email_templates/pull_request_comment.mako:99
10240 #: rhodecode/templates/email_templates/pull_request_comment.mako:153
9974 10241 msgid "Submitted review status"
9975 10242 msgstr ""
9976 10243
9977 #: rhodecode/templates/email_templates/pull_request_review.mako:14
9978 #, python-format
9979 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\""
9980 msgstr ""
9981
9982 #: rhodecode/templates/email_templates/pull_request_review.mako:34
9983 #, python-format
9984 msgid "Pull request from %(source_ref_type)s:%(source_ref_name)s of %(repo_url)s into %(target_ref_type)s:%(target_ref_name)s"
10244 #: rhodecode/templates/email_templates/pull_request_comment.mako:168
10245 #: rhodecode/templates/email_templates/pull_request_review.mako:114
10246 #: rhodecode/templates/email_templates/pull_request_update.mako:126
10247 msgid "Commit Flow"
10248 msgstr ""
10249
10250 #: rhodecode/templates/email_templates/pull_request_comment.mako:170
10251 #: rhodecode/templates/email_templates/pull_request_comment.mako:172
10252 #: rhodecode/templates/email_templates/pull_request_review.mako:116
10253 #: rhodecode/templates/email_templates/pull_request_review.mako:118
10254 #: rhodecode/templates/email_templates/pull_request_update.mako:128
10255 #: rhodecode/templates/email_templates/pull_request_update.mako:130
10256 #: rhodecode/templates/pullrequests/pullrequest_show.mako:128
10257 #: rhodecode/templates/pullrequests/pullrequest_show.mako:137
10258 msgid "of"
10259 msgstr ""
10260
10261 #: rhodecode/templates/email_templates/pull_request_review.mako:15
10262 msgid "{user} requested a pull request review. !{pr_id}: \"{pr_title}\""
9985 10263 msgstr ""
9986 10264
9987 10265 #: rhodecode/templates/email_templates/pull_request_review.mako:37
9988 msgid "Link"
9989 msgstr ""
9990
9991 #: rhodecode/templates/email_templates/pull_request_review.mako:71
9992 #, python-format
9993 msgid "%(user)s wants you to review pull request #%(pr_id)s: \"%(pr_title)s\"."
9994 msgstr ""
9995
9996 #: rhodecode/templates/email_templates/pull_request_review.mako:73
9997 #, python-format
9998 msgid "%(source_ref_type)s of %(source_repo_url)s"
9999 msgstr ""
10000
10001 #: rhodecode/templates/email_templates/pull_request_review.mako:74
10002 #, python-format
10003 msgid "%(target_ref_type)s of %(target_repo_url)s"
10266 #: rhodecode/templates/email_templates/pull_request_update.mako:37
10267 msgid "Pull Request link"
10268 msgstr ""
10269
10270 #: rhodecode/templates/email_templates/pull_request_review.mako:83
10271 msgid "requested a"
10272 msgstr ""
10273
10274 #: rhodecode/templates/email_templates/pull_request_review.mako:85
10275 msgid "pull request review."
10276 msgstr ""
10277
10278 #: rhodecode/templates/email_templates/pull_request_update.mako:15
10279 msgid "{updating_user} updated pull request. !{pr_id}: \"{pr_title}\""
10280 msgstr ""
10281
10282 #: rhodecode/templates/email_templates/pull_request_update.mako:95
10283 msgid "updated"
10284 msgstr ""
10285
10286 #: rhodecode/templates/email_templates/pull_request_update.mako:97
10287 msgid "pull request."
10288 msgstr ""
10289
10290 #: rhodecode/templates/email_templates/pull_request_update.mako:139
10291 msgid "Changes"
10004 10292 msgstr ""
10005 10293
10006 10294 #: rhodecode/templates/email_templates/test.mako:5
10007 10295 msgid "hello \"world\""
10008 10296 msgstr ""
10009 10297
10010 #: rhodecode/templates/email_templates/test.mako:21
10011 msgid "Translation"
10012 msgstr ""
10013
10014 #: rhodecode/templates/email_templates/user_registration.mako:22
10015 #, python-format
10016 msgid "New user %(user)s has registered on %(date)s"
10017 msgstr ""
10018
10019 #: rhodecode/templates/email_templates/user_registration.mako:24
10298 #: rhodecode/templates/email_templates/test.mako:22
10299 msgid "Translation String"
10300 msgstr ""
10301
10302 #: rhodecode/templates/email_templates/user_registration.mako:28
10303 msgid "New user {user} has registered on {date}"
10304 msgstr ""
10305
10306 #: rhodecode/templates/email_templates/user_registration.mako:46
10020 10307 msgid "Full Name"
10021 10308 msgstr ""
10022 10309
@@ -10038,11 +10325,11 b' msgstr ""'
10038 10325 msgid "Commit was too big and was cut off..."
10039 10326 msgstr ""
10040 10327
10041 #: rhodecode/templates/files/file_authors_box.mako:16
10328 #: rhodecode/templates/files/file_authors_box.mako:18
10042 10329 msgid "Load All Authors"
10043 10330 msgstr ""
10044 10331
10045 #: rhodecode/templates/files/file_authors_box.mako:18
10332 #: rhodecode/templates/files/file_authors_box.mako:20
10046 10333 msgid "last author"
10047 10334 msgstr ""
10048 10335
@@ -10105,16 +10392,22 b' msgstr ""'
10105 10392 msgid "Download this tree ZIP"
10106 10393 msgstr ""
10107 10394
10108 #: rhodecode/templates/files/files_browser_tree.mako:12
10109 #: rhodecode/templates/search/search_path.mako:9
10110 msgid "Size"
10111 msgstr ""
10112
10113 #: rhodecode/templates/files/files_browser_tree.mako:13
10114 msgid "Modified"
10395 #: rhodecode/templates/files/files_browser.mako:67
10396 #: rhodecode/templates/summary/summary.mako:37
10397 #, python-format
10398 msgid "Readme file from commit %s:%s"
10115 10399 msgstr ""
10116 10400
10117 10401 #: rhodecode/templates/files/files_browser_tree.mako:14
10402 #: rhodecode/templates/search/search_path.mako:12
10403 msgid "Size"
10404 msgstr ""
10405
10406 #: rhodecode/templates/files/files_browser_tree.mako:15
10407 msgid "Modified"
10408 msgstr ""
10409
10410 #: rhodecode/templates/files/files_browser_tree.mako:16
10118 10411 msgid "Last Commit"
10119 10412 msgstr ""
10120 10413
@@ -10127,13 +10420,12 b' msgid "Delete file"'
10127 10420 msgstr ""
10128 10421
10129 10422 #: rhodecode/templates/files/files_delete.mako:53
10130 #: rhodecode/templates/files/files_source.mako:104
10131 10423 #, python-format
10132 10424 msgid "Binary file (%s)"
10133 10425 msgstr ""
10134 10426
10135 10427 #: rhodecode/templates/files/files_delete.mako:58
10136 #: rhodecode/templates/files/files_source.mako:133
10428 #: rhodecode/templates/files/files_source.mako:125
10137 10429 msgid "File size {} is bigger then allowed limit {}. "
10138 10430 msgstr ""
10139 10431
@@ -10169,27 +10461,35 b' msgstr ""'
10169 10461 msgid "Deleting files allowed only when on branch head commit"
10170 10462 msgstr ""
10171 10463
10172 #: rhodecode/templates/files/files_source.mako:67
10464 #: rhodecode/templates/files/files_source.mako:65
10465 msgid "lines"
10466 msgstr ""
10467
10468 #: rhodecode/templates/files/files_source.mako:73
10173 10469 msgid "This file is a pointer to large binary file"
10174 10470 msgstr ""
10175 10471
10176 #: rhodecode/templates/files/files_source.mako:67
10472 #: rhodecode/templates/files/files_source.mako:73
10177 10473 msgid "LargeFile"
10178 10474 msgstr ""
10179 10475
10180 #: rhodecode/templates/files/files_source.mako:82
10476 #: rhodecode/templates/files/files_source.mako:96
10181 10477 msgid "History"
10182 10478 msgstr ""
10183 10479
10184 #: rhodecode/templates/files/files_source.mako:88
10480 #: rhodecode/templates/files/files_source.mako:102
10185 10481 msgid "Annotation"
10186 10482 msgstr ""
10187 10483
10188 #: rhodecode/templates/files/files_source.mako:90
10484 #: rhodecode/templates/files/files_source.mako:104
10189 10485 msgid "Raw"
10190 10486 msgstr ""
10191 10487
10192 #: rhodecode/templates/files/files_source_header.mako:31
10488 #: rhodecode/templates/files/files_source.mako:120
10489 msgid "Binary file ({})"
10490 msgstr ""
10491
10492 #: rhodecode/templates/files/files_source_header.mako:33
10193 10493 msgid "File last commit"
10194 10494 msgstr ""
10195 10495
@@ -10209,14 +10509,6 b' msgstr ""'
10209 10509 msgid "Upload new file"
10210 10510 msgstr ""
10211 10511
10212 #: rhodecode/templates/files/files_upload.mako:86
10213 msgid "Drag'n Drop files here or"
10214 msgstr ""
10215
10216 #: rhodecode/templates/files/files_upload.mako:86
10217 msgid "Choose your files"
10218 msgstr ""
10219
10220 10512 #: rhodecode/templates/files/files_upload.mako:109
10221 10513 msgid "Commiting..."
10222 10514 msgstr ""
@@ -10235,15 +10527,19 b' msgstr ""'
10235 10527 msgid "Fork name"
10236 10528 msgstr ""
10237 10529
10238 #: rhodecode/templates/forks/fork.mako:81
10530 #: rhodecode/templates/forks/fork.mako:71
10239 10531 msgid "Copy permissions"
10240 10532 msgstr ""
10241 10533
10242 #: rhodecode/templates/forks/fork.mako:85
10534 #: rhodecode/templates/forks/fork.mako:75
10243 10535 msgid "Copy permissions from parent repository."
10244 10536 msgstr ""
10245 10537
10246 #: rhodecode/templates/forks/fork.mako:100
10538 #: rhodecode/templates/forks/fork.mako:81
10539 msgid "Private"
10540 msgstr ""
10541
10542 #: rhodecode/templates/forks/fork.mako:90
10247 10543 msgid "Fork this Repository"
10248 10544 msgstr ""
10249 10545
@@ -10268,7 +10564,7 b' msgstr ""'
10268 10564 msgid "RSS journal feed"
10269 10565 msgstr ""
10270 10566
10271 #: rhodecode/templates/journal/journal_data.mako:51
10567 #: rhodecode/templates/journal/journal_data.mako:45
10272 10568 msgid "No entries yet"
10273 10569 msgstr ""
10274 10570
@@ -10286,65 +10582,69 b' msgid "RSS public journal feed"'
10286 10582 msgstr ""
10287 10583
10288 10584 #: rhodecode/templates/pullrequests/pullrequest.mako:5
10289 #: rhodecode/templates/pullrequests/pullrequest.mako:22
10585 #: rhodecode/templates/pullrequests/pullrequest.mako:28
10290 10586 msgid "New pull request"
10291 10587 msgstr ""
10292 10588
10293 #: rhodecode/templates/pullrequests/pullrequest.mako:59
10589 #: rhodecode/templates/pullrequests/pullrequest.mako:60
10590 #: rhodecode/templates/pullrequests/pullrequest_show.mako:118
10294 10591 msgid "Commit flow"
10295 10592 msgstr ""
10296 10593
10297 #: rhodecode/templates/pullrequests/pullrequest.mako:85
10594 #: rhodecode/templates/pullrequests/pullrequest.mako:68
10595 msgid "Source repository"
10596 msgstr ""
10597
10598 #: rhodecode/templates/pullrequests/pullrequest.mako:86
10298 10599 msgid "Loading refs..."
10299 10600 msgstr ""
10300 10601
10301 #: rhodecode/templates/pullrequests/pullrequest.mako:96
10602 #: rhodecode/templates/pullrequests/pullrequest.mako:97
10302 10603 msgid "Submit Pull Request"
10303 10604 msgstr ""
10304 10605
10305 #: rhodecode/templates/pullrequests/pullrequest.mako:110
10306 #: rhodecode/templates/pullrequests/pullrequest_show.mako:313
10606 #: rhodecode/templates/pullrequests/pullrequest.mako:111
10307 10607 msgid "Author of this pull request"
10308 10608 msgstr ""
10309 10609
10310 #: rhodecode/templates/pullrequests/pullrequest.mako:124
10311 #: rhodecode/templates/pullrequests/pullrequest_show.mako:327
10610 #: rhodecode/templates/pullrequests/pullrequest.mako:125
10611 #: rhodecode/templates/pullrequests/pullrequest_show.mako:286
10312 10612 msgid "Reviewer rules"
10313 10613 msgstr ""
10314 10614
10315 #: rhodecode/templates/pullrequests/pullrequest.mako:134
10316 #: rhodecode/templates/pullrequests/pullrequest_show.mako:341
10615 #: rhodecode/templates/pullrequests/pullrequest.mako:135
10616 #: rhodecode/templates/pullrequests/pullrequest_show.mako:300
10317 10617 msgid "Pull request reviewers"
10318 10618 msgstr ""
10319 10619
10320 #: rhodecode/templates/pullrequests/pullrequest.mako:145
10321 #: rhodecode/templates/pullrequests/pullrequest_show.mako:384
10620 #: rhodecode/templates/pullrequests/pullrequest.mako:146
10621 #: rhodecode/templates/pullrequests/pullrequest_show.mako:344
10322 10622 msgid "Add reviewer or reviewer group"
10323 10623 msgstr ""
10324 10624
10325 #: rhodecode/templates/pullrequests/pullrequest.mako:301
10326 #: rhodecode/templates/pullrequests/pullrequest.mako:518
10625 #: rhodecode/templates/pullrequests/pullrequest.mako:302
10626 #: rhodecode/templates/pullrequests/pullrequest.mako:519
10327 10627 msgid "Please select source and target"
10328 10628 msgstr ""
10329 10629
10330 #: rhodecode/templates/pullrequests/pullrequest.mako:307
10630 #: rhodecode/templates/pullrequests/pullrequest.mako:308
10331 10631 msgid "Loading compare ..."
10332 10632 msgstr ""
10333 10633
10334 #: rhodecode/templates/pullrequests/pullrequest.mako:366
10634 #: rhodecode/templates/pullrequests/pullrequest.mako:367
10335 10635 msgid "Show detailed compare."
10336 10636 msgstr ""
10337 10637
10338 #: rhodecode/templates/pullrequests/pullrequest.mako:373
10638 #: rhodecode/templates/pullrequests/pullrequest.mako:374
10339 10639 msgid "There are no commits to merge."
10340 10640 msgstr ""
10341 10641
10342 #: rhodecode/templates/pullrequests/pullrequest.mako:423
10343 #: rhodecode/templates/pullrequests/pullrequest.mako:449
10642 #: rhodecode/templates/pullrequests/pullrequest.mako:424
10643 #: rhodecode/templates/pullrequests/pullrequest.mako:450
10344 10644 msgid "Select commit reference"
10345 10645 msgstr ""
10346 10646
10347 #: rhodecode/templates/pullrequests/pullrequest.mako:439
10647 #: rhodecode/templates/pullrequests/pullrequest.mako:440
10348 10648 msgid "Target repository"
10349 10649 msgstr ""
10350 10650
@@ -10356,216 +10656,237 b' msgstr ""'
10356 10656 msgid "Merge is not currently possible because of below failed checks."
10357 10657 msgstr ""
10358 10658
10359 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:55
10360 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:60
10361 msgid "refresh checks"
10362 msgstr ""
10363
10364 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:56
10365 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
10366 msgid "Merge Pull Request"
10367 msgstr ""
10368
10659 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:57
10369 10660 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:61
10661 msgid "Close with status {}"
10662 msgstr ""
10663
10664 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:66
10665 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
10666 msgid "Merge and close Pull Request"
10667 msgstr ""
10668
10669 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:70
10670 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:75
10671 msgid "refresh checks"
10672 msgstr ""
10673
10674 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
10370 10675 msgid "You are not allowed to merge this pull request."
10371 10676 msgstr ""
10372 10677
10373 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:63
10678 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:78
10374 10679 msgid "Login to Merge this Pull Request"
10375 10680 msgstr ""
10376 10681
10377 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:72
10378 #: rhodecode/templates/pullrequests/pullrequest_merge_checks.mako:76
10379 msgid "Close with status {}"
10380 msgstr ""
10381
10382 10682 #: rhodecode/templates/pullrequests/pullrequest_show.mako:6
10383 #, python-format
10384 msgid "%s Pull Request #%s"
10385 msgstr ""
10386
10387 #: rhodecode/templates/pullrequests/pullrequest_show.mako:48
10388 msgid "From"
10683 msgid "{} Pull Request !{}"
10684 msgstr ""
10685
10686 #: rhodecode/templates/pullrequests/pullrequest_show.mako:53
10687 msgid "Last updated on"
10389 10688 msgstr ""
10390 10689
10391 10690 #: rhodecode/templates/pullrequests/pullrequest_show.mako:54
10691 msgid "by"
10692 msgstr ""
10693
10694 #: rhodecode/templates/pullrequests/pullrequest_show.mako:63
10695 msgid "Update title & description"
10696 msgstr ""
10697
10698 #: rhodecode/templates/pullrequests/pullrequest_show.mako:67
10699 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
10700 msgid "Delete pull request"
10701 msgstr ""
10702
10703 #: rhodecode/templates/pullrequests/pullrequest_show.mako:68
10392 10704 msgid "Confirm to delete this pull request"
10393 10705 msgstr ""
10394 10706
10395 #: rhodecode/templates/pullrequests/pullrequest_show.mako:85
10707 #: rhodecode/templates/pullrequests/pullrequest_show.mako:71
10708 msgid "Not allowed to delete this pull request"
10709 msgstr ""
10710
10711 #: rhodecode/templates/pullrequests/pullrequest_show.mako:81
10712 msgid "Rendered using {} renderer"
10713 msgstr ""
10714
10715 #: rhodecode/templates/pullrequests/pullrequest_show.mako:95
10716 msgid "Review status"
10717 msgstr ""
10718
10719 #: rhodecode/templates/pullrequests/pullrequest_show.mako:151
10396 10720 msgid "Common ancestor"
10397 10721 msgstr ""
10398 10722
10399 #: rhodecode/templates/pullrequests/pullrequest_show.mako:97
10723 #: rhodecode/templates/pullrequests/pullrequest_show.mako:155
10724 msgid "not available"
10725 msgstr ""
10726
10727 #: rhodecode/templates/pullrequests/pullrequest_show.mako:167
10728 msgid "Pull changes from source"
10729 msgstr ""
10730
10731 #: rhodecode/templates/pullrequests/pullrequest_show.mako:168
10400 10732 msgid "Copy the pull url"
10401 10733 msgstr ""
10402 10734
10403 #: rhodecode/templates/pullrequests/pullrequest_show.mako:126
10404 msgid "Merge"
10405 msgstr ""
10406
10407 #: rhodecode/templates/pullrequests/pullrequest_show.mako:137
10735 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
10736 msgid "Clone repository in its merged state using shadow repository"
10737 msgstr ""
10738
10739 #: rhodecode/templates/pullrequests/pullrequest_show.mako:180
10740 msgid "Clone from shadow repository"
10741 msgstr ""
10742
10743 #: rhodecode/templates/pullrequests/pullrequest_show.mako:181
10408 10744 #: rhodecode/templates/summary/components.mako:78
10409 10745 msgid "Copy the clone url"
10410 10746 msgstr ""
10411 10747
10412 #: rhodecode/templates/pullrequests/pullrequest_show.mako:141
10748 #: rhodecode/templates/pullrequests/pullrequest_show.mako:185
10413 10749 msgid "Shadow repository data not available"
10414 10750 msgstr ""
10415 10751
10416 #: rhodecode/templates/pullrequests/pullrequest_show.mako:149
10417 msgid "Review"
10418 msgstr ""
10419
10420 #: rhodecode/templates/pullrequests/pullrequest_show.mako:165
10421 msgid "Rendered using {} renderer"
10422 msgstr ""
10423
10424 #: rhodecode/templates/pullrequests/pullrequest_show.mako:179
10752 #: rhodecode/templates/pullrequests/pullrequest_show.mako:201
10425 10753 msgid "Versions"
10426 10754 msgstr ""
10427 10755
10428 #: rhodecode/templates/pullrequests/pullrequest_show.mako:191
10429 msgid "Hide all versions of this pull request"
10430 msgstr ""
10431
10432 #: rhodecode/templates/pullrequests/pullrequest_show.mako:216
10433 msgid "Your review status at this version"
10434 msgstr ""
10435
10436 #: rhodecode/templates/pullrequests/pullrequest_show.mako:222
10437 msgid "Comment from pull request version v{0}, general:{1} inline:{2}"
10756 #: rhodecode/templates/pullrequests/pullrequest_show.mako:213
10757 #: rhodecode/templates/pullrequests/pullrequest_show.mako:215
10758 msgid "show versions"
10759 msgstr ""
10760
10761 #: rhodecode/templates/pullrequests/pullrequest_show.mako:214
10762 msgid "hide versions"
10438 10763 msgstr ""
10439 10764
10440 10765 #: rhodecode/templates/pullrequests/pullrequest_show.mako:239
10441 #: rhodecode/templates/pullrequests/pullrequest_show.mako:243
10766 msgid "Your review status at this version"
10767 msgstr ""
10768
10769 #: rhodecode/templates/pullrequests/pullrequest_show.mako:244
10770 msgid "Comments from pull request version v{0}"
10771 msgstr ""
10772
10773 #: rhodecode/templates/pullrequests/pullrequest_show.mako:262
10774 #: rhodecode/templates/pullrequests/pullrequest_show.mako:266
10442 10775 msgid "select versions to show changes"
10443 10776 msgstr ""
10444 10777
10445 #: rhodecode/templates/pullrequests/pullrequest_show.mako:240
10778 #: rhodecode/templates/pullrequests/pullrequest_show.mako:263
10446 10779 msgid "show changes between versions"
10447 10780 msgstr ""
10448 10781
10449 #: rhodecode/templates/pullrequests/pullrequest_show.mako:241
10782 #: rhodecode/templates/pullrequests/pullrequest_show.mako:264
10450 10783 msgid "show pull request for this version"
10451 10784 msgstr ""
10452 10785
10453 #: rhodecode/templates/pullrequests/pullrequest_show.mako:256
10454 msgid "Comments at this version"
10455 msgstr ""
10456
10457 #: rhodecode/templates/pullrequests/pullrequest_show.mako:260
10458 msgid "Comments for this pull request"
10459 msgstr ""
10460
10461 #: rhodecode/templates/pullrequests/pullrequest_show.mako:265
10462 #: rhodecode/templates/pullrequests/pullrequest_show.mako:267
10463 #, python-format
10464 msgid "%d General "
10465 msgstr ""
10466
10467 #: rhodecode/templates/pullrequests/pullrequest_show.mako:271
10468 10786 #: rhodecode/templates/pullrequests/pullrequest_show.mako:273
10469 #, python-format
10470 msgid "%d Inline"
10471 msgstr ""
10472
10473 #: rhodecode/templates/pullrequests/pullrequest_show.mako:277
10474 #: rhodecode/templates/pullrequests/pullrequest_show.mako:281
10475 #, python-format
10476 msgid "%d Outdated"
10477 msgstr ""
10478
10479 #: rhodecode/templates/pullrequests/pullrequest_show.mako:278
10480 msgid "show outdated comments"
10481 msgstr ""
10482
10483 #: rhodecode/templates/pullrequests/pullrequest_show.mako:279
10484 msgid "hide outdated comments"
10485 msgstr ""
10486
10487 #: rhodecode/templates/pullrequests/pullrequest_show.mako:290
10488 10787 msgid "Pull request versions not available"
10489 10788 msgstr ""
10490 10789
10491 #: rhodecode/templates/pullrequests/pullrequest_show.mako:304
10492 #: rhodecode/templates/pullrequests/pullrequest_show.mako:389
10790 #: rhodecode/templates/pullrequests/pullrequest_show.mako:349
10493 10791 msgid "Save Changes"
10494 10792 msgstr ""
10495 10793
10496 #: rhodecode/templates/pullrequests/pullrequest_show.mako:406
10794 #: rhodecode/templates/pullrequests/pullrequest_show.mako:386
10795 msgid "unresolved TODOs unavailable in this view"
10796 msgstr ""
10797
10798 #: rhodecode/templates/pullrequests/pullrequest_show.mako:422
10799 msgid "No unresolved TODOs"
10800 msgstr ""
10801
10802 #: rhodecode/templates/pullrequests/pullrequest_show.mako:440
10803 msgid "Cannot show diff when pull request state is changing. Current progress state"
10804 msgstr ""
10805
10806 #: rhodecode/templates/pullrequests/pullrequest_show.mako:453
10497 10807 msgid "Missing requirements:"
10498 10808 msgstr ""
10499 10809
10500 #: rhodecode/templates/pullrequests/pullrequest_show.mako:407
10501 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
10502 msgstr ""
10503
10504 #: rhodecode/templates/pullrequests/pullrequest_show.mako:415
10505 msgid "Missing commits"
10506 msgstr ""
10507
10508 #: rhodecode/templates/pullrequests/pullrequest_show.mako:416
10509 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
10510 msgstr ""
10511
10512 #: rhodecode/templates/pullrequests/pullrequest_show.mako:417
10513 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
10514 msgstr ""
10515
10516 #: rhodecode/templates/pullrequests/pullrequest_show.mako:418
10517 msgid "Consider doing a {force_refresh_url} in case you think this is an error."
10518 msgstr ""
10519
10520 #: rhodecode/templates/pullrequests/pullrequest_show.mako:429
10521 #, python-format
10522 msgid "Showing changes at v%d, commenting is disabled."
10523 msgstr ""
10524
10525 #: rhodecode/templates/pullrequests/pullrequest_show.mako:452
10526 #: rhodecode/templates/pullrequests/pullrequest_show.mako:454
10527 msgid "Update commits"
10528 msgstr ""
10529
10530 10810 #: rhodecode/templates/pullrequests/pullrequest_show.mako:454
10531 msgid "Update is disabled for current view"
10811 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled."
10812 msgstr ""
10813
10814 #: rhodecode/templates/pullrequests/pullrequest_show.mako:462
10815 msgid "Missing commits"
10816 msgstr ""
10817
10818 #: rhodecode/templates/pullrequests/pullrequest_show.mako:463
10819 msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository."
10820 msgstr ""
10821
10822 #: rhodecode/templates/pullrequests/pullrequest_show.mako:464
10823 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request."
10532 10824 msgstr ""
10533 10825
10534 10826 #: rhodecode/templates/pullrequests/pullrequest_show.mako:465
10827 msgid "Consider doing a {force_refresh_url} in case you think this is an error."
10828 msgstr ""
10829
10830 #: rhodecode/templates/pullrequests/pullrequest_show.mako:476
10831 #, python-format
10832 msgid "Showing changes at v%d, commenting is disabled."
10833 msgstr ""
10834
10835 #: rhodecode/templates/pullrequests/pullrequest_show.mako:499
10836 #: rhodecode/templates/pullrequests/pullrequest_show.mako:521
10837 msgid "Update commits"
10838 msgstr ""
10839
10840 #: rhodecode/templates/pullrequests/pullrequest_show.mako:502
10841 msgid "more update options"
10842 msgstr ""
10843
10844 #: rhodecode/templates/pullrequests/pullrequest_show.mako:510
10845 msgid "Force update commits"
10846 msgstr ""
10847
10848 #: rhodecode/templates/pullrequests/pullrequest_show.mako:513
10849 msgid "Update commits and force refresh this pull request."
10850 msgstr ""
10851
10852 #: rhodecode/templates/pullrequests/pullrequest_show.mako:521
10853 msgid "Update is disabled for current view"
10854 msgstr ""
10855
10856 #: rhodecode/templates/pullrequests/pullrequest_show.mako:532
10535 10857 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled"
10536 10858 msgstr ""
10537 10859
10538 #: rhodecode/templates/pullrequests/pullrequest_show.mako:469
10860 #: rhodecode/templates/pullrequests/pullrequest_show.mako:536
10539 10861 msgid "commits added: {}, removed: {}"
10540 10862 msgstr ""
10541 10863
10542 #: rhodecode/templates/pullrequests/pullrequest_show.mako:487
10864 #: rhodecode/templates/pullrequests/pullrequest_show.mako:554
10543 10865 msgid "Commit added in displayed changes"
10544 10866 msgstr ""
10545 10867
10546 #: rhodecode/templates/pullrequests/pullrequest_show.mako:489
10868 #: rhodecode/templates/pullrequests/pullrequest_show.mako:556
10547 10869 msgid "Commit removed in displayed changes"
10548 10870 msgstr ""
10549 10871
10550 #: rhodecode/templates/pullrequests/pullrequest_show.mako:578
10872 #: rhodecode/templates/pullrequests/pullrequest_show.mako:664
10551 10873 msgid "there is {num} general comment from older versions"
10552 10874 msgstr ""
10553 10875
10554 #: rhodecode/templates/pullrequests/pullrequest_show.mako:579
10876 #: rhodecode/templates/pullrequests/pullrequest_show.mako:665
10555 10877 msgid "show it"
10556 10878 msgstr ""
10557 10879
10558 #: rhodecode/templates/pullrequests/pullrequest_show.mako:581
10880 #: rhodecode/templates/pullrequests/pullrequest_show.mako:667
10559 10881 msgid "there are {num} general comments from older versions"
10560 10882 msgstr ""
10561 10883
10562 #: rhodecode/templates/pullrequests/pullrequest_show.mako:582
10884 #: rhodecode/templates/pullrequests/pullrequest_show.mako:668
10563 10885 msgid "show them"
10564 10886 msgstr ""
10565 10887
10566 10888 #: rhodecode/templates/pullrequests/pullrequests.mako:4
10567 #, python-format
10568 msgid "%s Pull Requests"
10889 msgid "{} Pull Requests"
10569 10890 msgstr ""
10570 10891
10571 10892 #: rhodecode/templates/pullrequests/pullrequests.mako:27
@@ -10607,35 +10928,30 b' msgstr ""'
10607 10928 msgid "Search inside all accessible repositories"
10608 10929 msgstr ""
10609 10930
10610 #: rhodecode/templates/search/search.mako:85
10931 #: rhodecode/templates/search/search.mako:99
10611 10932 msgid "File path"
10612 10933 msgstr ""
10613 10934
10614 #: rhodecode/templates/search/search.mako:88
10935 #: rhodecode/templates/search/search.mako:102
10615 10936 msgid "Search"
10616 10937 msgstr ""
10617 10938
10618 #: rhodecode/templates/search/search.mako:94
10619 #: rhodecode/templates/search/search.mako:96
10620 #: rhodecode/templates/search/search.mako:98
10939 #: rhodecode/templates/search/search.mako:108
10940 #: rhodecode/templates/search/search.mako:110
10941 #: rhodecode/templates/search/search.mako:112
10621 10942 msgid "Global Search"
10622 10943 msgstr ""
10623 10944
10624 #: rhodecode/templates/search/search.mako:133
10625 msgid "Query Langague examples"
10626 msgstr ""
10627
10628 #: rhodecode/templates/search/search_commit.mako:11
10629 #: rhodecode/templates/summary/summary_commits.mako:9
10630 msgid "Commit message"
10631 msgstr ""
10632
10633 #: rhodecode/templates/search/search_commit.mako:14
10634 msgid "Age (new first)"
10635 msgstr ""
10636
10637 #: rhodecode/templates/search/search_commit.mako:16
10638 msgid "Age (old first)"
10945 #: rhodecode/templates/search/search.mako:138
10946 msgid "sort"
10947 msgstr ""
10948
10949 #: rhodecode/templates/search/search.mako:157
10950 msgid "Query Language examples"
10951 msgstr ""
10952
10953 #: rhodecode/templates/search/search_commit.mako:15
10954 msgid "Commit date"
10639 10955 msgstr ""
10640 10956
10641 10957 #: rhodecode/templates/search/search_content.mako:7
@@ -10654,11 +10970,7 b' msgstr ""'
10654 10970 msgid "Narrow to this repository"
10655 10971 msgstr ""
10656 10972
10657 #: rhodecode/templates/search/search_path.mako:8
10658 msgid "File"
10659 msgstr ""
10660
10661 #: rhodecode/templates/search/search_path.mako:10
10973 #: rhodecode/templates/search/search_path.mako:15
10662 10974 msgid "Lines"
10663 10975 msgstr ""
10664 10976
@@ -10718,14 +11030,8 b' msgstr ""'
10718 11030 msgid "Quick start"
10719 11031 msgstr ""
10720 11032
10721 #: rhodecode/templates/summary/summary.mako:36
10722 #, python-format
10723 msgid "Readme file from commit %s:%s"
10724 msgstr ""
10725
10726 11033 #: rhodecode/templates/summary/summary_base.mako:5
10727 #, python-format
10728 msgid "%s Summary"
11034 msgid "{} Summary"
10729 11035 msgstr ""
10730 11036
10731 11037 #: rhodecode/templates/summary/summary_base.mako:13
@@ -10771,23 +11077,19 b' msgstr ""'
10771 11077 msgid "tags"
10772 11078 msgstr ""
10773 11079
10774 #: rhodecode/templates/user_group/profile.mako:5
10775 msgid "User group profile"
10776 msgstr ""
10777
10778 #: rhodecode/templates/user_group/profile.mako:14
11080 #: rhodecode/templates/user_group/profile.mako:6
11081 msgid "User Group Profile"
11082 msgstr ""
11083
11084 #: rhodecode/templates/user_group/profile.mako:15
10779 11085 msgid "Group Name"
10780 11086 msgstr ""
10781 11087
10782 #: rhodecode/templates/user_group/user_group.mako:29
10783 msgid "User Group Profile"
10784 msgstr ""
10785
10786 #: rhodecode/templates/users/user_profile.mako:38
11088 #: rhodecode/templates/users/user_profile.mako:39
10787 11089 msgid "First name"
10788 11090 msgstr ""
10789 11091
10790 #: rhodecode/templates/users/user_profile.mako:48
11092 #: rhodecode/templates/users/user_profile.mako:49
10791 11093 msgid "Last name"
10792 11094 msgstr ""
10793 11095
@@ -151,20 +151,22 b' def _store_log(action_name, action_data,'
151 151
152 152
153 153 def store_web(*args, **kwargs):
154 if 'action_data' not in kwargs:
155 kwargs['action_data'] = {}
156 kwargs['action_data'].update({
157 'source': SOURCE_WEB
158 })
154 action_data = {}
155 org_action_data = kwargs.pop('action_data', {})
156 action_data.update(org_action_data)
157 action_data['source'] = SOURCE_WEB
158 kwargs['action_data'] = action_data
159
159 160 return store(*args, **kwargs)
160 161
161 162
162 163 def store_api(*args, **kwargs):
163 if 'action_data' not in kwargs:
164 kwargs['action_data'] = {}
165 kwargs['action_data'].update({
166 'source': SOURCE_API
167 })
164 action_data = {}
165 org_action_data = kwargs.pop('action_data', {})
166 action_data.update(org_action_data)
167 action_data['source'] = SOURCE_API
168 kwargs['action_data'] = action_data
169
168 170 return store(*args, **kwargs)
169 171
170 172
@@ -24,7 +24,6 b' authentication and permission libraries'
24 24
25 25 import os
26 26 import time
27 import inspect
28 27 import collections
29 28 import fnmatch
30 29 import hashlib
@@ -2013,6 +2012,7 b' class PermsFunction(object):'
2013 2012 self.user_group_name = None
2014 2013
2015 2014 def __bool__(self):
2015 import inspect
2016 2016 frame = inspect.currentframe()
2017 2017 stack_trace = traceback.format_stack(frame)
2018 2018 log.error('Checking bool value on a class instance of perm '
@@ -211,8 +211,9 b' def vcs_operation_context('
211 211 class BasicAuth(AuthBasicAuthenticator):
212 212
213 213 def __init__(self, realm, authfunc, registry, auth_http_code=None,
214 initial_call_detection=False, acl_repo_name=None):
214 initial_call_detection=False, acl_repo_name=None, rc_realm=''):
215 215 self.realm = realm
216 self.rc_realm = rc_realm
216 217 self.initial_call = initial_call_detection
217 218 self.authfunc = authfunc
218 219 self.registry = registry
@@ -227,7 +228,7 b' class BasicAuth(AuthBasicAuthenticator):'
227 228 return HTTPForbidden
228 229
229 230 def get_rc_realm(self):
230 return safe_str(self.registry.rhodecode_settings.get('rhodecode_realm'))
231 return safe_str(self.rc_realm)
231 232
232 233 def build_authentication(self):
233 234 head = WWW_AUTHENTICATE.tuples('Basic realm="%s"' % self.realm)
@@ -288,7 +289,7 b' def attach_context_attributes(context, r'
288 289 """
289 290 config = request.registry.settings
290 291
291 rc_config = SettingsModel().get_all_settings(cache=True)
292 rc_config = SettingsModel().get_all_settings(cache=True, from_request=False)
292 293 context.rc_config = rc_config
293 294 context.rhodecode_version = rhodecode.__version__
294 295 context.rhodecode_edition = config.get('rhodecode.edition')
@@ -66,11 +66,12 b' markdown_tags = ['
66 66 markdown_attrs = {
67 67 "*": ["class", "style", "align"],
68 68 "img": ["src", "alt", "title"],
69 "a": ["href", "alt", "title", "name"],
69 "a": ["href", "alt", "title", "name", "data-hovercard-alt", "data-hovercard-url"],
70 70 "abbr": ["title"],
71 71 "acronym": ["title"],
72 72 "pre": ["lang"],
73 "input": ["type", "disabled", "checked"]
73 "input": ["type", "disabled", "checked"],
74 "strong": ["title", "data-hovercard-alt", "data-hovercard-url"],
74 75 }
75 76
76 77 standard_styles = [
@@ -421,9 +421,20 b' class DbManage(object):'
421 421
422 422 :param skip_existing:
423 423 """
424 defaults = [
425 ('auth_plugins',
426 'egg:rhodecode-enterprise-ce#token,egg:rhodecode-enterprise-ce#rhodecode',
427 'list'),
424 428
425 for k, v, t in [('auth_plugins', 'egg:rhodecode-enterprise-ce#rhodecode', 'list'),
426 ('auth_rhodecode_enabled', 'True', 'bool')]:
429 ('auth_authtoken_enabled',
430 'True',
431 'bool'),
432
433 ('auth_rhodecode_enabled',
434 'True',
435 'bool'),
436 ]
437 for k, v, t in defaults:
427 438 if (skip_existing and
428 439 SettingsModel().get_setting_by_name(k) is not None):
429 440 log.debug('Skipping option %s', k)
@@ -568,19 +579,32 b' class DbManage(object):'
568 579 ('title', '', 'unicode'),
569 580 ('pre_code', '', 'unicode'),
570 581 ('post_code', '', 'unicode'),
582
583 # Visual
571 584 ('show_public_icon', True, 'bool'),
572 585 ('show_private_icon', True, 'bool'),
573 586 ('stylify_metatags', False, 'bool'),
574 587 ('dashboard_items', 100, 'int'),
575 588 ('admin_grid_items', 25, 'int'),
589
590 ('markup_renderer', 'markdown', 'unicode'),
591
576 592 ('show_version', True, 'bool'),
593 ('show_revision_number', True, 'bool'),
594 ('show_sha_length', 12, 'int'),
595
577 596 ('use_gravatar', False, 'bool'),
578 597 ('gravatar_url', User.DEFAULT_GRAVATAR_URL, 'unicode'),
598
579 599 ('clone_uri_tmpl', Repository.DEFAULT_CLONE_URI, 'unicode'),
600 ('clone_uri_ssh_tmpl', Repository.DEFAULT_CLONE_URI_SSH, 'unicode'),
580 601 ('support_url', '', 'unicode'),
581 602 ('update_url', RhodeCodeSetting.DEFAULT_UPDATE_URL, 'unicode'),
582 ('show_revision_number', True, 'bool'),
583 ('show_sha_length', 12, 'int'),
603
604 # VCS Settings
605 ('pr_merge_enabled', True, 'bool'),
606 ('use_outdated_comments', True, 'bool'),
607 ('diff_cache', True, 'bool'),
584 608 ]
585 609
586 610 for key, val, type_ in settings:
@@ -598,9 +598,10 b' class _Message(object):'
598 598 * ``category``: the category specified when the message was created.
599 599 """
600 600
601 def __init__(self, category, message):
601 def __init__(self, category, message, sub_data=None):
602 602 self.category = category
603 603 self.message = message
604 self.sub_data = sub_data or {}
604 605
605 606 def __str__(self):
606 607 return self.message
@@ -663,7 +664,17 b' class Flash(object):'
663 664 # of strings.
664 665 for cat in self.categories:
665 666 for msg in session.pop_flash(queue=cat):
666 messages.append(_Message(cat, msg))
667 sub_data = {}
668 if hasattr(msg, 'rsplit'):
669 flash_data = msg.rsplit('|DELIM|', 1)
670 org_message = flash_data[0]
671 if len(flash_data) > 1:
672 sub_data = json.loads(flash_data[1])
673 else:
674 org_message = msg
675
676 messages.append(_Message(cat, org_message, sub_data=sub_data))
677
667 678 # Map messages from the default queue to the 'notice' category.
668 679 for msg in session.pop_flash():
669 680 messages.append(_Message('notice', msg))
@@ -673,23 +684,14 b' class Flash(object):'
673 684
674 685 def json_alerts(self, session=None, request=None):
675 686 payloads = []
676 messages = flash.pop_messages(session=session, request=request)
677 if messages:
687 messages = flash.pop_messages(session=session, request=request) or []
678 688 for message in messages:
679 subdata = {}
680 if hasattr(message.message, 'rsplit'):
681 flash_data = message.message.rsplit('|DELIM|', 1)
682 org_message = flash_data[0]
683 if len(flash_data) > 1:
684 subdata = json.loads(flash_data[1])
685 else:
686 org_message = message.message
687 689 payloads.append({
688 690 'message': {
689 'message': u'{}'.format(org_message),
691 'message': u'{}'.format(message.message),
690 692 'level': message.category,
691 693 'force': True,
692 'subdata': subdata
694 'subdata': message.sub_data
693 695 }
694 696 })
695 697 return json.dumps(payloads)
@@ -1514,6 +1516,9 b' def get_active_pattern_entries(repo_name'
1514 1516 return active_entries
1515 1517
1516 1518
1519 pr_pattern_re = re.compile(r'(?:(?:^!)|(?: !))(\d+)')
1520
1521
1517 1522 def process_patterns(text_string, repo_name, link_format='html', active_entries=None):
1518 1523
1519 1524 allowed_formats = ['html', 'rst', 'markdown',
@@ -1522,7 +1527,10 b' def process_patterns(text_string, repo_n'
1522 1527 raise ValueError('Link format can be only one of:{} got {}'.format(
1523 1528 allowed_formats, link_format))
1524 1529
1525 active_entries = active_entries or get_active_pattern_entries(repo_name)
1530 if active_entries is None:
1531 log.debug('Fetch active patterns for repo: %s', repo_name)
1532 active_entries = get_active_pattern_entries(repo_name)
1533
1526 1534 issues_data = []
1527 1535 new_text = text_string
1528 1536
@@ -1537,6 +1545,9 b' def process_patterns(text_string, repo_n'
1537 1545 log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s',
1538 1546 uid, entry['pat'], entry['url'], entry['pref'])
1539 1547
1548 if entry.get('pat_compiled'):
1549 pattern = entry['pat_compiled']
1550 else:
1540 1551 try:
1541 1552 pattern = re.compile(r'%s' % entry['pat'])
1542 1553 except re.error:
@@ -1569,7 +1580,7 b' def process_patterns(text_string, repo_n'
1569 1580 pr_url_func = partial(
1570 1581 _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None,
1571 1582 link_format=link_format+'+hovercard')
1572 new_text = re.compile(r'(?:(?:^!)|(?: !))(\d+)').sub(pr_url_func, new_text)
1583 new_text = pr_pattern_re.sub(pr_url_func, new_text)
1573 1584 log.debug('processed !pr pattern')
1574 1585
1575 1586 return new_text, issues_data
@@ -1580,6 +1591,7 b' def urlify_commit_message(commit_text, r'
1580 1591 Parses given text message and makes proper links.
1581 1592 issues are linked to given issue-server, and rest is a commit link
1582 1593 """
1594
1583 1595 def escaper(_text):
1584 1596 return _text.replace('<', '&lt;').replace('>', '&gt;')
1585 1597
@@ -1636,7 +1648,7 b' def renderer_from_filename(filename, exc'
1636 1648
1637 1649
1638 1650 def render(source, renderer='rst', mentions=False, relative_urls=None,
1639 repo_name=None):
1651 repo_name=None, active_pattern_entries=None):
1640 1652
1641 1653 def maybe_convert_relative_links(html_source):
1642 1654 if relative_urls:
@@ -1651,7 +1663,8 b" def render(source, renderer='rst', menti"
1651 1663 if repo_name:
1652 1664 # process patterns on comments if we pass in repo name
1653 1665 source, issues = process_patterns(
1654 source, repo_name, link_format='rst')
1666 source, repo_name, link_format='rst',
1667 active_entries=active_pattern_entries)
1655 1668
1656 1669 return literal(
1657 1670 '<div class="rst-block">%s</div>' %
@@ -1662,7 +1675,8 b" def render(source, renderer='rst', menti"
1662 1675 if repo_name:
1663 1676 # process patterns on comments if we pass in repo name
1664 1677 source, issues = process_patterns(
1665 source, repo_name, link_format='markdown')
1678 source, repo_name, link_format='markdown',
1679 active_entries=active_pattern_entries)
1666 1680
1667 1681 return literal(
1668 1682 '<div class="markdown-block">%s</div>' %
@@ -47,6 +47,14 b' log = logging.getLogger(__name__)'
47 47 # default renderer used to generate automated comments
48 48 DEFAULT_COMMENTS_RENDERER = 'rst'
49 49
50 try:
51 from lxml.html import fromstring
52 from lxml.html import tostring
53 except ImportError:
54 log.exception('Failed to import lxml')
55 fromstring = None
56 tostring = None
57
50 58
51 59 class CustomHTMLTranslator(writers.html4css1.HTMLTranslator):
52 60 """
@@ -81,11 +89,7 b' def relative_links(html_source, server_p'
81 89 if not html_source:
82 90 return html_source
83 91
84 try:
85 from lxml.html import fromstring
86 from lxml.html import tostring
87 except ImportError:
88 log.exception('Failed to import lxml')
92 if not fromstring and tostring:
89 93 return html_source
90 94
91 95 try:
@@ -210,6 +214,8 b' class MarkupRenderer(object):'
210 214 URL_PAT = re.compile(r'(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@.&+]'
211 215 r'|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)')
212 216
217 MENTION_PAT = re.compile(MENTIONS_REGEX)
218
213 219 extensions = ['markdown.extensions.codehilite', 'markdown.extensions.extra',
214 220 'markdown.extensions.def_list', 'markdown.extensions.sane_lists']
215 221
@@ -348,6 +354,26 b' class MarkupRenderer(object):'
348 354 return cls.URL_PAT.sub(url_func, text)
349 355
350 356 @classmethod
357 def convert_mentions(cls, text, mode):
358 mention_pat = cls.MENTION_PAT
359
360 def wrapp(match_obj):
361 uname = match_obj.groups()[0]
362 hovercard_url = "pyroutes.url('hovercard_username', {'username': '%s'});" % uname
363
364 if mode == 'markdown':
365 tmpl = '<strong class="tooltip-hovercard" data-hovercard-alt="{uname}" data-hovercard-url="{hovercard_url}">@{uname}</strong>'
366 elif mode == 'rst':
367 tmpl = ' **@{uname}** '
368 else:
369 raise ValueError('mode must be rst or markdown')
370
371 return tmpl.format(**{'uname': uname,
372 'hovercard_url': hovercard_url})
373
374 return mention_pat.sub(wrapp, text).strip()
375
376 @classmethod
351 377 def plain(cls, source, universal_newline=True, leading_newline=True):
352 378 source = safe_unicode(source)
353 379 if universal_newline:
@@ -378,12 +404,7 b' class MarkupRenderer(object):'
378 404 cls.extensions, cls.output_format)
379 405
380 406 if mentions:
381 mention_pat = re.compile(MENTIONS_REGEX)
382
383 def wrapp(match_obj):
384 uname = match_obj.groups()[0]
385 return ' **@%(uname)s** ' % {'uname': uname}
386 mention_hl = mention_pat.sub(wrapp, source).strip()
407 mention_hl = cls.convert_mentions(source, mode='markdown')
387 408 # we extracted mentions render with this using Mentions false
388 409 return cls.markdown(mention_hl, safe=safe, flavored=flavored,
389 410 mentions=False)
@@ -409,12 +430,7 b' class MarkupRenderer(object):'
409 430 @classmethod
410 431 def rst(cls, source, safe=True, mentions=False, clean_html=False):
411 432 if mentions:
412 mention_pat = re.compile(MENTIONS_REGEX)
413
414 def wrapp(match_obj):
415 uname = match_obj.groups()[0]
416 return ' **@%(uname)s** ' % {'uname': uname}
417 mention_hl = mention_pat.sub(wrapp, source).strip()
433 mention_hl = cls.convert_mentions(source, mode='rst')
418 434 # we extracted mentions render with this using Mentions false
419 435 return cls.rst(mention_hl, safe=safe, mentions=False)
420 436
@@ -443,7 +459,7 b' class MarkupRenderer(object):'
443 459 except Exception:
444 460 log.exception('Error when rendering RST')
445 461 if safe:
446 log.debug('Fallbacking to render in plain mode')
462 log.debug('Fallback to render in plain mode')
447 463 return cls.plain(source)
448 464 else:
449 465 raise
@@ -133,15 +133,16 b' class SimpleVCS(object):'
133 133 self.config = config
134 134 # re-populated by specialized middleware
135 135 self.repo_vcs_config = base.Config()
136 self.rhodecode_settings = SettingsModel().get_all_settings(cache=True)
137 136
138 registry.rhodecode_settings = self.rhodecode_settings
137 rc_settings = SettingsModel().get_all_settings(cache=True, from_request=False)
138 realm = rc_settings.get('rhodecode_realm') or 'RhodeCode AUTH'
139
139 140 # authenticate this VCS request using authfunc
140 141 auth_ret_code_detection = \
141 142 str2bool(self.config.get('auth_ret_code_detection', False))
142 143 self.authenticate = BasicAuth(
143 144 '', authenticate, registry, config.get('auth_ret_code'),
144 auth_ret_code_detection)
145 auth_ret_code_detection, rc_realm=realm)
145 146 self.ip_addr = '0.0.0.0'
146 147
147 148 @LazyProperty
@@ -32,10 +32,14 b' def BeakerSessionFactoryConfig(**options'
32 32
33 33 def session_callback(request, response):
34 34 exception = getattr(request, 'exception', None)
35 if (exception is None or self._cookie_on_exception) and self.accessed():
35 file_response = getattr(request, '_file_response', None)
36
37 if file_response is None \
38 and (exception is None or self._cookie_on_exception) \
39 and self.accessed():
36 40 self.persist()
37 41 headers = self.__dict__['_headers']
38 if headers['set_cookie'] and headers['cookie_out']:
42 if headers.get('set_cookie') and headers.get('cookie_out'):
39 43 response.headerlist.append(('Set-Cookie', headers['cookie_out']))
40 44 request.add_response_callback(session_callback)
41 45
@@ -148,6 +148,15 b' class HGUpdateCaches(MaintenanceTask):'
148 148 return res
149 149
150 150
151 class HGRebuildFnCaches(MaintenanceTask):
152 human_name = 'HG rebuild fn caches'
153
154 def run(self):
155 instance = self.db_repo.scm_instance()
156 res = instance.hg_rebuild_fn_cache()
157 return res
158
159
151 160 class SVNVerify(MaintenanceTask):
152 161 human_name = 'SVN Verify repo'
153 162
@@ -162,7 +171,7 b' class RepoMaintenance(object):'
162 171 Performs maintenance of repository based on it's type
163 172 """
164 173 tasks = {
165 'hg': [HGVerify, HGUpdateCaches],
174 'hg': [HGVerify, HGUpdateCaches, HGRebuildFnCaches],
166 175 'git': [GitFSCK, GitGC, GitRepack],
167 176 'svn': [SVNVerify],
168 177 }
@@ -432,8 +432,11 b' class GitCommit(base.BaseCommit):'
432 432 """
433 433 if not self.parents:
434 434 return list(self._get_file_nodes())
435 return AddedFileNodesGenerator(
436 [n for n in self._get_paths_for_status('added')], self)
435 return AddedFileNodesGenerator(self.added_paths, self)
436
437 @LazyProperty
438 def added_paths(self):
439 return [n for n in self._get_paths_for_status('added')]
437 440
438 441 @LazyProperty
439 442 def changed(self):
@@ -442,8 +445,11 b' class GitCommit(base.BaseCommit):'
442 445 """
443 446 if not self.parents:
444 447 return []
445 return ChangedFileNodesGenerator(
446 [n for n in self._get_paths_for_status('modified')], self)
448 return ChangedFileNodesGenerator(self.changed_paths, self)
449
450 @LazyProperty
451 def changed_paths(self):
452 return [n for n in self._get_paths_for_status('modified')]
447 453
448 454 @LazyProperty
449 455 def removed(self):
@@ -452,8 +458,11 b' class GitCommit(base.BaseCommit):'
452 458 """
453 459 if not self.parents:
454 460 return []
455 return RemovedFileNodesGenerator(
456 [n for n in self._get_paths_for_status('deleted')], self)
461 return RemovedFileNodesGenerator(self.removed_paths, self)
462
463 @LazyProperty
464 def removed_paths(self):
465 return [n for n in self._get_paths_for_status('deleted')]
457 466
458 467 def _get_submodule_url(self, submodule_path):
459 468 git_modules_path = '.gitmodules'
@@ -472,7 +481,7 b' class GitCommit(base.BaseCommit):'
472 481 for line in _content.splitlines():
473 482 yield line
474 483
475 parser = configparser.ConfigParser()
484 parser = configparser.RawConfigParser()
476 485 parser.read_file(iter_content(submodules_node.content))
477 486
478 487 for section in parser.sections():
@@ -372,18 +372,30 b' class MercurialCommit(base.BaseCommit):'
372 372 """
373 373 Returns list of added ``FileNode`` objects.
374 374 """
375 return AddedFileNodesGenerator([n for n in self.status[1]], self)
375 return AddedFileNodesGenerator(self.added_paths, self)
376
377 @LazyProperty
378 def added_paths(self):
379 return [n for n in self.status[1]]
376 380
377 381 @property
378 382 def changed(self):
379 383 """
380 384 Returns list of modified ``FileNode`` objects.
381 385 """
382 return ChangedFileNodesGenerator([n for n in self.status[0]], self)
386 return ChangedFileNodesGenerator(self.changed_paths, self)
387
388 @LazyProperty
389 def changed_paths(self):
390 return [n for n in self.status[0]]
383 391
384 392 @property
385 393 def removed(self):
386 394 """
387 395 Returns list of removed ``FileNode`` objects.
388 396 """
389 return RemovedFileNodesGenerator([n for n in self.status[2]], self)
397 return RemovedFileNodesGenerator(self.removed_paths, self)
398
399 @LazyProperty
400 def removed_paths(self):
401 return [n for n in self.status[2]]
@@ -290,6 +290,12 b' class MercurialRepository(BaseRepository'
290 290 self._remote.invalidate_vcs_cache()
291 291 return update_cache
292 292
293 def hg_rebuild_fn_cache(self):
294 update_cache = self._remote.hg_rebuild_fn_cache()
295
296 self._remote.invalidate_vcs_cache()
297 return update_cache
298
293 299 def get_common_ancestor(self, commit_id1, commit_id2, repo2):
294 300 if commit_id1 == commit_id2:
295 301 return commit_id1
@@ -218,18 +218,27 b' class SubversionCommit(base.BaseCommit):'
218 218
219 219 @property
220 220 def added(self):
221 return nodes.AddedFileNodesGenerator(
222 self._changes_cache['added'], self)
221 return nodes.AddedFileNodesGenerator(self.added_paths, self)
222
223 @LazyProperty
224 def added_paths(self):
225 return [n for n in self._changes_cache['added']]
223 226
224 227 @property
225 228 def changed(self):
226 return nodes.ChangedFileNodesGenerator(
227 self._changes_cache['changed'], self)
229 return nodes.ChangedFileNodesGenerator(self.changed_paths, self)
230
231 @LazyProperty
232 def changed_paths(self):
233 return [n for n in self._changes_cache['changed']]
228 234
229 235 @property
230 236 def removed(self):
231 return nodes.RemovedFileNodesGenerator(
232 self._changes_cache['removed'], self)
237 return nodes.RemovedFileNodesGenerator(self.removed_paths, self)
238
239 @LazyProperty
240 def removed_paths(self):
241 return [n for n in self._changes_cache['removed']]
233 242
234 243
235 244 def _date_from_svn_properties(properties):
@@ -18,6 +18,19 b''
18 18 # RhodeCode Enterprise Edition, including its added features, Support services,
19 19 # and proprietary license terms, please see https://rhodecode.com/licenses/
20 20
21 DEFAULTS = {
22 'encodings_map': {'.gz': 'gzip',
23 '.Z': 'compress',
24 '.bz2': 'bzip2',
25 '.xz': 'xz'},
26 'suffix_map': {'.svgz': '.svg.gz',
27 '.tgz': '.tar.gz',
28 '.taz': '.tar.gz',
29 '.tz': '.tar.gz',
30 '.tbz2': '.tar.bz2',
31 '.txz': '.tar.xz'},
32 }
33
21 34 TYPES_MAP = [
22 35 {'.jpg': 'image/jpg',
23 36 '.mid': 'audio/midi',
@@ -1203,4 +1216,6 b' def get_mimetypes_db(extra_types=None):'
1203 1216 types_map[1].update(extra_types)
1204 1217 db = mimetypes.MimeTypes()
1205 1218 db.types_map = types_map
1219 db.encodings_map.update(DEFAULTS['encodings_map'])
1220 db.suffix_map.update(DEFAULTS['suffix_map'])
1206 1221 return db
@@ -1025,6 +1025,17 b' class User(Base, BaseModel):'
1025 1025 return qry.all()
1026 1026
1027 1027 @classmethod
1028 def get_all_user_ids(cls, only_active=True):
1029 """
1030 Returns all users IDs
1031 """
1032 qry = Session().query(User.user_id)
1033
1034 if only_active:
1035 qry = qry.filter(User.active == true())
1036 return [x.user_id for x in qry]
1037
1038 @classmethod
1028 1039 def get_default_user(cls, cache=False, refresh=False):
1029 1040 user = User.get_by_username(User.DEFAULT_USER, cache=cache)
1030 1041 if user is None:
@@ -3890,8 +3901,8 b' class _SetState(object):'
3890 3901 self._current_state = None
3891 3902
3892 3903 def __enter__(self):
3893 log.debug('StateLock: entering set state context, setting state to: `%s`',
3894 self._pr_state)
3904 log.debug('StateLock: entering set state context of pr %s, setting state to: `%s`',
3905 self._pr, self._pr_state)
3895 3906 self.set_pr_state(self._pr_state)
3896 3907 return self
3897 3908
@@ -3901,8 +3912,9 b' class _SetState(object):'
3901 3912 return None
3902 3913
3903 3914 self.set_pr_state(self._org_state)
3904 log.debug('StateLock: exiting set state context, setting state to: `%s`',
3905 self._org_state)
3915 log.debug('StateLock: exiting set state context of pr %s, setting state to: `%s`',
3916 self._pr, self._org_state)
3917
3906 3918 @property
3907 3919 def state(self):
3908 3920 return self._current_state
@@ -4285,6 +4297,7 b' class PullRequest(Base, _PullRequestBase'
4285 4297 def __json__(self):
4286 4298 return {
4287 4299 'revisions': self.revisions,
4300 'versions': self.versions_count
4288 4301 }
4289 4302
4290 4303 def calculated_review_status(self):
@@ -4307,6 +4320,14 b' class PullRequest(Base, _PullRequestBase'
4307 4320 vcs_obj = self.target_repo.scm_instance()
4308 4321 return vcs_obj.get_shadow_instance(shadow_repository_path)
4309 4322
4323 @property
4324 def versions_count(self):
4325 """
4326 return number of versions this PR have, e.g a PR that once been
4327 updated will have 2 versions
4328 """
4329 return self.versions.count() + 1
4330
4310 4331
4311 4332 class PullRequestVersion(Base, _PullRequestBase):
4312 4333 __tablename__ = 'pull_request_versions'
@@ -21,8 +21,7 b''
21 21 """
22 22 permissions model for RhodeCode
23 23 """
24
25
24 import collections
26 25 import logging
27 26 import traceback
28 27
@@ -557,6 +556,27 b' class PermissionModel(BaseModel):'
557 556 self.sa.rollback()
558 557 raise
559 558
559 def get_users_with_repo_write(self, db_repo):
560 write_plus = ['repository.write', 'repository.admin']
561 default_user_id = User.get_default_user().user_id
562 user_write_permissions = collections.OrderedDict()
563
564 # write+ and DEFAULT user for inheritance
565 for perm in db_repo.permissions():
566 if perm.permission in write_plus or perm.user_id == default_user_id:
567 user_write_permissions[perm.user_id] = perm
568 return user_write_permissions
569
570 def get_user_groups_with_repo_write(self, db_repo):
571 write_plus = ['repository.write', 'repository.admin']
572 user_group_write_permissions = collections.OrderedDict()
573
574 # write+ and DEFAULT user for inheritance
575 for p in db_repo.permission_user_groups():
576 if p.permission in write_plus:
577 user_group_write_permissions[p.users_group_id] = p
578 return user_group_write_permissions
579
560 580 def trigger_permission_flush(self, affected_user_ids):
561 581 events.trigger(events.UserPermissionsChange(affected_user_ids))
562 582
@@ -26,6 +26,8 b' pull request model for RhodeCode'
26 26
27 27 import json
28 28 import logging
29 import os
30
29 31 import datetime
30 32 import urllib
31 33 import collections
@@ -632,6 +634,7 b' class PullRequestModel(BaseModel):'
632 634 repo_id = pull_request.target_repo.repo_id
633 635 use_rebase = self._use_rebase_for_merging(pull_request)
634 636 close_branch = self._close_branch_before_merging(pull_request)
637 user_name = self._user_name_for_merging(pull_request, user)
635 638
636 639 target_ref = self._refresh_reference(
637 640 pull_request.target_ref_parts, target_vcs)
@@ -647,7 +650,6 b' class PullRequestModel(BaseModel):'
647 650 target_vcs.config.set(
648 651 'rhodecode', 'RC_SCM_DATA', json.dumps(extras))
649 652
650 user_name = user.short_contact
651 653 merge_state = target_vcs.merge(
652 654 repo_id, workspace_id, target_ref, source_vcs,
653 655 pull_request.source_ref_parts,
@@ -1664,6 +1666,16 b' class PullRequestModel(BaseModel):'
1664 1666
1665 1667 return False
1666 1668
1669 def _user_name_for_merging(self, pull_request, user):
1670 env_user_name_attr = os.environ.get('RC_MERGE_USER_NAME_ATTR', '')
1671 if env_user_name_attr and hasattr(user, env_user_name_attr):
1672 user_name_attr = env_user_name_attr
1673 else:
1674 user_name_attr = 'short_contact'
1675
1676 user_name = getattr(user, user_name_attr)
1677 return user_name
1678
1667 1679 def _close_branch_before_merging(self, pull_request):
1668 1680 repo_type = pull_request.target_repo.repo_type
1669 1681 if repo_type == 'hg':
@@ -38,8 +38,7 b' from rhodecode.lib.user_log_filter impor'
38 38 from rhodecode.lib.utils import make_db_config
39 39 from rhodecode.lib.utils2 import (
40 40 safe_str, safe_unicode, remove_prefix, obfuscate_url_pw,
41 get_current_rhodecode_user, safe_int, datetime_to_time,
42 action_logger_generic)
41 get_current_rhodecode_user, safe_int, action_logger_generic)
43 42 from rhodecode.lib.vcs.backends import get_backend
44 43 from rhodecode.model import BaseModel
45 44 from rhodecode.model.db import (
@@ -199,9 +198,11 b' class RepoModel(BaseModel):'
199 198
200 199 def get_repos_as_dict(self, repo_list=None, admin=False,
201 200 super_user_actions=False, short_name=None):
201
202 202 _render = get_current_request().get_partial_renderer(
203 203 'rhodecode:templates/data_table/_dt_elements.mako')
204 204 c = _render.get_call_context()
205 h = _render.get_helpers()
205 206
206 207 def quick_menu(repo_name):
207 208 return _render('quick_menu', repo_name)
@@ -258,7 +259,7 b' class RepoModel(BaseModel):'
258 259 "name": repo_lnk(repo.repo_name, repo.repo_type, repo.repo_state,
259 260 repo.private, repo.archived, repo.fork),
260 261
261 "desc": desc(repo.description),
262 "desc": desc(h.escape(repo.description)),
262 263
263 264 "last_change": last_change(repo.updated_on),
264 265
@@ -619,13 +620,26 b' class RepoModel(BaseModel):'
619 620 changes = {
620 621 'added': [],
621 622 'updated': [],
622 'deleted': []
623 'deleted': [],
624 'default_user_changed': None
623 625 }
626
627 repo = self._get_repo(repo)
628
624 629 # update permissions
625 630 for member_id, perm, member_type in perm_updates:
626 631 member_id = int(member_id)
627 632 if member_type == 'user':
628 633 member_name = User.get(member_id).username
634 if member_name == User.DEFAULT_USER:
635 # NOTE(dan): detect if we changed permissions for default user
636 perm_obj = self.sa.query(UserRepoToPerm) \
637 .filter(UserRepoToPerm.user_id == member_id) \
638 .filter(UserRepoToPerm.repository == repo) \
639 .scalar()
640 if perm_obj and perm_obj.permission.permission_name != perm:
641 changes['default_user_changed'] = True
642
629 643 # this updates also current one if found
630 644 self.grant_user_permission(
631 645 repo=repo, user=member_id, perm=perm)
@@ -41,7 +41,7 b' from rhodecode.model.db import (_hash_ke'
41 41 UserGroup, Repository)
42 42 from rhodecode.model.settings import VcsSettingsModel, SettingsModel
43 43 from rhodecode.lib.caching_query import FromCache
44 from rhodecode.lib.utils2 import action_logger_generic, datetime_to_time
44 from rhodecode.lib.utils2 import action_logger_generic
45 45
46 46 log = logging.getLogger(__name__)
47 47
@@ -353,7 +353,8 b' class RepoGroupModel(BaseModel):'
353 353 changes = {
354 354 'added': [],
355 355 'updated': [],
356 'deleted': []
356 'deleted': [],
357 'default_user_changed': None
357 358 }
358 359
359 360 def _set_perm_user(obj, user, perm):
@@ -430,6 +431,15 b' class RepoGroupModel(BaseModel):'
430 431 member_id = int(member_id)
431 432 if member_type == 'user':
432 433 member_name = User.get(member_id).username
434 if isinstance(obj, RepoGroup) and obj == repo_group and member_name == User.DEFAULT_USER:
435 # NOTE(dan): detect if we changed permissions for default user
436 perm_obj = self.sa.query(UserRepoGroupToPerm) \
437 .filter(UserRepoGroupToPerm.user_id == member_id) \
438 .filter(UserRepoGroupToPerm.group == repo_group) \
439 .scalar()
440 if perm_obj and perm_obj.permission.permission_name != perm:
441 changes['default_user_changed'] = True
442
433 443 # this updates also current one if found
434 444 _set_perm_user(obj, user=member_id, perm=perm)
435 445 elif member_type == 'user_group':
@@ -698,8 +708,6 b' class RepoGroupModel(BaseModel):'
698 708 for repo_group in repo_groups:
699 709 repo_group.update_commit_cache()
700 710
701
702
703 711 def get_repo_groups_as_dict(self, repo_group_list=None, admin=False,
704 712 super_user_actions=False):
705 713
@@ -753,7 +761,7 b' class RepoGroupModel(BaseModel):'
753 761 "last_changeset": "",
754 762 "last_changeset_raw": "",
755 763
756 "desc": desc(group.group_description, group.personal),
764 "desc": desc(h.escape(group.group_description), group.personal),
757 765 "top_level_repos": 0,
758 766 "owner": user_profile(group.User.username)
759 767 }
@@ -21,9 +21,11 b''
21 21 import os
22 22 import hashlib
23 23 import logging
24 import re
24 25 from collections import namedtuple
25 26 from functools import wraps
26 27 import bleach
28 from pyramid.threadlocal import get_current_request, get_current_registry
27 29
28 30 from rhodecode.lib import rc_cache
29 31 from rhodecode.lib.utils2 import (
@@ -210,7 +212,23 b' class SettingsModel(BaseModel):'
210 212 invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
211 213 CacheKey.set_invalidate(invalidation_namespace)
212 214
213 def get_all_settings(self, cache=False):
215 def get_all_settings(self, cache=False, from_request=True):
216 from rhodecode.authentication.base import get_authn_registry
217
218 # defines if we use GLOBAL, or PER_REPO
219 repo = self._get_repo(self.repo) if self.repo else None
220 key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
221
222 # initially try the requests context, this is the fastest
223 # we only fetch global config
224 if from_request:
225 request = get_current_request()
226
227 if request and not repo and hasattr(request, 'call_context') and hasattr(request.call_context, 'rc_config'):
228 rc_config = request.call_context.rc_config
229 if rc_config:
230 return rc_config
231
214 232 region = rc_cache.get_or_create_region('sql_cache_short')
215 233 invalidation_namespace = CacheKey.SETTINGS_INVALIDATION_NAMESPACE
216 234
@@ -226,9 +244,6 b' class SettingsModel(BaseModel):'
226 244 }
227 245 return settings
228 246
229 repo = self._get_repo(self.repo) if self.repo else None
230 key = "settings_repo.{}".format(repo.repo_id) if repo else "settings_app"
231
232 247 inv_context_manager = rc_cache.InvalidationContext(
233 248 uid='cache_settings', invalidation_namespace=invalidation_namespace)
234 249 with inv_context_manager as invalidation_context:
@@ -240,6 +255,11 b' class SettingsModel(BaseModel):'
240 255 # are anyway very short lived and it's a safest way.
241 256 region = rc_cache.get_or_create_region('sql_cache_short')
242 257 region.invalidate()
258 registry = get_current_registry()
259 if registry:
260 authn_registry = get_authn_registry(registry)
261 if authn_registry:
262 authn_registry.invalidate_plugins_for_auth()
243 263
244 264 result = _get_all_settings('rhodecode_settings', key)
245 265 log.debug('Fetching app settings for key: %s took: %.4fs', key,
@@ -360,9 +380,15 b' class IssueTrackerSettingsModel(object):'
360 380 for uid in issuetracker_entries:
361 381 url_data = qs.get(self._get_keyname('url', uid, 'rhodecode_'))
362 382
383 pat = qs.get(self._get_keyname('pat', uid, 'rhodecode_'))
384 try:
385 pat_compiled = re.compile(r'%s' % pat)
386 except re.error:
387 pat_compiled = None
388
363 389 issuetracker_entries[uid] = AttributeDict({
364 'pat': qs.get(
365 self._get_keyname('pat', uid, 'rhodecode_')),
390 'pat': pat,
391 'pat_compiled': pat_compiled,
366 392 'url': url_cleaner(
367 393 qs.get(self._get_keyname('url', uid, 'rhodecode_')) or ''),
368 394 'pref': bleach.clean(
@@ -38,6 +38,7 b' log = logging.getLogger(__name__)'
38 38
39 39 class SshKeyModel(BaseModel):
40 40 cls = UserSshKeys
41 DEFAULT_PRIVATE_KEY_FORMAT = 'pkcs8'
41 42
42 43 def parse_key(self, key_data):
43 44 """
@@ -66,16 +67,23 b' class SshKeyModel(BaseModel):'
66 67 log.error("Key Parse error: %s", err)
67 68 raise
68 69
69 def generate_keypair(self, comment=None):
70 def generate_keypair(self, comment=None, private_format=DEFAULT_PRIVATE_KEY_FORMAT):
70 71
71 72 key = rsa.generate_private_key(
72 73 backend=crypto_default_backend(),
73 74 public_exponent=65537,
74 75 key_size=2048
75 76 )
77 if private_format == self.DEFAULT_PRIVATE_KEY_FORMAT:
78 private_format = crypto_serialization.PrivateFormat.PKCS8
79 else:
80 # legacy format that can be used by older systems, use if pkcs8 have
81 # problems
82 private_format = crypto_serialization.PrivateFormat.TraditionalOpenSSL
83
76 84 private_key = key.private_bytes(
77 85 crypto_serialization.Encoding.PEM,
78 crypto_serialization.PrivateFormat.PKCS8,
86 private_format,
79 87 crypto_serialization.NoEncryption())
80 88 public_key = key.public_key().public_bytes(
81 89 crypto_serialization.Encoding.OpenSSH,
@@ -134,14 +134,11 b' div.markdown-block h2 {'
134 134 div.markdown-block h1 {
135 135 font-size: 32px;
136 136 margin: 15px 0 15px 0 !important;
137 padding-bottom: 5px !important;
138 137 }
139 138
140 139 div.markdown-block h2 {
141 140 font-size: 24px !important;
142 141 margin: 34px 0 10px 0 !important;
143 padding-top: 15px !important;
144 padding-bottom: 8px !important;
145 142 }
146 143
147 144 div.markdown-block h3 {
@@ -174,6 +171,21 b' div.markdown-block hr {'
174 171 margin-bottom: 13px;
175 172 }
176 173
174 div.markdown-block blockquote {
175 color: #424242 !important;
176 padding: 8px 21px;
177 margin: 12px 0;
178 border-left: 4px solid @grey6;
179 }
180
181 div.markdown-block blockquote p {
182 color: #424242 !important;
183 padding: 0 !important;
184 margin: 0 !important;
185 line-height: 1.5;
186 }
187
188
177 189 div.markdown-block ol,
178 190 div.markdown-block ul,
179 191 div.markdown-block p,
@@ -181,13 +193,11 b' div.markdown-block blockquote,'
181 193 div.markdown-block dl,
182 194 div.markdown-block li,
183 195 div.markdown-block table {
184 margin: 3px 0px 13px 0px !important;
185 196 color: #424242 !important;
186 197 font-size: 13px !important;
187 198 font-family: @text-regular;
188 199 font-weight: normal !important;
189 200 overflow: visible !important;
190 line-height: 140% !important;
191 201 }
192 202
193 203 div.markdown-block pre {
@@ -245,14 +255,6 b' div.markdown-block ol li {'
245 255 list-style: decimal !important;
246 256 }
247 257
248 /*
249 div.markdown-block a,
250 div.markdown-block a:visited {
251 color: #4183C4 !important;
252 background-color: inherit;
253 text-decoration: none;
254 }
255 */
256 258
257 259 div.markdown-block #message {
258 260 .border-radius(@border-radius);
@@ -87,6 +87,10 b' body {'
87 87 border-left: @border-thickness solid @border-default-color;
88 88 }
89 89
90 .cursor-pointer {
91 cursor: pointer;
92 }
93
90 94 input + .action-link, .action-link.first{
91 95 border-left: none;
92 96 }
@@ -3,9 +3,13 b''
3 3 .readme-title {
4 4 border: 1px solid @grey6;
5 5 padding: 10px 5px;
6 font-weight: 600;
7 6 margin-top: 30px;
8 7 margin-bottom: -1px;
8
9 a {
10 font-weight: 600;
11 font-size: 13px
12 }
9 13 }
10 14
11 15 div.readme_box {
@@ -34,14 +38,11 b' div.readme_box h2 {'
34 38 div.readme_box h1 {
35 39 font-size: 32px;
36 40 margin: 15px 0 15px 0 !important;
37 padding-bottom: 5px !important;
38 41 }
39 42
40 43 div.readme_box h2 {
41 44 font-size: 24px !important;
42 45 margin: 34px 0 10px 0 !important;
43 padding-top: 15px !important;
44 padding-bottom: 8px !important;
45 46 }
46 47
47 48 div.readme_box h3 {
@@ -74,6 +75,20 b' div.readme_box hr {'
74 75 margin-bottom: 13px;
75 76 }
76 77
78 div.readme_box blockquote {
79 color: #424242 !important;
80 padding: 8px 21px;
81 margin: 12px 0;
82 border-left: 4px solid @grey6;
83 }
84
85 div.readme_box blockquote p {
86 color: #424242 !important;
87 padding: 0 !important;
88 margin: 0 !important;
89 line-height: 1.5;
90 }
91
77 92 div.readme_box ol,
78 93 div.readme_box ul,
79 94 div.readme_box p,
@@ -81,13 +96,11 b' div.readme_box blockquote,'
81 96 div.readme_box dl,
82 97 div.readme_box li,
83 98 div.readme_box table {
84 margin: 3px 0px 13px 0px !important;
85 99 color: #424242 !important;
86 100 font-size: 13px !important;
87 101 font-family: @text-regular;
88 102 font-weight: normal !important;
89 103 overflow: visible !important;
90 line-height: 140% !important;
91 104 }
92 105
93 106 div.readme_box pre {
@@ -373,6 +373,17 b' table#repo_list_table {'
373 373 min-width: 600px;
374 374 }
375 375
376 #no_grid_data {
377 text-align: center;
378 }
379
380 #grid_data_loading {
381 text-align: center;
382 font-weight: 600;
383 font-size: 16px;
384 padding: 80px 20px;
385 }
386
376 387 // Keyboard mappings
377 388 table.keyboard-mappings {
378 389 th {
@@ -538,5 +549,12 b' table.compare_view_commits {'
538 549 img{
539 550 vertical-align: middle;
540 551 }
552
553 &.td-expire {
554 width: 200px;
555 }
556 &.td-gist-type {
557 width: 100px;
541 558 }
542 559 }
560 }
@@ -593,7 +593,7 b' address {'
593 593 }
594 594
595 595 .help-block-inline {
596 margin: 0;
596 margin: 0 !important;
597 597 }
598 598
599 599 // help block text
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Lifetime',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Lebensdauer',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Lifetime',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'De por vida',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Durée de vie',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} mois',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Segui',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'a vita',
33 42 'Loading ...': 'Caricamento ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'Nessuna corrispondenza tra i file',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'Nessun risultato',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': '選択したステータス ({0}) を元にコメントが自動的に設定されます...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'フォロー',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': '有効期間',
33 42 'Loading ...': '読み込み中...',
34 43 'Loading failed': '読み込み失敗',
35 44 'Loading more results...': '結果を読み込み中...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'まだブックマークがありません。',
37 47 'No branches available yet.': 'まだブランチがありません。',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'マッチするファイルはありません',
42 52 'No pull requests available yet.': 'まだプルリクエストがありません。',
43 53 'No repositories available yet.': 'まだリポジトリがありません。',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'まだリポジトリグループがありません。',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': '結果がありません',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'まだタグがありません。',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} 分',
126 138 '{0} month': '{0} ヶ月',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。',
133 147 '{0} sec': '{0} 秒',
@@ -5,28 +5,38 b''
5 5 _gettext('All Authors');
6 6 _gettext('All individual reviewers must vote.');
7 7 _gettext('All reviewers must vote.');
8 _gettext('Are you sure to close this pull request without merging?');
8 9 _gettext('At least {0} reviewer must vote.');
9 10 _gettext('At least {0} reviewers must vote.');
10 11 _gettext('Author is not allowed to be a reviewer.');
11 12 _gettext('Changed files');
12 13 _gettext('Close');
14 _gettext('Collapse all files');
15 _gettext('Collapse {0} commit');
16 _gettext('Collapse {0} commits');
13 17 _gettext('Comment text will be set automatically based on currently selected status ({0}) ...');
14 18 _gettext('Commit Authors are not allowed to be a reviewer.');
15 19 _gettext('Context file: ');
16 20 _gettext('Delete this comment?');
17 21 _gettext('Diff to Commit ');
22 _gettext('Expand all files');
23 _gettext('Expand {0} commit');
24 _gettext('Expand {0} commits');
18 25 _gettext('Fetching repository state failed. Error code: {0} {1}. Try <a href="{2}">refreshing</a> this page.');
19 26 _gettext('Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.');
20 27 _gettext('Follow');
28 _gettext('Force updating...');
21 29 _gettext('Hide full context diff');
22 30 _gettext('Hide whitespace changes');
23 31 _gettext('Invite reviewers to this discussion');
24 32 _gettext('Leave a comment on line {0}.');
25 33 _gettext('Leave a comment, or click resolve button to resolve TODO comment #{0}');
34 _gettext('Leave a resolution comment, or click resolve button to resolve TODO comment #{0}');
26 35 _gettext('Lifetime');
27 36 _gettext('Loading ...');
28 37 _gettext('Loading failed');
29 38 _gettext('Loading more results...');
39 _gettext('Loading...');
30 40 _gettext('No bookmarks available yet.');
31 41 _gettext('No branches available yet.');
32 42 _gettext('No forks available yet.');
@@ -35,7 +45,9 b''
35 45 _gettext('No matching files');
36 46 _gettext('No pull requests available yet.');
37 47 _gettext('No repositories available yet.');
48 _gettext('No repositories present.');
38 49 _gettext('No repository groups available yet.');
50 _gettext('No repository groups present.');
39 51 _gettext('No results');
40 52 _gettext('No ssh keys available yet.');
41 53 _gettext('No tags available yet.');
@@ -119,9 +131,11 b''
119 131 _gettext('{0} min');
120 132 _gettext('{0} month');
121 133 _gettext('{0} months');
134 _gettext('{0} of {1} repositories');
122 135 _gettext('{0} of {1} repository groups');
123 136 _gettext('{0} out of {1} ssh keys');
124 137 _gettext('{0} out of {1} users');
138 _gettext('{0} repositories');
125 139 _gettext('{0} repository groups');
126 140 _gettext('{0} results are available, use up and down arrow keys to navigate.');
127 141 _gettext('{0} sec');
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Zamknij',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Obserwuj',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Czas życia',
33 42 'Loading ...': 'Ładuję...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'Nie ma plików pasujących',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Seguir',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Tempo de Vida',
33 42 'Loading ...': 'Carregando...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'Nenhum arquivo encontrado',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Наблюдать',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': 'Срок',
33 42 'Loading ...': 'Загрузка...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'Нет совпадений',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -11,28 +11,38 b' var _TM = {'
11 11 'All Authors': 'All Authors',
12 12 'All individual reviewers must vote.': 'All individual reviewers must vote.',
13 13 'All reviewers must vote.': 'All reviewers must vote.',
14 'Are you sure to close this pull request without merging?': 'Are you sure to close this pull request without merging?',
14 15 'At least {0} reviewer must vote.': 'At least {0} reviewer must vote.',
15 16 'At least {0} reviewers must vote.': 'At least {0} reviewers must vote.',
16 17 'Author is not allowed to be a reviewer.': 'Author is not allowed to be a reviewer.',
17 18 'Changed files': 'Changed files',
18 19 'Close': 'Close',
20 'Collapse all files': 'Collapse all files',
21 'Collapse {0} commit': 'Collapse {0} commit',
22 'Collapse {0} commits': 'Collapse {0} commits',
19 23 'Comment text will be set automatically based on currently selected status ({0}) ...': 'Comment text will be set automatically based on currently selected status ({0}) ...',
20 24 'Commit Authors are not allowed to be a reviewer.': 'Commit Authors are not allowed to be a reviewer.',
21 25 'Context file: ': 'Context file: ',
22 26 'Delete this comment?': 'Delete this comment?',
23 27 'Diff to Commit ': 'Diff to Commit ',
28 'Expand all files': 'Expand all files',
29 'Expand {0} commit': 'Expand {0} commit',
30 'Expand {0} commits': 'Expand {0} commits',
24 31 '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.',
25 32 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.': 'Fetching repository state failed. Error code: {0} {1}. Try refreshing this page.',
26 33 'Follow': 'Follow',
34 'Force updating...': 'Force updating...',
27 35 'Hide full context diff': 'Hide full context diff',
28 36 'Hide whitespace changes': 'Hide whitespace changes',
29 37 'Invite reviewers to this discussion': 'Invite reviewers to this discussion',
30 38 'Leave a comment on line {0}.': 'Leave a comment on line {0}.',
31 39 'Leave a comment, or click resolve button to resolve TODO comment #{0}': 'Leave a comment, or click resolve button to resolve TODO comment #{0}',
40 '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}',
32 41 'Lifetime': '终身',
33 42 'Loading ...': 'Loading ...',
34 43 'Loading failed': 'Loading failed',
35 44 'Loading more results...': 'Loading more results...',
45 'Loading...': 'Loading...',
36 46 'No bookmarks available yet.': 'No bookmarks available yet.',
37 47 'No branches available yet.': 'No branches available yet.',
38 48 'No forks available yet.': 'No forks available yet.',
@@ -41,7 +51,9 b' var _TM = {'
41 51 'No matching files': 'No matching files',
42 52 'No pull requests available yet.': 'No pull requests available yet.',
43 53 'No repositories available yet.': 'No repositories available yet.',
54 'No repositories present.': 'No repositories present.',
44 55 'No repository groups available yet.': 'No repository groups available yet.',
56 'No repository groups present.': 'No repository groups present.',
45 57 'No results': 'No results',
46 58 'No ssh keys available yet.': 'No ssh keys available yet.',
47 59 'No tags available yet.': 'No tags available yet.',
@@ -125,9 +137,11 b' var _TM = {'
125 137 '{0} min': '{0} min',
126 138 '{0} month': '{0} month',
127 139 '{0} months': '{0} months',
140 '{0} of {1} repositories': '{0} of {1} repositories',
128 141 '{0} of {1} repository groups': '{0} of {1} repository groups',
129 142 '{0} out of {1} ssh keys': '{0} out of {1} ssh keys',
130 143 '{0} out of {1} users': '{0} out of {1} users',
144 '{0} repositories': '{0} repositories',
131 145 '{0} repository groups': '{0} repository groups',
132 146 '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.',
133 147 '{0} sec': '{0} sec',
@@ -31,6 +31,7 b' function registerRCRoutes() {'
31 31 pyroutes.register('repo_integrations_create', '/%(repo_name)s/settings/integrations/%(integration)s/new', ['repo_name', 'integration']);
32 32 pyroutes.register('repo_integrations_edit', '/%(repo_name)s/settings/integrations/%(integration)s/%(integration_id)s', ['repo_name', 'integration', 'integration_id']);
33 33 pyroutes.register('hovercard_user', '/_hovercard/user/%(user_id)s', ['user_id']);
34 pyroutes.register('hovercard_username', '/_hovercard/username/%(username)s', ['username']);
34 35 pyroutes.register('hovercard_user_group', '/_hovercard/user_group/%(user_group_id)s', ['user_group_id']);
35 36 pyroutes.register('hovercard_pull_request', '/_hovercard/pull_request/%(pull_request_id)s', ['pull_request_id']);
36 37 pyroutes.register('hovercard_repo_commit', '/_hovercard/commit/%(repo_name)s/%(commit_id)s', ['repo_name', 'commit_id']);
@@ -299,6 +299,10 b' var tooltipActivate = function () {'
299 299 var altHovercard =$origin.data('hovercardAlt');
300 300
301 301 if (hovercardUrl !== undefined && hovercardUrl !== "") {
302 if (hovercardUrl.substr(0,12) === 'pyroutes.url'){
303 hovercardUrl = eval(hovercardUrl)
304 }
305
302 306 var loaded = loadHoverCard(hovercardUrl, altHovercard, function (data) {
303 307 instance.content(data);
304 308 })
@@ -102,7 +102,7 b''
102 102 { data: {"_": "author",
103 103 "sort": "author_raw"}, title: "${_("Author")}", width: "250px", className: "td-user" },
104 104 { data: {"_": "type",
105 "sort": "type"}, title: "${_("Type")}", width: "70px", className: "td-tags" },
105 "sort": "type"}, title: "${_("Type")}", width: "100px", className: "td-gist-type" },
106 106 { data: {"_": "access_id",
107 107 "sort": "access_id"}, title: "${_("Name")}", width:"150px", className: "td-componentname" },
108 108 { data: {"_": "description",
@@ -110,7 +110,7 b''
110 110 { data: {"_": "created_on",
111 111 "sort": "created_on_raw"}, title: "${_("Created on")}", className: "td-time" },
112 112 { data: {"_": "expires",
113 "sort": "expires"}, title: "${_("Expires")}", className: "td-exp" }
113 "sort": "expires"}, title: "${_("Expires")}", width: "200px", className: "td-expire" }
114 114 ],
115 115 language: {
116 116 paginate: DEFAULT_GRID_PAGINATION,
@@ -71,7 +71,7 b''
71 71 <div class="input">
72 72 ${h.text('description', class_='medium', placeholder=_('Description'))}
73 73 ${h.hidden('lifetime')}
74 ${h.select('role', '', c.role_options)}
74 ${h.select('role', request.GET.get('token_role', ''), c.role_options)}
75 75
76 76 % if c.allow_scoped_tokens:
77 77 ${h.hidden('scope_repo_id')}
@@ -4,6 +4,8 b''
4 4
5 5 % if c.extern_type != 'rhodecode':
6 6 <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
7 <br/>${_('For VCS access please generate')}
8 <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
7 9 <br/>${_('Source type')}: <strong>${c.extern_type}</strong>
8 10 </p>
9 11 % else:
@@ -8,6 +8,17 b''
8 8 </div>
9 9
10 10 <div class="panel-body fields">
11 %if c.extern_type != 'rhodecode':
12 <% readonly = "readonly" %>
13 <% disabled = " disabled" %>
14 <div class="alert-warning" style="margin:0px 0px 20px 0px; padding: 10px">
15 <strong>${_('This user was created from external source (%s). Editing some of the settings is limited.' % c.extern_type)}</strong>
16 </div>
17 <div style="margin:-10px 0px 20px 0px;">
18 ${_('For VCS access please generate')}
19 <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
20 </div>
21 %endif
11 22 <div class="field">
12 23 <div class="label">
13 24 ${_('Photo')}:
@@ -12,12 +12,18 b''
12 12 %if c.extern_type != 'rhodecode':
13 13 <% readonly = "readonly" %>
14 14 <% disabled = "disabled" %>
15 <div class="alert-warning" style="margin:0px 0px 20px 0px; padding: 10px">
16 <strong>${_('This user was created from external source (%s). Editing some of the settings is limited.' % c.extern_type)}</strong>
17 </div>
18 <div style="margin:-10px 0px 20px 0px;">
19 ${_('For VCS access please generate')}
20 <a href="${h.route_path('my_account_auth_tokens', _query={'token_role':'token_role_vcs'})}">Authentication Token</a> or <a href="${h.route_path('my_account_ssh_keys_generate')}">SSH Key</a>.
21 </div>
22 %endif
23
24 %if c.extern_type != 'rhodecode':
15 25 <div class="infoform">
16 26 <div class="fields">
17 <p>${_('Your user account details are managed by an external source. Details cannot be managed here.')}
18 <br/>${_('Source type')}: <strong>${c.extern_type}</strong>
19 </p>
20
21 27 <div class="field">
22 28 <div class="label">
23 29 <label for="username">${_('Username')}:</label>
@@ -55,7 +55,13 b''
55 55 <div class="textarea editor">
56 56 ${h.textarea('group_description',cols=23,rows=5,class_="medium")}
57 57 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
58 <span class="help-block">${_('Plain text format with support of {metatags}').format(metatags=metatags_url)|n}</span>
58 <span class="help-block">
59 % if c.visual.stylify_metatags:
60 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
61 % else:
62 ${_('Plain text format.')}
63 % endif
64 </span>
59 65 <span id="meta-tags-desc" style="display: none">
60 66 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
61 67 ${dt.metatags_help()}
@@ -28,7 +28,7 b''
28 28 <div class="sidebar">
29 29 <ul class="nav nav-pills nav-stacked">
30 30 <li class="${h.is_active('settings', c.active)}"><a href="${h.route_path('edit_repo_group', repo_group_name=c.repo_group.group_name)}">${_('Settings')}</a></li>
31 <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Permissions')}</a></li>
31 <li class="${h.is_active('permissions', c.active)}"><a href="${h.route_path('edit_repo_group_perms', repo_group_name=c.repo_group.group_name)}">${_('Access Permissions')}</a></li>
32 32 <li class="${h.is_active('advanced', c.active)}"><a href="${h.route_path('edit_repo_group_advanced', repo_group_name=c.repo_group.group_name)}">${_('Advanced')}</a></li>
33 33 <li class="${h.is_active('integrations', c.active)}"><a href="${h.route_path('repo_group_integrations_home', repo_group_name=c.repo_group.group_name)}">${_('Integrations')}</a></li>
34 34 </ul>
@@ -61,7 +61,12 b''
61 61 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
62 62 <span class="user">
63 63 % if _user.username == h.DEFAULT_USER:
64 ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
64 ${h.DEFAULT_USER}
65 % if _user.active:
66 <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
67 % else:
68 <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
69 % endif
65 70 % else:
66 71 ${h.link_to_user(_user.username)}
67 72 %if getattr(_user, 'duplicate_perm', None):
@@ -104,7 +109,12 b''
104 109 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
105 110 <span class="user">
106 111 % if _user.username == h.DEFAULT_USER:
107 ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
112 ${h.DEFAULT_USER}
113 % if _user.active:
114 <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
115 % else:
116 <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
117 % endif
108 118 % else:
109 119 ${h.link_to_user(_user.username)}
110 120 %if getattr(_user, 'duplicate_perm', None):
@@ -59,7 +59,13 b''
59 59 ${c.form.render_error(request, c.form['repo_group_description'])|n}
60 60
61 61 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
62 <span class="help-block">${_('Plain text format with support of {metatags}').format(metatags=metatags_url)|n}</span>
62 <span class="help-block">
63 % if c.visual.stylify_metatags:
64 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
65 % else:
66 ${_('Plain text format.')}
67 % endif
68 </span>
63 69 <span id="meta-tags-desc" style="display: none">
64 70 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
65 71 ${dt.metatags_help()}
@@ -68,7 +68,14 b''
68 68 <div class="textarea editor">
69 69 ${h.textarea('repo_description',cols=23,rows=5,class_="medium")}
70 70 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
71 <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
71 <span class="help-block">
72 % if c.visual.stylify_metatags:
73 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
74 % else:
75 ${_('Plain text format.')}
76 % endif
77 ${_('Add a README file for longer descriptions')}
78 </span>
72 79 <span id="meta-tags-desc" style="display: none">
73 80 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
74 81 ${dt.metatags_help()}
@@ -23,6 +23,7 b''
23 23 <div class="panel-heading">
24 24 <h3 class="panel-title">${_('Inherited Issue Tracker Patterns')}</h3>
25 25 </div>
26
26 27 <div class="panel-body">
27 28 <table class="rctable issuetracker readonly">
28 29 <tr>
@@ -32,6 +33,7 b''
32 33 <th>${_('Prefix')}</th>
33 34 <th ></th>
34 35 </tr>
36
35 37 %for uid, entry in c.global_patterns.items():
36 38 <tr id="${uid}">
37 39 <td class="td-description issuetracker_desc">
@@ -60,6 +62,9 b''
60 62 %endfor
61 63
62 64 </table>
65 <div class="buttons">
66 <button type="submit" class="btn btn-primary save-inheritance" id="save">${_('Save')}</button>
67 </div>
63 68 </div>
64 69 </div>
65 70 </div>
@@ -77,7 +82,6 b''
77 82 )}
78 83 <div class="buttons">
79 84 <button type="submit" class="btn btn-primary save-inheritance" id="save">${_('Save')}</button>
80 <button type="reset" class="btn reset-inheritance">${_('Reset')}</button>
81 85 </div>
82 86 </div>
83 87 </div>
@@ -58,7 +58,11 b''
58 58 <td class="private_repo_msg">
59 59 ${base.gravatar(h.DEFAULT_USER_EMAIL, 16)}
60 60 ${h.DEFAULT_USER} - ${_('only users/user groups explicitly added here will have access')}</td>
61 <td></td>
61 <td class="td-action">
62 <span class="tooltip btn btn-link btn-default" onclick="setPrivateRepo(false); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
63 ${_('un-set private mode')}
64 </span>
65 </td>
62 66 <td class="quick_repo_menu">
63 67 % if c.rhodecode_user.is_admin:
64 68 <i class="icon-more"></i>
@@ -83,7 +87,12 b''
83 87 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
84 88 <span class="user">
85 89 % if _user.username == h.DEFAULT_USER:
86 ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
90 ${h.DEFAULT_USER}
91 % if _user.active:
92 <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
93 % else:
94 <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
95 % endif
87 96 % else:
88 97 ${h.link_to_user(_user.username)}
89 98 %if getattr(_user, 'duplicate_perm', None):
@@ -106,7 +115,7 b''
106 115 ${_('Remove')}
107 116 </span>
108 117 %elif _user.username == h.DEFAULT_USER:
109 <span class="tooltip btn btn-link btn-default" onclick="enablePrivateRepo(); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators.')}">
118 <span class="tooltip btn btn-link btn-default" onclick="setPrivateRepo(true); return false" title="${_('Private repositories are only visible to people explicitly added as collaborators. Default permissions wont apply')}">
110 119 ${_('set private mode')}
111 120 </span>
112 121 %endif
@@ -204,9 +213,10 b''
204 213 });
205 214 quick_repo_menu();
206 215
207 var enablePrivateRepo = function () {
216 var setPrivateRepo = function (private) {
208 217 var postData = {
209 'csrf_token': CSRF_TOKEN
218 'csrf_token': CSRF_TOKEN,
219 'private': private
210 220 };
211 221
212 222 var success = function(o) {
@@ -174,7 +174,14 b''
174 174 ${c.form.render_error(request, c.form['repo_description'])|n}
175 175
176 176 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
177 <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
177 <span class="help-block">
178 % if c.visual.stylify_metatags:
179 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
180 % else:
181 ${_('Plain text format.')}
182 % endif
183 ${_('Add a README file for longer descriptions')}
184 </span>
178 185 <span id="meta-tags-desc" style="display: none">
179 186 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
180 187 ${dt.metatags_help()}
@@ -1,5 +1,5 b''
1 1
2 <div id="update_notice" style="display: none; margin: -40px 0px 20px 0px">
2 <div id="update_notice" style="display: none; margin: 0px 0px 30px 0px">
3 3 <div>${_('Checking for updates...')}</div>
4 4 </div>
5 5
@@ -18,7 +18,11 b''
18 18
19 19 <div class="panel panel-default">
20 20 <div class="panel-heading">
21 <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
21 <h3 class="panel-title">
22 <i class="icon-user-group" title="${_('User group')}"></i>
23 ${h.link_to_group(c.user_group.users_group_name)}
24 - ${_('Advanced')}
25 </h3>
22 26 </div>
23 27 <div class="panel-body">
24 28 ${base.dt_info_panel(elems)}
@@ -2,7 +2,11 b''
2 2
3 3 <div class="panel panel-default">
4 4 <div class="panel-heading">
5 <h3 class="panel-title">${_('User Group Permissions')}</h3>
5 <h3 class="panel-title">
6 <i class="icon-user-group" title="${_('User group')}"></i>
7 ${h.link_to_group(c.user_group.users_group_name)}
8 - ${_('Access Permissions')}
9 </h3>
6 10 </div>
7 11 <div class="panel-body">
8 12 ${h.secure_form(h.route_path('edit_user_group_perms_update', user_group_id=c.user_group.users_group_id), request=request)}
@@ -63,7 +67,12 b''
63 67 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
64 68 <span class="user">
65 69 % if _user.username == h.DEFAULT_USER:
66 ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
70 ${h.DEFAULT_USER}
71 % if _user.active:
72 <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
73 % else:
74 <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
75 % endif
67 76 % else:
68 77 ${h.link_to_user(_user.username)}
69 78 %if getattr(_user, 'duplicate_perm', None):
@@ -106,7 +115,12 b''
106 115 ${base.gravatar(_user.email, 16, user=_user, tooltip=True)}
107 116 <span class="user">
108 117 % if _user.username == h.DEFAULT_USER:
109 ${h.DEFAULT_USER} <span class="user-perm-help-text"> - ${_('permission for all other users')}</span>
118 ${h.DEFAULT_USER}
119 % if _user.active:
120 <span class="user-perm-help-text"> - ${_('permission for other logged in and anonymous users')}</span>
121 % else:
122 <span class="user-perm-help-text"> - ${_('permission for other logged in users')}</span>
123 % endif
110 124 % else:
111 125 ${h.link_to_user(_user.username)}
112 126 %if getattr(_user, 'duplicate_perm', None):
@@ -3,7 +3,11 b''
3 3
4 4 <div class="panel panel-default">
5 5 <div class="panel-heading">
6 <h3 class="panel-title">${_('User Group: %s') % c.user_group.users_group_name}</h3>
6 <h3 class="panel-title">
7 <i class="icon-user-group" title="${_('User group')}"></i>
8 ${h.link_to_group(c.user_group.users_group_name)}
9 - ${_('Settings')}
10 </h3>
7 11 </div>
8 12 <div class="panel-body">
9 13 ${h.secure_form(h.route_path('user_groups_update', user_group_id=c.user_group.users_group_id), id='edit_user_group', request=request)}
@@ -25,7 +25,10 b''
25 25
26 26 <div class="panel panel-default">
27 27 <div class="panel-heading">
28 <h3 class="panel-title">${_('User: {}').format(c.user.username)}</h3>
28 <h3 class="panel-title">
29 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
30 &nbsp;- ${_('Access Permissions')}
31 </h3>
29 32 </div>
30 33 <div class="panel-body">
31 34 <table class="rctable">
@@ -4,8 +4,10 b''
4 4
5 5 <div class="panel panel-default">
6 6 <div class="panel-heading">
7 <h3 class="panel-title">${_('User Audit Logs')} -
8 ${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)}
7 <h3 class="panel-title">
8 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
9 &nbsp;- ${_('Audit Logs')}
10 (${_ungettext('%s entry', '%s entries', c.audit_logs.item_count) % (c.audit_logs.item_count)})
9 11 </h3>
10 12 <a href="${h.route_path('edit_user_audit_logs_download', user_id=c.user.user_id)}" class="panel-edit">${_('Download as JSON')}</a>
11 13 </div>
@@ -1,6 +1,11 b''
1 <%namespace name="base" file="/base/base.mako"/>
2
1 3 <div class="panel panel-default">
2 4 <div class="panel-heading">
3 <h3 class="panel-title">${_('Authentication Tokens')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('Authentication Tokens')}
8 </h3>
4 9 </div>
5 10 <div class="panel-body">
6 11 <div class="apikeys_wrap">
@@ -2,7 +2,10 b''
2 2
3 3 <div class="panel panel-default">
4 4 <div class="panel-heading">
5 <h3 class="panel-title">${_('Caches')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('Caches')}
8 </h3>
6 9 </div>
7 10 <div class="panel-body">
8 11 <p>
@@ -2,7 +2,10 b''
2 2
3 3 <div class="panel panel-default">
4 4 <div class="panel-heading">
5 <h3 class="panel-title">${_('Additional Email Addresses')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('Additional Email Addresses')}
8 </h3>
6 9 </div>
7 10 <div class="panel-body">
8 11 <div class="emails_wrap">
@@ -1,9 +1,12 b''
1 1 ## -*- coding: utf-8 -*-
2
2 <%namespace name="base" file="/base/base.mako"/>
3 3
4 4 <div class="panel panel-default">
5 5 <div class="panel-heading">
6 <h3 class="panel-title">${_('User groups administration')}</h3>
6 <h3 class="panel-title">
7 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
8 &nbsp;- ${_('User groups administration')}
9 </h3>
7 10 </div>
8 11 <div class="panel-body">
9 12 <div class="fields">
@@ -1,6 +1,11 b''
1 <%namespace name="base" file="/base/base.mako"/>
2
1 3 <div class="panel panel-default">
2 4 <div class="panel-heading">
3 <h3 class="panel-title">${_('Custom IP Whitelist')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('Custom IP Whitelist')}
8 </h3>
4 9 </div>
5 10 <div class="panel-body">
6 11 <div class="ips_wrap">
@@ -2,7 +2,10 b''
2 2
3 3 <div class="panel panel-default user-profile">
4 4 <div class="panel-heading">
5 <h3 class="panel-title">${_('User Profile')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('User Profile')}
8 </h3>
6 9 </div>
7 10 <div class="panel-body">
8 11 <div class="user-profile-content">
@@ -73,7 +76,13 b''
73 76 <div class="input textarea editor">
74 77 ${h.textarea('description', rows=10, class_="medium")}
75 78 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
76 <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
79 <span class="help-block">
80 % if c.visual.stylify_metatags:
81 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
82 % else:
83 ${_('Plain text format.')}
84 % endif
85 </span>
77 86 <span id="meta-tags-desc" style="display: none">
78 87 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
79 88 ${dt.metatags_help()}
@@ -1,6 +1,11 b''
1 <%namespace name="base" file="/base/base.mako"/>
2
1 3 <div class="panel panel-default">
2 4 <div class="panel-heading">
3 <h3 class="panel-title">${_('SSH Keys')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('SSH Keys')}
8 </h3>
4 9 </div>
5 10 <div class="panel-body">
6 11 <div class="sshkeys_wrap">
@@ -1,11 +1,16 b''
1 <%namespace name="base" file="/base/base.mako"/>
2
1 3 <div class="panel panel-default">
2 4 <div class="panel-heading">
3 <h3 class="panel-title">${_('New SSH Key generation')}</h3>
5 <h3 class="panel-title">
6 ${base.gravatar_with_user(c.user.username, 16, tooltip=False, _class='pull-left')}
7 &nbsp;- ${_('New SSH Key generation')}
8 </h3>
4 9 </div>
5 10 <div class="panel-body">
6 11 %if c.ssh_enabled and c.ssh_key_generator_enabled:
7 12 <p>
8 ${_('Below is a 2048 bit generated SSH RSA key.')}<br/>
13 ${_('Below is a 2048 bit generated SSH RSA key.')}<br/>${_('If you use older systems please try to generate a')} <a href="${h.current_route_path(request, private_format='legacy')}">${_('legacy format')}</a> ssh key.<br/>
9 14 ${_('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.')}
10 15 </p>
11 16 <h4>${_('Private key')}</h4>
@@ -230,13 +230,13 b''
230 230 </%def>
231 231
232 232
233 <%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False)">
233 <%def name="gravatar_with_user(contact, size=16, show_disabled=False, tooltip=False, _class='rc-user')">
234 234 <%
235 235 email = h.email_or_none(contact)
236 236 rc_user = h.discover_user(contact)
237 237 %>
238 238
239 <div class="rc-user">
239 <div class="${_class}">
240 240 ${self.gravatar(email, size, tooltip=tooltip, tooltip_alt=contact, user=rc_user)}
241 241 <span class="${('user user-disabled' if show_disabled else 'user')}"> ${h.link_to_user(rc_user or contact)}</span>
242 242 </div>
@@ -405,10 +405,6 b''
405 405 %endif
406 406 %endif
407 407 </ul>
408 % else:
409 <a class="menulink disabled">
410 <div class="menulabel">${_('Options')}<div class="show_more"></div></div>
411 </a>
412 408 % endif
413 409 </li>
414 410
@@ -59,14 +59,14 b' examples = ['
59 59
60 60 (
61 61 'Pivotal Tracker',
62 '(?:pivot-)(?<project_id>\d+)-(?<story>\d+)',
62 '(?:pivot-)(?P<project_id>\d+)-(?P<story>\d+)',
63 63 'https://www.pivotaltracker.com/s/projects/${project_id}/stories/${story}',
64 64 'PIV-',
65 65 ),
66 66
67 67 (
68 68 'Trello',
69 '(?:trello-)(?<card_id>[a-zA-Z0-9]+)',
69 '(?:trello-)(?P<card_id>[a-zA-Z0-9]+)',
70 70 'https://trello.com/example.com/${card_id}',
71 71 'TRELLO-',
72 72 ),
@@ -5,7 +5,7 b''
5 5 ##
6 6 <%namespace name="base" file="/base/base.mako"/>
7 7
8 <%def name="comment_block(comment, inline=False)">
8 <%def name="comment_block(comment, inline=False, active_pattern_entries=None)">
9 9 <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %>
10 10 <% latest_ver = len(getattr(c, 'versions', [])) %>
11 11 % if inline:
@@ -156,7 +156,7 b''
156 156 </div>
157 157 </div>
158 158 <div class="text">
159 ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None))}
159 ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None), active_pattern_entries=active_pattern_entries)}
160 160 </div>
161 161
162 162 </div>
@@ -164,13 +164,17 b''
164 164
165 165 ## generate main comments
166 166 <%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)">
167 <%
168 active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
169 %>
170
167 171 <div class="general-comments" id="comments">
168 172 %for comment in comments:
169 173 <div id="comment-tr-${comment.comment_id}">
170 174 ## only render comments that are not from pull request, or from
171 175 ## pull request and a status change
172 176 %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request:
173 ${comment_block(comment)}
177 ${comment_block(comment, active_pattern_entries=active_pattern_entries)}
174 178 %endif
175 179 </div>
176 180 %endfor
@@ -60,12 +60,16 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
60 60 <%
61 61 diffset_container_id = h.md5(diffset.target_ref)
62 62 collapse_all = len(diffset.files) > collapse_when_files_over
63 active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None))
63 64 %>
64 65
65 66 %if use_comments:
67
68 ## Template for injecting comments
66 69 <div id="cb-comments-inline-container-template" class="js-template">
67 ${inline_comments_container([], inline_comments)}
70 ${inline_comments_container([])}
68 71 </div>
72
69 73 <div class="js-template" id="cb-comment-inline-form-template">
70 74 <div class="comment-inline-form ac">
71 75
@@ -259,7 +263,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
259 263 ## new/deleted/empty content case
260 264 % if not filediff.hunks:
261 265 ## Comment container, on "fakes" hunk that contains all data to render comments
262 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)}
266 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
263 267 % endif
264 268
265 269 %if filediff.limited_diff:
@@ -299,7 +303,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
299 303 ${hunk.section_header}
300 304 </td>
301 305 </tr>
302 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)}
306 ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
303 307 % endfor
304 308
305 309 <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %>
@@ -323,7 +327,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
323 327 <td class="cb-lineno cb-context"></td>
324 328 <td class="cb-lineno cb-context"></td>
325 329 <td class="cb-content cb-context">
326 ${inline_comments_container(comments, inline_comments)}
330 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
327 331 </td>
328 332 </tr>
329 333 %elif c.user_session_attrs["diffmode"] == 'sideside':
@@ -348,7 +352,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
348 352 <td class="cb-lineno cb-context"></td>
349 353 <td class="cb-content cb-context">
350 354 % if lineno.startswith('o'):
351 ${inline_comments_container(comments, inline_comments)}
355 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
352 356 % endif
353 357 </td>
354 358
@@ -356,7 +360,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
356 360 <td class="cb-lineno cb-context"></td>
357 361 <td class="cb-content cb-context">
358 362 % if lineno.startswith('n'):
359 ${inline_comments_container(comments, inline_comments)}
363 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
360 364 % endif
361 365 </td>
362 366 </tr>
@@ -415,7 +419,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
415 419 <td class="cb-lineno cb-context"></td>
416 420 <td class="cb-lineno cb-context"></td>
417 421 <td class="cb-content cb-context">
418 ${inline_comments_container(comments_dict['comments'], inline_comments)}
422 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
419 423 </td>
420 424 </tr>
421 425 %elif c.user_session_attrs["diffmode"] == 'sideside':
@@ -427,7 +431,7 b" return '%s_%s_%i' % (h.md5_safe(commit+f"
427 431 <td class="cb-data cb-context"></td>
428 432 <td class="cb-lineno cb-context"></td>
429 433 <td class="cb-content cb-context">
430 ${inline_comments_container(comments_dict['comments'], inline_comments)}
434 ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)}
431 435 </td>
432 436 </tr>
433 437 %endif
@@ -584,10 +588,11 b' from rhodecode.lib.diffs import NEW_FILE'
584 588 </%def>
585 589
586 590
587 <%def name="inline_comments_container(comments, inline_comments)">
591 <%def name="inline_comments_container(comments, active_pattern_entries=None)">
592
588 593 <div class="inline-comments">
589 594 %for comment in comments:
590 ${commentblock.comment_block(comment, inline=True)}
595 ${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)}
591 596 %endfor
592 597 % if comments and comments[-1].outdated:
593 598 <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}">
@@ -619,7 +624,7 b' def get_comments_for(diff_type, comments'
619 624 return data
620 625 %>
621 626
622 <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None)">
627 <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
623 628 %for i, line in enumerate(hunk.sideside):
624 629 <%
625 630 old_line_anchor, new_line_anchor = None, None
@@ -669,7 +674,7 b' def get_comments_for(diff_type, comments'
669 674 <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span>
670 675
671 676 %if use_comments and line.original.lineno and line_old_comments:
672 ${inline_comments_container(line_old_comments, inline_comments)}
677 ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)}
673 678 %endif
674 679
675 680 </td>
@@ -711,7 +716,7 b' def get_comments_for(diff_type, comments'
711 716 %endif
712 717 <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span>
713 718 %if use_comments and line.modified.lineno and line_new_comments:
714 ${inline_comments_container(line_new_comments, inline_comments)}
719 ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)}
715 720 %endif
716 721 </td>
717 722 </tr>
@@ -719,7 +724,7 b' def get_comments_for(diff_type, comments'
719 724 </%def>
720 725
721 726
722 <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None)">
727 <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)">
723 728 %for old_line_no, new_line_no, action, content, comments_args in hunk.unified:
724 729
725 730 <%
@@ -777,7 +782,7 b' def get_comments_for(diff_type, comments'
777 782 %endif
778 783 <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span>
779 784 %if use_comments and comments:
780 ${inline_comments_container(comments, inline_comments)}
785 ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)}
781 786 %endif
782 787 </td>
783 788 </tr>
@@ -785,11 +790,11 b' def get_comments_for(diff_type, comments'
785 790 </%def>
786 791
787 792
788 <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments)">
793 <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)">
789 794 % if diff_mode == 'unified':
790 ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)}
795 ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
791 796 % elif diff_mode == 'sideside':
792 ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)}
797 ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)}
793 798 % else:
794 799 <tr class="cb-line">
795 800 <td>unknown diff mode</td>
@@ -310,9 +310,9 b''
310 310
311 311 <%def name="gist_access_id(gist_access_id, full_contact)">
312 312 <div>
313 <b>
314 <a href="${h.route_path('gist_show', gist_id=gist_access_id)}">gist: ${gist_access_id}</a>
315 </b>
313 <code>
314 <a href="${h.route_path('gist_show', gist_id=gist_access_id)}">${gist_access_id}</a>
315 </code>
316 316 </div>
317 317 </%def>
318 318
@@ -21,7 +21,7 b''
21 21 <ul>
22 22 % for elem in sorted(c.email_types.keys()):
23 23 <li>
24 <a href="${request.route_path('debug_style_email', email_id=elem, _query={'user':c.rhodecode_user.username})}">${elem}</a>
24 <a href="${request.route_path('debug_style_email', email_id=elem, _query={'user':c.rhodecode_user.username, 'email': ''})}">${elem}</a>
25 25 |
26 26 <a href="${request.route_path('debug_style_email_plain_rendered', email_id=elem, _query={'user':c.rhodecode_user.username})}">plain rendered</a>
27 27 </li>
@@ -63,8 +63,8 b" css_style = ';'.join(["
63 63
64 64 ## Constants
65 65 <%
66 text_regular = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', sans-serif;"
67 text_monospace = "'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;"
66 text_regular = "-apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Helvetica, sans-serif"
67 text_monospace = "'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace"
68 68
69 69 %>
70 70
@@ -100,7 +100,7 b' text_monospace = "\'Menlo\', \'Liberation M'
100 100 -ms-text-size-adjust: 100%;
101 101 margin: 0;
102 102 padding: 0;
103 font-family: ${text_regular|n}
103 font-family: ${text_regular|n};
104 104 }
105 105
106 106 /* Prevent Webkit and Windows Mobile platforms from changing default font sizes.*/
@@ -184,6 +184,13 b' text_monospace = "\'Menlo\', \'Liberation M'
184 184 mso-table-rspace: 0pt;
185 185 }
186 186
187 table tr {
188 display: table-row;
189 vertical-align: inherit;
190 border-color: inherit;
191 border-spacing: 0 3px;
192 }
193
187 194 table td {
188 195 padding: .65em 1em .65em 0;
189 196 border-collapse: collapse;
@@ -202,6 +209,10 b' text_monospace = "\'Menlo\', \'Liberation M'
202 209 outline: 1px solid #979797
203 210 }
204 211
212 code {
213 font-family: ${text_monospace|n};
214 }
215
205 216 @media only screen and (-webkit-min-device-pixel-ratio: 2) {
206 217 /* Put your iPhone 4g styles in here */
207 218 }
@@ -283,7 +294,7 b' text_monospace = "\'Menlo\', \'Liberation M'
283 294 margin: 3px 0 13px 0 !important;
284 295 color: #424242 !important;
285 296 font-size: 13px !important;
286 font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen-Sans, Ubuntu, Cantarell, "Helvetica Neue", sans-serif;
297 font-family: ${text_regular|n};
287 298 font-weight: normal !important;
288 299 overflow: visible !important;
289 300 line-height: 140% !important
@@ -361,7 +372,7 b' text_monospace = "\'Menlo\', \'Liberation M'
361 372 }
362 373
363 374 div.markdown-block code, div.markdown-block pre, div.markdown-block #ws, div.markdown-block #message {
364 font-family: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
375 font-family: ${text_monospace|n};
365 376 font-size: 11px;
366 377 -webkit-border-radius: 2px;
367 378 -moz-border-radius: 2px;
@@ -490,8 +501,10 b' text_monospace = "\'Menlo\', \'Liberation M'
490 501 <![endif]-->
491 502 </head>
492 503 <body>
504
505 <div>
493 506 <!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
494 <table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:sans-serif;font-weight:100;border:1px solid #dbd9da">
507 <table cellpadding="0" cellspacing="0" border="0" id="backgroundTable" align="left" style="margin:1%;width:97%;padding:0;font-family:${text_regular|n};font-weight:100;border:1px solid #dbd9da">
495 508 <tr>
496 509 <td valign="top" style="padding:0;">
497 510 <table cellpadding="0" cellspacing="0" border="0" align="left" width="100%">
@@ -513,11 +526,13 b' text_monospace = "\'Menlo\', \'Liberation M'
513 526 </tr>
514 527 </table>
515 528 <!-- End of wrapper table -->
529 </div>
516 530
517 <div style="clear: both"></div>
518 <div style="margin-left:1%;font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace}">
531 <div style="width:100%; clear: both; height: 1px">&nbsp;</div>
532
533 <div style="margin-left:1%;font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};">
519 534 ${_('This is a notification from RhodeCode.')}
520 <a style="font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace}" href="${instance_url}">
535 <a style="font-weight:100;font-size:11px;color:#666666;text-decoration:none;font-family:${text_monospace};" href="${instance_url}">
521 536 ${instance_url}
522 537 </a>
523 538 </div>
@@ -58,7 +58,14 b''
58 58 <div class="textarea editor">
59 59 ${h.textarea('description',cols=23,rows=5,class_="medium")}
60 60 <% metatags_url = h.literal('''<a href="#metatagsShow" onclick="$('#meta-tags-desc').toggle();return false">meta-tags</a>''') %>
61 <span class="help-block">${_('Plain text format with support of {metatags}. Add a README file for longer descriptions').format(metatags=metatags_url)|n}</span>
61 <span class="help-block">
62 % if c.visual.stylify_metatags:
63 ${_('Plain text format with {metatags} support.').format(metatags=metatags_url)|n}
64 % else:
65 ${_('Plain text format.')}
66 % endif
67 ${_('Add a README file for longer descriptions')}
68 </span>
62 69 <span id="meta-tags-desc" style="display: none">
63 70 <%namespace name="dt" file="/data_table/_dt_elements.mako"/>
64 71 ${dt.metatags_help()}
@@ -14,32 +14,50 b''
14 14 <div class="title">
15 15
16 16 </div>
17
17 18 <!-- end box / title -->
18 19 <div id="no_grid_data" class="table" style="display: none">
19 <h2 class="no-object-border">
20 <h2>
20 21 ${_('No repositories or repositories groups exists here.')}
21 22 </h2>
22 23 </div>
23 24
25 <div id="grid_data_loading" class="table" style="display: none">
26 <i class="icon-spin animate-spin"></i>
27 ${_('loading...')}
28 </div>
29
24 30 <div class="table">
25 <div id="groups_list_wrap" style="min-height: 200px;">
31 <div id="groups_list_wrap" style="min-height: 200px;display: none">
26 32 <table id="group_list_table" class="display" style="width: 100%;"></table>
27 33 </div>
28 34 </div>
29 35
30 36 <div class="table">
31 <div id="repos_list_wrap" style="min-height: 200px;">
37 <div id="repos_list_wrap" style="min-height: 200px;display: none">
32 38 <table id="repo_list_table" class="display" style="width: 100%;"></table>
33 39 </div>
34 40 </div>
35 41
36 42 </div>
43
37 44 <script>
38 45 $(document).ready(function () {
46 var noRepoData = null;
47 var noGroupData = null;
48 var $gridDataLoading = $('#grid_data_loading');
39 49
40 // repo group list
50 // global show loading of hidden grids
51 $(document).on('preInit.dt', function (e, settings) {
52 $gridDataLoading.show();
53 });
54
55 ## repo group list
41 56 var $groupListTable = $('#group_list_table');
42 57
58 $groupListTable.on('xhr.dt', function (e, settings, json, xhr) {
59 $gridDataLoading.hide();
60 });
43 61 $groupListTable.DataTable({
44 62 processing: true,
45 63 serverSide: true,
@@ -97,11 +115,12 b''
97 115 emptyTable: _gettext("No repository groups present.")
98 116 },
99 117 "drawCallback": function (settings, json) {
118
100 119 // hide grid if it's empty
101 120 if (settings.fnRecordsDisplay() === 0) {
102 $('#groups_list_wrap').hide();
121 noGroupData = true;
103 122 // both hidden, show no-data
104 if ($('#repos_list_wrap').is(':hidden')) {
123 if (noRepoData === true) {
105 124 $('#no_grid_data').show();
106 125 }
107 126 } else {
@@ -119,18 +138,13 b''
119 138 },
120 139 });
121 140
122 $groupListTable.on('xhr.dt', function (e, settings, json, xhr) {
123 $groupListTable.css('opacity', 1);
124 });
125 141
126 $groupListTable.on('preXhr.dt', function (e, settings, data) {
127 $groupListTable.css('opacity', 0.3);
128 });
129
130
131 ## // repo list
142 ## repo list
132 143 var $repoListTable = $('#repo_list_table');
133 144
145 $repoListTable.on('xhr.dt', function (e, settings, json, xhr) {
146 $gridDataLoading.hide();
147 });
134 148 $repoListTable.DataTable({
135 149 processing: true,
136 150 serverSide: true,
@@ -188,11 +202,13 b''
188 202 emptyTable: _gettext("No repositories present.")
189 203 },
190 204 "drawCallback": function (settings, json) {
205
191 206 // hide grid if it's empty
192 207 if (settings.fnRecordsDisplay() == 0) {
193 $('#repos_list_wrap').hide()
208 noRepoData = true;
209
194 210 // both hidden, show no-data
195 if ($('#groups_list_wrap').is(':hidden')) {
211 if (noGroupData === true) {
196 212 $('#no_grid_data').show()
197 213 }
198 214 } else {
@@ -210,14 +226,6 b''
210 226 },
211 227 });
212 228
213 $repoListTable.on('xhr.dt', function (e, settings, json, xhr) {
214 $repoListTable.css('opacity', 1);
215 });
216
217 $repoListTable.on('preXhr.dt', function (e, settings, data) {
218 $repoListTable.css('opacity', 0.3);
219 });
220
221 229 });
222 230 </script>
223 231 </%def>
@@ -514,6 +514,7 b''
514 514 // Flush changes into textarea
515 515 codeMirrorInstance.save();
516 516 prButtonLock(true, null, 'all');
517 $pullRequestSubmit.val(_gettext('Please wait creating pull request...'));
517 518 });
518 519
519 520 prButtonLock(true, "${_('Please select source and target')}", 'all');
@@ -438,6 +438,11 b''
438 438
439 439 <h2 style="text-align: center">
440 440 ${_('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>
441
442 % if c.is_super_admin:
443 <br/>
444 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.
445 % endif
441 446 </h2>
442 447
443 448 % else:
@@ -29,6 +29,7 b' import shutil'
29 29
30 30 import configobj
31 31
32 from rhodecode.model.settings import SettingsModel
32 33 from rhodecode.tests import *
33 34 from rhodecode.model.db import Repository, User, RepoGroup, UserGroup, Gist, UserEmailMap
34 35 from rhodecode.model.meta import Session
@@ -122,7 +123,7 b' class Fixture(object):'
122 123
123 124 return context()
124 125
125 def auth_restriction(self, auth_restriction):
126 def auth_restriction(self, registry, auth_restriction):
126 127 """
127 128 Context process for changing the builtin rhodecode plugin auth restrictions.
128 129 Use like:
@@ -135,26 +136,26 b' class Fixture(object):'
135 136
136 137 class context(object):
137 138 def _get_pluing(self):
138 plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(
139 RhodeCodeAuthPlugin.uid)
139 plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
140 140 plugin = RhodeCodeAuthPlugin(plugin_id)
141 141 return plugin
142 142
143 143 def __enter__(self):
144 144 plugin = self._get_pluing()
145 plugin.create_or_update_setting(
146 'auth_restriction', auth_restriction)
145 plugin.create_or_update_setting('auth_restriction', auth_restriction)
147 146 Session().commit()
147 SettingsModel().invalidate_settings_cache()
148 148
149 149 def __exit__(self, exc_type, exc_val, exc_tb):
150 150 plugin = self._get_pluing()
151 151 plugin.create_or_update_setting(
152 152 'auth_restriction', RhodeCodeAuthPlugin.AUTH_RESTRICTION_NONE)
153 153 Session().commit()
154 SettingsModel().invalidate_settings_cache()
154 155
155 156 return context()
156 157
157 def scope_restriction(self, scope_restriction):
158 def scope_restriction(self, registry, scope_restriction):
158 159 """
159 160 Context process for changing the builtin rhodecode plugin scope restrictions.
160 161 Use like:
@@ -167,22 +168,22 b' class Fixture(object):'
167 168
168 169 class context(object):
169 170 def _get_pluing(self):
170 plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(
171 RhodeCodeAuthPlugin.uid)
171 plugin_id = 'egg:rhodecode-enterprise-ce#{}'.format(RhodeCodeAuthPlugin.uid)
172 172 plugin = RhodeCodeAuthPlugin(plugin_id)
173 173 return plugin
174 174
175 175 def __enter__(self):
176 176 plugin = self._get_pluing()
177 plugin.create_or_update_setting(
178 'scope_restriction', scope_restriction)
177 plugin.create_or_update_setting('scope_restriction', scope_restriction)
179 178 Session().commit()
179 SettingsModel().invalidate_settings_cache()
180 180
181 181 def __exit__(self, exc_type, exc_val, exc_tb):
182 182 plugin = self._get_pluing()
183 183 plugin.create_or_update_setting(
184 184 'scope_restriction', RhodeCodeAuthPlugin.AUTH_RESTRICTION_SCOPE_ALL)
185 185 Session().commit()
186 SettingsModel().invalidate_settings_cache()
186 187
187 188 return context()
188 189
@@ -43,6 +43,9 b' class TestIssueTrackerSettingsModel(obje'
43 43 settings_mock.return_value = input_settings
44 44 result = model.get_global_settings(cache=True)
45 45 get_settings.assert_called_once_with(cache=True)
46 for k, v in result.items():
47 v.pop('pat_compiled', None)
48
46 49 assert expected_result == result
47 50
48 51 def test_get_repo_settings_raise_exception_when_repo_is_not_set(self):
@@ -68,6 +71,8 b' class TestIssueTrackerSettingsModel(obje'
68 71 settings_mock.return_value = input_settings
69 72 result = model.get_repo_settings(cache=True)
70 73 get_settings.assert_called_once_with(cache=True)
74 for k, v in result.items():
75 v.pop('pat_compiled', None)
71 76 assert expected_result == result
72 77
73 78 @pytest.mark.parametrize("inherit_settings, method", [
@@ -209,6 +209,8 b' def enable_auth_plugins(request, baseapp'
209 209 Session().add(setting)
210 210 Session().commit()
211 211
212 SettingsModel().invalidate_settings_cache()
213
212 214 def cleanup():
213 215 _enable_plugins(['egg:rhodecode-enterprise-ce#rhodecode'])
214 216
General Comments 0
You need to be logged in to leave comments. Login now