diff --git a/rhodecode/i18n/rhodecode.pot b/rhodecode/i18n/rhodecode.pot --- a/rhodecode/i18n/rhodecode.pot +++ b/rhodecode/i18n/rhodecode.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: rhodecode-enterprise-ce 4.12.0\n" +"Project-Id-Version: rhodecode-enterprise-ce 4.13.0\n" "Report-Msgid-Bugs-To: marcin@rhodecode.com\n" -"POT-Creation-Date: 2018-04-23 15:50+0200\n" +"POT-Creation-Date: 2018-09-04 13:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -24,7 +24,7 @@ msgid "Global" msgstr "" #: rhodecode/apps/admin/navigation.py:74 -#: rhodecode/templates/admin/repos/repo_edit.mako:55 +#: rhodecode/templates/admin/repos/repo_edit.mako:58 msgid "VCS" msgstr "" @@ -37,17 +37,17 @@ msgid "Remap and Rescan" msgstr "" #: rhodecode/apps/admin/navigation.py:80 -#: rhodecode/templates/admin/repos/repo_edit.mako:61 +#: rhodecode/templates/admin/repos/repo_edit.mako:64 msgid "Issue Tracker" msgstr "" #: rhodecode/apps/admin/navigation.py:82 #: rhodecode/integrations/types/email.py:176 -#: rhodecode/templates/register.mako:76 +#: rhodecode/templates/register.mako:91 #: rhodecode/templates/admin/my_account/my_account_profile.mako:48 #: rhodecode/templates/admin/users/user_add.mako:86 #: rhodecode/templates/admin/users/user_edit_profile.mako:65 -#: rhodecode/templates/admin/users/users.mako:65 +#: rhodecode/templates/admin/users/users.mako:73 #: rhodecode/templates/email_templates/user_registration.mako:25 #: rhodecode/templates/users/user_profile.mako:51 msgid "Email" @@ -74,7 +74,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/new.mako:17 #: rhodecode/templates/admin/integrations/new.mako:23 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:51 -#: rhodecode/templates/admin/repos/repo_edit.mako:75 +#: rhodecode/templates/admin/repos/repo_edit.mako:78 #: rhodecode/templates/base/base.mako:84 msgid "Integrations" msgstr "" @@ -85,23 +85,27 @@ msgid "System Info" msgstr "" #: rhodecode/apps/admin/navigation.py:92 +msgid "Exceptions Tracker" +msgstr "" + +#: rhodecode/apps/admin/navigation.py:95 msgid "Processes" msgstr "" -#: rhodecode/apps/admin/navigation.py:94 +#: rhodecode/apps/admin/navigation.py:97 msgid "User Sessions" msgstr "" -#: rhodecode/apps/admin/navigation.py:96 +#: rhodecode/apps/admin/navigation.py:99 msgid "Open Source Licenses" msgstr "" -#: rhodecode/apps/admin/navigation.py:98 -#: rhodecode/templates/admin/repos/repo_edit.mako:83 +#: rhodecode/apps/admin/navigation.py:101 +#: rhodecode/templates/admin/repos/repo_edit.mako:86 msgid "Automation" msgstr "" -#: rhodecode/apps/admin/navigation.py:102 +#: rhodecode/apps/admin/navigation.py:105 msgid "Labs" msgstr "" @@ -113,25 +117,33 @@ msgstr "" msgid "Error occurred during update of default values" msgstr "" +#: rhodecode/apps/admin/views/exception_tracker.py:136 +msgid "Removed {} Exceptions" +msgstr "" + +#: rhodecode/apps/admin/views/exception_tracker.py:153 +msgid "Removed Exception {}" +msgstr "" + #: rhodecode/apps/admin/views/permissions.py:120 msgid "Application permissions updated successfully" msgstr "" #: rhodecode/apps/admin/views/permissions.py:141 -#: rhodecode/apps/admin/views/permissions.py:213 -#: rhodecode/apps/admin/views/permissions.py:288 +#: rhodecode/apps/admin/views/permissions.py:214 +#: rhodecode/apps/admin/views/permissions.py:313 msgid "Error occurred during update of permissions" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:193 +#: rhodecode/apps/admin/views/permissions.py:194 msgid "Object permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:268 +#: rhodecode/apps/admin/views/permissions.py:293 msgid "Global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:450 +#: rhodecode/apps/admin/views/permissions.py:475 #: rhodecode/templates/admin/gists/show.mako:63 #: rhodecode/templates/admin/integrations/list.mako:174 #: rhodecode/templates/admin/my_account/my_account_profile.mako:5 @@ -146,27 +158,27 @@ msgstr "" #: rhodecode/templates/files/files_edit.mako:168 #: rhodecode/templates/files/files_source.mako:54 #: rhodecode/templates/files/files_source.mako:57 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:63 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:64 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:347 #: rhodecode/templates/user_group/profile.mako:7 #: rhodecode/templates/users/user_profile.mako:7 msgid "Edit" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:478 +#: rhodecode/apps/admin/views/permissions.py:503 msgid "Updated SSH keys file: {}" msgstr "" -#: rhodecode/apps/admin/views/permissions.py:481 +#: rhodecode/apps/admin/views/permissions.py:506 msgid "SSH key support is disabled in .ini file" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:181 +#: rhodecode/apps/admin/views/repo_groups.py:182 #, python-format msgid "Created repository group %s" msgstr "" -#: rhodecode/apps/admin/views/repo_groups.py:199 +#: rhodecode/apps/admin/views/repo_groups.py:200 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "" @@ -326,289 +338,297 @@ msgid "Platform UUID" msgstr "" #: rhodecode/apps/admin/views/system_info.py:115 -msgid "Python version" +msgid "Lang" msgstr "" #: rhodecode/apps/admin/views/system_info.py:116 +msgid "Python version" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:117 msgid "Python path" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:120 -msgid "CPU" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:121 -msgid "Load" +msgid "CPU" msgstr "" #: rhodecode/apps/admin/views/system_info.py:122 -msgid "Memory" +msgid "Load" msgstr "" #: rhodecode/apps/admin/views/system_info.py:123 +msgid "Memory" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:124 msgid "Uptime" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:127 +#: rhodecode/apps/admin/views/system_info.py:128 msgid "Ulimit" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:130 -msgid "Storage location" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:131 -msgid "Storage info" +msgid "Storage location" msgstr "" #: rhodecode/apps/admin/views/system_info.py:132 +msgid "Storage info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:133 msgid "Storage inodes" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:134 -msgid "Gist storage location" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:135 +msgid "Gist storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:136 msgid "Gist storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:137 -msgid "Archive cache storage location" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:138 +msgid "Archive cache storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:139 msgid "Archive cache info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:140 -msgid "Temp storage location" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:141 +msgid "Temp storage location" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:142 msgid "Temp storage info" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:143 -msgid "Search info" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:144 +msgid "Search info" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:145 msgid "Search location" msgstr "" -#: rhodecode/apps/admin/views/system_info.py:148 -msgid "VCS Backends" -msgstr "" - #: rhodecode/apps/admin/views/system_info.py:149 -msgid "VCS Server" +msgid "VCS Backends" msgstr "" #: rhodecode/apps/admin/views/system_info.py:150 -msgid "GIT" +msgid "VCS Server" msgstr "" #: rhodecode/apps/admin/views/system_info.py:151 -msgid "HG" +msgid "GIT" msgstr "" #: rhodecode/apps/admin/views/system_info.py:152 +msgid "HG" +msgstr "" + +#: rhodecode/apps/admin/views/system_info.py:153 msgid "SVN" msgstr "" -#: rhodecode/apps/admin/views/user_groups.py:219 +#: rhodecode/apps/admin/views/user_groups.py:231 #, python-format msgid "Created user group %(user_group_link)s" msgstr "" -#: rhodecode/apps/admin/views/user_groups.py:241 +#: rhodecode/apps/admin/views/user_groups.py:253 #, python-format msgid "Error occurred during creation of user group %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:209 +#: rhodecode/apps/admin/views/users.py:218 #, python-format msgid "Created user %(user_link)s" msgstr "" -#: rhodecode/apps/admin/views/users.py:230 +#: rhodecode/apps/admin/views/users.py:239 #, python-format msgid "Error occurred during creation of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:304 +#: rhodecode/apps/admin/views/users.py:313 msgid "User updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:322 +#: rhodecode/apps/admin/views/users.py:331 #, python-format msgid "Error occurred during update of user %s" msgstr "" -#: rhodecode/apps/admin/views/users.py:354 +#: rhodecode/apps/admin/views/users.py:363 #, python-format msgid "Detached %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:359 +#: rhodecode/apps/admin/views/users.py:368 #, python-format msgid "Deleted %s repositories" msgstr "" -#: rhodecode/apps/admin/views/users.py:367 +#: rhodecode/apps/admin/views/users.py:376 #, python-format msgid "Detached %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:372 +#: rhodecode/apps/admin/views/users.py:381 #, python-format msgid "Deleted %s repository groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:380 +#: rhodecode/apps/admin/views/users.py:389 #, python-format msgid "Detached %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:385 +#: rhodecode/apps/admin/views/users.py:394 #, python-format msgid "Deleted %s user groups" msgstr "" -#: rhodecode/apps/admin/views/users.py:402 +#: rhodecode/apps/admin/views/users.py:411 msgid "Successfully deleted user" msgstr "" -#: rhodecode/apps/admin/views/users.py:408 +#: rhodecode/apps/admin/views/users.py:417 msgid "An error occurred during deletion of user" msgstr "" -#: rhodecode/apps/admin/views/users.py:473 +#: rhodecode/apps/admin/views/users.py:482 msgid "" "The user participates as reviewer in {} pull request and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:479 +#: rhodecode/apps/admin/views/users.py:488 msgid "" "The user participates as reviewer in {} pull requests and cannot be deleted. \n" "You can set the user to \"{}\" instead of deleting it." msgstr "" -#: rhodecode/apps/admin/views/users.py:567 +#: rhodecode/apps/admin/views/users.py:576 msgid "User global permissions updated successfully" msgstr "" -#: rhodecode/apps/admin/views/users.py:585 -#: rhodecode/apps/user_group/views/__init__.py:448 +#: rhodecode/apps/admin/views/users.py:594 +#: rhodecode/apps/user_group/views/__init__.py:474 msgid "An error occurred during permissions saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:610 +#: rhodecode/apps/admin/views/users.py:619 msgid "Force password change disabled for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:615 -msgid "Force password change enabled for user" -msgstr "" - #: rhodecode/apps/admin/views/users.py:624 +msgid "Force password change enabled for user" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:633 msgid "An error occurred during password reset for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:663 +#: rhodecode/apps/admin/views/users.py:672 #, python-format msgid "Linked repository group `%s` as personal" msgstr "" -#: rhodecode/apps/admin/views/users.py:669 -#, python-format -msgid "Created repository group `%s`" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:673 -#, python-format -msgid "Repository group `%s` is already taken" -msgstr "" - #: rhodecode/apps/admin/views/users.py:678 +#, python-format +msgid "Created repository group `%s`" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:682 +#, python-format +msgid "Repository group `%s` is already taken" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:687 msgid "An error occurred during repository group creation for user" msgstr "" -#: rhodecode/apps/admin/views/users.py:701 +#: rhodecode/apps/admin/views/users.py:710 #: rhodecode/apps/my_account/views/my_account.py:160 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:16 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:16 msgid "Role" msgstr "" -#: rhodecode/apps/admin/views/users.py:739 -#: rhodecode/apps/my_account/views/my_account.py:194 +#: rhodecode/apps/admin/views/users.py:749 +#: rhodecode/apps/my_account/views/my_account.py:195 msgid "Auth token successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:768 -#: rhodecode/apps/my_account/views/my_account.py:218 +#: rhodecode/apps/admin/views/users.py:778 +#: rhodecode/apps/my_account/views/my_account.py:219 msgid "Auth token successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:841 +#: rhodecode/apps/admin/views/users.py:851 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:113 msgid "Ssh Key successfully created" msgstr "" -#: rhodecode/apps/admin/views/users.py:847 -#: rhodecode/apps/admin/views/users.py:851 +#: rhodecode/apps/admin/views/users.py:857 +#: rhodecode/apps/admin/views/users.py:861 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:119 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:123 msgid "An error occurred during ssh key saving: {}" msgstr "" -#: rhodecode/apps/admin/views/users.py:885 +#: rhodecode/apps/admin/views/users.py:895 #: rhodecode/apps/my_account/views/my_account_ssh_keys.py:153 msgid "Ssh key successfully deleted" msgstr "" -#: rhodecode/apps/admin/views/users.py:931 -#, python-format -msgid "Added new email address `%s` for user account" -msgstr "" - -#: rhodecode/apps/admin/views/users.py:937 -msgid "Email `{}` is already registered for another user." -msgstr "" - #: rhodecode/apps/admin/views/users.py:941 +#, python-format +msgid "Added new email address `%s` for user account" +msgstr "" + +#: rhodecode/apps/admin/views/users.py:947 +msgid "Email `{}` is already registered for another user." +msgstr "" + +#: rhodecode/apps/admin/views/users.py:951 msgid "An error occurred during email saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:968 +#: rhodecode/apps/admin/views/users.py:978 msgid "Removed email address from user account" msgstr "" -#: rhodecode/apps/admin/views/users.py:1014 +#: rhodecode/apps/admin/views/users.py:1024 #, python-format msgid "An error occurred during ip saving:%s" msgstr "" -#: rhodecode/apps/admin/views/users.py:1036 +#: rhodecode/apps/admin/views/users.py:1046 msgid "An error occurred during ip saving" msgstr "" -#: rhodecode/apps/admin/views/users.py:1040 +#: rhodecode/apps/admin/views/users.py:1050 #, python-format msgid "Added ips %s to user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1070 +#: rhodecode/apps/admin/views/users.py:1080 msgid "Removed ip address from user whitelist" msgstr "" -#: rhodecode/apps/admin/views/users.py:1135 +#: rhodecode/apps/admin/views/users.py:1145 msgid "Groups successfully changed" msgstr "" +#: rhodecode/apps/admin/views/users.py:1239 +msgid "Deleted {} cache keys" +msgstr "" + #: rhodecode/apps/gist/views.py:57 rhodecode/model/auth_token.py:51 msgid "forever" msgstr "" @@ -630,8 +650,8 @@ msgid "1 month" msgstr "" #: rhodecode/apps/gist/views.py:64 -#: rhodecode/public/js/rhodecode-components.js:49292 -#: rhodecode/public/js/scripts.js:41140 +#: rhodecode/public/js/rhodecode-components.js:54572 +#: rhodecode/public/js/scripts.js:41322 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:21 #: rhodecode/public/js/src/rhodecode.js:502 msgid "Lifetime" @@ -684,27 +704,18 @@ msgstr "" msgid "Error occurred during update of gist %s" msgstr "" -#: rhodecode/apps/home/views.py:218 rhodecode/apps/home/views.py:251 -#: rhodecode/apps/repository/views/repo_pull_requests.py:775 +#: rhodecode/apps/home/views.py:295 +#: rhodecode/apps/repository/views/repo_pull_requests.py:784 #: rhodecode/templates/admin/my_account/my_account.mako:41 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:126 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:197 #: rhodecode/templates/admin/repos/repo_add.mako:15 #: rhodecode/templates/admin/repos/repo_add.mako:19 #: rhodecode/templates/admin/users/user_edit_advanced.mako:11 #: rhodecode/templates/base/base.mako:78 rhodecode/templates/base/base.mako:150 -#: rhodecode/templates/base/base.mako:584 +#: rhodecode/templates/base/base.mako:655 msgid "Repositories" msgstr "" -#: rhodecode/apps/home/views.py:244 -msgid "Groups" -msgstr "" - -#: rhodecode/apps/home/views.py:264 -#, python-format -msgid "Commits in %(repo)s" -msgstr "" - #: rhodecode/apps/journal/views.py:132 rhodecode/apps/journal/views.py:178 msgid "public journal" msgstr "" @@ -713,27 +724,27 @@ msgstr "" msgid "journal" msgstr "" -#: rhodecode/apps/login/views.py:272 rhodecode/apps/login/views.py:349 +#: rhodecode/apps/login/views.py:293 rhodecode/apps/login/views.py:374 msgid "Bad captcha" msgstr "" -#: rhodecode/apps/login/views.py:288 +#: rhodecode/apps/login/views.py:315 msgid "You have successfully registered with RhodeCode" msgstr "" -#: rhodecode/apps/login/views.py:325 +#: rhodecode/apps/login/views.py:352 msgid "If such email exists, a password reset link was sent to it." msgstr "" -#: rhodecode/apps/login/views.py:331 +#: rhodecode/apps/login/views.py:358 msgid "Password reset has been disabled." msgstr "" -#: rhodecode/apps/login/views.py:420 +#: rhodecode/apps/login/views.py:446 msgid "Given reset token is invalid" msgstr "" -#: rhodecode/apps/login/views.py:428 +#: rhodecode/apps/login/views.py:454 msgid "Your password reset was successful, a new password has been sent to your email" msgstr "" @@ -745,23 +756,23 @@ msgstr "" msgid "Successfully updated password" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:282 +#: rhodecode/apps/my_account/views/my_account.py:283 msgid "Error occurred during adding email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:285 +#: rhodecode/apps/my_account/views/my_account.py:286 msgid "Successfully added email" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:307 +#: rhodecode/apps/my_account/views/my_account.py:308 msgid "Email successfully deleted" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:490 +#: rhodecode/apps/my_account/views/my_account.py:491 msgid "Your account was updated successfully" msgstr "" -#: rhodecode/apps/my_account/views/my_account.py:497 +#: rhodecode/apps/my_account/views/my_account.py:498 msgid "Error occurred during update of user" msgstr "" @@ -775,42 +786,42 @@ msgstr "" msgid "Error occurred during deletion of repository group %s" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:73 -#: rhodecode/apps/user_group/views/__init__.py:328 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:74 +#: rhodecode/apps/user_group/views/__init__.py:346 msgid "Cannot change permission for yourself as admin" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_permissions.py:97 +#: rhodecode/apps/repo_group/views/repo_group_permissions.py:98 msgid "Repository Group permissions updated" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_settings.py:174 +#: rhodecode/apps/repo_group/views/repo_group_settings.py:173 msgid "Repository Group `{}` updated successfully" msgstr "" -#: rhodecode/apps/repo_group/views/repo_group_settings.py:179 +#: rhodecode/apps/repo_group/views/repo_group_settings.py:178 #, python-format msgid "Error occurred during update of repository group %s" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:72 +#: rhodecode/apps/repository/views/repo_caches.py:80 msgid "Cache invalidation successful" msgstr "" -#: rhodecode/apps/repository/views/repo_caches.py:76 +#: rhodecode/apps/repository/views/repo_caches.py:84 msgid "An error occurred during cache invalidation" msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:66 #: rhodecode/apps/repository/views/repo_compare.py:66 -#: rhodecode/apps/repository/views/repo_pull_requests.py:641 +#: rhodecode/apps/repository/views/repo_pull_requests.py:647 msgid "There are no commits yet" msgstr "" #: rhodecode/apps/repository/views/repo_changelog.py:71 #: rhodecode/apps/repository/views/repo_commits.py:199 -#: rhodecode/apps/repository/views/repo_files.py:150 -#: rhodecode/apps/repository/views/repo_files.py:170 +#: rhodecode/apps/repository/views/repo_files.py:162 +#: rhodecode/apps/repository/views/repo_files.py:182 msgid "No such commit exists for this repository" msgstr "" @@ -854,12 +865,12 @@ msgid "Increase context for all diffs" msgstr "" #: rhodecode/apps/repository/views/repo_commits.py:415 -#: rhodecode/apps/repository/views/repo_pull_requests.py:1185 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1211 #, python-format msgid "Status change %(transition_icon)s %(status)s" msgstr "" -#: rhodecode/apps/repository/views/repo_commits.py:459 +#: rhodecode/apps/repository/views/repo_commits.py:460 msgid "Changing the status of a commit associated with a closed pull request is not allowed" msgstr "" @@ -888,215 +899,224 @@ msgstr "" msgid "Repositories unrelated. Cannot compare commit %(commit1)s from repository %(repo1)s with commit %(commit2)s from repository %(repo2)s." msgstr "" -#: rhodecode/apps/repository/views/repo_feed.py:70 +#: rhodecode/apps/repository/views/repo_feed.py:69 #, python-format msgid "Changes on %s repository" msgstr "" -#: rhodecode/apps/repository/views/repo_feed.py:71 +#: rhodecode/apps/repository/views/repo_feed.py:70 #, python-format msgid "%s %s feed" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:94 +#: rhodecode/apps/repository/views/repo_files.py:92 #, python-format msgid "This repository has been locked by %s on %s" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:140 +#: rhodecode/apps/repository/views/repo_files.py:108 +msgid "Branch `{}` changes forbidden by rule {}." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:152 msgid "Click here to add a new file." msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:145 +#: rhodecode/apps/repository/views/repo_files.py:157 #, python-format msgid "There are no files yet. %s" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:259 +#: rhodecode/apps/repository/views/repo_files.py:293 msgid "Downloads disabled" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:265 +#: rhodecode/apps/repository/views/repo_files.py:299 msgid "Unknown archive type for: `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:271 -msgid "Unknown commit_id {}" -msgstr "" - -#: rhodecode/apps/repository/views/repo_files.py:274 -msgid "Empty repository" -msgstr "" - #: rhodecode/apps/repository/views/repo_files.py:305 +msgid "Unknown commit_id {}" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:308 +msgid "Empty repository" +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:340 msgid "Unknown archive type" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:865 +#: rhodecode/apps/repository/views/repo_files.py:906 msgid "Changesets" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:886 -#: rhodecode/apps/repository/views/repo_summary.py:322 -#: rhodecode/model/pull_request.py:1421 rhodecode/model/scm.py:789 +#: rhodecode/apps/repository/views/repo_files.py:927 +#: rhodecode/apps/repository/views/repo_summary.py:340 +#: rhodecode/model/pull_request.py:1445 rhodecode/model/scm.py:795 #: rhodecode/templates/base/vcs_settings.mako:235 msgid "Branches" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:890 rhodecode/model/scm.py:804 +#: rhodecode/apps/repository/views/repo_files.py:931 rhodecode/model/scm.py:810 #: rhodecode/templates/base/vcs_settings.mako:260 msgid "Tags" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:987 -#: rhodecode/apps/repository/views/repo_files.py:1018 -msgid "You can only delete files with commit being a valid branch " -msgstr "" - -#: rhodecode/apps/repository/views/repo_files.py:997 -#: rhodecode/apps/repository/views/repo_files.py:1028 +#: rhodecode/apps/repository/views/repo_files.py:1030 +#: rhodecode/apps/repository/views/repo_files.py:1064 +msgid "You can only delete files with commit being a valid branch head." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1041 +#: rhodecode/apps/repository/views/repo_files.py:1075 msgid "Deleted file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1049 +#: rhodecode/apps/repository/views/repo_files.py:1096 msgid "Successfully deleted file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1053 -#: rhodecode/apps/repository/views/repo_files.py:1171 -#: rhodecode/apps/repository/views/repo_files.py:1290 +#: rhodecode/apps/repository/views/repo_files.py:1100 +#: rhodecode/apps/repository/views/repo_files.py:1225 +#: rhodecode/apps/repository/views/repo_files.py:1383 msgid "Error occurred during commit" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1071 -#: rhodecode/apps/repository/views/repo_files.py:1108 -msgid "You can only edit files with commit being a valid branch " -msgstr "" - -#: rhodecode/apps/repository/views/repo_files.py:1088 -#: rhodecode/apps/repository/views/repo_files.py:1125 +#: rhodecode/apps/repository/views/repo_files.py:1120 +#: rhodecode/apps/repository/views/repo_files.py:1160 +msgid "You can only edit files with commit being a valid branch head." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1138 +#: rhodecode/apps/repository/views/repo_files.py:1179 msgid "Edited file {} via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1143 +#: rhodecode/apps/repository/views/repo_files.py:1197 msgid "No changes" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1167 +#: rhodecode/apps/repository/views/repo_files.py:1221 msgid "Successfully committed changes to file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1191 -#: rhodecode/apps/repository/views/repo_files.py:1215 +#: rhodecode/apps/repository/views/repo_files.py:1245 +#: rhodecode/apps/repository/views/repo_files.py:1308 msgid "Added file via RhodeCode Enterprise" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1248 +#: rhodecode/apps/repository/views/repo_files.py:1258 +#: rhodecode/apps/repository/views/repo_files.py:1299 +msgid "You can only add files with commit being a valid branch head." +msgstr "" + +#: rhodecode/apps/repository/views/repo_files.py:1341 msgid "No filename" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1278 +#: rhodecode/apps/repository/views/repo_files.py:1371 msgid "Successfully committed new file `{}`" msgstr "" -#: rhodecode/apps/repository/views/repo_files.py:1282 +#: rhodecode/apps/repository/views/repo_files.py:1375 msgid "The location specified must be a relative path and must not contain .. in the path" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:146 +#: rhodecode/apps/repository/views/repo_forks.py:147 #: rhodecode/templates/base/base.mako:264 msgid "Compare fork" msgstr "" -#: rhodecode/apps/repository/views/repo_forks.py:251 +#: rhodecode/apps/repository/views/repo_forks.py:252 #, python-format msgid "An error occurred during repository forking %s" msgstr "" -#: rhodecode/apps/repository/views/repo_permissions.py:86 +#: rhodecode/apps/repository/views/repo_permissions.py:85 msgid "Repository permissions updated" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:671 +#: rhodecode/apps/repository/views/repo_pull_requests.py:677 msgid "Commit does not exist" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:806 +#: rhodecode/apps/repository/views/repo_pull_requests.py:815 msgid "Error creating pull request: {}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:831 +#: rhodecode/apps/repository/views/repo_pull_requests.py:840 msgid "Not Enough permissions to source repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:846 +#: rhodecode/apps/repository/views/repo_pull_requests.py:855 msgid "Not Enough permissions to target repo `{}`." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:897 +#: rhodecode/apps/repository/views/repo_pull_requests.py:918 msgid "Successfully opened new pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:900 +#: rhodecode/apps/repository/views/repo_pull_requests.py:921 msgid "Error occurred during creation of this pull request." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:931 -#: rhodecode/apps/repository/views/repo_pull_requests.py:961 +#: rhodecode/apps/repository/views/repo_pull_requests.py:952 +#: rhodecode/apps/repository/views/repo_pull_requests.py:986 msgid "Cannot update closed pull requests." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:967 +#: rhodecode/apps/repository/views/repo_pull_requests.py:992 msgid "Pull request title & description updated." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:986 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1011 msgid "Pull request updated to \"{source_commit_id}\" with {count_added} added, {count_removed} removed commits. Source of changes: {change_source}" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1002 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1027 msgid "Reload page" msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1066 +#: rhodecode/apps/repository/views/repo_pull_requests.py:1092 msgid "Pull request was successfully merged and closed." msgstr "" -#: rhodecode/apps/repository/views/repo_pull_requests.py:1090 -msgid "Pull request reviewers updated." -msgstr "" - #: rhodecode/apps/repository/views/repo_pull_requests.py:1116 +msgid "Pull request reviewers updated." +msgstr "" + +#: rhodecode/apps/repository/views/repo_pull_requests.py:1142 msgid "Successfully deleted pull request" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:172 +#: rhodecode/apps/repository/views/repo_settings.py:171 msgid "Repository `{}` updated successfully" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:176 +#: rhodecode/apps/repository/views/repo_settings.py:175 msgid "Error occurred during update of repository {}" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:198 +#: rhodecode/apps/repository/views/repo_settings.py:204 msgid "Unlocked" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:203 -msgid "Locked" -msgstr "" - -#: rhodecode/apps/repository/views/repo_settings.py:205 -#, python-format -msgid "Repository has been %s" -msgstr "" - #: rhodecode/apps/repository/views/repo_settings.py:209 +msgid "Locked" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:211 +#, python-format +msgid "Repository has been %s" +msgstr "" + +#: rhodecode/apps/repository/views/repo_settings.py:215 #: rhodecode/apps/repository/views/repo_settings_advanced.py:228 msgid "An error occurred during unlocking" msgstr "" -#: rhodecode/apps/repository/views/repo_settings.py:253 +#: rhodecode/apps/repository/views/repo_settings.py:259 msgid "An error occurred during deletion of repository stats" msgstr "" @@ -1158,7 +1178,7 @@ msgid "Unlocked repository" msgstr "" #: rhodecode/apps/repository/views/repo_settings_advanced.py:245 -msgid "installed hooks repository" +msgid "installed updated hooks into this repository" msgstr "" #: rhodecode/apps/repository/views/repo_settings_fields.py:86 @@ -1185,19 +1205,21 @@ msgstr "" msgid "Error occurred during updating repository VCS settings" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:297 +#: rhodecode/apps/repository/views/repo_summary.py:315 +#: rhodecode/templates/admin/permissions/permissions.mako:42 +#: rhodecode/templates/files/files_add.mako:15 msgid "Branch" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:298 +#: rhodecode/apps/repository/views/repo_summary.py:316 msgid "Tag" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:299 +#: rhodecode/apps/repository/views/repo_summary.py:317 msgid "Bookmark" msgstr "" -#: rhodecode/apps/repository/views/repo_summary.py:323 +#: rhodecode/apps/repository/views/repo_summary.py:341 msgid "Closed branches" msgstr "" @@ -1209,80 +1231,80 @@ msgstr "" msgid "Configuration for Apache mad_dav_svn changed." msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:184 +#: rhodecode/apps/user_group/views/__init__.py:188 #, python-format msgid "Updated user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:206 +#: rhodecode/apps/user_group/views/__init__.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:232 +#: rhodecode/apps/user_group/views/__init__.py:250 msgid "Successfully deleted user group" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:237 +#: rhodecode/apps/user_group/views/__init__.py:255 msgid "An error occurred during deletion of user group" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:341 +#: rhodecode/apps/user_group/views/__init__.py:359 msgid "Target group cannot be the same" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:356 +#: rhodecode/apps/user_group/views/__init__.py:374 msgid "User Group permissions updated" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:428 +#: rhodecode/apps/user_group/views/__init__.py:454 msgid "User Group global permissions updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:510 +#: rhodecode/apps/user_group/views/__init__.py:536 msgid "User Group synchronization updated successfully" msgstr "" -#: rhodecode/apps/user_group/views/__init__.py:514 +#: rhodecode/apps/user_group/views/__init__.py:540 msgid "An error occurred during synchronization update" msgstr "" -#: rhodecode/authentication/schema.py:35 +#: rhodecode/authentication/schema.py:36 msgid "Enable or disable this authentication plugin." msgstr "" -#: rhodecode/authentication/schema.py:37 rhodecode/integrations/schema.py:32 -#: rhodecode/model/permission.py:101 rhodecode/model/permission.py:105 -#: rhodecode/model/permission.py:109 rhodecode/model/permission.py:113 -#: rhodecode/model/permission.py:117 rhodecode/model/permission.py:121 -#: rhodecode/model/validation_schema/schemas/integration_schema.py:197 +#: rhodecode/authentication/schema.py:38 rhodecode/integrations/schema.py:32 +#: rhodecode/model/permission.py:110 rhodecode/model/permission.py:114 +#: rhodecode/model/permission.py:118 rhodecode/model/permission.py:122 +#: rhodecode/model/permission.py:126 rhodecode/model/permission.py:130 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:195 #: rhodecode/templates/admin/integrations/list.mako:71 msgid "Enabled" msgstr "" -#: rhodecode/authentication/schema.py:43 +#: rhodecode/authentication/schema.py:44 msgid "" "Amount of seconds to cache the authentication and permissions check response call for this plugin. \n" "Useful for expensive calls like LDAP to improve the performance of the system (0 means disabled)." msgstr "" -#: rhodecode/authentication/schema.py:48 +#: rhodecode/authentication/schema.py:49 msgid "Auth Cache TTL" msgstr "" -#: rhodecode/authentication/views.py:94 +#: rhodecode/authentication/views.py:92 msgid "Errors exist when saving plugin settings. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:116 rhodecode/authentication/views.py:175 +#: rhodecode/authentication/views.py:104 rhodecode/authentication/views.py:163 msgid "Auth settings updated successfully." msgstr "" -#: rhodecode/authentication/views.py:178 +#: rhodecode/authentication/views.py:166 msgid "Errors exist when saving plugin setting. Please check the form inputs." msgstr "" -#: rhodecode/authentication/views.py:186 +#: rhodecode/authentication/views.py:174 msgid "Error occurred during update of auth settings." msgstr "" @@ -1299,7 +1321,7 @@ msgid "The Port in use by the Atlassian msgstr "" #: rhodecode/authentication/plugins/auth_crowd.py:69 -#: rhodecode/authentication/plugins/auth_ldap.py:91 +#: rhodecode/authentication/plugins/auth_ldap.py:89 msgid "Port" msgstr "" @@ -1371,46 +1393,46 @@ msgstr "" msgid "Jasig-CAS" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:79 +#: rhodecode/authentication/plugins/auth_ldap.py:77 msgid "" "Host[s] of the LDAP Server \n" "(e.g., 192.168.2.154, or ldap-server.domain.com.\n" " Multiple servers can be specified using commas" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:83 +#: rhodecode/authentication/plugins/auth_ldap.py:81 msgid "LDAP Host" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:88 +#: rhodecode/authentication/plugins/auth_ldap.py:86 msgid "Custom port that the LDAP server is listening on. Default value is: 389" msgstr "" +#: rhodecode/authentication/plugins/auth_ldap.py:96 +msgid "Timeout for LDAP connection" +msgstr "" + #: rhodecode/authentication/plugins/auth_ldap.py:98 -msgid "Timeout for LDAP connection" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:100 msgid "Connection timeout" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:107 +#: rhodecode/authentication/plugins/auth_ldap.py:105 msgid "" "Optional user DN/account to connect to LDAP if authentication is required. \n" "e.g., cn=admin,dc=mydomain,dc=com, or uid=root,cn=users,dc=mydomain,dc=com, or admin@mydomain.com" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:112 +#: rhodecode/authentication/plugins/auth_ldap.py:110 msgid "Account" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:117 +#: rhodecode/authentication/plugins/auth_ldap.py:115 msgid "Password to authenticate for given user DN." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:120 +#: rhodecode/authentication/plugins/auth_ldap.py:118 #: rhodecode/integrations/types/webhook.py:92 rhodecode/templates/login.mako:50 -#: rhodecode/templates/register.mako:48 +#: rhodecode/templates/register.mako:58 #: rhodecode/templates/admin/my_account/my_account.mako:30 #: rhodecode/templates/admin/users/user_add.mako:44 #: rhodecode/templates/base/base.mako:326 @@ -1418,93 +1440,93 @@ msgstr "" msgid "Password" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:125 +#: rhodecode/authentication/plugins/auth_ldap.py:123 msgid "TLS Type" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:126 +#: rhodecode/authentication/plugins/auth_ldap.py:124 msgid "Connection Security" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:132 +#: rhodecode/authentication/plugins/auth_ldap.py:130 msgid "" "Require Cert over TLS?. Self-signed and custom certificates can be used when\n" " `RhodeCode Certificate` found in admin > settings > system info page is extended." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:135 +#: rhodecode/authentication/plugins/auth_ldap.py:133 msgid "Certificate Checks" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:141 +#: rhodecode/authentication/plugins/auth_ldap.py:139 msgid "" "Base DN to search. Dynamic bind is supported. Add `$login` marker in it to be replaced with current user credentials \n" "(e.g., dc=mydomain,dc=com, or ou=Users,dc=mydomain,dc=com)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:146 +#: rhodecode/authentication/plugins/auth_ldap.py:144 msgid "Base DN" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:151 +#: rhodecode/authentication/plugins/auth_ldap.py:149 msgid "" "Filter to narrow results \n" "(e.g., (&(objectCategory=Person)(objectClass=user)), or \n" "(memberof=cn=rc-login,ou=groups,ou=company,dc=mydomain,dc=com)))" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:156 +#: rhodecode/authentication/plugins/auth_ldap.py:154 msgid "LDAP Search Filter" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:162 +#: rhodecode/authentication/plugins/auth_ldap.py:160 msgid "How deep to search LDAP. If unsure set to SUBTREE" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:163 +#: rhodecode/authentication/plugins/auth_ldap.py:161 msgid "LDAP Search Scope" msgstr "" +#: rhodecode/authentication/plugins/auth_ldap.py:167 +msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" +msgstr "" + #: rhodecode/authentication/plugins/auth_ldap.py:169 -msgid "LDAP Attribute to map to user name (e.g., uid, or sAMAccountName)" -msgstr "" - -#: rhodecode/authentication/plugins/auth_ldap.py:171 msgid "Login Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:172 +#: rhodecode/authentication/plugins/auth_ldap.py:170 msgid "The LDAP Login attribute of the CN must be specified" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:177 +#: rhodecode/authentication/plugins/auth_ldap.py:175 msgid "LDAP Attribute to map to first name (e.g., givenName)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:180 +#: rhodecode/authentication/plugins/auth_ldap.py:178 msgid "First Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:185 +#: rhodecode/authentication/plugins/auth_ldap.py:183 msgid "LDAP Attribute to map to last name (e.g., sn)" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:188 +#: rhodecode/authentication/plugins/auth_ldap.py:186 msgid "Last Name Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:193 +#: rhodecode/authentication/plugins/auth_ldap.py:191 msgid "" "LDAP Attribute to map to email address (e.g., mail).\n" "Emails are a crucial part of RhodeCode. \n" "If possible add a valid email attribute to ldap users." msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:198 +#: rhodecode/authentication/plugins/auth_ldap.py:196 msgid "Email Attribute" msgstr "" -#: rhodecode/authentication/plugins/auth_ldap.py:426 +#: rhodecode/authentication/plugins/auth_ldap.py:390 msgid "LDAP" msgstr "" @@ -1620,17 +1642,21 @@ msgstr "" msgid "user pre update" msgstr "" +#: rhodecode/events/user.py:100 +msgid "user permissions change" +msgstr "" + #: rhodecode/forms/__init__.py:35 rhodecode/templates/admin/gists/new.mako:62 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:87 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:68 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:70 #: rhodecode/templates/admin/permissions/permissions_application.mako:60 #: rhodecode/templates/admin/permissions/permissions_ips.mako:64 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:57 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:134 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:205 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:84 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:66 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:80 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:110 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:187 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:244 #: rhodecode/templates/admin/repos/repo_edit_vcs.mako:44 #: rhodecode/templates/admin/settings/settings_global.mako:140 @@ -1638,12 +1664,12 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_labs.mako:49 #: rhodecode/templates/admin/settings/settings_vcs.mako:14 #: rhodecode/templates/admin/settings/settings_visual.mako:215 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:121 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:192 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:83 #: rhodecode/templates/admin/users/user_edit_emails.mako:63 #: rhodecode/templates/admin/users/user_edit_ips.mako:71 #: rhodecode/templates/admin/users/user_edit_profile.mako:135 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:63 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:65 #: rhodecode/templates/base/default_perms_box.mako:89 msgid "Reset" msgstr "" @@ -1652,7 +1678,7 @@ msgstr "" #: rhodecode/templates/admin/integrations/list.mako:181 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:49 #: rhodecode/templates/admin/my_account/my_account_emails.mako:32 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:31 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:33 #: rhodecode/templates/admin/notifications/notifications_data.mako:22 #: rhodecode/templates/admin/notifications/notifications_show.mako:35 #: rhodecode/templates/admin/permissions/permissions_ips.mako:29 @@ -1661,13 +1687,13 @@ msgstr "" #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:45 #: rhodecode/templates/admin/users/user_edit_emails.mako:31 #: rhodecode/templates/admin/users/user_edit_ips.mako:35 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:28 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:30 #: rhodecode/templates/base/issue_tracker_settings.mako:69 #: rhodecode/templates/base/vcs_settings.mako:244 #: rhodecode/templates/base/vcs_settings.mako:269 -#: rhodecode/templates/changeset/changeset_file_comment.mako:143 -#: rhodecode/templates/changeset/changeset_file_comment.mako:145 -#: rhodecode/templates/changeset/changeset_file_comment.mako:148 +#: rhodecode/templates/changeset/changeset_file_comment.mako:144 +#: rhodecode/templates/changeset/changeset_file_comment.mako:146 +#: rhodecode/templates/changeset/changeset_file_comment.mako:149 #: rhodecode/templates/data_table/_dt_elements.mako:171 #: rhodecode/templates/data_table/_dt_elements.mako:244 #: rhodecode/templates/data_table/_dt_elements.mako:258 @@ -1676,23 +1702,23 @@ msgstr "" #: rhodecode/templates/files/files_source.mako:51 #: rhodecode/templates/files/files_source.mako:55 #: rhodecode/templates/files/files_source.mako:58 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:56 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:60 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:61 msgid "Delete" msgstr "" #: rhodecode/integrations/schema.py:30 -#: rhodecode/model/validation_schema/schemas/integration_schema.py:195 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:193 msgid "Enable or disable this integration." msgstr "" #: rhodecode/integrations/schema.py:37 -#: rhodecode/model/validation_schema/schemas/integration_schema.py:176 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:174 msgid "Short name for this integration." msgstr "" #: rhodecode/integrations/schema.py:39 -#: rhodecode/model/validation_schema/schemas/integration_schema.py:178 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:176 msgid "Integration name" msgstr "" @@ -1815,7 +1841,7 @@ msgstr "" #: rhodecode/integrations/types/slack.py:60 #: rhodecode/integrations/types/webhook.py:82 rhodecode/templates/login.mako:43 -#: rhodecode/templates/register.mako:41 +#: rhodecode/templates/register.mako:46 #: rhodecode/templates/admin/admin_log_base.mako:7 #: rhodecode/templates/admin/my_account/my_account_profile.mako:24 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:23 @@ -1823,7 +1849,7 @@ msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:70 #: rhodecode/templates/admin/users/user_add.mako:35 #: rhodecode/templates/admin/users/user_edit_profile.mako:39 -#: rhodecode/templates/admin/users/users.mako:63 +#: rhodecode/templates/admin/users/users.mako:71 #: rhodecode/templates/base/base.mako:317 #: rhodecode/templates/debug_style/login.html:36 #: rhodecode/templates/email_templates/user_registration.mako:23 @@ -2006,7 +2032,7 @@ msgid "fork name %s" msgstr "" #: rhodecode/lib/action_parser.py:191 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:51 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:52 #, python-format msgid "Pull request #%s" msgstr "" @@ -2039,16 +2065,16 @@ msgstr "" msgid "Commit not found" msgstr "" -#: rhodecode/lib/auth.py:1441 +#: rhodecode/lib/auth.py:1600 #, python-format msgid "IP %s not allowed" msgstr "" -#: rhodecode/lib/auth.py:1531 +#: rhodecode/lib/auth.py:1687 msgid "You need to be a registered user to perform this action" msgstr "" -#: rhodecode/lib/auth.py:1575 +#: rhodecode/lib/auth.py:1731 msgid "You need to be signed in to view this page" msgstr "" @@ -2056,7 +2082,7 @@ msgstr "" msgid "Click to select line" msgstr "" -#: rhodecode/lib/helpers.py:1868 +#: rhodecode/lib/helpers.py:1881 msgid "" "Example filter terms:\n" " repository:vcs\n" @@ -2067,6 +2093,8 @@ msgid "" " date:20120101\n" " date:[20120101100000 TO 20120102]\n" "\n" +"Actions: {actions}\n" +"\n" "Generate wildcards using '*' character:\n" " \"repository:vcs*\" - search everything starting with 'vcs'\n" " \"repository:*vcs*\" - search for repository containing 'vcs'\n" @@ -2076,7 +2104,7 @@ msgid "" " \"username:test AND repository:test*\"\n" msgstr "" -#: rhodecode/lib/helpers.py:1892 +#: rhodecode/lib/helpers.py:1907 msgid "" "Example filter terms for `{searcher}` search:\n" "{terms}\n" @@ -2090,46 +2118,46 @@ msgid "" "More: {search_doc}" msgstr "" -#: rhodecode/lib/helpers.py:1909 +#: rhodecode/lib/helpers.py:1924 #, python-format msgid "%s repository is not mapped to db perhaps it was created or renamed from the filesystem please run the application again in order to rescan repositories" msgstr "" -#: rhodecode/lib/utils2.py:524 +#: rhodecode/lib/utils2.py:535 msgid "in ${ago}" msgstr "" -#: rhodecode/lib/utils2.py:530 -msgid "${ago} ago" -msgstr "" - -#: rhodecode/lib/utils2.py:539 -msgid "${val}, ${detail}" -msgstr "" - #: rhodecode/lib/utils2.py:541 +msgid "${ago} ago" +msgstr "" + +#: rhodecode/lib/utils2.py:550 +msgid "${val}, ${detail}" +msgstr "" + +#: rhodecode/lib/utils2.py:552 msgid "${val}, ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:543 +#: rhodecode/lib/utils2.py:554 msgid "in ${val}, ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:545 +#: rhodecode/lib/utils2.py:556 msgid "${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:547 +#: rhodecode/lib/utils2.py:558 msgid "${val} and ${detail} ago" msgstr "" -#: rhodecode/lib/utils2.py:549 +#: rhodecode/lib/utils2.py:560 msgid "in ${val} and ${detail}" msgstr "" -#: rhodecode/lib/utils2.py:553 -#: rhodecode/public/js/rhodecode-components.js:30702 -#: rhodecode/public/js/scripts.js:22550 +#: rhodecode/lib/utils2.py:564 +#: rhodecode/public/js/rhodecode-components.js:35750 +#: rhodecode/public/js/scripts.js:22544 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:84 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:174 msgid "just now" @@ -2158,15 +2186,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:823 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:945 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:970 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2662 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2588 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2654 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2276 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2268 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2268 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2272 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2272 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2322 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2524 rhodecode/model/db.py:2717 msgid "Repository no access" msgstr "" @@ -2193,15 +2222,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:824 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:946 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:971 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2663 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2589 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2655 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2269 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2269 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2273 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2273 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2323 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2525 rhodecode/model/db.py:2718 msgid "Repository read access" msgstr "" @@ -2228,15 +2258,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:825 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:947 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:972 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2664 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2590 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2656 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2278 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2270 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2270 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2274 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2274 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2324 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2325 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2526 rhodecode/model/db.py:2719 msgid "Repository write access" msgstr "" @@ -2263,15 +2294,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:826 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:948 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:973 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2602 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2282 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2282 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2336 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2337 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2538 rhodecode/model/db.py:2665 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2591 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2657 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2271 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2271 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2275 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2275 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2325 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2326 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2527 rhodecode/model/db.py:2720 msgid "Repository admin access" msgstr "" @@ -2338,15 +2370,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:844 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:966 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:991 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2620 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2304 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2354 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2556 rhodecode/model/db.py:2683 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2680 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2743 msgid "Repository creation disabled" msgstr "" @@ -2373,15 +2406,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:845 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:967 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:992 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2684 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2681 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2744 msgid "Repository creation enabled" msgstr "" @@ -2408,15 +2442,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:849 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:971 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:996 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2688 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2685 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2748 msgid "Repository forking disabled" msgstr "" @@ -2443,15 +2478,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:850 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:972 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:997 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2689 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2686 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2749 msgid "Repository forking enabled" msgstr "" @@ -2499,17 +2535,18 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1195 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1317 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1342 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3328 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2940 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2940 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2944 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2944 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3044 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3045 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3264 rhodecode/model/db.py:3391 -#: rhodecode/public/js/rhodecode-components.js:48219 -#: rhodecode/public/js/scripts.js:40067 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3296 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3379 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2916 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2908 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2909 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2912 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2912 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3012 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3013 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3232 rhodecode/model/db.py:3466 +#: rhodecode/public/js/rhodecode-components.js:53541 +#: rhodecode/public/js/scripts.js:40291 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:39 #: rhodecode/public/js/src/rhodecode/pullrequests.js:319 msgid "Not Reviewed" @@ -2538,15 +2575,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1196 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1318 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1343 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3329 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2941 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2941 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2945 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2945 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3045 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3046 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3265 rhodecode/model/db.py:3392 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3297 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3380 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2917 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2909 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2913 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2913 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3013 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3014 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3233 rhodecode/model/db.py:3467 msgid "Approved" msgstr "" @@ -2573,15 +2611,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1197 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1319 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1344 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3330 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2948 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2942 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2942 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2946 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3046 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3047 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3266 rhodecode/model/db.py:3393 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3298 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3381 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2918 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2910 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2914 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2914 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3014 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3015 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3234 rhodecode/model/db.py:3468 msgid "Rejected" msgstr "" @@ -2608,15 +2647,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:1198 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:1320 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1345 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3331 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2949 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2943 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2943 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2947 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3047 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3048 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3267 rhodecode/model/db.py:3394 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:3299 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:3382 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2919 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2911 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2912 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2915 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2915 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:3015 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:3016 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:3235 rhodecode/model/db.py:3469 msgid "Under Review" msgstr "" @@ -2640,15 +2680,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:828 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:950 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:975 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2667 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2593 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2659 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2273 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2273 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2277 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2327 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2328 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2529 rhodecode/model/db.py:2722 msgid "Repository group no access" msgstr "" @@ -2672,15 +2713,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:829 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:951 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:976 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2605 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2339 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2541 rhodecode/model/db.py:2668 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2594 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2660 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2274 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2274 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2278 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2278 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2328 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2329 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2530 rhodecode/model/db.py:2723 msgid "Repository group read access" msgstr "" @@ -2704,15 +2746,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:830 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:952 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:977 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2669 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2595 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2661 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2275 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2275 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2329 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2330 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2531 rhodecode/model/db.py:2724 msgid "Repository group write access" msgstr "" @@ -2736,15 +2779,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:831 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:953 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:978 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2670 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2596 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2662 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2276 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2276 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2330 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2331 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2532 rhodecode/model/db.py:2725 msgid "Repository group admin access" msgstr "" @@ -2767,15 +2811,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:833 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:955 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:980 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2609 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2289 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2293 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2343 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2545 rhodecode/model/db.py:2672 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2598 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2664 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2278 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2278 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2282 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2332 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2534 rhodecode/model/db.py:2727 msgid "User group no access" msgstr "" @@ -2798,15 +2843,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:834 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:981 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2610 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2290 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2344 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2546 rhodecode/model/db.py:2673 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2599 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2665 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2279 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2333 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2535 rhodecode/model/db.py:2728 msgid "User group read access" msgstr "" @@ -2829,15 +2875,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:835 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:982 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2674 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2600 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2666 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2280 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2334 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2536 rhodecode/model/db.py:2729 msgid "User group write access" msgstr "" @@ -2860,15 +2907,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:836 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:983 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2675 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2601 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2667 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2289 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2281 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2285 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2335 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2336 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2537 rhodecode/model/db.py:2730 msgid "User group admin access" msgstr "" @@ -2891,15 +2939,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:838 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:960 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:985 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2614 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2294 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2348 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2550 rhodecode/model/db.py:2677 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2603 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2674 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2283 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2337 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2539 rhodecode/model/db.py:2737 msgid "Repository Group creation disabled" msgstr "" @@ -2922,15 +2971,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:839 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:961 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:986 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2615 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2295 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2299 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2349 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2350 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2551 rhodecode/model/db.py:2678 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2604 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2675 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2284 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2288 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2338 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2339 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2540 rhodecode/model/db.py:2738 msgid "Repository Group creation enabled" msgstr "" @@ -2953,15 +3003,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:841 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:963 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:988 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2680 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2606 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2677 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2294 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2286 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2290 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2340 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2542 rhodecode/model/db.py:2740 msgid "User Group creation disabled" msgstr "" @@ -2984,15 +3035,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:842 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:964 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:989 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2681 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2607 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2678 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2287 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2341 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2342 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2543 rhodecode/model/db.py:2741 msgid "User Group creation enabled" msgstr "" @@ -3015,15 +3067,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:852 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:974 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:999 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2308 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2691 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2617 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2688 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2297 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2351 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2553 rhodecode/model/db.py:2751 msgid "Registration disabled" msgstr "" @@ -3046,15 +3099,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:853 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:975 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1000 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2309 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2692 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2618 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2689 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2298 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2352 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2554 rhodecode/model/db.py:2752 msgid "User Registration with manual account activation" msgstr "" @@ -3077,15 +3131,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:854 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:976 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1001 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2630 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2318 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2314 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2364 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2365 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2566 rhodecode/model/db.py:2693 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2619 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2690 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2307 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2303 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2353 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2354 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2555 rhodecode/model/db.py:2753 msgid "User Registration with automatic account activation" msgstr "" @@ -3108,16 +3163,17 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:856 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:978 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1003 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2636 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2312 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2370 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2371 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2572 rhodecode/model/db.py:2699 -#: rhodecode/model/permission.py:96 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2625 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2696 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2301 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2359 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2561 rhodecode/model/db.py:2759 +#: rhodecode/model/permission.py:105 msgid "Manual activation of external account" msgstr "" @@ -3140,16 +3196,17 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:857 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:979 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1004 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2637 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2321 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2313 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2317 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2371 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2372 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2573 rhodecode/model/db.py:2700 -#: rhodecode/model/permission.py:97 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2626 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2697 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2360 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2361 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2562 rhodecode/model/db.py:2760 +#: rhodecode/model/permission.py:106 msgid "Automatic activation of external account" msgstr "" @@ -3166,15 +3223,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:846 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:968 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:993 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2310 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2302 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2306 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2685 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2611 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2682 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2299 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2291 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2295 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2345 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2547 rhodecode/model/db.py:2745 msgid "Repository creation enabled with write permission to a repository group" msgstr "" @@ -3191,15 +3249,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:847 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:969 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:994 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2311 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2303 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2307 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2686 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2612 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2683 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2300 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2292 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2296 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2346 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2347 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2548 rhodecode/model/db.py:2746 msgid "Repository creation disabled with write permission to a repository group" msgstr "" @@ -3213,15 +3272,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:821 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:943 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:968 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2597 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2285 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2277 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2277 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2281 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2281 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2331 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2332 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2533 rhodecode/model/db.py:2660 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2586 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2652 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2274 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2266 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2266 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2270 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2270 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2320 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2321 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2522 rhodecode/model/db.py:2715 msgid "RhodeCode Super Administrator" msgstr "" @@ -3233,15 +3293,16 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:859 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:981 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1006 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2639 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2323 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2315 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2319 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2373 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2575 rhodecode/model/db.py:2702 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2628 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2699 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2312 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2304 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2308 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2362 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2564 rhodecode/model/db.py:2762 msgid "Inherit object permissions from default user disabled" msgstr "" @@ -3253,19 +3314,21 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_3_3_0_0.py:860 #: rhodecode/lib/dbmigrate/schema/db_3_5_0_0.py:982 #: rhodecode/lib/dbmigrate/schema/db_3_7_0_0.py:1007 -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2640 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2324 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2316 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2320 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2374 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2375 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2576 rhodecode/model/db.py:2703 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2629 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2700 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2313 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2305 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2309 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2363 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2364 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2565 rhodecode/model/db.py:2763 msgid "Inherit object permissions from default user enabled" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1103 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1107 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:910 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:911 @@ -3273,11 +3336,12 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:955 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:956 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1107 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1051 rhodecode/model/db.py:1103 msgid "all" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1104 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1108 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:911 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:912 @@ -3285,11 +3349,12 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:956 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:957 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1108 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1052 rhodecode/model/db.py:1104 msgid "http/web interface" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1105 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1109 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:912 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:913 @@ -3297,11 +3362,12 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:957 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:958 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1109 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1053 rhodecode/model/db.py:1105 msgid "vcs (git/hg/svn protocol)" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1106 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1110 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:913 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:914 @@ -3309,11 +3375,12 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:916 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:958 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:959 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1110 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1054 rhodecode/model/db.py:1106 msgid "api calls" msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:1107 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:1111 #: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:914 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:915 #: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:915 @@ -3321,43 +3388,67 @@ msgstr "" #: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:917 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:959 #: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:960 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1111 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:1055 rhodecode/model/db.py:1107 msgid "feed access" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2360 -#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2063 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2055 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2055 -#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2059 -#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2059 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2102 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2103 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2297 rhodecode/model/db.py:2423 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2349 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2415 +#: rhodecode/lib/dbmigrate/schema/db_4_3_0_0.py:2052 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_0.py:2044 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_1.py:2044 +#: rhodecode/lib/dbmigrate/schema/db_4_4_0_2.py:2048 +#: rhodecode/lib/dbmigrate/schema/db_4_5_0_0.py:2048 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2091 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2092 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2286 rhodecode/model/db.py:2468 msgid "No parent" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2632 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2366 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2367 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2568 rhodecode/model/db.py:2695 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2621 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2692 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2355 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2557 rhodecode/model/db.py:2755 msgid "Password reset enabled" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2633 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2367 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2569 rhodecode/model/db.py:2696 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2622 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2693 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2356 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2558 rhodecode/model/db.py:2756 msgid "Password reset hidden" msgstr "" -#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2634 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2368 -#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2369 -#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2570 rhodecode/model/db.py:2697 +#: rhodecode/lib/dbmigrate/schema/db_4_11_0_0.py:2623 +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2694 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_0.py:2357 +#: rhodecode/lib/dbmigrate/schema/db_4_7_0_1.py:2358 +#: rhodecode/lib/dbmigrate/schema/db_4_9_0_0.py:2559 rhodecode/model/db.py:2757 msgid "Password reset disabled" msgstr "" +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2669 +#: rhodecode/model/db.py:2732 +msgid "Branch no permissions" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2670 +#: rhodecode/model/db.py:2733 +msgid "Branch access by web merge" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2671 +#: rhodecode/model/db.py:2734 +msgid "Branch access by push" +msgstr "" + +#: rhodecode/lib/dbmigrate/schema/db_4_13_0_0.py:2672 +#: rhodecode/model/db.py:2735 +msgid "Branch access by push with force" +msgstr "" + #: rhodecode/lib/index/whoosh.py:164 msgid "Index Type" msgstr "" @@ -3394,11 +3485,11 @@ msgstr "" msgid "1 month {end_date}" msgstr "" -#: rhodecode/model/comment.py:382 +#: rhodecode/model/comment.py:384 msgid "made a comment" msgstr "" -#: rhodecode/model/comment.py:383 +#: rhodecode/model/comment.py:385 msgid "Show it now" msgstr "" @@ -3480,35 +3571,36 @@ msgstr "" msgid "%(user)s commented on pull request at %(date_or_age)s" msgstr "" -#: rhodecode/model/permission.py:68 rhodecode/model/permission.py:74 -#: rhodecode/model/permission.py:80 +#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 +#: rhodecode/model/permission.py:83 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:124 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:195 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:11 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:11 msgid "None" msgstr "" -#: rhodecode/model/permission.py:69 rhodecode/model/permission.py:75 -#: rhodecode/model/permission.py:81 +#: rhodecode/model/permission.py:72 rhodecode/model/permission.py:78 +#: rhodecode/model/permission.py:84 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:12 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:12 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:12 msgid "Read" msgstr "" -#: rhodecode/model/permission.py:70 rhodecode/model/permission.py:76 -#: rhodecode/model/permission.py:82 +#: rhodecode/model/permission.py:73 rhodecode/model/permission.py:79 +#: rhodecode/model/permission.py:85 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:13 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:13 #: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:13 -#: rhodecode/templates/changeset/changeset_file_comment.mako:272 -#: rhodecode/templates/changeset/changeset_file_comment.mako:322 +#: rhodecode/templates/changeset/changeset_file_comment.mako:273 +#: rhodecode/templates/changeset/changeset_file_comment.mako:323 +#: rhodecode/templates/data_table/_dt_elements.mako:386 msgid "Write" msgstr "" -#: rhodecode/model/permission.py:71 rhodecode/model/permission.py:77 -#: rhodecode/model/permission.py:83 +#: rhodecode/model/permission.py:74 rhodecode/model/permission.py:80 +#: rhodecode/model/permission.py:86 #: rhodecode/templates/admin/auth/auth_settings.mako:12 #: rhodecode/templates/admin/auth/plugin_settings.mako:12 #: rhodecode/templates/admin/defaults/defaults.mako:12 @@ -3536,36 +3628,52 @@ msgstr "" #: rhodecode/templates/admin/users/user_add.mako:11 #: rhodecode/templates/admin/users/user_edit.mako:12 #: rhodecode/templates/admin/users/users.mako:13 -#: rhodecode/templates/admin/users/users.mako:76 -#: rhodecode/templates/base/base.mako:421 -#: rhodecode/templates/base/base.mako:428 +#: rhodecode/templates/admin/users/users.mako:84 +#: rhodecode/templates/base/base.mako:452 +#: rhodecode/templates/base/base.mako:459 msgid "Admin" msgstr "" -#: rhodecode/model/permission.py:86 rhodecode/model/permission.py:100 -#: rhodecode/model/permission.py:104 rhodecode/model/permission.py:108 -#: rhodecode/model/permission.py:112 rhodecode/model/permission.py:116 -#: rhodecode/model/permission.py:120 -msgid "Disabled" -msgstr "" - -#: rhodecode/model/permission.py:87 -msgid "Allowed with manual account activation" -msgstr "" - -#: rhodecode/model/permission.py:88 -msgid "Allowed with automatic account activation" +#: rhodecode/model/permission.py:89 +msgid "Protected/No Access" +msgstr "" + +#: rhodecode/model/permission.py:90 +msgid "Web merge" msgstr "" #: rhodecode/model/permission.py:91 -msgid "Allow password recovery" +msgid "Push" msgstr "" #: rhodecode/model/permission.py:92 +msgid "Force Push" +msgstr "" + +#: rhodecode/model/permission.py:95 rhodecode/model/permission.py:109 +#: rhodecode/model/permission.py:113 rhodecode/model/permission.py:117 +#: rhodecode/model/permission.py:121 rhodecode/model/permission.py:125 +#: rhodecode/model/permission.py:129 +msgid "Disabled" +msgstr "" + +#: rhodecode/model/permission.py:96 +msgid "Allowed with manual account activation" +msgstr "" + +#: rhodecode/model/permission.py:97 +msgid "Allowed with automatic account activation" +msgstr "" + +#: rhodecode/model/permission.py:100 +msgid "Allow password recovery" +msgstr "" + +#: rhodecode/model/permission.py:101 msgid "Hide password recovery link" msgstr "" -#: rhodecode/model/permission.py:93 +#: rhodecode/model/permission.py:102 msgid "Disable password recovery" msgstr "" @@ -3641,71 +3749,75 @@ msgstr "" msgid "This pull request cannot be updated because the source reference is missing." msgstr "" -#: rhodecode/model/pull_request.py:1218 +#: rhodecode/model/pull_request.py:1236 msgid "Server-side pull request merging is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1220 +#: rhodecode/model/pull_request.py:1238 msgid "This pull request is closed." msgstr "" -#: rhodecode/model/pull_request.py:1233 +#: rhodecode/model/pull_request.py:1253 msgid "Pull request merging is not supported." msgstr "" -#: rhodecode/model/pull_request.py:1252 +#: rhodecode/model/pull_request.py:1272 msgid "Target repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1255 +#: rhodecode/model/pull_request.py:1275 msgid "Source repository large files support is disabled." msgstr "" -#: rhodecode/model/pull_request.py:1420 rhodecode/model/scm.py:797 +#: rhodecode/model/pull_request.py:1444 rhodecode/model/scm.py:803 msgid "Bookmarks" msgstr "" -#: rhodecode/model/pull_request.py:1425 +#: rhodecode/model/pull_request.py:1449 msgid "Commit IDs" msgstr "" -#: rhodecode/model/pull_request.py:1428 +#: rhodecode/model/pull_request.py:1452 msgid "Closed Branches" msgstr "" -#: rhodecode/model/pull_request.py:1588 +#: rhodecode/model/pull_request.py:1613 msgid "User `{}` not allowed to perform merge." msgstr "" -#: rhodecode/model/pull_request.py:1601 +#: rhodecode/model/pull_request.py:1631 +msgid "Target branch `{}` changes rejected by rule {}." +msgstr "" + +#: rhodecode/model/pull_request.py:1645 msgid "Pull request reviewer approval is pending." msgstr "" -#: rhodecode/model/pull_request.py:1616 +#: rhodecode/model/pull_request.py:1660 msgid "Cannot merge, {} TODO still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1619 +#: rhodecode/model/pull_request.py:1663 msgid "Cannot merge, {} TODOs still not resolved." msgstr "" -#: rhodecode/model/pull_request.py:1654 +#: rhodecode/model/pull_request.py:1699 msgid "Merge strategy: rebase" msgstr "" -#: rhodecode/model/pull_request.py:1659 +#: rhodecode/model/pull_request.py:1704 msgid "Merge strategy: explicit merge commit" msgstr "" -#: rhodecode/model/pull_request.py:1666 +#: rhodecode/model/pull_request.py:1711 msgid "Source branch will be closed after merge." msgstr "" -#: rhodecode/model/pull_request.py:1668 +#: rhodecode/model/pull_request.py:1713 msgid "Source branch will be deleted after merge." msgstr "" -#: rhodecode/model/scm.py:775 +#: rhodecode/model/scm.py:781 msgid "latest tip" msgstr "" @@ -3967,19 +4079,19 @@ msgstr "" msgid "Only superadmins can create global integrations" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:183 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:181 msgid "Scope of the integration. Recursive means the integration runs on all repos of that group and children recursively." msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:186 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:184 msgid "Integration scope" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:216 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:214 msgid "General integration options" msgstr "" -#: rhodecode/model/validation_schema/schemas/integration_schema.py:219 +#: rhodecode/model/validation_schema/schemas/integration_schema.py:217 msgid "{integration_type} settings" msgstr "" @@ -4043,459 +4155,459 @@ msgstr "" msgid "Additional emails can be specified at extra emails page." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:28706 -#: rhodecode/public/js/scripts.js:20554 +#: rhodecode/public/js/rhodecode-components.js:13225 +#: rhodecode/public/js/scripts.js:19 +msgid ": , " +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:33754 +#: rhodecode/public/js/scripts.js:20548 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:34 #: rhodecode/public/js/src/plugins/jquery.autocomplete.js:87 msgid "No results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30637 -#: rhodecode/public/js/scripts.js:22485 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 +#: rhodecode/public/js/rhodecode-components.js:35685 +#: rhodecode/public/js/scripts.js:22479 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:112 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:109 msgid "{0} year" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30638 -#: rhodecode/public/js/scripts.js:22486 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 +#: rhodecode/public/js/rhodecode-components.js:35686 +#: rhodecode/public/js/scripts.js:22480 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:110 msgid "{0} month" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30639 -#: rhodecode/public/js/scripts.js:22487 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 +#: rhodecode/public/js/rhodecode-components.js:35687 +#: rhodecode/public/js/scripts.js:22481 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:111 msgid "{0} day" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30640 -#: rhodecode/public/js/scripts.js:22488 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:99 +#: rhodecode/public/js/rhodecode-components.js:35688 +#: rhodecode/public/js/scripts.js:22482 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:112 msgid "{0} hour" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30641 -#: rhodecode/public/js/scripts.js:22489 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:101 +#: rhodecode/public/js/rhodecode-components.js:35689 +#: rhodecode/public/js/scripts.js:22483 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:113 msgid "{0} min" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30642 -#: rhodecode/public/js/scripts.js:22490 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 +#: rhodecode/public/js/rhodecode-components.js:35690 +#: rhodecode/public/js/scripts.js:22484 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:114 msgid "{0} sec" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30662 -#: rhodecode/public/js/scripts.js:22510 +#: rhodecode/public/js/rhodecode-components.js:35710 +#: rhodecode/public/js/scripts.js:22504 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:81 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:134 msgid "in {0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30670 -#: rhodecode/public/js/scripts.js:22518 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +#: rhodecode/public/js/rhodecode-components.js:35718 +#: rhodecode/public/js/scripts.js:22512 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:142 msgid "{0} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30682 -#: rhodecode/public/js/scripts.js:22530 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +#: rhodecode/public/js/rhodecode-components.js:35730 +#: rhodecode/public/js/scripts.js:22524 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:114 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:154 msgid "{0}, {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30684 -#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode-components.js:35732 +#: rhodecode/public/js/scripts.js:22526 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:83 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:156 msgid "in {0}, {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30688 -#: rhodecode/public/js/scripts.js:22536 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 +#: rhodecode/public/js/rhodecode-components.js:35736 +#: rhodecode/public/js/scripts.js:22530 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:97 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:160 msgid "{0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30690 -#: rhodecode/public/js/scripts.js:22538 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:96 +#: rhodecode/public/js/rhodecode-components.js:35738 +#: rhodecode/public/js/scripts.js:22532 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:162 msgid "{0} and {1} ago" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:30692 -#: rhodecode/public/js/scripts.js:22540 +#: rhodecode/public/js/rhodecode-components.js:35740 +#: rhodecode/public/js/scripts.js:22534 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:82 #: rhodecode/public/js/src/plugins/jquery.timeago-extension.js:164 msgid "in {0} and {1}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44751 -#: rhodecode/public/js/scripts.js:36599 +#: rhodecode/public/js/rhodecode-components.js:49799 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:24 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:4 msgid "Loading more results..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44754 -#: rhodecode/public/js/scripts.js:36602 +#: rhodecode/public/js/rhodecode-components.js:49802 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:50 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:7 msgid "Searching..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44757 -#: rhodecode/public/js/scripts.js:36605 +#: rhodecode/public/js/rhodecode-components.js:49805 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:29 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:10 msgid "No matches found" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44760 -#: rhodecode/public/js/scripts.js:36608 +#: rhodecode/public/js/rhodecode-components.js:49808 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:23 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:13 msgid "Loading failed" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44764 -#: rhodecode/public/js/scripts.js:36612 +#: rhodecode/public/js/rhodecode-components.js:49812 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:41 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:17 msgid "One result is available, press enter to select it." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44766 -#: rhodecode/public/js/scripts.js:36614 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 +#: rhodecode/public/js/rhodecode-components.js:49814 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:108 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:19 msgid "{0} results are available, use up and down arrow keys to navigate." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44771 -#: rhodecode/public/js/scripts.js:36619 +#: rhodecode/public/js/rhodecode-components.js:49819 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:46 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:24 msgid "Please enter {0} or more character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44773 -#: rhodecode/public/js/scripts.js:36621 +#: rhodecode/public/js/rhodecode-components.js:49821 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:47 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:26 msgid "Please enter {0} or more characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44778 -#: rhodecode/public/js/scripts.js:36626 +#: rhodecode/public/js/rhodecode-components.js:49826 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:44 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:31 msgid "Please delete {0} character" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44780 -#: rhodecode/public/js/scripts.js:36628 +#: rhodecode/public/js/rhodecode-components.js:49828 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:45 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:33 msgid "Please delete {0} characters" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44784 -#: rhodecode/public/js/scripts.js:36632 +#: rhodecode/public/js/rhodecode-components.js:49832 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:73 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:37 msgid "You can only select {0} item" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:44786 -#: rhodecode/public/js/scripts.js:36634 +#: rhodecode/public/js/rhodecode-components.js:49834 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:74 #: rhodecode/public/js/rhodecode/i18n/select2/translations.js:39 msgid "You can only select {0} items" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:45724 -#: rhodecode/public/js/scripts.js:37572 +#: rhodecode/public/js/rhodecode-components.js:50772 +#: rhodecode/public/js/scripts.js:37522 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:88 #: rhodecode/public/js/src/rhodecode/changelog.js:35 msgid "showing {0} out of {1} commit" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:45726 -#: rhodecode/public/js/scripts.js:37574 +#: rhodecode/public/js/rhodecode-components.js:50774 +#: rhodecode/public/js/scripts.js:37524 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:89 #: rhodecode/public/js/src/rhodecode/changelog.js:37 msgid "showing {0} out of {1} commits" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46172 -#: rhodecode/public/js/scripts.js:38020 +#: rhodecode/public/js/rhodecode-components.js:51282 +#: rhodecode/public/js/scripts.js:38032 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:53 -#: rhodecode/public/js/src/rhodecode/codemirror.js:297 +#: rhodecode/public/js/src/rhodecode/codemirror.js:359 msgid "Set status to Approved" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46191 -#: rhodecode/public/js/scripts.js:38039 +#: rhodecode/public/js/rhodecode-components.js:51301 +#: rhodecode/public/js/scripts.js:38051 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:54 -#: rhodecode/public/js/src/rhodecode/codemirror.js:316 +#: rhodecode/public/js/src/rhodecode/codemirror.js:378 msgid "Set status to Rejected" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46210 -#: rhodecode/public/js/scripts.js:38058 +#: rhodecode/public/js/rhodecode-components.js:51320 +#: rhodecode/public/js/scripts.js:38070 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:66 -#: rhodecode/public/js/src/rhodecode/codemirror.js:335 +#: rhodecode/public/js/src/rhodecode/codemirror.js:397 #: rhodecode/templates/email_templates/commit_comment.mako:99 #: rhodecode/templates/email_templates/pull_request_comment.mako:107 msgid "TODO comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46230 -#: rhodecode/public/js/scripts.js:38078 +#: rhodecode/public/js/rhodecode-components.js:51340 +#: rhodecode/public/js/scripts.js:38090 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:40 -#: rhodecode/public/js/src/rhodecode/codemirror.js:355 +#: rhodecode/public/js/src/rhodecode/codemirror.js:417 msgid "Note Comment" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46597 -#: rhodecode/public/js/scripts.js:38445 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 -#: rhodecode/public/js/src/rhodecode/comments.js:126 -msgid "resolve comment" -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:46681 -#: rhodecode/public/js/scripts.js:38529 +#: rhodecode/public/js/rhodecode-components.js:51653 +#: rhodecode/public/js/rhodecode-components.js:52007 +#: rhodecode/public/js/scripts.js:38403 rhodecode/public/js/scripts.js:38757 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:61 -#: rhodecode/public/js/src/rhodecode/comments.js:210 +#: rhodecode/public/js/src/rhodecode/codemirror.js:730 +#: rhodecode/public/js/src/rhodecode/comments.js:233 msgid "Status Review" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46696 -#: rhodecode/public/js/scripts.js:38544 +#: rhodecode/public/js/rhodecode-components.js:51668 +#: rhodecode/public/js/rhodecode-components.js:52022 +#: rhodecode/public/js/scripts.js:38418 rhodecode/public/js/scripts.js:38772 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:11 -#: rhodecode/public/js/src/rhodecode/comments.js:225 +#: rhodecode/public/js/src/rhodecode/codemirror.js:745 +#: rhodecode/public/js/src/rhodecode/comments.js:248 msgid "Comment text will be set automatically based on currently selected status ({0}) ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:46853 -#: rhodecode/public/js/scripts.js:38701 -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 -#: rhodecode/public/js/src/rhodecode/comments.js:382 -msgid "Submitting..." -msgstr "" - -#: rhodecode/public/js/rhodecode-components.js:46904 -#: rhodecode/public/js/scripts.js:38752 +#: rhodecode/public/js/rhodecode-components.js:51749 +#: rhodecode/public/js/rhodecode-components.js:52217 +#: rhodecode/public/js/scripts.js:38499 rhodecode/public/js/scripts.js:38967 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:22 -#: rhodecode/public/js/src/rhodecode/comments.js:433 +#: rhodecode/public/js/src/rhodecode/codemirror.js:826 +#: rhodecode/public/js/src/rhodecode/comments.js:443 #: rhodecode/templates/files/files_browser_tree.mako:51 msgid "Loading ..." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47014 -#: rhodecode/public/js/scripts.js:38862 +#: rhodecode/public/js/rhodecode-components.js:51923 +#: rhodecode/public/js/scripts.js:38673 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:87 +#: rhodecode/public/js/src/rhodecode/comments.js:149 +msgid "resolve comment" +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:52166 +#: rhodecode/public/js/scripts.js:38916 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:63 +#: rhodecode/public/js/src/rhodecode/comments.js:392 +msgid "Submitting..." +msgstr "" + +#: rhodecode/public/js/rhodecode-components.js:52331 +#: rhodecode/public/js/scripts.js:39081 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:13 -#: rhodecode/public/js/src/rhodecode/comments.js:543 +#: rhodecode/public/js/src/rhodecode/comments.js:557 msgid "Delete this comment?" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47086 -#: rhodecode/public/js/scripts.js:38934 +#: rhodecode/public/js/rhodecode-components.js:52403 +#: rhodecode/public/js/scripts.js:39153 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:20 -#: rhodecode/public/js/src/rhodecode/comments.js:615 +#: rhodecode/public/js/src/rhodecode/comments.js:629 msgid "Leave a comment, or click resolve button to resolve TODO comment #{0}" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47163 -#: rhodecode/public/js/scripts.js:39011 +#: rhodecode/public/js/rhodecode-components.js:52480 +#: rhodecode/public/js/scripts.js:39230 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:19 -#: rhodecode/public/js/src/rhodecode/comments.js:692 +#: rhodecode/public/js/src/rhodecode/comments.js:706 msgid "Leave a comment on line {0}." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47277 -#: rhodecode/public/js/scripts.js:39125 +#: rhodecode/public/js/rhodecode-components.js:52598 +#: rhodecode/public/js/scripts.js:39348 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:67 -#: rhodecode/public/js/src/rhodecode/comments.js:806 +#: rhodecode/public/js/src/rhodecode/comments.js:824 msgid "TODO from comment {0} was fixed." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47457 -#: rhodecode/public/js/scripts.js:39305 +#: rhodecode/public/js/rhodecode-components.js:52778 +#: rhodecode/public/js/scripts.js:39528 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:91 #: rhodecode/public/js/src/rhodecode/files.js:150 msgid "truncated result" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47459 -#: rhodecode/public/js/scripts.js:39307 +#: rhodecode/public/js/rhodecode-components.js:52780 +#: rhodecode/public/js/scripts.js:39530 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:92 #: rhodecode/public/js/src/rhodecode/files.js:152 msgid "truncated results" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47468 -#: rhodecode/public/js/scripts.js:39316 +#: rhodecode/public/js/rhodecode-components.js:52789 +#: rhodecode/public/js/scripts.js:39539 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:30 #: rhodecode/public/js/src/rhodecode/files.js:161 msgid "No matching files" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47603 -#: rhodecode/public/js/scripts.js:39451 +#: rhodecode/public/js/rhodecode-components.js:52924 +#: rhodecode/public/js/scripts.js:39674 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:51 #: rhodecode/public/js/src/rhodecode/files.js:296 msgid "Selection link" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47643 -#: rhodecode/public/js/scripts.js:39491 +#: rhodecode/public/js/rhodecode-components.js:52964 +#: rhodecode/public/js/scripts.js:39714 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:62 #: rhodecode/public/js/src/rhodecode/followers.js:26 msgid "Stop following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47644 -#: rhodecode/public/js/scripts.js:39492 +#: rhodecode/public/js/rhodecode-components.js:52965 +#: rhodecode/public/js/scripts.js:39715 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:69 #: rhodecode/public/js/src/rhodecode/followers.js:27 msgid "Unfollow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47653 -#: rhodecode/public/js/scripts.js:39501 +#: rhodecode/public/js/rhodecode-components.js:52974 +#: rhodecode/public/js/scripts.js:39724 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:60 #: rhodecode/public/js/src/rhodecode/followers.js:36 msgid "Start following this repository" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:47654 -#: rhodecode/public/js/scripts.js:39502 +#: rhodecode/public/js/rhodecode-components.js:52975 +#: rhodecode/public/js/scripts.js:39725 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:17 #: rhodecode/public/js/src/rhodecode/followers.js:37 msgid "Follow" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48034 -#: rhodecode/public/js/scripts.js:39882 +#: rhodecode/public/js/rhodecode-components.js:53356 +#: rhodecode/public/js/scripts.js:40106 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:6 #: rhodecode/public/js/src/rhodecode/pullrequests.js:134 msgid "All reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48043 -#: rhodecode/public/js/scripts.js:39891 +#: rhodecode/public/js/rhodecode-components.js:53365 +#: rhodecode/public/js/scripts.js:40115 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:5 #: rhodecode/public/js/src/rhodecode/pullrequests.js:143 msgid "All individual reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48048 -#: rhodecode/public/js/scripts.js:39896 +#: rhodecode/public/js/rhodecode-components.js:53370 +#: rhodecode/public/js/scripts.js:40120 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:7 #: rhodecode/public/js/src/rhodecode/pullrequests.js:148 msgid "At least {0} reviewer must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48054 -#: rhodecode/public/js/scripts.js:39902 +#: rhodecode/public/js/rhodecode-components.js:53376 +#: rhodecode/public/js/scripts.js:40126 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:8 #: rhodecode/public/js/src/rhodecode/pullrequests.js:154 msgid "At least {0} reviewers must vote." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48070 -#: rhodecode/public/js/scripts.js:39918 +#: rhodecode/public/js/rhodecode-components.js:53392 +#: rhodecode/public/js/scripts.js:40142 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:48 #: rhodecode/public/js/src/rhodecode/pullrequests.js:170 msgid "Reviewers picked from source code changes." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48077 -#: rhodecode/public/js/scripts.js:39925 +#: rhodecode/public/js/rhodecode-components.js:53399 +#: rhodecode/public/js/scripts.js:40149 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:4 #: rhodecode/public/js/src/rhodecode/pullrequests.js:177 msgid "Adding new reviewers is forbidden." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48084 -#: rhodecode/public/js/scripts.js:39932 +#: rhodecode/public/js/rhodecode-components.js:53406 +#: rhodecode/public/js/scripts.js:40156 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:9 #: rhodecode/public/js/src/rhodecode/pullrequests.js:184 msgid "Author is not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48098 -#: rhodecode/public/js/scripts.js:39946 +#: rhodecode/public/js/rhodecode-components.js:53420 +#: rhodecode/public/js/scripts.js:40170 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:12 #: rhodecode/public/js/src/rhodecode/pullrequests.js:198 msgid "Commit Authors are not allowed to be a reviewer." msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48206 -#: rhodecode/public/js/scripts.js:40054 +#: rhodecode/public/js/rhodecode-components.js:53528 +#: rhodecode/public/js/scripts.js:40278 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:72 #: rhodecode/public/js/src/rhodecode/pullrequests.js:306 msgid "User `{0}` not allowed to be a reviewer" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48212 -#: rhodecode/public/js/scripts.js:40060 +#: rhodecode/public/js/rhodecode-components.js:53534 +#: rhodecode/public/js/scripts.js:40284 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:71 #: rhodecode/public/js/src/rhodecode/pullrequests.js:312 msgid "User `{0}` already in reviewers" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48342 -#: rhodecode/public/js/scripts.js:40190 +#: rhodecode/public/js/rhodecode-components.js:53622 +#: rhodecode/public/js/scripts.js:40372 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:75 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:442 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:400 msgid "added manually by \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48346 -#: rhodecode/public/js/scripts.js:40194 +#: rhodecode/public/js/rhodecode-components.js:53626 +#: rhodecode/public/js/scripts.js:40376 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:86 -#: rhodecode/public/js/src/rhodecode/pullrequests.js:446 +#: rhodecode/public/js/src/rhodecode/pullrequests.js:404 msgid "member of \"{0}\"" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48932 -#: rhodecode/public/js/scripts.js:40780 +#: rhodecode/public/js/rhodecode-components.js:54212 +#: rhodecode/public/js/scripts.js:40962 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:79 #: rhodecode/public/js/src/rhodecode.js:142 msgid "file" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:48952 -#: rhodecode/public/js/scripts.js:40800 +#: rhodecode/public/js/rhodecode-components.js:54232 +#: rhodecode/public/js/scripts.js:40982 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:56 #: rhodecode/public/js/src/rhodecode.js:162 +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:33 msgid "Show more" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49328 -#: rhodecode/public/js/scripts.js:41176 +#: rhodecode/public/js/rhodecode-components.js:54608 +#: rhodecode/public/js/scripts.js:41358 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:76 #: rhodecode/public/js/src/rhodecode.js:538 msgid "date not in future" msgstr "" -#: rhodecode/public/js/rhodecode-components.js:49336 -#: rhodecode/public/js/scripts.js:41184 +#: rhodecode/public/js/rhodecode-components.js:54616 +#: rhodecode/public/js/scripts.js:41366 #: rhodecode/public/js/rhodecode/i18n/js_translations.js:59 #: rhodecode/public/js/src/rhodecode.js:546 msgid "Specified expiration date" @@ -4506,14 +4618,14 @@ msgid "(from usergroup {0})" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:3 -#: rhodecode/templates/codeblocks/diffs.mako:497 #: rhodecode/templates/codeblocks/diffs.mako:502 +#: rhodecode/templates/codeblocks/diffs.mako:507 msgid "Add another comment" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:10 #: rhodecode/public/js/src/i18n_messages.js:5 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:333 msgid "Close" msgstr "" @@ -4593,7 +4705,7 @@ msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:52 #: rhodecode/public/js/src/i18n_messages.js:6 -#: rhodecode/templates/admin/settings/settings_email.mako:48 +#: rhodecode/templates/admin/settings/settings_email.mako:52 msgid "Send" msgstr "" @@ -4642,7 +4754,7 @@ msgid "files" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:85 -#: rhodecode/templates/pullrequests/pullrequest.mako:140 +#: rhodecode/templates/pullrequests/pullrequest.mako:141 msgid "loading..." msgstr "" @@ -4651,30 +4763,46 @@ msgid "specify commit" msgstr "" #: rhodecode/public/js/rhodecode/i18n/js_translations.js:93 +msgid "{0} ({1} inactive) of {2} user groups ({3} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:94 +msgid "{0} ({1} inactive) of {2} users ({3} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:95 msgid "{0} active out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:98 -msgid "{0} days" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:100 +msgid "{0} days" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:102 msgid "{0} hours" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:103 -msgid "{0} months" -msgstr "" - -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:104 -msgid "{0} out of {1} ssh keys" -msgstr "" - #: rhodecode/public/js/rhodecode/i18n/js_translations.js:105 +msgid "{0} months" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:106 +msgid "{0} out of {1} ssh keys" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:107 msgid "{0} out of {1} users" msgstr "" -#: rhodecode/public/js/rhodecode/i18n/js_translations.js:109 +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:110 +msgid "{0} user groups ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:111 +msgid "{0} users ({1} inactive)" +msgstr "" + +#: rhodecode/public/js/rhodecode/i18n/js_translations.js:113 msgid "{0} years" msgstr "" @@ -4706,54 +4834,38 @@ msgstr "" msgid "Dashboard" msgstr "" -#: rhodecode/templates/index_base.mako:8 -#: rhodecode/templates/admin/gists/index.mako:18 -#: rhodecode/templates/admin/my_account/my_account_repos.mako:7 -#: rhodecode/templates/admin/my_account/my_account_watched.mako:7 -#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 -#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 -#: rhodecode/templates/admin/repos/repos.mako:12 -#: rhodecode/templates/admin/user_groups/user_groups.mako:12 -#: rhodecode/templates/admin/users/users.mako:12 -#: rhodecode/templates/bookmarks/bookmarks.mako:12 -#: rhodecode/templates/branches/branches.mako:12 -#: rhodecode/templates/journal/journal.mako:13 -#: rhodecode/templates/tags/tags.mako:12 -msgid "quick filter..." -msgstr "" - -#: rhodecode/templates/index_base.mako:10 +#: rhodecode/templates/index_base.mako:9 msgid "matches" msgstr "" -#: rhodecode/templates/index_base.mako:30 -#: rhodecode/templates/index_base.mako:39 +#: rhodecode/templates/index_base.mako:29 +#: rhodecode/templates/index_base.mako:38 #: rhodecode/templates/admin/repos/repo_add.mako:22 #: rhodecode/templates/admin/repos/repos.mako:27 msgid "Add Repository" msgstr "" -#: rhodecode/templates/index_base.mako:34 -#: rhodecode/templates/index_base.mako:42 +#: rhodecode/templates/index_base.mako:33 +#: rhodecode/templates/index_base.mako:41 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:16 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:27 msgid "Add Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:45 +#: rhodecode/templates/index_base.mako:44 msgid "You have admin right to this group, and can edit it" msgstr "" -#: rhodecode/templates/index_base.mako:45 +#: rhodecode/templates/index_base.mako:44 msgid "Edit Repository Group" msgstr "" -#: rhodecode/templates/index_base.mako:68 +#: rhodecode/templates/index_base.mako:67 msgid "No repositories or repositories groups exists here." msgstr "" -#: rhodecode/templates/index_base.mako:86 -#: rhodecode/templates/index_base.mako:116 +#: rhodecode/templates/index_base.mako:85 +#: rhodecode/templates/index_base.mako:115 #: rhodecode/templates/admin/gists/index.mako:112 #: rhodecode/templates/admin/integrations/list.mako:72 #: rhodecode/templates/admin/my_account/my_account_pullrequests.mako:55 @@ -4764,9 +4876,10 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:9 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:16 #: rhodecode/templates/admin/repos/repos.mako:54 -#: rhodecode/templates/admin/user_groups/user_groups.mako:61 +#: rhodecode/templates/admin/user_groups/user_groups.mako:73 #: rhodecode/templates/admin/users/user_edit_groups.mako:54 -#: rhodecode/templates/base/perms_summary.mako:149 +#: rhodecode/templates/base/perms_summary.mako:168 +#: rhodecode/templates/base/perms_summary.mako:242 #: rhodecode/templates/bookmarks/bookmarks.mako:59 #: rhodecode/templates/branches/branches.mako:58 #: rhodecode/templates/files/files_browser_tree.mako:5 @@ -4775,31 +4888,31 @@ msgstr "" msgid "Name" msgstr "" -#: rhodecode/templates/index_base.mako:89 -#: rhodecode/templates/index_base.mako:119 +#: rhodecode/templates/index_base.mako:88 +#: rhodecode/templates/index_base.mako:118 #: rhodecode/templates/admin/gists/index.mako:114 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:15 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:71 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:10 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:55 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:57 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:44 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:49 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:45 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:56 -#: rhodecode/templates/admin/repos/repo_add_base.mako:43 +#: rhodecode/templates/admin/repos/repo_add_base.mako:52 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:29 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:170 #: rhodecode/templates/admin/repos/repos.mako:57 #: rhodecode/templates/admin/user_groups/user_group_add.mako:43 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:42 -#: rhodecode/templates/admin/user_groups/user_groups.mako:63 +#: rhodecode/templates/admin/user_groups/user_groups.mako:75 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:15 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:67 #: rhodecode/templates/admin/users/user_edit_groups.mako:59 #: rhodecode/templates/admin/users/user_edit_ips.mako:12 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:10 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:50 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:52 #: rhodecode/templates/base/issue_tracker_settings.mako:10 #: rhodecode/templates/changeset/changeset.mako:76 #: rhodecode/templates/compare/compare_commits.mako:21 @@ -4809,23 +4922,23 @@ msgstr "" #: rhodecode/templates/files/file_tree_detail.mako:5 #: rhodecode/templates/files/file_tree_detail.mako:12 #: rhodecode/templates/forks/fork.mako:48 -#: rhodecode/templates/forks/forks.mako:72 -#: rhodecode/templates/pullrequests/pullrequest.mako:54 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 +#: rhodecode/templates/forks/forks.mako:64 +#: rhodecode/templates/pullrequests/pullrequest.mako:55 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:170 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:484 #: rhodecode/templates/summary/components.mako:88 msgid "Description" msgstr "" -#: rhodecode/templates/index_base.mako:92 -#: rhodecode/templates/index_base.mako:122 +#: rhodecode/templates/index_base.mako:91 +#: rhodecode/templates/index_base.mako:121 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:59 #: rhodecode/templates/admin/repos/repos.mako:60 msgid "Last Change" msgstr "" -#: rhodecode/templates/index_base.mako:94 -#: rhodecode/templates/index_base.mako:127 +#: rhodecode/templates/index_base.mako:93 +#: rhodecode/templates/index_base.mako:126 #: rhodecode/templates/admin/my_account/my_account_user_group_membership.mako:50 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:5 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:37 @@ -4835,15 +4948,15 @@ msgstr "" #: rhodecode/templates/admin/repos/repos.mako:65 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:5 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:24 -#: rhodecode/templates/admin/user_groups/user_groups.mako:71 +#: rhodecode/templates/admin/user_groups/user_groups.mako:83 #: rhodecode/templates/admin/users/user_edit_groups.mako:65 -#: rhodecode/templates/forks/forks.mako:68 +#: rhodecode/templates/forks/forks.mako:60 #: rhodecode/templates/summary/components.mako:209 #: rhodecode/templates/user_group/profile.mako:23 msgid "Owner" msgstr "" -#: rhodecode/templates/index_base.mako:125 +#: rhodecode/templates/index_base.mako:124 #: rhodecode/templates/admin/my_account/my_account_repos.mako:35 #: rhodecode/templates/admin/my_account/my_account_watched.mako:35 #: rhodecode/templates/admin/repos/repos.mako:63 @@ -4855,7 +4968,7 @@ msgstr "" #: rhodecode/templates/email_templates/commit_comment.mako:49 #: rhodecode/templates/email_templates/commit_comment.mako:88 #: rhodecode/templates/files/file_authors_box.mako:31 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:479 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:482 #: rhodecode/templates/search/search_commit.mako:6 #: rhodecode/templates/summary/summary_commits.mako:8 #: rhodecode/templates/tags/tags.mako:66 @@ -4895,7 +5008,6 @@ msgstr "" #: rhodecode/templates/login.mako:68 rhodecode/templates/password_reset.mako:37 #: rhodecode/templates/base/base.mako:48 -#: rhodecode/templates/errors/error_document.mako:63 msgid "Support" msgstr "" @@ -4925,58 +5037,62 @@ msgstr "" msgid "Email Address" msgstr "" -#: rhodecode/templates/password_reset.mako:61 -#: rhodecode/templates/register.mako:85 +#: rhodecode/templates/password_reset.mako:58 +msgid "Password reset link will be sent to matching email address" +msgstr "" + +#: rhodecode/templates/password_reset.mako:62 +#: rhodecode/templates/register.mako:100 msgid "Captcha" msgstr "" -#: rhodecode/templates/password_reset.mako:71 +#: rhodecode/templates/password_reset.mako:73 msgid "Send password reset email" msgstr "" -#: rhodecode/templates/password_reset.mako:72 -msgid "Password reset link will be sent to matching email address" -msgstr "" - #: rhodecode/templates/register.mako:5 msgid "Create an Account" msgstr "" -#: rhodecode/templates/register.mako:35 +#: rhodecode/templates/register.mako:36 +msgid "Create an account linked with {}" +msgstr "" + +#: rhodecode/templates/register.mako:38 msgid "Create an account" msgstr "" -#: rhodecode/templates/register.mako:36 +#: rhodecode/templates/register.mako:41 msgid "Go to the login page to sign in with an existing account." msgstr "" -#: rhodecode/templates/register.mako:55 +#: rhodecode/templates/register.mako:65 msgid "Re-enter password" msgstr "" -#: rhodecode/templates/register.mako:62 +#: rhodecode/templates/register.mako:77 #: rhodecode/templates/admin/my_account/my_account_profile.mako:32 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:32 #: rhodecode/templates/admin/users/user_add.mako:68 #: rhodecode/templates/admin/users/user_edit_profile.mako:47 -#: rhodecode/templates/admin/users/users.mako:67 +#: rhodecode/templates/admin/users/users.mako:75 msgid "First Name" msgstr "" -#: rhodecode/templates/register.mako:69 +#: rhodecode/templates/register.mako:84 #: rhodecode/templates/admin/my_account/my_account_profile.mako:40 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:41 #: rhodecode/templates/admin/users/user_add.mako:77 #: rhodecode/templates/admin/users/user_edit_profile.mako:56 -#: rhodecode/templates/admin/users/users.mako:69 +#: rhodecode/templates/admin/users/users.mako:77 msgid "Last Name" msgstr "" -#: rhodecode/templates/register.mako:97 +#: rhodecode/templates/register.mako:112 msgid "Account activation requires admin approval." msgstr "" -#: rhodecode/templates/register.mako:104 +#: rhodecode/templates/register.mako:119 msgid "Create Account" msgstr "" @@ -5010,19 +5126,19 @@ msgstr "" #: rhodecode/templates/admin/admin_log_base.mako:8 #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:18 #: rhodecode/templates/admin/my_account/my_account_repos.mako:37 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:13 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:55 #: rhodecode/templates/admin/repo_groups/repo_groups.mako:65 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:13 #: rhodecode/templates/admin/repos/repos.mako:69 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:71 -#: rhodecode/templates/admin/user_groups/user_groups.mako:73 +#: rhodecode/templates/admin/user_groups/user_groups.mako:85 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:18 #: rhodecode/templates/admin/users/user_edit_groups.mako:73 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 -#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:13 +#: rhodecode/templates/admin/users/users.mako:88 #: rhodecode/templates/files/files_detail.mako:58 -#: rhodecode/templates/forks/forks.mako:79 +#: rhodecode/templates/forks/forks.mako:71 msgid "Action" msgstr "" @@ -5039,7 +5155,7 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_log_entry.mako:92 #: rhodecode/templates/admin/admin_log_base.mako:10 #: rhodecode/templates/admin/defaults/defaults.mako:31 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:13 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:16 #: rhodecode/templates/search/search_commit.mako:5 #: rhodecode/templates/search/search_path.mako:3 msgid "Repository" @@ -5057,19 +5173,20 @@ msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:14 #: rhodecode/templates/admin/repos/repo_edit_audit.mako:15 #: rhodecode/templates/admin/users/user_edit_audit.mako:15 +#: rhodecode/templates/journal/journal.mako:13 msgid "filter" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:15 -#: rhodecode/templates/admin/repos/repo_edit.mako:92 +#: rhodecode/templates/admin/repos/repo_edit.mako:95 #: rhodecode/templates/admin/users/user_edit.mako:47 msgid "Audit logs" msgstr "" #: rhodecode/templates/admin/admin_audit_logs.mako:17 -#: rhodecode/templates/admin/repos/repo_edit_audit.mako:17 -#: rhodecode/templates/admin/users/user_edit_audit.mako:17 -#: rhodecode/templates/journal/journal.mako:18 +#: rhodecode/templates/admin/repos/repo_edit_audit.mako:18 +#: rhodecode/templates/admin/users/user_edit_audit.mako:18 +#: rhodecode/templates/journal/journal.mako:16 #: rhodecode/templates/search/search.mako:76 msgid "Example Queries" msgstr "" @@ -5118,18 +5235,18 @@ msgstr "" #: rhodecode/templates/admin/auth/plugin_settings.mako:87 #: rhodecode/templates/admin/defaults/defaults_repositories.mako:63 #: rhodecode/templates/admin/permissions/permissions_application.mako:59 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:56 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:59 #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:78 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:133 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:204 #: rhodecode/templates/admin/repo_groups/repo_group_edit_settings.mako:83 #: rhodecode/templates/admin/repos/repo_add_base.mako:106 #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:79 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:109 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:186 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:243 #: rhodecode/templates/admin/settings/settings_hooks.mako:63 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:15 #: rhodecode/templates/admin/user_groups/user_group_add.mako:60 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:120 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:191 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:102 #: rhodecode/templates/admin/users/user_add.mako:128 #: rhodecode/templates/admin/users/user_edit_groups.mako:27 @@ -5154,7 +5271,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:14 #: rhodecode/templates/admin/gists/index.mako:110 #: rhodecode/templates/admin/integrations/list.mako:73 -#: rhodecode/templates/admin/repos/repo_add_base.mako:80 +#: rhodecode/templates/admin/repos/repo_add_base.mako:43 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:12 msgid "Type" msgstr "" @@ -5167,7 +5284,7 @@ msgstr "" #: rhodecode/templates/admin/defaults/defaults_repositories.mako:27 #: rhodecode/templates/admin/repos/repo_add_base.mako:102 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:192 -#: rhodecode/templates/forks/fork.mako:92 +#: rhodecode/templates/forks/fork.mako:102 msgid "Private repositories are only visible to people explicitly added as collaborators." msgstr "" @@ -5228,12 +5345,12 @@ msgstr "" #: rhodecode/templates/admin/gists/edit.mako:102 #: rhodecode/templates/base/issue_tracker_settings.mako:73 -#: rhodecode/templates/changeset/changeset_file_comment.mako:391 +#: rhodecode/templates/changeset/changeset_file_comment.mako:392 #: rhodecode/templates/codeblocks/diffs.mako:72 #: rhodecode/templates/files/files_add.mako:108 #: rhodecode/templates/files/files_delete.mako:69 #: rhodecode/templates/files/files_edit.mako:108 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:64 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:65 msgid "Cancel" msgstr "" @@ -5258,6 +5375,21 @@ msgstr "" msgid "Public Gists" msgstr "" +#: rhodecode/templates/admin/gists/index.mako:18 +#: rhodecode/templates/admin/my_account/my_account_repos.mako:7 +#: rhodecode/templates/admin/my_account/my_account_watched.mako:7 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:11 +#: rhodecode/templates/admin/repo_groups/repo_groups.mako:12 +#: rhodecode/templates/admin/repos/repos.mako:12 +#: rhodecode/templates/admin/user_groups/user_groups.mako:12 +#: rhodecode/templates/admin/users/users.mako:12 +#: rhodecode/templates/bookmarks/bookmarks.mako:12 +#: rhodecode/templates/branches/branches.mako:12 +#: rhodecode/templates/journal/journal.mako:12 +#: rhodecode/templates/tags/tags.mako:12 +msgid "quick filter..." +msgstr "" + #: rhodecode/templates/admin/gists/index.mako:24 #, python-format msgid "All Gists for user %s" @@ -5300,7 +5432,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:203 #: rhodecode/templates/compare/compare_commits.mako:18 #: rhodecode/templates/files/files_browser_tree.mako:9 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:478 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:481 #: rhodecode/templates/pullrequests/pullrequests.mako:112 #: rhodecode/templates/search/search_commit.mako:16 #: rhodecode/templates/summary/summary_commits.mako:11 @@ -5309,11 +5441,13 @@ msgid "Author" msgstr "" #: rhodecode/templates/admin/gists/index.mako:116 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:51 #: rhodecode/templates/admin/repo_groups/repo_group_edit_advanced.mako:6 #: rhodecode/templates/admin/repos/repo_edit_advanced.mako:6 #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:6 #: rhodecode/templates/admin/users/user_edit_advanced.mako:5 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 msgid "Created on" msgstr "" @@ -5389,9 +5523,9 @@ msgstr "" #: rhodecode/templates/admin/integrations/form.mako:17 #: rhodecode/templates/admin/integrations/list.mako:10 #: rhodecode/templates/admin/integrations/new.mako:13 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:28 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:31 #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:14 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:125 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:196 msgid "Repository Groups" msgstr "" @@ -5521,7 +5655,7 @@ msgstr "" #: rhodecode/templates/admin/my_account/my_account.mako:32 #: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:3 -#: rhodecode/templates/admin/permissions/permissions.mako:48 +#: rhodecode/templates/admin/permissions/permissions.mako:51 #: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:4 #: rhodecode/templates/admin/users/user_edit.mako:40 #: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:3 @@ -5608,13 +5742,13 @@ msgid "Repository scope works only with msgstr "" #: rhodecode/templates/admin/my_account/my_account_auth_tokens.mako:86 -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:67 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:69 #: rhodecode/templates/admin/permissions/permissions_ips.mako:63 #: rhodecode/templates/admin/repos/repo_edit_fields.mako:65 #: rhodecode/templates/admin/users/user_edit_auth_tokens.mako:82 #: rhodecode/templates/admin/users/user_edit_emails.mako:62 #: rhodecode/templates/admin/users/user_edit_ips.mako:70 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:62 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:64 msgid "Add" msgstr "" @@ -5646,15 +5780,27 @@ msgstr "" msgid "No additional emails specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:21 +#: rhodecode/templates/admin/my_account/my_account_emails.mako:51 +#: rhodecode/templates/admin/my_account/my_account_password.mako:6 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17 +msgid "Your user account details are managed by an external source. Details cannot be managed here." +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_emails.mako:52 +#: rhodecode/templates/admin/my_account/my_account_password.mako:7 +#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18 +msgid "Source type" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:22 msgid "Your Live Notification Settings" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:33 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:34 msgid "Notifications Status" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_notifications.mako:46 +#: rhodecode/templates/admin/my_account/my_account_notifications.mako:47 msgid "Test Notifications" msgstr "" @@ -5662,16 +5808,6 @@ msgstr "" msgid "Change Your Account Password" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_password.mako:6 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:17 -msgid "Your user account details are managed by an external source. Details cannot be managed here." -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_password.mako:7 -#: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:18 -msgid "Source type" -msgstr "" - #: rhodecode/templates/admin/my_account/my_account_profile.mako:4 #: rhodecode/templates/admin/my_account/my_account_profile_edit.mako:4 msgid "My Profile" @@ -5717,7 +5853,7 @@ msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:9 #: rhodecode/templates/email_templates/pull_request_review.mako:39 #: rhodecode/templates/email_templates/pull_request_review.mako:72 -#: rhodecode/templates/pullrequests/pullrequest.mako:45 +#: rhodecode/templates/pullrequests/pullrequest.mako:46 #: rhodecode/templates/pullrequests/pullrequests.mako:114 msgid "Title" msgstr "" @@ -5737,44 +5873,44 @@ msgstr "" msgid "Fingerprint" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:11 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:11 -#: rhodecode/templates/data_table/_dt_elements.mako:183 -msgid "Created" -msgstr "" - -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:15 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:12 +#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:12 +msgid "Accessed on" +msgstr "" + +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:16 msgid "SSH Keys usage is currently disabled, please ask your administrator to enable them." msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:30 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:27 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:32 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:29 #, python-format msgid "Confirm to remove ssh key %s" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:38 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:35 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:40 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:37 msgid "No additional ssh keys specified" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:52 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:47 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:54 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:49 msgid "New ssh key" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:56 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:51 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:58 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:53 msgid "Generate random RSA key" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:62 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:57 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:64 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:59 msgid "Public key, begins with 'ssh-rsa', 'ssh-dss', 'ssh-ed25519', 'ecdsa-sha2-nistp256', 'ecdsa-sha2-nistp384', or 'ecdsa-sha2-nistp521'" msgstr "" -#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:71 -#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:66 +#: rhodecode/templates/admin/my_account/my_account_ssh_keys.mako:73 +#: rhodecode/templates/admin/users/user_edit_ssh_keys.mako:68 msgid "Click add to use this generate SSH key" msgstr "" @@ -5782,11 +5918,11 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:41 #: rhodecode/templates/admin/user_groups/user_group_add.mako:52 #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:51 -#: rhodecode/templates/admin/user_groups/user_groups.mako:69 +#: rhodecode/templates/admin/user_groups/user_groups.mako:81 #: rhodecode/templates/admin/users/user_add.mako:97 #: rhodecode/templates/admin/users/user_edit_groups.mako:64 #: rhodecode/templates/admin/users/user_edit_profile.mako:90 -#: rhodecode/templates/admin/users/users.mako:74 +#: rhodecode/templates/admin/users/users.mako:82 #: rhodecode/templates/user_group/profile.mako:33 msgid "Active" msgstr "" @@ -5852,15 +5988,15 @@ msgstr "" msgid "Object" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.mako:42 +#: rhodecode/templates/admin/permissions/permissions.mako:45 msgid "IP Whitelist" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.mako:45 +#: rhodecode/templates/admin/permissions/permissions.mako:48 msgid "AuthToken Access" msgstr "" -#: rhodecode/templates/admin/permissions/permissions.mako:51 +#: rhodecode/templates/admin/permissions/permissions.mako:54 msgid "Overview" msgstr "" @@ -5905,6 +6041,19 @@ msgstr "" msgid "List of views available for usage in whitelist access" msgstr "" +#: rhodecode/templates/admin/permissions/permissions_branch.mako:3 +msgid "Default Permissions for Branches." +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_branch.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:6 +#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62 +#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6 +#: rhodecode/templates/admin/settings/settings_automation.mako:6 +msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license." +msgstr "" + #: rhodecode/templates/admin/permissions/permissions_ips.mako:5 msgid "Default IP Whitelist For All Users" msgstr "" @@ -5946,31 +6095,35 @@ msgstr "" msgid "Default Permissions for Repositories, User Groups and Repository Groups." msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.mako:6 -msgid "Default system permissions. Each permissions management entity will be created with the following default settings. Check the overwrite checkbox to force any permission changes on already existing settings." -msgstr "" - -#: rhodecode/templates/admin/permissions/permissions_objects.mako:20 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:7 +msgid "Default access permissions. This defines permissions for the `default` user from which other users inherit permissions." +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_objects.mako:9 +msgid "Check the overwrite checkbox to force change all previously defined permissions for `default` user to the new selected value." +msgstr "" + +#: rhodecode/templates/admin/permissions/permissions_objects.mako:23 msgid "All default permissions on each repository will be reset to chosen permission, note that all custom default permission on repositories will be lost" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.mako:21 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:35 -#: rhodecode/templates/admin/permissions/permissions_objects.mako:49 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:24 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:38 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:52 msgid "Overwrite Existing Settings" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.mako:34 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:37 msgid "All default permissions on each repository group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.mako:42 +#: rhodecode/templates/admin/permissions/permissions_objects.mako:45 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:14 msgid "User Groups" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_objects.mako:48 -msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on repository groups will be lost" +#: rhodecode/templates/admin/permissions/permissions_objects.mako:51 +msgid "All default permissions on each user group will be reset to chosen permission, note that all custom default permission on user groups will be lost" msgstr "" #: rhodecode/templates/admin/permissions/permissions_perms.mako:1 @@ -5981,10 +6134,6 @@ msgstr "" msgid "Update SSH keys file" msgstr "" -#: rhodecode/templates/admin/permissions/permissions_ssh_keys.mako:53 -msgid "Accessed on" -msgstr "" - #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:5 msgid "Add repository group" msgstr "" @@ -6011,7 +6160,7 @@ msgid "Group Parent" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_add.mako:69 -#: rhodecode/templates/admin/repos/repo_add_base.mako:71 +#: rhodecode/templates/admin/repos/repo_add_base.mako:89 msgid "Copy Parent Group Permissions" msgstr "" @@ -6029,7 +6178,7 @@ msgid "Add Child Group" msgstr "" #: rhodecode/templates/admin/repo_groups/repo_group_edit.mako:50 -#: rhodecode/templates/admin/repos/repo_edit.mako:52 +#: rhodecode/templates/admin/repos/repo_edit.mako:55 #: rhodecode/templates/admin/user_groups/user_group_edit.mako:35 #: rhodecode/templates/admin/users/user_edit.mako:41 msgid "Advanced" @@ -6079,54 +6228,64 @@ msgstr "" msgid "User/User Group" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:30 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:30 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:31 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:32 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:31 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:33 msgid "super admin" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:33 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:33 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:34 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:35 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:34 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:36 msgid "owner" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:50 -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:74 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:52 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:76 -msgid "permission for all other users" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:60 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:64 #: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:107 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:70 -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:98 -msgid "Revoke" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:78 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:80 -msgid "delegated admin" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:116 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:86 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:66 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109 +msgid "permission for all other users" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:68 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:111 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:90 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:70 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:113 +msgid "inactive duplicate" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:77 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:155 #: rhodecode/templates/admin/repos/repo_edit_permissions.mako:106 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:117 -#: rhodecode/templates/base/issue_tracker_settings.mako:83 -msgid "Add new" -msgstr "" - -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:121 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:150 +#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:79 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:157 +msgid "Remove" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:114 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:116 +msgid "delegated admin" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:182 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:177 +#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:183 +msgid "Add user/user group" +msgstr "" + +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:192 msgid "Apply to children" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:127 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:198 msgid "Both" msgstr "" -#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:128 +#: rhodecode/templates/admin/repo_groups/repo_group_edit_permissions.mako:199 msgid "Set or revoke permissions to selected types of children of this group, including non-private repositories and other groups if chosen." msgstr "" @@ -6180,43 +6339,43 @@ msgstr "" msgid "Clone from" msgstr "" -#: rhodecode/templates/admin/repos/repo_add_base.mako:48 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177 -#: rhodecode/templates/forks/fork.mako:53 -msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions" +#: rhodecode/templates/admin/repos/repo_add_base.mako:47 +msgid "Set the type of repository to create." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:57 -msgid "Repository Group" -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:63 -#: rhodecode/templates/forks/fork.mako:69 -#, python-format -msgid "Select my personal group (%(repo_group_name)s)" +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:177 +#: rhodecode/templates/forks/fork.mako:53 +msgid "Plain text format with support of {metatags}. Add a README file for longer descriptions" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:66 -#: rhodecode/templates/forks/fork.mako:72 -msgid "Optionally select a group to put this repository into." +msgid "Repository Group" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:72 +#: rhodecode/templates/forks/fork.mako:69 +#, python-format +msgid "Select my personal group (%(repo_group_name)s)" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:75 -msgid "Copy permission set from the parent repository group." +#: rhodecode/templates/forks/fork.mako:72 +msgid "Optionally select a group to put this repository into." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_add_base.mako:80 +#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141 +#: rhodecode/templates/forks/fork.mako:78 +msgid "Landing commit" msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:84 -msgid "Set the type of repository to create." -msgstr "" - -#: rhodecode/templates/admin/repos/repo_add_base.mako:89 -#: rhodecode/templates/admin/repos/repo_edit_settings.mako:141 -#: rhodecode/templates/forks/fork.mako:78 -msgid "Landing commit" +msgid "The default commit for file pages, downloads, full text search index, and README generation." msgstr "" #: rhodecode/templates/admin/repos/repo_add_base.mako:93 -msgid "The default commit for file pages, downloads, full text search index, and README generation." +msgid "Copy permission set from the parent repository group." msgstr "" #: rhodecode/templates/admin/repos/repo_creating.mako:5 @@ -6237,33 +6396,39 @@ msgstr "" msgid "%s repository settings" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:58 +#: rhodecode/templates/admin/repos/repo_edit.mako:52 +msgid "Branch Permissions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:61 msgid "Extra Fields" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:64 +#: rhodecode/templates/admin/repos/repo_edit.mako:67 +#: rhodecode/templates/admin/users/user_edit.mako:48 +#: rhodecode/templates/admin/users/user_edit_caches.mako:5 msgid "Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:68 +#: rhodecode/templates/admin/repos/repo_edit.mako:71 msgid "Remote sync" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:72 +#: rhodecode/templates/admin/repos/repo_edit.mako:75 #: rhodecode/templates/summary/components.mako:149 msgid "Statistics" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:79 +#: rhodecode/templates/admin/repos/repo_edit.mako:82 msgid "Reviewer Rules" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit.mako:86 -#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 -msgid "Maintenance" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit.mako:89 +#: rhodecode/templates/admin/repos/repo_edit_maintenance.mako:3 +msgid "Maintenance" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit.mako:92 msgid "Strip" msgstr "" @@ -6392,13 +6557,6 @@ msgstr "" msgid "Repo Automation" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_automation.mako:6 -#: rhodecode/templates/admin/repos/repo_edit_remote.mako:62 -#: rhodecode/templates/admin/repos/repo_edit_reviewers.mako:6 -#: rhodecode/templates/admin/settings/settings_automation.mako:6 -msgid "This feature is available in RhodeCode EE edition only. Contact {sales_email} to obtain a trial license." -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_caches.mako:3 msgid "Invalidate Cache for Repository" msgstr "" @@ -6420,29 +6578,44 @@ msgid "Confirm to invalidate repository msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:39 -#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 -#: rhodecode/templates/base/issue_tracker_settings.mako:13 -msgid "Prefix" +#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 +msgid "Key" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:40 -#: rhodecode/templates/admin/repos/repo_edit_fields.mako:11 -msgid "Key" +msgid "Namespace" msgstr "" #: rhodecode/templates/admin/repos/repo_edit_caches.mako:58 +msgid "Cache keys" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:74 +#: rhodecode/templates/admin/users/user_edit_caches.mako:19 +msgid "Show all" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:92 +msgid "Shadow Repositories" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:104 +msgid "No Shadow repositories exist for this repository." +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:115 msgid "Diff Caches" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:63 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:120 msgid "Cached diff name" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:67 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:124 msgid "Cached diff files" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_caches.mako:71 +#: rhodecode/templates/admin/repos/repo_edit_caches.mako:128 msgid "Cached diff size" msgstr "" @@ -6498,6 +6671,7 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:30 #: rhodecode/templates/base/issue_tracker_settings.mako:11 +#: rhodecode/templates/base/perms_summary.mako:169 msgid "Pattern" msgstr "" @@ -6506,6 +6680,11 @@ msgstr "" msgid "Url" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:32 +#: rhodecode/templates/base/issue_tracker_settings.mako:13 +msgid "Prefix" +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_issuetracker.mako:70 #: rhodecode/templates/admin/settings/settings_issuetracker.mako:5 msgid "Issue Tracker / Wiki Patterns" @@ -6544,14 +6723,26 @@ msgstr "" msgid "Repository Permissions" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:42 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:55 msgid "private repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:47 +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:60 msgid "only users/user groups explicitly added here will have access" msgstr "" +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:94 +msgid "used by {} branch rule, requires write+ permissions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_permissions.mako:96 +msgid "used by {} branch rules, requires write+ permissions" +msgstr "" + +#: rhodecode/templates/admin/repos/repo_edit_permissions_branch.mako:3 +msgid "Repository Branch Permissions." +msgstr "" + #: rhodecode/templates/admin/repos/repo_edit_remote.mako:3 msgid "Remote Sync" msgstr "" @@ -6642,9 +6833,10 @@ msgstr "" #: rhodecode/templates/admin/repos/repo_edit_settings.mako:60 #: rhodecode/templates/admin/repos/repo_edit_settings.mako:102 -#: rhodecode/templates/base/perms_summary.mako:92 -#: rhodecode/templates/base/perms_summary.mako:210 -#: rhodecode/templates/base/perms_summary.mako:212 +#: rhodecode/templates/base/perms_summary.mako:111 +#: rhodecode/templates/base/perms_summary.mako:228 +#: rhodecode/templates/base/perms_summary.mako:306 +#: rhodecode/templates/base/perms_summary.mako:308 #: rhodecode/templates/debug_style/form-elements.html:45 msgid "edit" msgstr "" @@ -6769,10 +6961,6 @@ msgstr "" msgid "Sorry this functionality is not available for SVN repository" msgstr "" -#: rhodecode/templates/admin/repos/repo_edit_strip.mako:46 -msgid "Remove" -msgstr "" - #: rhodecode/templates/admin/repos/repo_edit_strip.mako:114 msgid "Checking commits" msgstr "" @@ -6873,18 +7061,74 @@ msgstr "" msgid "SMTP auth" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.mako:34 +#: rhodecode/templates/admin/settings/settings_email.mako:30 +msgid "You can adjust those settings in [DEFAULT] section of .ini file located at" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_email.mako:38 msgid "Test Email" msgstr "" -#: rhodecode/templates/admin/settings/settings_email.mako:40 -msgid "enter valid email" -msgstr "" - #: rhodecode/templates/admin/settings/settings_email.mako:44 +msgid "enter valid email" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_email.mako:48 msgid "Send an auto-generated email from this server to above email..." msgstr "" +#: rhodecode/templates/admin/settings/settings_exceptions.mako:3 +msgid "Exceptions Tracker - Exception ID" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:8 +msgid "Exception `{}` generated on UTC date: {}" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:12 +msgid "Unable to Read Exception. It might be removed or non-existing." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:21 +msgid "Delete this Exception" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:29 +msgid "Confirm to delete this exception" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions.mako:31 +msgid "Delete This Exception" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:3 +msgid "Exceptions Tracker " +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:7 +msgid "There is {} stored exception." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:9 +msgid "There are {} stored exceptions." +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:11 +msgid "Store directory" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:18 +msgid "Confirm to delete all exceptions" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:20 +msgid "Delete All" +msgstr "" + +#: rhodecode/templates/admin/settings/settings_exceptions_browse.mako:32 +msgid "Exceptions Tracker - Showing the last {} Exceptions" +msgstr "" + #: rhodecode/templates/admin/settings/settings_global.mako:5 msgid "Branding" msgstr "" @@ -6935,19 +7179,19 @@ msgid "Registration Captcha" msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:68 -msgid "Google ReCaptcha public key" +msgid "Google reCaptcha v2 site key." msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:75 -msgid "Public key for reCaptcha system." +msgid "Site key for reCaptcha v2 system." msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:80 -msgid "Google ReCaptcha private key" +msgid "Google reCaptcha v2 secret key." msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:87 -msgid "Private key for reCaptcha system. Setting this value will enable captcha on registration" +msgid "Secret key for reCaptcha v2 system. Setting this value will enable captcha on registration and password reset forms." msgstr "" #: rhodecode/templates/admin/settings/settings_global.mako:95 @@ -7352,7 +7596,7 @@ msgid "Permissions summary" msgstr "" #: rhodecode/templates/admin/user_groups/user_group_edit_advanced.mako:8 -#: rhodecode/templates/admin/user_groups/user_groups.mako:65 +#: rhodecode/templates/admin/user_groups/user_groups.mako:77 #: rhodecode/templates/debug_style/form-elements.html:509 #: rhodecode/templates/user_group/profile.mako:42 msgid "Members" @@ -7426,11 +7670,6 @@ msgstr "" msgid "User Group Permissions" msgstr "" -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:62 -#: rhodecode/templates/admin/user_groups/user_group_edit_perms.mako:109 -msgid "revoke" -msgstr "" - #: rhodecode/templates/admin/user_groups/user_group_edit_settings.mako:36 msgid "Change owner of this user group." msgstr "" @@ -7449,11 +7688,7 @@ msgstr "" msgid "User groups administration" msgstr "" -#: rhodecode/templates/admin/user_groups/user_groups.mako:13 -msgid "user groups" -msgstr "" - -#: rhodecode/templates/admin/user_groups/user_groups.mako:67 +#: rhodecode/templates/admin/user_groups/user_groups.mako:79 msgid "Sync" msgstr "" @@ -7543,8 +7778,8 @@ msgid "Last login" msgstr "" #: rhodecode/templates/admin/users/user_edit_advanced.mako:9 -#: rhodecode/templates/admin/users/users.mako:72 -#: rhodecode/templates/forks/forks.mako:77 +#: rhodecode/templates/admin/users/users.mako:80 +#: rhodecode/templates/forks/forks.mako:69 msgid "Last activity" msgstr "" @@ -7634,6 +7869,14 @@ msgstr "" msgid "User Audit Logs" msgstr "" +#: rhodecode/templates/admin/users/user_edit_caches.mako:33 +msgid "Invalidate user cache" +msgstr "" + +#: rhodecode/templates/admin/users/user_edit_caches.mako:33 +msgid "Confirm to invalidate user cache" +msgstr "" + #: rhodecode/templates/admin/users/user_edit_emails.mako:5 msgid "Additional Email Addresses" msgstr "" @@ -7739,7 +7982,7 @@ msgstr "" msgid "Users administration" msgstr "" -#: rhodecode/templates/admin/users/users.mako:78 +#: rhodecode/templates/admin/users/users.mako:86 msgid "Auth type" msgstr "" @@ -7818,7 +8061,7 @@ msgid "Compare fork with %s" msgstr "" #: rhodecode/templates/base/base.mako:269 -#: rhodecode/templates/base/base.mako:415 +#: rhodecode/templates/base/base.mako:446 #: rhodecode/templates/search/search.mako:64 msgid "Search" msgstr "" @@ -7871,46 +8114,49 @@ msgstr "" msgid "Sign Out" msgstr "" -#: rhodecode/templates/base/base.mako:397 +#: rhodecode/templates/base/base.mako:403 +msgid "search / go to..." +msgstr "" + +#: rhodecode/templates/base/base.mako:428 msgid "Show activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:398 +#: rhodecode/templates/base/base.mako:429 #: rhodecode/templates/journal/journal.mako:4 -#: rhodecode/templates/journal/journal.mako:15 +#: rhodecode/templates/journal/journal.mako:14 msgid "Journal" msgstr "" -#: rhodecode/templates/base/base.mako:403 +#: rhodecode/templates/base/base.mako:434 msgid "Show Public activity journal" msgstr "" -#: rhodecode/templates/base/base.mako:404 +#: rhodecode/templates/base/base.mako:435 msgid "Public journal" msgstr "" -#: rhodecode/templates/base/base.mako:409 +#: rhodecode/templates/base/base.mako:440 msgid "Show Gists" msgstr "" -#: rhodecode/templates/base/base.mako:410 +#: rhodecode/templates/base/base.mako:441 msgid "Gists" msgstr "" -#: rhodecode/templates/base/base.mako:414 +#: rhodecode/templates/base/base.mako:445 msgid "Search in repositories you have access to" msgstr "" -#: rhodecode/templates/base/base.mako:420 +#: rhodecode/templates/base/base.mako:451 msgid "Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:427 +#: rhodecode/templates/base/base.mako:458 msgid "Delegated Admin settings" msgstr "" -#: rhodecode/templates/base/base.mako:437 -#: rhodecode/templates/base/base.mako:438 +#: rhodecode/templates/base/base.mako:471 #: rhodecode/templates/debug_style/alerts.html:5 #: rhodecode/templates/debug_style/buttons.html:5 #: rhodecode/templates/debug_style/code-block.html:6 @@ -7932,15 +8178,15 @@ msgstr "" msgid "Style" msgstr "" -#: rhodecode/templates/base/base.mako:495 -msgid "Go to" -msgstr "" - -#: rhodecode/templates/base/base.mako:548 +#: rhodecode/templates/base/base.mako:472 +msgid "[Style]" +msgstr "" + +#: rhodecode/templates/base/base.mako:619 msgid "Keyboard shortcuts" msgstr "" -#: rhodecode/templates/base/base.mako:556 +#: rhodecode/templates/base/base.mako:627 msgid "Site-wide shortcuts" msgstr "" @@ -8023,6 +8269,10 @@ msgstr "" msgid "Read more" msgstr "" +#: rhodecode/templates/base/issue_tracker_settings.mako:83 +msgid "Add new" +msgstr "" + #: rhodecode/templates/base/issue_tracker_settings.mako:91 msgid "New Entry" msgstr "" @@ -8032,8 +8282,9 @@ msgid "Confirm to remove this pattern:" msgstr "" #: rhodecode/templates/base/issue_tracker_settings.mako:191 -#: rhodecode/templates/changeset/changeset_file_comment.mako:275 -#: rhodecode/templates/changeset/changeset_file_comment.mako:325 +#: rhodecode/templates/changeset/changeset_file_comment.mako:276 +#: rhodecode/templates/changeset/changeset_file_comment.mako:326 +#: rhodecode/templates/data_table/_dt_elements.mako:389 #: rhodecode/templates/files/files_add.mako:84 #: rhodecode/templates/files/files_add.mako:230 #: rhodecode/templates/files/files_edit.mako:85 @@ -8045,94 +8296,116 @@ msgstr "" msgid "Test Pattern Preview" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:14 +#: rhodecode/templates/base/perms_summary.mako:26 msgid "in JSON format" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:23 +#: rhodecode/templates/base/perms_summary.mako:35 +#: rhodecode/templates/base/perms_summary.mako:43 msgid "show" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:24 +#: rhodecode/templates/base/perms_summary.mako:36 +#: rhodecode/templates/base/perms_summary.mako:44 msgid "none" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:25 +#: rhodecode/templates/base/perms_summary.mako:37 +#: rhodecode/templates/changelog/changelog_elements.mako:107 +#: rhodecode/templates/changeset/changeset.mako:109 +#: rhodecode/templates/files/base.mako:4 +msgid "merge" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:38 +msgid "push" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:39 +msgid "push force" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:45 msgid "read" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:26 +#: rhodecode/templates/base/perms_summary.mako:46 msgid "write" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:27 +#: rhodecode/templates/base/perms_summary.mako:47 msgid "admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:34 +#: rhodecode/templates/base/perms_summary.mako:55 msgid "No permissions defined" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:42 -#: rhodecode/templates/base/perms_summary.mako:150 +#: rhodecode/templates/base/perms_summary.mako:63 +#: rhodecode/templates/base/perms_summary.mako:170 +#: rhodecode/templates/base/perms_summary.mako:243 msgid "Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:44 -#: rhodecode/templates/base/perms_summary.mako:152 +#: rhodecode/templates/base/perms_summary.mako:65 +#: rhodecode/templates/base/perms_summary.mako:245 msgid "Edit Permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:100 -#: rhodecode/templates/base/perms_summary.mako:109 +#: rhodecode/templates/base/perms_summary.mako:119 +#: rhodecode/templates/base/perms_summary.mako:128 msgid "edit global" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:117 +#: rhodecode/templates/base/perms_summary.mako:136 msgid "Repository default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:120 +#: rhodecode/templates/base/perms_summary.mako:139 msgid "Repository group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:123 +#: rhodecode/templates/base/perms_summary.mako:142 msgid "User group default permission" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:126 +#: rhodecode/templates/base/perms_summary.mako:145 msgid "Super admin" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:129 +#: rhodecode/templates/base/perms_summary.mako:148 msgid "Inherit permissions" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:132 +#: rhodecode/templates/base/perms_summary.mako:151 msgid "Create repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:135 +#: rhodecode/templates/base/perms_summary.mako:154 msgid "Fork repositories" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:138 +#: rhodecode/templates/base/perms_summary.mako:157 msgid "Create repository groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:141 +#: rhodecode/templates/base/perms_summary.mako:160 msgid "Create user groups" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:190 +#: rhodecode/templates/base/perms_summary.mako:172 +msgid "Edit Branch Permission" +msgstr "" + +#: rhodecode/templates/base/perms_summary.mako:286 msgid "overridden by" msgstr "" -#: rhodecode/templates/base/perms_summary.mako:223 -msgid "No permission defined" -msgstr "" - -#: rhodecode/templates/base/root.mako:165 +#: rhodecode/templates/base/perms_summary.mako:321 +msgid "No matching permission defined" +msgstr "" + +#: rhodecode/templates/base/root.mako:142 msgid "Please enable JavaScript to use RhodeCode Enterprise" msgstr "" @@ -8500,17 +8773,11 @@ msgstr "" #: rhodecode/templates/changelog/changelog_elements.mako:83 #: rhodecode/templates/compare/compare_commits.mako:50 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:516 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:519 #: rhodecode/templates/search/search_commit.mako:36 msgid "Expand commit message" msgstr "" -#: rhodecode/templates/changelog/changelog_elements.mako:107 -#: rhodecode/templates/changeset/changeset.mako:109 -#: rhodecode/templates/files/base.mako:4 -msgid "merge" -msgstr "" - #: rhodecode/templates/changelog/changelog_elements.mako:129 #: rhodecode/templates/changeset/changeset.mako:122 #: rhodecode/templates/files/base.mako:17 @@ -8538,7 +8805,7 @@ msgid "Parent Commit" msgstr "" #: rhodecode/templates/changeset/changeset.mako:65 -msgid "Parent" +msgid "parent" msgstr "" #: rhodecode/templates/changeset/changeset.mako:69 @@ -8546,7 +8813,7 @@ msgid "Child Commit" msgstr "" #: rhodecode/templates/changeset/changeset.mako:69 -msgid "Child" +msgid "child" msgstr "" #: rhodecode/templates/changeset/changeset.mako:81 @@ -8555,7 +8822,7 @@ msgstr "" #: rhodecode/templates/changeset/changeset.mako:89 #: rhodecode/templates/changeset/changeset.mako:95 -#: rhodecode/templates/changeset/changeset_file_comment.mako:82 +#: rhodecode/templates/changeset/changeset_file_comment.mako:83 #: rhodecode/templates/compare/compare_diff.mako:159 msgid "Commit status" msgstr "" @@ -8571,8 +8838,8 @@ msgid "Diff options" msgstr "" #: rhodecode/templates/changeset/changeset.mako:142 -#: rhodecode/templates/codeblocks/diffs.mako:455 -#: rhodecode/templates/codeblocks/diffs.mako:458 +#: rhodecode/templates/codeblocks/diffs.mako:460 +#: rhodecode/templates/codeblocks/diffs.mako:463 msgid "Raw diff" msgstr "" @@ -8589,8 +8856,8 @@ msgid "Patch Diff" msgstr "" #: rhodecode/templates/changeset/changeset.mako:150 -#: rhodecode/templates/codeblocks/diffs.mako:462 -#: rhodecode/templates/codeblocks/diffs.mako:465 +#: rhodecode/templates/codeblocks/diffs.mako:467 +#: rhodecode/templates/codeblocks/diffs.mako:470 msgid "Download diff" msgstr "" @@ -8614,102 +8881,99 @@ msgstr "" msgid "No Parent Commits" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:33 +#: rhodecode/templates/changeset/changeset_file_comment.mako:34 msgid "Resolved by comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:40 +#: rhodecode/templates/changeset/changeset_file_comment.mako:41 msgid "Click to resolve this comment" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:67 -#: rhodecode/templates/changeset/changeset_file_comment.mako:69 +#: rhodecode/templates/changeset/changeset_file_comment.mako:68 +#: rhodecode/templates/changeset/changeset_file_comment.mako:70 #, python-format msgid "pull request #%s" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:74 +#: rhodecode/templates/changeset/changeset_file_comment.mako:75 msgid "Status change on commit" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:89 +#: rhodecode/templates/changeset/changeset_file_comment.mako:90 msgid "resolves comment #{}" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:97 -msgid "Pull request author" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:98 +msgid "Pull request author" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:99 msgid "author" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:106 -msgid "Outdated comment from pull request version {0}" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:110 -#: rhodecode/templates/changeset/changeset_file_comment.mako:125 -msgid "Comment from pull request version {0}" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:122 -msgid "Outdated comment from pull request version {}" -msgstr "" - -#: rhodecode/templates/changeset/changeset_file_comment.mako:152 -#: rhodecode/templates/changeset/changeset_file_comment.mako:155 -msgid "Prev" +#: rhodecode/templates/changeset/changeset_file_comment.mako:107 +#: rhodecode/templates/changeset/changeset_file_comment.mako:123 +msgid "Outdated comment from pull request version v{0}, latest v{1}" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:111 +#: rhodecode/templates/changeset/changeset_file_comment.mako:126 +msgid "Comment from pull request version v{0}, latest v{1}" msgstr "" #: rhodecode/templates/changeset/changeset_file_comment.mako:153 #: rhodecode/templates/changeset/changeset_file_comment.mako:156 +msgid "Prev" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:154 +#: rhodecode/templates/changeset/changeset_file_comment.mako:157 msgid "Next" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:191 +#: rhodecode/templates/changeset/changeset_file_comment.mako:192 msgid "Leave a comment on this Pull Request." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:193 +#: rhodecode/templates/changeset/changeset_file_comment.mako:194 msgid "Leave a comment on {} commits in this range." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:195 +#: rhodecode/templates/changeset/changeset_file_comment.mako:196 msgid "Leave a comment on this Commit." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:283 -#: rhodecode/templates/codeblocks/diffs.mako:67 -msgid "You need to be logged in to leave comments." -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:284 #: rhodecode/templates/codeblocks/diffs.mako:67 +msgid "You need to be logged in to leave comments." +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:285 +#: rhodecode/templates/codeblocks/diffs.mako:67 msgid "Login now" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:349 +#: rhodecode/templates/changeset/changeset_file_comment.mako:350 #, python-format msgid "Comments parsed using %s syntax with %s, and %s actions support." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:351 -msgid "Use @username inside this text to send notification to this RhodeCode user" -msgstr "" - #: rhodecode/templates/changeset/changeset_file_comment.mako:352 +msgid "Use @username inside this text to send notification to this RhodeCode user" +msgstr "" + +#: rhodecode/templates/changeset/changeset_file_comment.mako:353 msgid "Start typing with / for certain actions to be triggered via text box." msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:369 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:15 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:159 +#: rhodecode/templates/changeset/changeset_file_comment.mako:370 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:16 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:160 #: rhodecode/templates/pullrequests/pullrequests.mako:52 msgid "Closed" msgstr "" -#: rhodecode/templates/changeset/changeset_file_comment.mako:399 +#: rhodecode/templates/changeset/changeset_file_comment.mako:400 #: rhodecode/templates/compare/compare_diff.mako:104 #: rhodecode/templates/compare/compare_diff.mako:112 #: rhodecode/templates/compare/compare_diff.mako:120 @@ -8809,82 +9073,82 @@ msgstr "" msgid "Hide them" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:294 -msgid "File was deleted in this version, and outdated comments were made on it" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:360 +#: rhodecode/templates/codeblocks/diffs.mako:299 +msgid "File was deleted in this version. There are still outdated/unresolved comments attached to it." +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:365 #: rhodecode/templates/files/files_source.mako:19 msgid "Copy the full path" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:425 -#: rhodecode/templates/codeblocks/diffs.mako:441 +#: rhodecode/templates/codeblocks/diffs.mako:430 +#: rhodecode/templates/codeblocks/diffs.mako:446 #, python-format msgid "Show file at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:427 -#: rhodecode/templates/codeblocks/diffs.mako:434 -msgid "Show file before" -msgstr "" - #: rhodecode/templates/codeblocks/diffs.mako:432 -#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:439 +msgid "Show file before" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:437 +#: rhodecode/templates/codeblocks/diffs.mako:453 #, python-format msgid "File no longer present at commit: %(commit_id)s" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:443 -#: rhodecode/templates/codeblocks/diffs.mako:450 +#: rhodecode/templates/codeblocks/diffs.mako:448 +#: rhodecode/templates/codeblocks/diffs.mako:455 msgid "Show file after" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:481 +#: rhodecode/templates/codeblocks/diffs.mako:486 msgid "Show comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:481 +#: rhodecode/templates/codeblocks/diffs.mako:486 msgid "Hide comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:547 -#: rhodecode/templates/codeblocks/diffs.mako:590 -#: rhodecode/templates/codeblocks/diffs.mako:645 +#: rhodecode/templates/codeblocks/diffs.mako:552 +#: rhodecode/templates/codeblocks/diffs.mako:595 +#: rhodecode/templates/codeblocks/diffs.mako:650 msgid "comments including outdated" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:549 -#: rhodecode/templates/codeblocks/diffs.mako:592 -#: rhodecode/templates/codeblocks/diffs.mako:647 +#: rhodecode/templates/codeblocks/diffs.mako:554 +#: rhodecode/templates/codeblocks/diffs.mako:597 +#: rhodecode/templates/codeblocks/diffs.mako:652 msgid "comments" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:701 +#: rhodecode/templates/codeblocks/diffs.mako:706 msgid "View side by side" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:703 -msgid "Side by Side" -msgstr "" - -#: rhodecode/templates/codeblocks/diffs.mako:707 -msgid "View unified" -msgstr "" - #: rhodecode/templates/codeblocks/diffs.mako:708 +msgid "Side by Side" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:712 +msgid "View unified" +msgstr "" + +#: rhodecode/templates/codeblocks/diffs.mako:713 msgid "Unified" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:718 +#: rhodecode/templates/codeblocks/diffs.mako:723 msgid "Expand All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:722 +#: rhodecode/templates/codeblocks/diffs.mako:727 msgid "Collapse All Files" msgstr "" -#: rhodecode/templates/codeblocks/diffs.mako:726 +#: rhodecode/templates/codeblocks/diffs.mako:731 msgid "Wide Mode Diff" msgstr "" @@ -8901,7 +9165,7 @@ msgid "Compare was calculated based on t msgstr "" #: rhodecode/templates/compare/compare_commits.mako:17 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:477 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:480 msgid "Time" msgstr "" @@ -8928,7 +9192,7 @@ msgstr "" #: rhodecode/templates/compare/compare_diff.mako:60 #: rhodecode/templates/email_templates/pull_request_review.mako:74 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:107 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:108 msgid "Target" msgstr "" @@ -8936,7 +9200,7 @@ msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:90 #: rhodecode/templates/email_templates/pull_request_review.mako:73 #: rhodecode/templates/files/files_source.mako:29 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:71 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:72 msgid "Source" msgstr "" @@ -9003,6 +9267,10 @@ msgstr "" msgid "Creating" msgstr "" +#: rhodecode/templates/data_table/_dt_elements.mako:183 +msgid "Created" +msgstr "" + #: rhodecode/templates/data_table/_dt_elements.mako:225 msgid "personal" msgstr "" @@ -9019,15 +9287,20 @@ msgid "User group" msgstr "" #: rhodecode/templates/data_table/_dt_elements.mako:332 -#: rhodecode/templates/forks/fork.mako:88 +#: rhodecode/templates/forks/fork.mako:98 msgid "Private" msgstr "" -#: rhodecode/templates/data_table/_dt_elements.mako:366 +#: rhodecode/templates/data_table/_dt_elements.mako:365 #, python-format msgid "Pull request #%(pr_number)s" msgstr "" +#: rhodecode/templates/data_table/_dt_elements.mako:406 +#, python-format +msgid "Parsed using %s syntax" +msgstr "" + #: rhodecode/templates/debug_style/buttons.html:131 msgid "Confirm to remove this field: Field" msgstr "" @@ -9266,7 +9539,7 @@ msgid "%(user)s left %(comment_type)s on msgstr "" #: rhodecode/templates/email_templates/pull_request_comment.mako:49 -#: rhodecode/templates/pullrequests/pullrequest.mako:72 +#: rhodecode/templates/pullrequests/pullrequest.mako:73 msgid "Source repository" msgstr "" @@ -9349,6 +9622,10 @@ msgstr "" msgid "You will be redirected to %s in %s seconds" msgstr "" +#: rhodecode/templates/errors/error_document.mako:63 +msgid "Support Page" +msgstr "" + #: rhodecode/templates/feed/atom_feed_entry.mako:3 #, python-format msgid "%(user)s commited on %(date)s UTC" @@ -9634,7 +9911,7 @@ msgid "New Fork" msgstr "" #: rhodecode/templates/forks/fork.mako:37 -#: rhodecode/templates/forks/forks.mako:70 +#: rhodecode/templates/forks/forks.mako:62 msgid "Fork name" msgstr "" @@ -9642,11 +9919,11 @@ msgstr "" msgid "Default commit for files page, downloads, whoosh and readme" msgstr "" -#: rhodecode/templates/forks/fork.mako:98 +#: rhodecode/templates/forks/fork.mako:88 msgid "Copy permissions" msgstr "" -#: rhodecode/templates/forks/fork.mako:102 +#: rhodecode/templates/forks/fork.mako:92 msgid "Copy permissions from forked repository" msgstr "" @@ -9667,19 +9944,15 @@ msgstr "" msgid "Create new fork" msgstr "" -#: rhodecode/templates/forks/forks.mako:74 +#: rhodecode/templates/forks/forks.mako:66 msgid "Forked" msgstr "" -#: rhodecode/templates/journal/journal.mako:14 -msgid "Filter" -msgstr "" - -#: rhodecode/templates/journal/journal.mako:24 -msgid "ATOM journal feed" -msgstr "" - #: rhodecode/templates/journal/journal.mako:25 +msgid "ATOM journal feed" +msgstr "" + +#: rhodecode/templates/journal/journal.mako:26 msgid "RSS journal feed" msgstr "" @@ -9700,74 +9973,70 @@ msgstr "" msgid "RSS public journal feed" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:4 -#: rhodecode/templates/pullrequests/pullrequest.mako:8 +#: rhodecode/templates/pullrequests/pullrequest.mako:5 +#: rhodecode/templates/pullrequests/pullrequest.mako:9 msgid "New pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:35 +#: rhodecode/templates/pullrequests/pullrequest.mako:36 msgid "Pull request summary" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:58 -msgid "Write a short description on this pull request" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest.mako:64 +#: rhodecode/templates/pullrequests/pullrequest.mako:65 msgid "Commit flow" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:90 +#: rhodecode/templates/pullrequests/pullrequest.mako:91 msgid "Loading refs..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:101 +#: rhodecode/templates/pullrequests/pullrequest.mako:102 msgid "Submit Pull Request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:115 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:315 +#: rhodecode/templates/pullrequests/pullrequest.mako:116 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:317 msgid "Author of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:129 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:329 +#: rhodecode/templates/pullrequests/pullrequest.mako:130 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:331 msgid "Reviewer rules" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:139 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:343 +#: rhodecode/templates/pullrequests/pullrequest.mako:140 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:345 msgid "Pull request reviewers" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:150 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:386 +#: rhodecode/templates/pullrequests/pullrequest.mako:151 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:388 msgid "Add reviewer or reviewer group" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:305 -#: rhodecode/templates/pullrequests/pullrequest.mako:513 +#: rhodecode/templates/pullrequests/pullrequest.mako:307 +#: rhodecode/templates/pullrequests/pullrequest.mako:524 msgid "Please select source and target" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:311 +#: rhodecode/templates/pullrequests/pullrequest.mako:313 msgid "Loading compare ..." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:367 +#: rhodecode/templates/pullrequests/pullrequest.mako:372 msgid "Show detailed compare." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:374 +#: rhodecode/templates/pullrequests/pullrequest.mako:379 msgid "There are no commits to merge." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:424 -#: rhodecode/templates/pullrequests/pullrequest.mako:450 +#: rhodecode/templates/pullrequests/pullrequest.mako:429 +#: rhodecode/templates/pullrequests/pullrequest.mako:455 msgid "Select commit reference" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest.mako:440 +#: rhodecode/templates/pullrequests/pullrequest.mako:445 msgid "Target repository" msgstr "" @@ -9802,179 +10071,187 @@ msgstr "" msgid "Close with status {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:5 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:6 #, python-format msgid "%s Pull Request #%s" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:51 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:52 msgid "From" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:57 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:58 msgid "Confirm to delete this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:88 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:89 msgid "Common ancestor" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:100 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:101 msgid "Copy the pull url" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:129 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:130 msgid "Merge" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:140 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:141 #: rhodecode/templates/summary/components.mako:66 msgid "Copy the clone url" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:144 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:145 msgid "Shadow repository data not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:152 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:153 msgid "Review" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:181 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:169 +msgid "Rendered using {} renderer" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:183 msgid "Versions" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:193 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:195 msgid "Hide all versions of this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:218 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:220 msgid "Your review status at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:224 -msgid "Comment from pull request version {0}, general:{1} inline:{2}" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:241 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 -msgid "select versions to show changes" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:242 -msgid "show changes between versions" +#: rhodecode/templates/pullrequests/pullrequest_show.mako:226 +msgid "Comment from pull request version v{0}, general:{1} inline:{2}" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:243 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:247 +msgid "select versions to show changes" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:244 +msgid "show changes between versions" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:245 msgid "show pull request for this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:258 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:260 msgid "Comments at this version" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:262 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:264 msgid "Comments for this pull request" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:267 #: rhodecode/templates/pullrequests/pullrequest_show.mako:269 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:271 #, python-format msgid "%d General " msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:273 #: rhodecode/templates/pullrequests/pullrequest_show.mako:275 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:277 #, python-format msgid "%d Inline" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:279 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 -#, python-format -msgid "%d Outdated" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:280 -msgid "show outdated comments" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:281 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:285 +#, python-format +msgid "%d Outdated" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:282 +msgid "show outdated comments" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:283 msgid "hide outdated comments" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:292 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:294 msgid "Pull request versions not available" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:306 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:391 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:308 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:393 msgid "Save Changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:408 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:410 msgid "Missing requirements:" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:409 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:411 msgid "These commits cannot be displayed, because this repository uses the Mercurial largefiles extension, which was not enabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:417 -msgid "Missing commits" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:418 -msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository." -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:419 +msgid "Missing commits" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:420 +msgid "This pull request cannot be displayed, because one or more commits no longer exist in the source repository." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:421 msgid "Please update this pull request, push the commits back into the source repository, or consider closing this pull request." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:430 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:422 +msgid "Consider doing a {force_refresh_url} in case you think this is an error." +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:433 #, python-format msgid "Showing changes at v%d, commenting is disabled." msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:453 -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:456 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:458 msgid "Update commits" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:455 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:458 msgid "Update is disabled for current view" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:466 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:469 msgid "Commits and changes between v{ver_from} and {ver_to} of this pull request, commenting is disabled" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:470 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:473 msgid "commits added: {}, removed: {}" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:488 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:491 msgid "Commit added in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:490 +#: rhodecode/templates/pullrequests/pullrequest_show.mako:493 msgid "Commit removed in displayed changes" msgstr "" -#: rhodecode/templates/pullrequests/pullrequest_show.mako:594 -msgid "there is {num} general comment from older versions" -msgstr "" - -#: rhodecode/templates/pullrequests/pullrequest_show.mako:595 -msgid "show it" -msgstr "" - #: rhodecode/templates/pullrequests/pullrequest_show.mako:597 -msgid "there are {num} general comments from older versions" +msgid "there is {num} general comment from older versions" msgstr "" #: rhodecode/templates/pullrequests/pullrequest_show.mako:598 +msgid "show it" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:600 +msgid "there are {num} general comments from older versions" +msgstr "" + +#: rhodecode/templates/pullrequests/pullrequest_show.mako:601 msgid "show them" msgstr "" diff --git a/rhodecode/public/js/rhodecode/i18n/be.js b/rhodecode/public/js/rhodecode/i18n/be.js --- a/rhodecode/public/js/rhodecode/i18n/be.js +++ b/rhodecode/public/js/rhodecode/i18n/be.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/de.js b/rhodecode/public/js/rhodecode/i18n/de.js --- a/rhodecode/public/js/rhodecode/i18n/de.js +++ b/rhodecode/public/js/rhodecode/i18n/de.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/en.js b/rhodecode/public/js/rhodecode/i18n/en.js --- a/rhodecode/public/js/rhodecode/i18n/en.js +++ b/rhodecode/public/js/rhodecode/i18n/en.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/es.js b/rhodecode/public/js/rhodecode/i18n/es.js --- a/rhodecode/public/js/rhodecode/i18n/es.js +++ b/rhodecode/public/js/rhodecode/i18n/es.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/fr.js b/rhodecode/public/js/rhodecode/i18n/fr.js --- a/rhodecode/public/js/rhodecode/i18n/fr.js +++ b/rhodecode/public/js/rhodecode/i18n/fr.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'Spécifier un commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} années', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/it.js b/rhodecode/public/js/rhodecode/i18n/it.js --- a/rhodecode/public/js/rhodecode/i18n/it.js +++ b/rhodecode/public/js/rhodecode/i18n/it.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/ja.js b/rhodecode/public/js/rhodecode/i18n/ja.js --- a/rhodecode/public/js/rhodecode/i18n/ja.js +++ b/rhodecode/public/js/rhodecode/i18n/ja.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': '省略された結果', 'truncated results': '省略された結果', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} 前', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} 件の結果があります。矢印キーの上下で選択できます。', '{0} sec': '{0} 秒', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} 年', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/js_translations.js b/rhodecode/public/js/rhodecode/i18n/js_translations.js --- a/rhodecode/public/js/rhodecode/i18n/js_translations.js +++ b/rhodecode/public/js/rhodecode/i18n/js_translations.js @@ -90,6 +90,8 @@ _gettext('specify commit'); _gettext('truncated result'); _gettext('truncated results'); +_gettext('{0} ({1} inactive) of {2} user groups ({3} inactive)'); +_gettext('{0} ({1} inactive) of {2} users ({3} inactive)'); _gettext('{0} active out of {1} users'); _gettext('{0} ago'); _gettext('{0} and {1}'); @@ -105,6 +107,8 @@ _gettext('{0} out of {1} users'); _gettext('{0} results are available, use up and down arrow keys to navigate.'); _gettext('{0} sec'); +_gettext('{0} user groups ({1} inactive)'); +_gettext('{0} users ({1} inactive)'); _gettext('{0} year'); _gettext('{0} years'); _gettext('{0}, {1} ago'); diff --git a/rhodecode/public/js/rhodecode/i18n/pl.js b/rhodecode/public/js/rhodecode/i18n/pl.js --- a/rhodecode/public/js/rhodecode/i18n/pl.js +++ b/rhodecode/public/js/rhodecode/i18n/pl.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} aktywnych z {1} użytkowników', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/pt.js b/rhodecode/public/js/rhodecode/i18n/pt.js --- a/rhodecode/public/js/rhodecode/i18n/pt.js +++ b/rhodecode/public/js/rhodecode/i18n/pt.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/ru.js b/rhodecode/public/js/rhodecode/i18n/ru.js --- a/rhodecode/public/js/rhodecode/i18n/ru.js +++ b/rhodecode/public/js/rhodecode/i18n/ru.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago' diff --git a/rhodecode/public/js/rhodecode/i18n/zh.js b/rhodecode/public/js/rhodecode/i18n/zh.js --- a/rhodecode/public/js/rhodecode/i18n/zh.js +++ b/rhodecode/public/js/rhodecode/i18n/zh.js @@ -96,6 +96,8 @@ var _TM = { 'specify commit': 'specify commit', 'truncated result': 'truncated result', 'truncated results': 'truncated results', + '{0} ({1} inactive) of {2} user groups ({3} inactive)': '{0} ({1} inactive) of {2} user groups ({3} inactive)', + '{0} ({1} inactive) of {2} users ({3} inactive)': '{0} ({1} inactive) of {2} users ({3} inactive)', '{0} active out of {1} users': '{0} active out of {1} users', '{0} ago': '{0} ago', '{0} and {1}': '{0} and {1}', @@ -111,6 +113,8 @@ var _TM = { '{0} out of {1} users': '{0} out of {1} users', '{0} results are available, use up and down arrow keys to navigate.': '{0} results are available, use up and down arrow keys to navigate.', '{0} sec': '{0} sec', + '{0} user groups ({1} inactive)': '{0} user groups ({1} inactive)', + '{0} users ({1} inactive)': '{0} users ({1} inactive)', '{0} year': '{0} year', '{0} years': '{0} years', '{0}, {1} ago': '{0}, {1} ago'